@openui5/sap.ui.core 1.136.4 → 1.139.0

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

@@ -31,6 +31,7 @@ sap.ui.define([
 	"use strict";
 
 	var sClassName = "sap.ui.model.odata.v4.ODataListBinding",
+		rLambdaOperators = /All|Any|NotAll|NotAny/,
 		mSupportedEvents = {
 			AggregatedDataStateChange : true,
 			change : true,
@@ -59,7 +60,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.136.4
+		 * @version 1.139.0
 		 * @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#getUpdateGroupId as #getUpdateGroupId
@@ -580,8 +581,8 @@ sap.ui.define([
 	 * <code>start</code> and <code>length</code> parameters can be used to retrieve the received
 	 * data via {@link #requestContexts}.
 	 *
-	 * If the request fails, the <code>errorMessage</code> is a UI5 message containing the back-end
-	 * error. It is reported to the message model by default unless
+	 * If the request fails, the <code>messagesOnError</code> is an array of UI5 messages containing
+	 * the back-end messages. They are reported to the message model by default unless
 	 * {@link sap.ui.base.Event#preventDefault} is called.
 	 *
 	 * @param {sap.ui.base.Event} oEvent
@@ -596,12 +597,12 @@ sap.ui.define([
 	 *   The start index of the requested range
 	 * @param {number} oEvent.getParameters.length
 	 *   The length of the requested range
-	 * @param {sap.ui.core.message.Message} [oEvent.getParameters.errorMessage]
-	 *   A UI5 message of type {@link module:sap/ui/core/message/MessageType MessageType.Error}
+	 * @param {sap.ui.core.message.Message[]} [oEvent.getParameters.messagesOnError]
+	 *   An array of UI5 messages if the request failed; <code>undefined</code> otherwise
 	 *
 	 * @event sap.ui.model.odata.v4.ODataListBinding#separateReceived
-	 * @experimental As of version 1.131.0
 	 * @public
+	 * @since 1.137.0
 	 */
 
 	/**
@@ -2077,11 +2078,14 @@ sap.ui.define([
 				}
 
 				sOperator = oFilter.getOperator();
-				if (sOperator === FilterOperator.All || sOperator === FilterOperator.Any) {
+				if (rLambdaOperators.test(sOperator)) {
+					const bNot = sOperator.startsWith("Not");
+					sOperator = sOperator.replace("Not", "");
+					const sPrefix = (bNot ? "not " : "") + oFilter.getPath() + "/";
 					oCondition = oFilter.getCondition();
 					sLambdaVariable = oFilter.getVariable();
-					if (sOperator === FilterOperator.Any && !oCondition) {
-						return oFilter.getPath() + "/any()";
+					if (sOperator === "Any" && !oCondition) {
+						return sPrefix + "any()";
 					}
 					// multifilters are processed in parallel, so clone mLambdaVariableToPath
 					// to allow same lambda variables in different filters
@@ -2089,10 +2093,8 @@ sap.ui.define([
 					mLambdaVariableToPath[sLambdaVariable]
 						= replaceLambdaVariables(oFilter.getPath(), mLambdaVariableToPath);
 
-					return fetchFilter(
-						oCondition, mLambdaVariableToPath
-					).then(function (sFilterValue) {
-						return oFilter.getPath() + "/" + oFilter.getOperator().toLowerCase()
+					return fetchFilter(oCondition, mLambdaVariableToPath).then((sFilterValue) => {
+						return sPrefix + sOperator.toLowerCase()
 							+ "(" + sLambdaVariable + ":" + sFilterValue + ")";
 					});
 				}
@@ -2532,14 +2534,14 @@ sap.ui.define([
 			length : iEnd - iStart
 		};
 		if (oError) {
-			oParameters.errorMessage = this.oModel.reportTransitionMessages(
-				_Helper.extractMessages(oError), oError.resourcePath, /*bSilent*/true)[0];
+			oParameters.messagesOnError = this.oModel.reportTransitionMessages(
+				_Helper.extractMessages(oError), oError.resourcePath, /*bSilent*/true);
 		}
 
 		const bDefaultAction = this.fireEvent("separateReceived", oParameters, true);
 
 		if (oError && bDefaultAction) {
-			Messaging.updateMessages(undefined, [oParameters.errorMessage]);
+			Messaging.updateMessages(undefined, oParameters.messagesOnError);
 		}
 	};
 
@@ -2622,7 +2624,7 @@ sap.ui.define([
 	 * @param {string} sResourcePath
 	 *   The resource path for the cache
 	 * @param {object} mQueryOptions
-	 *   The query options for the cache
+	 *   The query options for the cache (requires "copy on write"!)
 	 * @returns {sap.ui.model.odata.v4.lib._CollectionCache|undefined}
 	 *   The cache or <code>undefined</code> if the model has no matching temporary binding
 	 *
@@ -3423,7 +3425,7 @@ sap.ui.define([
 	 * because the binding may have acquired them via autoExpandSelect.
 	 *
 	 * @param {object} mQueryOptions
-	 *   The query options
+	 *   A map of key-value pairs representing the query string (requires "copy on write"!)
 	 * @param {sap.ui.model.Context} [oContext]
 	 *   The context instance to be used, must be <code>undefined</code> for absolute bindings
 	 * @returns {object} The merged query options
@@ -3630,6 +3632,10 @@ sap.ui.define([
 	 */
 	ODataListBinding.prototype.isUnchangedParameter = function (sName, vOtherValue) {
 		if (sName === "$$aggregation") {
+			if (!vOtherValue) {
+				return this.mParameters.$$aggregation === vOtherValue;
+			}
+
 			// Note: $fetchMetadata is lost here, but never mind - $apply does not matter, only
 			// normalization is needed
 			vOtherValue = _Helper.clone(vOtherValue); // avoid modification due to normalization
@@ -4760,7 +4766,7 @@ sap.ui.define([
 
 	/**
 	 * Sets a new data aggregation object and derives the system query option <code>$apply</code>
-	 * implicitly from it.
+	 * implicitly from it. If the aggregation is unchanged, nothing happens.
 	 *
 	 * @param {object} [oAggregation]
 	 *   An object holding the information needed for data aggregation; see also
@@ -4811,7 +4817,9 @@ sap.ui.define([
 	 *   <code>hierarchyQualifier</code> is given. Root nodes are on the first level. By default,
 	 *   only root nodes are available; they are not yet expanded. Since 1.120.0,
 	 *   <code>expandTo >= Number.MAX_SAFE_INTEGER</code> can be used to expand all levels
-	 *   (<code>1E16</code> is recommended inside XML views for simplicity).
+	 *   (<code>1E16</code> is recommended inside XML views for simplicity). Since 1.139.0,
+	 *   {@link #getAggregation} returns <code>expandTo : Number.MAX_SAFE_INTEGER</code> instead of
+	 *   values greater than this. These differences do not count as changes.
 	 * @param {boolean} [oAggregation.grandTotalAtBottomOnly]
 	 *   Tells whether the grand totals for aggregatable properties are displayed at the bottom only
 	 *   (since 1.86.0); <code>true</code> for bottom only, <code>false</code> for top and bottom,
@@ -4881,12 +4889,13 @@ sap.ui.define([
 	 *     <li> the binding has a {@link sap.ui.model.odata.v4.Context#isKeepAlive kept-alive}
 	 *       context when switching the use case of data aggregation (recursive hierarchy, pure data
 	 *       aggregation, or none at all),
-	 *     <li> there are pending changes,
+	 *     <li> there are pending changes (unless the aggregation is unchanged),
 	 *     <li> a recursive hierarchy is requested, but the model does not use the
 	 *       <code>autoExpandSelect</code> parameter,
 	 *     <li> the binding is part of a {@link #create deep create} because it is relative to a
 	 *       {@link sap.ui.model.odata.v4.Context#isTransient transient} context,
-	 *     <li> the binding has {@link sap.ui.model.Filter.NONE}
+	 *     <li> the binding has {@link sap.ui.model.Filter.NONE} (unless the aggregation is
+	 *       unchanged)
 	 *   </ul>
 	 *
 	 * @example <caption>First group level is product category including subtotals for the net
@@ -4930,6 +4939,9 @@ sap.ui.define([
 		}
 
 		this.checkTransient();
+		if (this.isUnchangedParameter("$$aggregation", oAggregation)) {
+			return;
+		}
 		if (this.hasFilterNone()) {
 			throw new Error("Cannot combine Filter.NONE with $$aggregation");
 		}

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

@@ -60,6 +60,10 @@ sap.ui.define([
 		oBooleanType,
 		mCodeListUrl2Promise = {},
 		DEBUG = Log.Level.DEBUG,
+		oDynamicProperty = Object.freeze({
+			$kind : "Property",
+			$Type : "Edm.Untyped" // inspired by 4.01
+		}),
 		oGeoJSON = {
 			$kind : "ComplexType",
 			$OpenType : true,
@@ -195,7 +199,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.136.4
+		 * @version 1.139.0
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor
@@ -570,6 +574,7 @@ sap.ui.define([
 			? [vAnnotationUri] : vAnnotationUri;
 		this.sDefaultBindingMode = BindingMode.OneTime;
 		this.mETags = {};
+		this.sForbiddenSchema = undefined; // data service's schema in case of a value help service
 		this.sLanguage = sLanguage;
 		// no need to use UI5Date.getInstance as only the timestamp is relevant
 		this.oLastModified = new Date(0);
@@ -593,8 +598,8 @@ sap.ui.define([
 		this.mSupportedBindingModes = {OneTime : true, OneWay : true};
 		this.bSupportReferences = bSupportReferences !== false; // default is true
 		// ClientListBinding#filter calls checkFilter on the model; ClientModel does
-		// not support "All" and "Any" filters
-		this.mUnsupportedFilterOperators = {All : true, Any : true};
+		// not support "All", "Any", "NotAll", and "NotAny" filters
+		this.mUnsupportedFilterOperators = {All : true, Any : true, NotAll : true, NotAny : true};
 		this.sUrl = sUrl;
 	}
 
@@ -917,6 +922,21 @@ sap.ui.define([
 		throw oError;
 	};
 
+	/**
+	 * Tells this meta model to not include the given schema. Use this to prevent inclusion of the
+	 * data service's schema into a value help service, which would be possible due to a
+	 * "cross-service reference" but would violate the constraints of {@link #requestValueListInfo}
+	 * regarding "Unexpected annotation ... with namespace of data service ...".
+	 *
+	 * @param {string} sSchema
+	 *   A namespace of a schema, for example "foo.bar."
+	 *
+	 * @private
+	 */
+	ODataMetaModel.prototype._setForbiddenSchema = function (sSchema) {
+		this.sForbiddenSchema = sSchema;
+	};
+
 	/**
 	 * See {@link sap.ui.base.EventProvider#attachEvent}
 	 *
@@ -1184,6 +1204,7 @@ sap.ui.define([
 				vLocation, // {string[]|string} location of indirection
 				sName, // what "@sapui.name" refers to: OData or annotation name
 				bODataMode, // OData navigation mode with scope lookup etc.
+				bOpenType, // schema child is an open (entity or complex) type
 				// parent for next "17.2 SimpleIdentifier"...
 				// (normally the schema child containing the current object)
 				oSchemaChild, // ...as object
@@ -1229,8 +1250,8 @@ sap.ui.define([
 				if (vBindingParameterType) {
 					oSchemaChild = aOverloads = vResult.filter(isRightOverload);
 					if (aOverloads.length !== 1) {
-						return log(WARNING, "Expected a single overload, but found "
-							+ aOverloads.length);
+						return log(WARNING, "Expected a single overload, but found ",
+							aOverloads.length);
 					}
 					if (vBindingParameterType !== UNBOUND) {
 						sSignature = aOverloads[0].$Parameter[0].$isCollection
@@ -1443,6 +1464,10 @@ sap.ui.define([
 					}
 					// unknown qualified name: maybe schema is referenced and can be included?
 					sSchema = schema(sQualifiedName);
+					if (sSchema === that.sForbiddenSchema) {
+						return logWithLocation(WARNING, "Must not access schema '", sSchema,
+							"' from meta model for ", that.sUrl);
+					}
 					vResult = that._getOrFetchSchema(mScope, sSchema, logWithLocation);
 				}
 
@@ -1450,6 +1475,7 @@ sap.ui.define([
 					sTarget = sName = sSchemaChildName = sQualifiedName;
 					vResult = oSchemaChild = mScope[sSchemaChildName];
 					if (!SyncPromise.isThenable(vResult)) {
+						bOpenType = vResult.$OpenType;
 						return true; // qualified name found, steps may continue
 					}
 				}
@@ -1537,7 +1563,10 @@ sap.ui.define([
 								return scopeLookup(sSegment);
 							} else if (bResultIsObject && "$Type" in vResult) {
 								// implicit $Type insertion, e.g. at (navigation) property
-								if (!scopeLookup(vResult.$Type, "$Type")) {
+								if (bOpenType && vResult.$Type === "Edm.Untyped") {
+									// no use to lookup, type continues to be open
+									sName = undefined; // block "@sapui.name"
+								} else if (!scopeLookup(vResult.$Type, "$Type")) {
 									return false;
 								}
 							} else if (bResultIsObject && "$Action" in vResult) {
@@ -1651,9 +1680,9 @@ sap.ui.define([
 						function terminal(vValue) {
 							vResult = vValue;
 							if (vResult === undefined) {
-								log(WARNING, "Unsupported path before " + sSegment);
+								log(WARNING, "Unsupported path before ", sSegment);
 							} else if (i + 1 < aSegments.length) {
-								log(WARNING, "Unsupported path after " + sSegment);
+								log(WARNING, "Unsupported path after ", sSegment);
 							}
 							return false;
 						}
@@ -1698,7 +1727,9 @@ sap.ui.define([
 					}
 					sName = bODataMode || sSegment[0] === "@" ? sSegment : undefined;
 					sTarget = bODataMode ? sTarget + "/" + sSegment : undefined;
-					vResult = vResult[sSegment];
+					vResult = bOpenType && !bInsideAnnotation && !(sSegment in vResult)
+						? oDynamicProperty
+						: vResult[sSegment];
 				}
 				return true;
 			}
@@ -1956,7 +1987,7 @@ sap.ui.define([
 					sNavigationPath = _Helper.buildPath(sNavigationPath, sPropertyName);
 					oProperty = bInsideAnnotation ? {} : oType[sPropertyName];
 					if (!oProperty) {
-						if (sPropertyName.includes("@")) {
+						if (sPropertyName.includes("@") || oType.$OpenType) {
 							if (sPropertyName.includes("@$ui5.")
 									&& sPropertyName !== "@$ui5.context.isSelected") {
 								error("Read-only path must not be updated");
@@ -2556,13 +2587,17 @@ sap.ui.define([
 	 *   list model!
 	 * @param {boolean} [bAutoExpandSelect]
 	 *   Whether the model is to be created with autoExpandSelect
+	 * @param {string} [sQualifiedParentName]
+	 *   Only in case of a value list model: The qualified name of the structured type containing
+	 *   the property or the operation containing the parameter where value list info was requested.
+	 *   Used to derive the {@link #_setForbiddenSchema forbidden schema}.
 	 * @returns {sap.ui.model.odata.v4.ODataModel}
 	 *   The shared model
 	 *
 	 * @private
 	 */
 	ODataMetaModel.prototype.getOrCreateSharedModel = function (sUrl, bCopyAnnotations,
-			bAutoExpandSelect) {
+			bAutoExpandSelect, sQualifiedParentName) {
 		sUrl = this.getAbsoluteServiceUrl(sUrl);
 		const sMapKey = !!bAutoExpandSelect + sUrl; // no separator needed as sUrl.startsWith("/")
 		let mSharedModelByUrl = this.mSharedModelByUrl;
@@ -2584,6 +2619,9 @@ sap.ui.define([
 			if (bCopyAnnotations) {
 				oSharedModel.getMetaModel()._copyAnnotations(this.oMetaModelForAnnotations ?? this);
 			}
+			if (sQualifiedParentName) {
+				oSharedModel.getMetaModel()._setForbiddenSchema(schema(sQualifiedParentName));
+			}
 			oSharedModel.setRetryAfterHandler((oError) => {
 				return this.oModel.getOrCreateRetryAfterPromise(oError);
 			});
@@ -3117,7 +3155,7 @@ sap.ui.define([
 	 * "&lt;7.2.1 Attribute Property>@...", "$OnDelete@...", "&lt;10.2.1 Attribute Name>@..." and
 	 * "&lt;14.5.14.2.1 Attribute Property>@..." (where angle brackets denote a variable part and
 	 * sections refer to specification <a href=
-	 * "https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part3-csdl.htm"
+	 * "https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part3-csdl.html"
 	 * >"OData Version 4.0 Part 3: Common Schema Definition Language"</a>).
 	 *
 	 * Annotations starting with "@@", for example
@@ -3224,7 +3262,9 @@ sap.ui.define([
 	 * placeholder for one. In this way, "/EMPLOYEES/" addresses the same entity type as
 	 * "/EMPLOYEES/$Type/". That entity type in turn is a map of all its OData children (that is,
 	 * structural and navigation properties) and determines the set of possible child names that
-	 * might be used after the trailing slash.
+	 * might be used after the trailing slash. Since 1.137.0, open (complex or entity) types are
+	 * supported as follows: A simple identifier that does not refer to an OData child is valid and
+	 * treated as a dynamic property of type "Edm.Untyped".
 	 *
 	 * "$" can be used as the last segment to continue a path and thus force scope lookup, but no
 	 * OData simple identifier preparations. In this way, it serves as a placeholder for a technical
@@ -3470,11 +3510,9 @@ sap.ui.define([
 			// flag for "fixed values"
 			this.requestObject(sPropertyMetaPath + sValueListWithFixedValues),
 			this.requestObject(sParentMetaPath + "/@$ui5.overload")
-		]).then(function (aResults) {
-			var mAnnotationByTerm = aResults[2],
-				bFixedValues = aResults[3],
-				mMappingUrlByQualifier = {},
-				oProperty = aResults[1],
+		]).then(function ([sQualifiedParentName, oProperty, mAnnotationByTerm, bFixedValues,
+				aOverloads]) {
+			var mMappingUrlByQualifier = {},
 				oValueListInfo = {};
 
 			/*
@@ -3489,7 +3527,7 @@ sap.ui.define([
 			function addMapping(mValueListMapping, sQualifier, sMappingUrl, oModel) {
 				if ("CollectionRoot" in mValueListMapping) {
 					oModel = that.getOrCreateSharedModel(mValueListMapping.CollectionRoot,
-						/*bCopyAnnotations*/true, bAutoExpandSelect);
+						/*bCopyAnnotations*/true, bAutoExpandSelect, sQualifiedParentName);
 					if (oValueListInfo[sQualifier]
 							&& oValueListInfo[sQualifier].$model === oModel) {
 						// same model -> allow overriding the qualifier
@@ -3524,11 +3562,11 @@ sap.ui.define([
 				// fetch mappings for each entry and wait for all
 				return Promise.all(aMappingUrls.map(function (sMappingUrl) {
 					var oValueListModel = that.getOrCreateSharedModel(sMappingUrl,
-							/*bCopyAnnotations*/true, bAutoExpandSelect);
+							/*bCopyAnnotations*/true, bAutoExpandSelect, sQualifiedParentName);
 
 					// fetch the mappings for the given mapping URL
-					return that.fetchValueListMappings(oValueListModel,
-						/*sQualifiedParentName*/aResults[0], oProperty, /*aOverloads*/aResults[4]
+					return that.fetchValueListMappings(oValueListModel, sQualifiedParentName,
+						oProperty, aOverloads
 					).then(function (mValueListMappingByQualifier) {
 						// enrich with oValueListModel
 						return {

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

@@ -240,7 +240,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.136.4
+		 * @version 1.139.0
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -962,11 +962,11 @@ sap.ui.define([
 	 *   Whether the binding always uses an own service request to read its data; only the value
 	 *   <code>true</code> is allowed.
 	 * @param {string[]} [mParameters.$$separate]
-	 *   An array of navigation property names which are omitted from the main list request and
-	 *   loaded in a separate request instead (@experimental as of version 1.129.0). This results in
-	 *   the main list becoming available faster, while the separate properties are merged as soon
-	 *   as the data is received. Note that the separate properties must be single valued and part
-	 *   of the '$expand' system query option, either automatically via the "autoExpandSelect" model
+	 *   An array of navigation property names which are omitted from the main list request (since
+	 *   1.137.0). Instead, each of them is loaded in a separate request. This results in the main
+	 *   list becoming available faster, while the separate properties are merged as soon as the
+	 *   data is received. Note that the separate properties must be single valued and part of the
+	 *   '$expand' system query option, either automatically via the "autoExpandSelect" model
 	 *   parameter (see {@link #constructor}) or manually. The <code>$$separate</code> parameter
 	 *   must not be combined with <code>$$aggregation</code>.
 	 * @param {boolean} [mParameters.$$sharedRequest]
@@ -1266,7 +1266,7 @@ sap.ui.define([
 	 * and missing headers remain unchanged. The following headers must not be used:
 	 * <ul>
 	 *   <li> OData V4 requests headers as specified in <a href=
-	 *     "https://docs.oasis-open.org/odata/odata/v4.0/os/part1-protocol/odata-v4.0-os-part1-protocol.html#_Common_Headers"
+	 *     "https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part1-protocol.html#_Common_Headers"
 	 *     >"8.1 Common Headers"</a> and "8.2 Request Headers" of the specification "OData Version
 	 *     4.0 Part 1: Protocol"
 	 *   <li> OData V2 request headers as specified in "2.2.5 HTTP Header Fields" of the
@@ -2880,7 +2880,8 @@ sap.ui.define([
 	 *   but take care to replace dashes with underscores.
 	 * @throws {Error}
 	 *   If the given group ID is not a valid group ID or has
-	 *   {@link sap.ui.model.odata.v4.SubmitMode.Direct}
+	 *   {@link sap.ui.model.odata.v4.SubmitMode.Direct} or if multiple requests that apply the
+	 *   preference "handling=strict" already exist in the same change set of the batch request
 	 *
 	 * @private
 	 * @since 1.134.0

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

@@ -1097,7 +1097,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataParentBinding.prototype.getGeneration = function () {
-		return this.bRelative && this.oContext.getGeneration && this.oContext.getGeneration() || 0;
+		return this.bRelative && this.oContext?.getGeneration?.() || 0;
 	};
 
 	/**
@@ -1263,7 +1263,7 @@ sap.ui.define([
 	 * "unchanged" when compared to the given other value.
 	 *
 	 * @param {string} sName - The parameter's name
-	 * @param {any} vOtherValue - The parameter's other value
+	 * @param {any} [vOtherValue] - The parameter's other value
 	 * @returns {boolean} Whether the parameter is "unchanged"
 	 *
 	 * @private

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

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.136.4
+		 * @version 1.139.0
 		 * @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#getUpdateGroupId as #getUpdateGroupId

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

@@ -14,7 +14,7 @@ sap.ui.define([
 ], function (CalendarType, DateFormat, BaseODataUtils, _Batch, _Helper) {
 	"use strict";
 
-	// see http://docs.oasis-open.org/odata/odata/v4.0/errata02/os/complete/abnf/odata-abnf-construction-rules.txt
+	// see https://docs.oasis-open.org/odata/odata/v4.0/errata03/os/complete/abnf/
 	var oDateFormatter,
 		oDateTimeOffsetFormatter,
 		sDateValue = "\\d{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[12]\\d|3[01])",
@@ -140,7 +140,7 @@ sap.ui.define([
 			 *
 			 * @param {any} vValue
 			 *   The value according to <a href=
-			 *   "https://docs.oasis-open.org/odata/odata-json-format/v4.0/os/odata-json-format-v4.0-os.html#_Primitive_Value"
+			 *   "https://docs.oasis-open.org/odata/odata-json-format/v4.0/odata-json-format-v4.0.html#_Primitive_Value"
 			 *   >"OData JSON Format Version 4.0" section "7.1 Primitive Value"</a>
 			 * @param {string} sType
 			 *   The OData primitive type, for example "Edm.String"

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

@@ -9,14 +9,14 @@
 sap.ui.define([
 	"../_AnnotationHelperBasics",
 	"sap/base/Log",
+	"sap/ui/base/BindingInfo",
 	"sap/ui/base/BindingParser",
-	"sap/ui/base/ManagedObject",
 	"sap/ui/base/SyncPromise",
 	"sap/ui/performance/Measurement"
-], function (Basics, Log, BindingParser, ManagedObject, SyncPromise, Measurement) {
+], function (Basics, Log, BindingInfo, BindingParser, SyncPromise, Measurement) {
 	"use strict";
 
-	// see http://docs.oasis-open.org/odata/odata/v4.0/errata02/os/complete/abnf/odata-abnf-construction-rules.txt
+	// see https://docs.oasis-open.org/odata/odata/v4.0/errata03/os/complete/abnf/
 	var sAnnotationHelper = "sap.ui.model.odata.v4.AnnotationHelper",
 		aPerformanceCategories = [sAnnotationHelper],
 		sPerformanceGetExpression = sAnnotationHelper + "/getExpression",
@@ -680,7 +680,7 @@ sap.ui.define([
 			Measurement.average(sPerformanceGetExpression, "", aPerformanceCategories);
 
 			if (!bSimpleParserWarningLogged
-					&& ManagedObject.bindingParser === BindingParser.simpleParser) {
+					&& BindingInfo.parse === BindingParser.simpleParser) {
 				Log.warning("Complex binding syntax not active", null, sAnnotationHelper);
 				bSimpleParserWarningLogged = true;
 			}