@openui5/sap.ui.core 1.93.3 → 1.96.2

package/src/sap/ui/model/odata/v4/ODataPropertyBinding.js

@@ -57,14 +57,16 @@ sap.ui.define([
 	 * @mixes sap.ui.model.odata.v4.ODataBinding
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
-	 * @borrows sap.ui.model.odata.v4.ODataBinding#hasPendingChanges as #hasPendingChanges
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId
+	 * @borrows sap.ui.model.odata.v4.ODataBinding#hasPendingChanges as #hasPendingChanges
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#isInitial as #isInitial
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#refresh as #refresh
+	 * @borrows sap.ui.model.odata.v4.ODataBinding#requestRefresh as #requestRefresh
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#resetChanges as #resetChanges
+	 * @borrows sap.ui.model.odata.v4.ODataBinding#toString as #toString
 	 */
 	var ODataPropertyBinding
 		= PropertyBinding.extend("sap.ui.model.odata.v4.ODataPropertyBinding", {
@@ -85,16 +87,18 @@ sap.ui.define([
 					this.setIgnoreMessages(mParameters.$$ignoreMessages);
 				} else {
 					this.sGroupId = undefined;
+					this.bNoPatch = false;
 				}
 				this.oCheckUpdateCallToken = undefined;
-				// Note: no system query options supported at property binding
-				this.mQueryOptions = this.oModel.buildQueryOptions(_Helper.clone(mParameters),
-					/*bSystemQueryOptionsAllowed*/false);
-				this.fetchCache(oContext);
 				this.oContext = oContext;
 				this.bHasDeclaredType = undefined; // whether the binding info declares a type
 				this.bInitial = true;
+				// Note: system query options supported at property binding only for ".../$count"
+				this.mQueryOptions = this.oModel.buildQueryOptions(_Helper.clone(mParameters),
+					/*bSystemQueryOptionsAllowed*/sPath.endsWith("$count"));
 				this.vValue = undefined;
+				// BEWARE: #doFetchQueryOptions uses #isRoot which relies on this.oContext!
+				this.fetchCache(oContext);
 				oModel.bindingCreated(this);
 			},
 			metadata : {
@@ -793,4 +797,4 @@ sap.ui.define([
 	ODataPropertyBinding.prototype.visitSideEffects = function () {};
 
 	return ODataPropertyBinding;
-});
+});

package/src/sap/ui/model/odata/v4/_AnnotationHelperExpression.js

@@ -105,7 +105,8 @@ sap.ui.define([
 		 *       <li> when "constant": {any} the constant value (not escaped if string)
 		 *       <li> when "expression": {string} the expression unwrapped (no "{=" and "}")
 		 *     </ul>
-		 *   <li> <code>type</code>:  the EDM data type (like "Edm.String") if it could be determined
+		 *   <li> <code>type</code>:  the EDM data type (like "Edm.String") if it could be
+		 *      determined
 		 *   <li> <code>constraints</code>: {object} type constraints if result is "binding"
 		 * </ul>
 		 *
@@ -515,6 +516,12 @@ sap.ui.define([
 				return undefined;
 			}
 			return oModel.fetchObject(sPath + "/$").then(function (oTarget) {
+				var sCompositeConstraints =
+						oModel.getObject(oPathValue.path
+							+ "@com.sap.vocabularies.UI.v1.DoNotCheckScaleOfMeasureQuantity")
+						? ",constraints:{'skipDecimalsValidation':true}"
+						: "";
+
 				return {
 					result : "composite",
 					type : sCompositeType,
@@ -527,7 +534,7 @@ sap.ui.define([
 						+ getBinding(oModel.getConstraints(oTarget, sPath), oTarget.$Type,
 							sTargetPath)
 						+ ",{mode:'OneTime',path:'/##" + sComputedAnnotation + "',targetType:'any'}"
-						+ "],type:'" + sCompositeType + "'}"
+						+ "],type:'" + sCompositeType + "'" + sCompositeConstraints + "}"
 				};
 			});
 		},
@@ -872,4 +879,4 @@ sap.ui.define([
 
 	return Expression;
 
-}, /* bExport= */ false);
+}, /* bExport= */ false);

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

@@ -209,6 +209,8 @@ sap.ui.define([
 		}
 		_Helper.setPrivateAnnotation(oGroupNode, "spliced", aElements.splice(iIndex + 1, iCount));
 		aElements.$count -= iCount;
+		_Helper.updateAll(this.mChangeListeners, sGroupNodePath, oGroupNode,
+			{"@$ui5.node.groupLevelCount" : undefined});
 
 		return iCount;
 	};
@@ -315,7 +317,9 @@ sap.ui.define([
 					}
 				}
 			});
-
+			_Helper.updateAll(that.mChangeListeners, vGroupNodeOrPath, oGroupNode,
+				{"@$ui5.node.groupLevelCount" :
+					_Helper.getPrivateAnnotation(oGroupNode, "groupLevelCount")});
 			return SyncPromise.resolve(iCount);
 		}
 
@@ -348,6 +352,9 @@ sap.ui.define([
 			}
 
 			iCount = oResult.value.$count;
+			_Helper.setPrivateAnnotation(oGroupNode, "groupLevelCount", iCount);
+			_Helper.updateAll(that.mChangeListeners, vGroupNodeOrPath, oGroupNode,
+				{"@$ui5.node.groupLevelCount" : iCount});
 			if (bSubtotalsAtBottom) {
 				iCount += 1;
 			}

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

@@ -210,7 +210,7 @@ sap.ui.define([
 							}
 							fnCallback();
 						}
-						that.oRequestor.getModelInterface().reportBoundMessages(that.sResourcePath,
+						that.oRequestor.getModelInterface().reportStateMessages(that.sResourcePath,
 							[], [sEntityPath]);
 					}),
 				iIndex === undefined // single element or kept-alive not in list
@@ -485,7 +485,7 @@ sap.ui.define([
 
 		/*
 		 * Determines the implicit value if the value is missing in the cache. Reports an invalid
-		 * segment if there is no implicit value.
+		 * segment if there is no @Core.Permissions: 'None' annotation and no implicit value.
 		 *
 		 * @param {object} oValue The object that is expected to have the value
 		 * @param {string} sSegment The path segment that is missing
@@ -503,6 +503,8 @@ sap.ui.define([
 			return that.oRequestor.getModelInterface()
 				.fetchMetadata(that.sMetaPath + "/" + _Helper.getMetaPath(sPropertyPath))
 				.then(function (oProperty) {
+					var vPermissions;
+
 					if (!oProperty) {
 						return invalidSegment(sSegment);
 					}
@@ -514,6 +516,11 @@ sap.ui.define([
 							|| _Helper.buildPath(sServiceUrl + that.sResourcePath, sPropertyPath);
 					}
 					if (!bTransient) {
+						vPermissions = oValue[
+							_Helper.getAnnotationKey(oValue, ".Permissions", sSegment)];
+						if (vPermissions === 0 || vPermissions === "None") {
+							return undefined;
+						}
 						// If there is no entity with a key predicate, try it with the cache root
 						// object (in case of SimpleCache, the root object of CollectionCache is an
 						// array)
@@ -592,7 +599,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;
 			});
@@ -1213,7 +1220,7 @@ sap.ui.define([
 				} else if (aReadResult.length === 0) {
 					that.removeElement(aElements, iIndex, sPredicate, sPath);
 					that.oRequestor.getModelInterface()
-						.reportBoundMessages(that.sResourcePath, [], [sPath + sPredicate]);
+						.reportStateMessages(that.sResourcePath, [], [sPath + sPredicate]);
 					fnOnRemove(false);
 				} else if (bRemoveFromCollection) {
 					that.removeElement(aElements, iIndex, sPredicate, sPath);
@@ -1298,7 +1305,7 @@ sap.ui.define([
 	 */
 	_Cache.prototype.removeMessages = function () {
 		if (this.sReportedMessagesPath) {
-			this.oRequestor.getModelInterface().reportBoundMessages(this.sReportedMessagesPath, {});
+			this.oRequestor.getModelInterface().reportStateMessages(this.sReportedMessagesPath, {});
 			this.sReportedMessagesPath = undefined;
 		}
 	};
@@ -1610,7 +1617,7 @@ 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.
 	 * @returns {Promise}
@@ -1632,11 +1639,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) {
@@ -1672,9 +1681,7 @@ sap.ui.define([
 				 */
 				function onSubmit() {
 					oRequestLock = that.oRequestor.lockGroup(sGroupId, that, true);
-					if (fnPatchSent) {
-						fnPatchSent();
-					}
+					fnPatchSent();
 				}
 
 				if (bPatchWithoutSideEffects) {
@@ -1807,7 +1814,7 @@ sap.ui.define([
 	 * Processes the response from the server. All arrays are annotated by their length, influenced
 	 * by the annotations "@odata.count" and "@odata.nextLink". Recursively calculates the key
 	 * predicates for all entities in the result. Collects and reports OData messages via
-	 * {@link sap.ui.model.odata.v4.lib._Requestor#reportBoundMessages}.
+	 * {@link sap.ui.model.odata.v4.lib._Requestor#reportStateMessages}.
 	 *
 	 * @param {*} oRoot An OData response, arrays or simple values are wrapped into an object as
 	 *   property "value"
@@ -1982,7 +1989,7 @@ sap.ui.define([
 		}
 		if (bHasMessages) {
 			this.sReportedMessagesPath = this.getOriginalResourcePath(oRoot);
-			this.oRequestor.getModelInterface().reportBoundMessages(this.sReportedMessagesPath,
+			this.oRequestor.getModelInterface().reportStateMessages(this.sReportedMessagesPath,
 				mPathToODataMessages, aCachePaths);
 		}
 	};
@@ -2296,7 +2303,7 @@ sap.ui.define([
 				oKeptElement = this.aElements.$byPredicate[sPredicate];
 				if (oKeptElement) {
 					if (oElement["@odata.etag"] === oKeptElement["@odata.etag"]) {
-						oElement = oKeptElement;
+						_Helper.merge(oElement, oKeptElement);
 					} else if (this.hasPendingChangesForPath(sPredicate)) {
 						throw new Error("Modified on client and on server: "
 							+ this.sResourcePath + sPredicate);
@@ -2877,8 +2884,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()
@@ -2886,6 +2893,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"]) {

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

@@ -654,8 +654,7 @@ sap.ui.define([
 		},
 
 		/**
-		 * Extracts all (top and detail) messages from the given error instance into lists of
-		 * unbound and bound messages.
+		 * Extracts all (top and detail) messages from the given error instance.
 		 *
 		 * @param {Error} oError
 		 *   An error instance as created by {@link .createError} or {@link .decomposeError}
@@ -669,15 +668,14 @@ sap.ui.define([
 		 * @param {string} [oError.requestUrl]
 		 *   The absolute request URL of the failed OData request; required to resolve a long text
 		 *   URL
-		 * @returns {object}
-		 *   An object containing "unbound" and "bound" properties each containing an array of raw
-		 *   message objects suitable for {@link sap.ui.model.odata.v4.ODataModel#createUI5Message}
+		 * @returns {object[]}
+		 *   An array of raw message objects suitable for
+		 *   {@link sap.ui.model.odata.v4.ODataModel#createUI5Message}
 		 *
 		 * @private
 		 */
 		extractMessages : function (oError) {
-			var aBound = [],
-				aUnbound = [];
+			var aMessages = [];
 
 			/*
 			 * Creates a raw message object taking all relevant properties, converts the annotations
@@ -713,18 +711,17 @@ sap.ui.define([
 					}
 				});
 
-				if (typeof oMessage.target !== "string") {
-					aUnbound.push(oRawMessage);
-				} else if (oMessage.target[0] === "$" || !oError.resourcePath) {
-					// target for the bound message is a system query option or cannot be resolved
-					// -> report as unbound message
-					oRawMessage.message = oMessage.target + ": " + oMessage.message;
-					aUnbound.push(oRawMessage);
-				} else {
-					oRawMessage.target = oMessage.target;
-					oRawMessage.transition = true;
-					aBound.push(oRawMessage);
+				if (typeof oMessage.target === "string") {
+					if (oMessage.target[0] === "$" || !oError.resourcePath) {
+						// target for the bound message is a system query option or cannot be
+						// resolved -> report as unbound message
+						oRawMessage.message = oMessage.target + ": " + oMessage.message;
+					} else {
+						oRawMessage.target = oMessage.target;
+					}
 				}
+				oRawMessage.transition = true;
+				aMessages.push(oRawMessage);
 			}
 
 			if (oError.error) {
@@ -739,7 +736,7 @@ sap.ui.define([
 			} else {
 				addMessage(oError, 4 /*Error*/, true);
 			}
-			return {bound : aBound, unbound : aUnbound};
+			return aMessages;
 		},
 
 		/**
@@ -999,23 +996,28 @@ sap.ui.define([
 		},
 
 		/**
-		 * Returns the instance annotation key with a given name for the given message, ignoring the
+		 * Returns the instance annotation key with a given name for the given object, ignoring the
 		 * alias. Logs a warning if duplicates are found.
 		 *
-		 * @param {object} oMessage
-		 *   A single message from an OData error response
-		 * @param {object} sName
-		 *   The name of the annotation without prefix "@" and namespace, e.g. ".ContentID" for a
+		 * @param {object} oObject
+		 *   Any object
+		 * @param {string} sName
+		 *   The name of the annotation w/o prefix "@" and namespace, e.g. ".ContentID" for a
 		 *   annotation "@Org.OData.Core.V1.ContentID"
+		 * @param {string} [sProperty]
+		 *   The name of the annotated property, e.g. "Budget" in "Budget@Core.Permissions" for a
+		 *   property "Budget" annotated with "@Core.Permissions"
 		 * @returns {string|undefined}
 		 *   The key of the annotation, or <code>undefined</code> in case there is not exactly one
 		 *   such annotation (ignoring the alias)
 		 */
-		getAnnotationKey : function (oMessage, sName) {
-			var sAnnotationKey, bDuplicate;
+		getAnnotationKey : function (oObject, sName, sProperty) {
+			var sAnnotationKey,
+				bDuplicate,
+				sPrefix = (sProperty || "") + "@";
 
-			Object.keys(oMessage).forEach(function (sKey) {
-				if (sKey[0] === "@" && sKey.endsWith(sName)) {
+			Object.keys(oObject).forEach(function (sKey) {
+				if (sKey.startsWith(sPrefix) && sKey.endsWith(sName)) {
 					if (sAnnotationKey) {
 						Log.warning("Cannot distinguish " + sAnnotationKey + " from " + sKey,
 							undefined, sClassName);
@@ -1843,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.
@@ -1855,7 +1857,7 @@ sap.ui.define([
 				return [];
 			}
 			if (Array.isArray(vElement)) {
-				return vElement;
+				return vElement.slice();
 			}
 			return [vElement];
 		},

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

@@ -67,12 +67,12 @@ sap.ui.define([
 	 *   A function called with parameters <code>sGroupId</code> and <code>sPropertyName</code>
 	 *   returning the property value in question. Only 'submit' is supported for <code>
 	 *   sPropertyName</code>. Supported property values are: 'API', 'Auto' and 'Direct'.
-	 * @param {function} oModelInterface.reportBoundMessages
-	 *   A function for reporting bound messages; see {@link #reportBoundMessages} for the signature
+	 * @param {function} oModelInterface.reportStateMessages
+	 *   A function for reporting state messages; see {@link #reportStateMessages} for the signature
 	 *   of this function
-	 * @param {function} oModelInterface.reportUnboundMessages
+	 * @param {function} oModelInterface.reportTransitionMessages
 	 *   A function called with parameters <code>sResourcePath</code> and <code>sMessages</code>
-	 *   reporting unbound OData messages to the {@link sap.ui.core.message.MessageManager}.
+	 *   reporting OData transition messages to the {@link sap.ui.core.message.MessageManager}.
 	 * @param {function (string)} [oModelInterface.onCreateGroup]
 	 *   A callback function that is called with the group name as parameter when the first
 	 *   request is added to a group
@@ -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
 	}
 
 	/**
@@ -1200,7 +1201,7 @@ sap.ui.define([
 						// methods it must be possible to insert the ETag from the header
 						oResponse = vRequest.method === "GET" ? null : {};
 					}
-					that.reportUnboundMessagesAsJSON(vRequest.url,
+					that.reportHeaderMessages(vRequest.url,
 						getResponseHeader.call(vResponse, "sap-messages"));
 					sETag = getResponseHeader.call(vResponse, "ETag");
 					if (sETag) {
@@ -1287,6 +1288,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
@@ -1450,7 +1483,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Reports unbound OData messages.
+	 * Reports OData messages from the "sap-messages" response header.
 	 *
 	 * @param {string} sResourcePath
 	 *   The resource path of the request whose response contained the messages
@@ -1459,9 +1492,9 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	_Requestor.prototype.reportUnboundMessagesAsJSON = function (sResourcePath, sMessages) {
+	_Requestor.prototype.reportHeaderMessages = function (sResourcePath, sMessages) {
 		if (sMessages) {
-			this.oModelInterface.reportUnboundMessages(JSON.parse(sMessages), sResourcePath);
+			this.oModelInterface.reportTransitionMessages(JSON.parse(sMessages), sResourcePath);
 		}
 	};
 
@@ -1591,6 +1624,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);
 		}
@@ -1601,7 +1637,7 @@ sap.ui.define([
 			Object.assign({}, mHeaders, this.mFinalHeaders),
 			JSON.stringify(oPayload), sOriginalResourcePath
 		).then(function (oResponse) {
-			that.reportUnboundMessagesAsJSON(oResponse.resourcePath, oResponse.messages);
+			that.reportHeaderMessages(oResponse.resourcePath, oResponse.messages);
 			return that.doConvertResponse(oResponse.body, sMetaPath);
 		});
 	};
@@ -1697,7 +1733,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;
 					}
 
@@ -1875,11 +1911,10 @@ sap.ui.define([
 	 * @param {function (string)} [oModelInterface.onCreateGroup]
 	 *   A callback function that is called with the group name as parameter when the first
 	 *   request is added to a group
-	 * @param {function} oModelInterface.reportBoundMessages
-	 *   A function to report bound OData messages
-	 * @param {function (object[])} oModelInterface.reportUnboundMessages
-	 *   A function to report unbound OData messages contained in the <code>sap-messages</code>
-	 *   response header
+	 * @param {function} oModelInterface.reportStateMessages
+	 *   A function to report OData state messages
+	 * @param {function (object[])} oModelInterface.reportTransitionMessages
+	 *   A function to report OData transition messages
 	 * @param {object} [mHeaders={}]
 	 *   Map of default headers; may be overridden with request-specific headers; certain
 	 *   OData V4 headers are predefined, but may be overridden by the default or
@@ -1915,4 +1950,4 @@ sap.ui.define([
 	};
 
 	return _Requestor;
-}, /* bExport= */false);
+}, /* bExport= */false);

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

@@ -970,8 +970,8 @@ sap.ui.define([
 	//*********************************************************************************************
 	function asV2Requestor(oRequestor) {
 		Object.assign(oRequestor, _V2Requestor.prototype);
-		oRequestor.oModelInterface.reportBoundMessages = function () {};
-		oRequestor.oModelInterface.reportUnboundMessages = function () {};
+		oRequestor.oModelInterface.reportStateMessages = function () {};
+		oRequestor.oModelInterface.reportTransitionMessages = function () {};
 	}
 
 	/**

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.93.3
+	 * @version 1.96.2
 	 */
 	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.93.3
+	 * @version 1.96.2
 	 *
 	 * @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.93.3
+	 * @version 1.96.2
 	 *
 	 * @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.93.3
+	 * @version 1.96.2
 	 *
 	 * @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() {