@openui5/sap.ui.core 1.94.0 → 1.97.0

package/src/sap/ui/model/odata/v4/lib/_Cache.js

@@ -21,6 +21,7 @@ sap.ui.define([
 		//   EMPLOYEE($uid=id-1550828854217-16) -> aMatches[0] === "($uid=id-1550828854217-16)"
 		//   @see sap.base.util.uid
 		rEndsWithTransientPredicate = /\(\$uid=[-\w]+\)$/,
+		rInactive = /^\$inactive\./,
 		sMessagesAnnotation = "@com.sap.vocabularies.Common.v1.Messages",
 		rNumber = /^-?\d+$/,
 		// Matches two cases:  segment with predicate or simply predicate:
@@ -140,6 +141,10 @@ sap.ui.define([
 	 *   An entity with the ETag of the binding for which the deletion was requested. This is
 	 *   provided if the deletion is delegated from a context binding with empty path to a list
 	 *   binding.
+	 * @param {boolean} [bDoNotRequestCount]
+	 *   Whether not to request the new count from the server; useful in case of
+	 *   {@link sap.ui.model.odata.v4.Context#replaceWith} where it is known that the count remains
+	 *   unchanged
 	 * @param {function} fnCallback
 	 *   A function which is called after a transient entity has been deleted from the cache or
 	 *   after the entity has been deleted from the server and from the cache; the index of the
@@ -150,7 +155,8 @@ sap.ui.define([
 	 *
 	 * @public
 	 */
-	_Cache.prototype._delete = function (oGroupLock, sEditUrl, sPath, oETagEntity, fnCallback) {
+	_Cache.prototype._delete = function (oGroupLock, sEditUrl, sPath, oETagEntity,
+			bDoNotRequestCount, fnCallback) {
 		var aSegments = sPath.split("/"),
 			vDeleteProperty = aSegments.pop(),
 			iIndex = rNumber.test(vDeleteProperty) ? Number(vDeleteProperty) : undefined,
@@ -214,6 +220,7 @@ sap.ui.define([
 							[], [sEntityPath]);
 					}),
 				iIndex === undefined // single element or kept-alive not in list
+					&& !bDoNotRequestCount
 					&& that.requestCount(oGroupLock),
 				oGroupLock.unlock() // unlock when all requests have been queued
 			]);
@@ -395,6 +402,7 @@ sap.ui.define([
 				if (that.fetchTypes().isRejected()) {
 					throw oError;
 				}
+				sPostGroupId = sPostGroupId.replace(rInactive, "");
 				return request(sPostPath, that.oRequestor.lockGroup(
 					that.oRequestor.getGroupSubmitMode(sPostGroupId) === "API" ?
 						sPostGroupId : "$parked." + sPostGroupId, that, true, true));
@@ -599,7 +607,7 @@ sap.ui.define([
 					vValue = vValue[vIndex];
 				}
 				// missing advertisement or annotation is not an error
-				return vValue === undefined && sSegment[0] !== "#" &&  sSegment[0] !== "@"
+				return vValue === undefined && sSegment[0] !== "#" && !sSegment.includes("@")
 					? missingValue(oParentValue, sSegment, i + 1)
 					: vValue;
 			});
@@ -989,14 +997,23 @@ sap.ui.define([
 	 *
 	 * @param {string} sPath
 	 *   The relative path of a binding; must not end with '/'
+	 * @param {boolean} [bIgnoreKeptAlive]
+	 *   Whether to ignore changes which will not be lost by APIs like sort or filter because they
+	 *   relate to a context which is kept alive.
 	 * @returns {boolean}
 	 *   <code>true</code> if there are pending changes
 	 *
 	 * @public
 	 */
-	_Cache.prototype.hasPendingChangesForPath = function (sPath) {
+	_Cache.prototype.hasPendingChangesForPath = function (sPath, bIgnoreKeptAlive) {
+		var that = this;
+
 		return Object.keys(this.mPatchRequests).some(function (sRequestPath) {
-			return isSubPath(sRequestPath, sPath);
+			return isSubPath(sRequestPath, sPath)
+				&& !(bIgnoreKeptAlive
+					&& that.mPatchRequests[sRequestPath].every(function (oPatchPromise) {
+						return oPatchPromise.$isKeepAlive();
+					}));
 		}) || Object.keys(this.mPostRequests).some(function (sRequestPath) {
 			return isSubPath(sRequestPath, sPath);
 		});
@@ -1617,9 +1634,11 @@ sap.ui.define([
 	 *   Path of the unit or currency for the property, relative to the entity
 	 * @param {boolean} [bPatchWithoutSideEffects]
 	 *   Whether the PATCH response is ignored, except for a new ETag
-	 * @param {function} [fnPatchSent]
+	 * @param {function} fnPatchSent
 	 *   The function is called just before a back-end request is sent for the first time.
 	 *   If no back-end request is needed, the function is not called.
+	 * @param {function} fnIsKeepAlive
+	 *   A function to tell whether the entity is kept-alive
 	 * @returns {Promise}
 	 *   A promise for the PATCH request (resolves with <code>undefined</code>); rejected in case of
 	 *   cancellation or if no <code>fnErrorCallback</code> is given
@@ -1628,7 +1647,8 @@ sap.ui.define([
 	 * @public
 	 */
 	_Cache.prototype.update = function (oGroupLock, sPropertyPath, vValue, fnErrorCallback,
-			sEditUrl, sEntityPath, sUnitOrCurrencyPath, bPatchWithoutSideEffects, fnPatchSent) {
+			sEditUrl, sEntityPath, sUnitOrCurrencyPath, bPatchWithoutSideEffects, fnPatchSent,
+			fnIsKeepAlive) {
 		var oPromise,
 			aPropertyPath = sPropertyPath.split("/"),
 			aUnitOrCurrencyPath,
@@ -1639,11 +1659,13 @@ sap.ui.define([
 		try {
 			oPromise = this.fetchValue(_GroupLock.$cached, sEntityPath);
 		} catch (oError) {
-			if (!oError.$cached) {
+			if (!oError.$cached || this.oPromise !== null) {
 				throw oError;
 			}
-			// Note: we need a unique "entity" instance to avoid merging of PATCH requests!
-			oPromise = SyncPromise.resolve({"@odata.etag" : "*"});
+			// data has not been read, fake it
+			// Note: we need a unique "entity" instance to avoid merging of unrelated PATCH requests
+			// and sharing of data across bindings - the instance is modified below!
+			oPromise = this.oPromise = SyncPromise.resolve({"@odata.etag" : "*"});
 		}
 
 		return oPromise.then(function (oEntity) {
@@ -1679,9 +1701,7 @@ sap.ui.define([
 				 */
 				function onSubmit() {
 					oRequestLock = that.oRequestor.lockGroup(sGroupId, that, true);
-					if (fnPatchSent) {
-						fnPatchSent();
-					}
+					fnPatchSent();
 				}
 
 				if (bPatchWithoutSideEffects) {
@@ -1691,6 +1711,7 @@ sap.ui.define([
 					mHeaders, oUpdateData, onSubmit, onCancel, /*sMetaPath*/undefined,
 					_Helper.buildPath(that.getOriginalResourcePath(oEntity), sEntityPath),
 					bAtFront);
+				oPatchPromise.$isKeepAlive = fnIsKeepAlive;
 				_Helper.addByPath(that.mPatchRequests, sFullPath, oPatchPromise);
 				return SyncPromise.all([
 					oPatchPromise,
@@ -1761,9 +1782,10 @@ sap.ui.define([
 				if (sTransientGroup === true) {
 					throw new Error("No 'update' allowed while waiting for server response");
 				}
-				if (sTransientGroup.startsWith("$parked.")) {
+				if (sTransientGroup.startsWith("$parked.")
+						|| sTransientGroup.startsWith("$inactive.")) {
 					sParkedGroup = sTransientGroup;
-					sTransientGroup = sTransientGroup.slice(8);
+					sTransientGroup = sTransientGroup.slice(sTransientGroup.indexOf(".") + 1);
 				}
 				if (sTransientGroup !== sGroupId) {
 					throw new Error("The entity will be created via group '" + sTransientGroup
@@ -2073,6 +2095,19 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * Replaces the old element at the given index with the given new element.
+	 *
+	 * @param {number} iIndex - The index
+	 * @param {object} oElement - The new element
+	 *
+	 * @public
+	 */
+	_CollectionCache.prototype.doReplaceWith = function (iIndex, oElement) {
+		this.aElements[iIndex] = oElement;
+		this.addKeptElement(oElement); // maintain $byPredicate
+	};
+
 	/**
 	 * Returns a promise to be resolved (synchronously if possible) with an OData object for the
 	 * requested data.
@@ -2303,6 +2338,7 @@ sap.ui.define([
 				oKeptElement = this.aElements.$byPredicate[sPredicate];
 				if (oKeptElement) {
 					if (oElement["@odata.etag"] === oKeptElement["@odata.etag"]) {
+						_Helper.updateNonExisting(oKeptElement, oElement);
 						oElement = oKeptElement;
 					} else if (this.hasPendingChangesForPath(sPredicate)) {
 						throw new Error("Modified on client and on server: "
@@ -2456,7 +2492,9 @@ sap.ui.define([
 			var aKeyFilters,
 				mQueryOptions = _Helper.merge({}, that.mQueryOptions);
 
-			_Helper.aggregateExpandSelect(mQueryOptions, that.mLateQueryOptions);
+			if (that.mLateQueryOptions) {
+				_Helper.aggregateExpandSelect(mQueryOptions, that.mLateQueryOptions);
+			}
 			delete mQueryOptions.$count;
 			delete mQueryOptions.$orderby;
 			delete mQueryOptions.$search;
@@ -2588,6 +2626,7 @@ sap.ui.define([
 			mQueryOptions,
 			mPredicates = {}, // a set of the predicates (as map to true) to speed up the search
 			sResourcePath,
+			bSkip,
 			mTypeForMetaPath = this.fetchTypes().getResult(),
 			that = this;
 
@@ -2662,8 +2701,15 @@ sap.ui.define([
 			+ this.oRequestor.buildQueryString(this.sMetaPath, mQueryOptions, false, true);
 
 		return this.oRequestor.request("GET", sResourcePath, oGroupLock, undefined, undefined,
-				undefined, undefined, this.sMetaPath, undefined, false, mMergeableQueryOptions
-			).then(function (oResult) {
+				undefined, undefined, this.sMetaPath, undefined, false, mMergeableQueryOptions,
+				function (aOtherPaths) {
+					if (arguments.length) {
+						aPaths = aPaths.concat(aOtherPaths);
+					} else {
+						bSkip = true; // my GET was merged
+						return aPaths;
+					}
+			}).then(function (oResult) {
 				var oElement, sPredicate, i, n;
 
 				function preventKeyPredicateChange(sPath) {
@@ -2674,6 +2720,10 @@ sap.ui.define([
 					});
 				}
 
+				if (bSkip) {
+					return;
+				}
+
 				if (oResult.value.length !== aElements.length) {
 					throw new Error("Expected " + aElements.length + " row(s), but instead saw "
 						+ oResult.value.length);
@@ -2691,6 +2741,38 @@ sap.ui.define([
 			});
 	};
 
+	/**
+	 * Resets this cache to its initial state, but keeps certain elements and their change listeners
+	 * alive.
+	 *
+	 * @param {string[]} aKeptElementPredicates
+	 *   The key predicates for all kept-alive elements
+	 *
+	 * @public
+	 */
+	_CollectionCache.prototype.reset = function (aKeptElementPredicates) {
+		var mChangeListeners = this.mChangeListeners,
+			mByPredicate = this.aElements.$byPredicate,
+			that = this;
+
+		this.mChangeListeners = {};
+		this.sContext = undefined;
+		this.aElements = [];
+		this.aElements.$byPredicate = {};
+		this.aElements.$count = undefined; // needed for setCount()
+		this.aElements.$created = 0;
+		this.iLimit = Infinity;
+
+		Object.keys(mChangeListeners).forEach(function (sPath) {
+			if (aKeptElementPredicates.includes(sPath.split("/")[0])) {
+				that.mChangeListeners[sPath] = mChangeListeners[sPath];
+			}
+		});
+		aKeptElementPredicates.forEach(function (sPredicate) {
+			that.aElements.$byPredicate[sPredicate] = mByPredicate[sPredicate];
+		});
+	};
+
 	//*********************************************************************************************
 	// PropertyCache
 	//*********************************************************************************************
@@ -2884,8 +2966,8 @@ sap.ui.define([
 			if (this.bPost) {
 				throw new Error("Cannot fetch a value before the POST request");
 			}
-			this.bSentRequest = true;
 			this.oPromise = SyncPromise.all([
+				// Note: for _GroupLock.$cached, this may fail synchronously
 				this.oRequestor.request("GET", sResourcePath, oGroupLock, undefined, undefined,
 					fnDataRequested, undefined, this.sMetaPath),
 				this.fetchTypes()
@@ -2893,6 +2975,7 @@ sap.ui.define([
 				that.visitResponse(aResult[0], aResult[1]);
 				return aResult[0];
 			});
+			this.bSentRequest = true;
 		}
 		return this.oPromise.then(function (oResult) {
 			if (oResult && oResult["$ui5.deleted"]) {
@@ -3054,6 +3137,7 @@ sap.ui.define([
 			oOldValuePromise = this.oPromise,
 			mQueryOptions,
 			oResult,
+			bSkip,
 			that = this;
 
 		this.checkSharedRequest();
@@ -3071,7 +3155,15 @@ sap.ui.define([
 			+ this.oRequestor.buildQueryString(this.sMetaPath, mQueryOptions, false, true);
 		oResult = SyncPromise.all([
 			this.oRequestor.request("GET", sResourcePath, oGroupLock, undefined, undefined,
-				undefined, undefined, this.sMetaPath, undefined, false, mMergeableQueryOptions),
+				undefined, undefined, this.sMetaPath, undefined, false, mMergeableQueryOptions,
+				function (aOtherPaths) {
+					if (arguments.length) {
+						aPaths = aPaths.concat(aOtherPaths);
+					} else {
+						bSkip = true; // my GET was merged
+						return aPaths;
+					}
+				}),
 			this.fetchTypes(),
 			this.fetchValue(_GroupLock.$cached, "") // Note: includes some additional checks
 		]).then(function (aResult) {
@@ -3082,6 +3174,10 @@ sap.ui.define([
 			var oNewValue = aResult[0],
 				oOldValue = aResult[2];
 
+			if (bSkip) {
+				return;
+			}
+
 			// ensure that the new value has a predicate although key properties were not requested
 			_Helper.setPrivateAnnotation(oNewValue, "predicate",
 				_Helper.getPrivateAnnotation(oOldValue, "predicate"));

package/src/sap/ui/model/odata/v4/lib/_Helper.js

@@ -1845,7 +1845,7 @@ sap.ui.define([
 		/**
 		 * Converts given value to an array.
 		 * <code>null</code> and <code>undefined</code> are converted to the empty array, a
-		 * non-array value is wrapped with an array and an array is returned as it is.
+		 * non-array value is wrapped with an array and an array is returned as a shallow copy.
 		 *
 		 * @param {any} [vElement]
 		 *   The element to be converted into an array.
@@ -1857,7 +1857,7 @@ sap.ui.define([
 				return [];
 			}
 			if (Array.isArray(vElement)) {
-				return vElement;
+				return vElement.slice();
 			}
 			return [vElement];
 		},
@@ -1874,7 +1874,7 @@ sap.ui.define([
 		 * properties therein.
 		 *
 		 * Restrictions:
-		 * - oTarget and oSource are expected to have the same structure; when there is an
+		 * - oTarget and oSource are expected to have the same structure: when there is an
 		 *   object at a given path in either of them, the other one must have an object or
 		 *   <code>null</code>.
 		 * - no change events for collection-valued properties; list bindings without own cache must
@@ -1937,7 +1937,7 @@ sap.ui.define([
 		 * advertised actions.
 		 *
 		 * Restrictions:
-		 * - oOldObject and oNewObject are expected to have the same structure; when there is an
+		 * - oOldObject and oNewObject are expected to have the same structure: when there is an
 		 *   object at a given path in either of them, the other one must have an object or
 		 *   <code>null</code>.
 		 * - no change events for collection-valued properties
@@ -2004,6 +2004,36 @@ sap.ui.define([
 			});
 		},
 
+		/**
+		 * Recursively adds all properties of oSource to oTarget that do not exist there yet.
+		 * Ensures that object references in oTarget remain unchanged.
+		 *
+		 * Restrictions:
+		 * - oTarget and oSource are expected to have the same structure: when there is an
+		 *   object at a given path in either of them, the other one must have an object.
+		 *   <code>null</code>, or no property at all.
+		 * - arrays are not merged in any way, they are taken either from oSource or from oTarget
+		 *
+		 * @param {object} oTarget - The target
+		 * @param {object} oSource - The source
+		 */
+		updateNonExisting : function (oTarget, oSource) {
+			Object.keys(oSource).forEach(function (sKey) {
+				var vSourceValue = oSource[sKey],
+					vTargetValue;
+
+				if (sKey in oTarget) {
+					vTargetValue = oTarget[sKey];
+					if (vSourceValue && vTargetValue
+							&& typeof vSourceValue === "object" && !Array.isArray(vSourceValue)) {
+						_Helper.updateNonExisting(vTargetValue, vSourceValue);
+					}
+				} else {
+					oTarget[sKey] = vSourceValue;
+				}
+			});
+		},
+
 		/**
 		 * Updates the old value with the given new value for the selected properties (see
 		 * {@link #updateExisting}). If no selected properties are given or if "*" is contained in
@@ -2011,7 +2041,7 @@ sap.ui.define([
 		 * changed properties.
 		 *
 		 * Restrictions:
-		 * - oOldValue and oNewValue are expected to have the same structure; when there is an
+		 * - oOldValue and oNewValue are expected to have the same structure: when there is an
 		 *   object at a given path in either of them, the other one must have an object or
 		 *   <code>null</code>.
 		 * - "*" in aSelect does not work correctly if oNewValue contains navigation properties

package/src/sap/ui/model/odata/v4/lib/_Requestor.js

@@ -88,10 +88,11 @@ sap.ui.define([
 		this.oModelInterface = oModelInterface;
 		this.sQueryParams = _Helper.buildQuery(mQueryParams); // Used for $batch and CSRF token only
 		this.mRunningChangeRequests = {}; // map from group ID to a SyncPromise[]
-		this.oSecurityTokenPromise = null; // be nice to Chrome v8
 		this.iSessionTimer = 0;
 		this.iSerialNumber = 0;
 		this.sServiceUrl = sServiceUrl;
+		this.vStatistics = mQueryParams && mQueryParams["sap-statistics"];
+		this.processSecurityTokenHandlers(); // sets this.oSecurityTokenPromise
 	}
 
 	/**
@@ -1061,7 +1062,7 @@ sap.ui.define([
 	 * Merges all GET requests that are marked as mergeable, have the same resource path and the
 	 * same query options besides $expand and $select. One request with the merged $expand and
 	 * $select is left in the queue and all merged requests get the response of this one remaining
-	 * request.
+	 * request. For $mergeRequests, see parameter fnMergeRequests of {@link #request}.
 	 *
 	 * @param {object[]} aRequests The batch queue
 	 * @returns {object[]} The adjusted batch queue
@@ -1075,6 +1076,9 @@ sap.ui.define([
 				if (oCandidate.$queryOptions && oRequest.url === oCandidate.url) {
 					_Helper.aggregateExpandSelect(oCandidate.$queryOptions, oRequest.$queryOptions);
 					oRequest.$resolve(oCandidate.$promise);
+					if (oCandidate.$mergeRequests && oRequest.$mergeRequests) {
+						oCandidate.$mergeRequests(oRequest.$mergeRequests());
+					}
 
 					return true;
 				}
@@ -1287,6 +1291,38 @@ sap.ui.define([
 		return oGroupLock;
 	};
 
+	/**
+	 * Calls the security token handlers returned by
+	 * {@link sap.ui.core.Configuration#getSecurityTokenHandlers} one by one with the requestor's
+	 * service URL. The first handler not returning <code>undefined</code> but a
+	 * <code>Promise</code> is used to determine the required security tokens.
+	 *
+	 * @private
+	 */
+	_Requestor.prototype.processSecurityTokenHandlers = function () {
+		var that = this;
+
+		this.oSecurityTokenPromise = null;
+
+		sap.ui.getCore().getConfiguration().getSecurityTokenHandlers().some(function (fnHandler) {
+			var oSecurityTokenPromise = fnHandler(that.sServiceUrl);
+
+			if (oSecurityTokenPromise !== undefined) {
+				that.oSecurityTokenPromise = oSecurityTokenPromise.then(function (mHeaders) {
+					that.checkHeaderNames(mHeaders);
+					// also overwrite this.mPredefinedRequestHeaders["X-CSRF-Token"] : "Fetch"
+					Object.assign(that.mHeaders, {"X-CSRF-Token" : undefined}, mHeaders);
+					that.oSecurityTokenPromise = null;
+				}).catch(function (oError) {
+					Log.error("An error occurred within security token handler: " + fnHandler,
+						oError, sClassName);
+					throw oError;
+				});
+				return true;
+			}
+		});
+	};
+
 	/**
 	 * Returns a promise that will be resolved once the CSRF token has been refreshed, or rejected
 	 * if that fails. Makes sure that only one HEAD request is underway at any given time and
@@ -1512,6 +1548,10 @@ sap.ui.define([
 	 *   Query options if it is allowed to merge this request with another request having the same
 	 *   sResourcePath (only allowed for GET requests); the resulting resource path is the path from
 	 *   sResourcePath plus the merged query options; may only contain $expand and $select
+	 * @param {function(string[]):string[]} [fnMergeRequests]
+	 *    Function which is called during merging of GET requests. If a merged request has a
+	 *    function given, this function will be called and its return value is
+	 *    given to the one remaining request's function as a parameter.
 	 * @returns {Promise}
 	 *   A promise on the outcome of the HTTP request; it will be rejected with an error having the
 	 *   property <code>canceled = true</code> instead of sending a request if
@@ -1522,7 +1562,8 @@ sap.ui.define([
 	 * @public
 	 */
 	_Requestor.prototype.request = function (sMethod, sResourcePath, oGroupLock, mHeaders, oPayload,
-			fnSubmit, fnCancel, sMetaPath, sOriginalResourcePath, bAtFront, mQueryOptions) {
+			fnSubmit, fnCancel, sMetaPath, sOriginalResourcePath, bAtFront, mQueryOptions,
+			fnMergeRequests) {
 		var iChangeSetNo,
 			oError,
 			sGroupId = oGroupLock && oGroupLock.getGroupId() || "$direct",
@@ -1566,6 +1607,7 @@ sap.ui.define([
 						that.mFinalHeaders),
 					body : oPayload,
 					$cancel : fnCancel,
+					$mergeRequests : fnMergeRequests,
 					$metaPath : sMetaPath,
 					$queryOptions : mQueryOptions,
 					$reject : fnReject,
@@ -1591,6 +1633,9 @@ sap.ui.define([
 			return oPromise;
 		}
 
+		if (this.vStatistics !== undefined) {
+			mQueryOptions = Object.assign({"sap-statistics" : this.vStatistics}, mQueryOptions);
+		}
 		if (mQueryOptions) {
 			sResourcePath = that.addQueryString(sResourcePath, sMetaPath, mQueryOptions);
 		}
@@ -1697,7 +1742,7 @@ sap.ui.define([
 						// methods it must be possible to insert the ETag from the header
 						vResponse = sMethod === "GET" ? null : {};
 					}
-					if (sETag) {
+					if (sETag && typeof vResponse === "object") {
 						vResponse["@odata.etag"] = sETag;
 					}
 
@@ -1914,4 +1959,4 @@ sap.ui.define([
 	};
 
 	return _Requestor;
-}, /* bExport= */false);
+}, /* bExport= */false);

package/src/sap/ui/model/resource/ResourceModel.js

@@ -3,6 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
+/*eslint-disable max-len */
 /**
  * ResourceBundle-based DataBinding
  *
@@ -204,7 +205,10 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.model.resource.ResourceModel
 	 * @author SAP SE
-	 * @class Model implementation for resource bundles.
+	 * @class
+	 * Model implementation for resource bundles.
+	 *
+	 * This model is not prepared to be inherited from.
 	 *
 	 * This model allows to bind control properties against translatable texts. Its data is taken
 	 * from a {@link module:sap/base/i18n/ResourceBundle} and it only supports property bindings.
@@ -224,7 +228,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 */
 	var ResourceModel = Model.extend("sap.ui.model.resource.ResourceModel", /** @lends sap.ui.model.resource.ResourceModel.prototype */ {
 

package/src/sap/ui/model/resource/ResourcePropertyBinding.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 // Provides the resource model implementation of a property binding
 sap.ui.define(['sap/ui/model/PropertyBinding', 'sap/ui/model/ChangeReason'],
 	function(PropertyBinding, ChangeReason) {

package/src/sap/ui/model/type/Boolean.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 // Provides the base implementation for all model implementations
 sap.ui.define(['sap/ui/model/SimpleType', 'sap/ui/model/FormatException', 'sap/ui/model/ParseException'],
 	function(SimpleType, FormatException, ParseException) {
@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/model/SimpleType', 'sap/ui/model/FormatException', 'sap/u
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Currency.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 // Provides the base implementation for all model implementations
 sap.ui.define([
 	"sap/base/Log",
@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Date.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 // Provides the base implementation for all model implementations
 sap.ui.define([
 	"sap/base/util/each",
@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.
@@ -80,7 +80,7 @@ sap.ui.define([
 				if (oValue === "") {
 					return null;
 				}
-				var oResult = this.oOutputFormat.parse(oValue);
+				oResult = this.oOutputFormat.parse(oValue);
 				if (!oResult) {
 					oBundle = sap.ui.getCore().getLibraryResourceBundle();
 					throw new ParseException(oBundle.getText(this.sName + ".Invalid"));
@@ -131,6 +131,7 @@ sap.ui.define([
 							aMessages.push(oBundle.getText(that.sName + ".Maximum", [sContent]));
 						}
 						break;
+					default: break;
 				}
 			});
 			if (aViolatedConstraints.length > 0) {
@@ -176,6 +177,11 @@ sap.ui.define([
 	};
 
 	/**
+	 * Returns the output pattern.
+	 *
+	 * @returns {string} The output pattern
+	 *
+	 * @see sap.ui.core.format.DateFormat.getDateInstance
 	 * @protected
 	 */
 	Date1.prototype.getOutputPattern = function() {

package/src/sap/ui/model/type/DateInterval.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 
 sap.ui.define([
 	'sap/ui/core/format/DateFormat',
@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.
@@ -216,6 +216,8 @@ sap.ui.define([
 							aViolatedConstraints.push("maximum");
 							aMessages.push(oBundle.getText("Date.Maximum", [oCompareValue]));
 						}
+						break;
+					default: break;
 				}
 			}.bind(this));
 

package/src/sap/ui/model/type/DateTime.js

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 // Provides the base implementation for all model implementations
 sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	function(Date, DateFormat) {
@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.