@openui5/sap.ui.core 1.141.2 → 1.143.0

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

@@ -548,6 +548,9 @@ sap.ui.define([
 		this.oCachePromise = SyncPromise.all(aPromises).then(function (aResult) {
 			var mQueryOptions = aResult[0].mQueryOptions;
 
+			if (oCallToken.initiallySuspended) {
+				return null;
+			}
 			if (aResult[0].sReducedPath) {
 				that.sReducedPath = aResult[0].sReducedPath;
 			}
@@ -1576,9 +1579,9 @@ sap.ui.define([
 	 * @param {string} sGroupId
 	 *   The group ID to be used for requesting side effects
 	 * @param {string[]} aPaths
-	 *   The "14.5.11 Expression edm:NavigationPropertyPath" or
-	 *   "14.5.13 Expression edm:PropertyPath" strings describing which properties need to be loaded
-	 *   because they may have changed due to side effects of a previous update
+	 *   The "14.4.1.5  Expression edm:NavigationPropertyPath" or
+	 *   "14.4.1.6 Expression edm:PropertyPath" strings describing which properties need to be
+	 *   loaded because they may have changed due to side effects of a previous update
 	 * @param {sap.ui.model.odata.v4.Context} [oContext]
 	 *   The context for which to request side effects; if missing, the whole binding is affected
 	 * @param {Promise[]} aPromises

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

@@ -74,7 +74,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.141.2
+		 * @version 1.143.0
 		 *
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
@@ -1215,7 +1215,7 @@ sap.ui.define([
 	 * 1. Operation is bound.
 	 * 2. Operation has single entity return value. Note: existence of EntitySetPath
 	 *    implies the return value is an entity or a collection thereof;
-	 *    see OData V4 spec part 3, 12.1.3. It thus ensures the "entity" in this condition.
+	 *    see [OData-CSDL-XML-v4.01], 12.6. It thus ensures the "entity" in this condition.
 	 * 3. EntitySetPath of operation is the binding parameter.
 	 * 4. Operation binding has
 	 *    (a) a V4 parent context which
@@ -1454,7 +1454,7 @@ sap.ui.define([
 	 * 1. Operation is bound.
 	 * 2. Operation has single entity return value. Note: existence of EntitySetPath
 	 *    implies the return value is an entity or a collection thereof;
-	 *    see OData V4 spec part 3, 12.1.3. It thus ensures the "entity" in this condition.
+	 *    see [OData-CSDL-XML-v4.01], 12.6. It thus ensures the "entity" in this condition.
 	 * 3. EntitySetPath of operation is the binding parameter.
 	 * 4. Operation binding has
 	 *    (a) a V4 parent context.
@@ -1633,7 +1633,7 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.model.odata.v4.Context} oContext
 	 *   The context to refresh
-	 * @param {string} sGroupId
+	 * @param {string} [sGroupId]
 	 *   The group ID for the refresh
 	 * @param {boolean} [bKeepCacheOnError]
 	 *   If <code>true</code>, the binding data remains unchanged if the refresh fails
@@ -1685,8 +1685,8 @@ sap.ui.define([
 	 * Returns a promise on the value for the given path relative to this binding. The function
 	 * allows access to the complete data the binding points to (if <code>sPath</code> is "") or
 	 * any part thereof. The data is a JSON structure as described in
-	 * <a href="https://docs.oasis-open.org/odata/odata-json-format/v4.0/">
-	 * "OData JSON Format Version 4.0"</a>.
+	 * <a href="https://docs.oasis-open.org/odata/odata-json-format/v4.01/">
+	 * "OData JSON Format Version 4.01"</a>.
 	 * Note that the function clones the result. Modify values via
 	 * {@link sap.ui.model.odata.v4.Context#setProperty}.
 	 *

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

@@ -60,7 +60,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.141.2
+		 * @version 1.143.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
@@ -143,6 +143,10 @@ sap.ui.define([
 		this.oHeaderContext = this.bRelative
 			? null
 			: Context.createNewContext(oModel, this, sPath);
+		this.bInitial = true;
+		Promise.resolve().then(() => {
+			this.bInitial = false; // ensure to reset the initial flag after the synchronous part
+		});
 		this.sOperationMode = mParameters.$$operationMode || oModel.sOperationMode;
 		// map<string,sap.ui.model.odata.v4.Context>
 		// Maps a string path to a v4.Context with that path. A context may either be
@@ -970,6 +974,7 @@ sap.ui.define([
 			oEntityData,
 			sGroupId = this.getUpdateGroupId(),
 			oGroupLock,
+			bRefresh,
 			sResolvedPath = this.getResolvedPath(),
 			sTransientPredicate = "($uid=" + _Helper.uid() + ")",
 			sTransientPath = sResolvedPath + sTransientPredicate,
@@ -1013,7 +1018,6 @@ sap.ui.define([
 		// clone data to avoid modifications outside the cache
 		// remove any property starting with "@$ui5."
 		oEntityData = _Helper.publicClone(oInitialData, true) || {};
-		let bRefresh;
 		if (oAggregation) {
 			if (!bSkipRefresh) {
 				throw new Error("Missing bSkipRefresh");
@@ -1098,7 +1102,7 @@ sap.ui.define([
 			// currently the optimized update w/o bSkipRefresh is restricted to deep create
 			return bSkipRefresh || bDeepCreate
 				? oContext.updateAfterCreate(bSkipRefresh, sGroupId0)
-				: that.refreshSingle(oContext, that.lockGroup(sGroupId0));
+				: that.refreshSingle(oContext, sGroupId0);
 		}, function (oError) {
 			oGroupLock.unlock(true); // createInCache failed, so the lock might still be blocking
 			throw oError;
@@ -1728,6 +1732,18 @@ sap.ui.define([
 	 */
 	ODataListBinding.prototype.doSetProperty = function () {};
 
+	/**
+	 * @override
+	 * @see sap.ui.model.odata.v4.ODataParentBinding#doSuspend
+	 */
+	ODataListBinding.prototype.doSuspend = function () {
+		// if auto-$expand/$select is not used, this.oFetchCacheCallToken may be reset already
+		if (this.bInitial && this.oFetchCacheCallToken) {
+			this.oFetchCacheCallToken.initiallySuspended = true;
+			this.oCache = null;
+		}
+	};
+
 	/**
 	 * Expands the group node that the given context points to by the given number of levels.
 	 *
@@ -2148,7 +2164,7 @@ sap.ui.define([
 
 		return oPromise.then((oEntityType) => {
 			const oAggregation = this.mParameters.$$aggregation;
-			if (oEntityType) {
+			if (oEntityType && oAggregation) {
 				oAggregation.$leafLevelAggregated = !oEntityType.$Key?.every((sKey) => {
 					// "group" and "additionally" determine groupby()
 					return sKey in oAggregation.group
@@ -2674,7 +2690,7 @@ sap.ui.define([
 			oContext.oBinding = that;
 		});
 		oCache = oBinding.oCache;
-		oCache.setQueryOptions(mQueryOptions);
+		oCache.setQueryOptions(mQueryOptions, /*bForce*/true);
 		// avoid that the cache is set inactive or that contexts are destroyed
 		oBinding.oCache = null;
 		oBinding.oCachePromise = SyncPromise.resolve(null);
@@ -3476,6 +3492,7 @@ sap.ui.define([
 	 */
 	// @override sap.ui.model.Binding#initialize
 	ODataListBinding.prototype.initialize = function () {
+		this.bInitial = false;
 		if (this.isResolved()) {
 			this.checkDataState();
 			if (this.isRootBindingSuspended()) {
@@ -4095,8 +4112,10 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.model.odata.v4.Context} oContext
 	 *   The context object for the entity to be refreshed
-	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
-	 *   A lock for the group ID to be used for refresh
+	 * @param {string} [sGroupId]
+	 *   The group ID to be used
+	 * @param {boolean} [bLocked]
+	 *   Whether the group lock created from the given group ID is locked
 	 * @param {boolean} [bAllowRemoval]
 	 *   Allows the list binding to remove the given context from its collection because the
 	 *   entity does not match the binding's filter anymore, see {@link #filter}; a removed context
@@ -4115,11 +4134,12 @@ sap.ui.define([
 	 *   or rejects if the refresh failed.
 	 * @throws {Error}
 	 *   If the given context does not represent a single entity (see {@link #getHeaderContext}), or
-	 *   if <code>bAllowRemoval && bWithMessages</code> are combined
+	 *   if <code>bAllowRemoval</code> is combined with <code>bWithMessages</code> or with a
+	 *   recursive hierarchy
 	 *
 	 * @private
 	 */
-	ODataListBinding.prototype.refreshSingle = function (oContext, oGroupLock, bAllowRemoval,
+	ODataListBinding.prototype.refreshSingle = function (oContext, sGroupId, bLocked, bAllowRemoval,
 			bKeepCacheOnError, bWithMessages) {
 		var sContextPath = oContext.getPath(),
 			sResourcePathPrefix = sContextPath.slice(1),
@@ -4128,6 +4148,15 @@ sap.ui.define([
 		if (oContext === this.oHeaderContext) {
 			throw new Error("Unsupported header context: " + oContext);
 		}
+		if (this.mParameters.$$aggregation?.hierarchyQualifier) {
+			if (!oContext.isEffectivelyKeptAlive()
+					&& this.aContexts[oContext.iIndex] !== oContext) {
+				throw new Error("Not currently part of the hierarchy: " + oContext);
+			}
+			if (bAllowRemoval) {
+				throw new Error("Unsupported parameter bAllowRemoval: " + bAllowRemoval);
+			}
+		}
 		if (bAllowRemoval && bWithMessages) {
 			throw new Error("Unsupported: bAllowRemoval && bWithMessages");
 		}
@@ -4206,6 +4235,7 @@ sap.ui.define([
 				throw new Error("Cannot refresh. Hint: Side-effects refresh in parallel? "
 					+ oContext);
 			}
+			const oGroupLock = that.lockGroup(sGroupId, bLocked);
 			aPromises.push(
 				(bAllowRemoval
 					? oCache.refreshSingleWithRemove(oGroupLock, sPath, iModelIndex, sPredicate,
@@ -4221,8 +4251,8 @@ sap.ui.define([
 						aUpdatePromises.push(oContext.checkUpdateInternal());
 						if (bAllowRemoval) {
 							aUpdatePromises.push(
-								oContext.refreshDependentBindings(sResourcePathPrefix,
-									oGroupLock.getGroupId(), false, bKeepCacheOnError));
+								oContext.refreshDependentBindings(sResourcePathPrefix, sGroupId,
+									false, bKeepCacheOnError));
 						}
 					}
 
@@ -4243,8 +4273,8 @@ sap.ui.define([
 			if (!bAllowRemoval) {
 				// call refreshInternal on all dependent bindings to ensure that all resulting data
 				// requests are in the same batch request
-				aPromises.push(oContext.refreshDependentBindings(sResourcePathPrefix,
-					oGroupLock.getGroupId(), false, bKeepCacheOnError));
+				aPromises.push(oContext.refreshDependentBindings(sResourcePathPrefix, sGroupId,
+					false, bKeepCacheOnError));
 			}
 
 			return SyncPromise.all(aPromises);
@@ -4593,7 +4623,7 @@ sap.ui.define([
 			oModel.withUnresolvedBindings("removeCachesAndMessages",
 				oContext.getPath().slice(1));
 
-			return this.refreshSingle(oContext, this.lockGroup(sGroupId), /*bAllowRemoval*/false,
+			return this.refreshSingle(oContext, sGroupId, /*bLocked*/false, /*bAllowRemoval*/false,
 				/*bKeepCacheOnError*/true, /*bWithMessages*/true);
 		}
 		if (this.iCurrentEnd === 0) {
@@ -4871,8 +4901,8 @@ sap.ui.define([
 	 *   </ul>
 	 * @param {string} [oAggregation.search]
 	 *   Like the <a href=
-	 *   "https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part2-url-conventions.html#_Search_System_Query"
-	 *   >"5.1.7 System Query Option $search"</a>, but applied before data aggregation
+	 *   "https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html#_Toc31361044"
+	 *   >"5.1.8 System Query Option $search"</a>, but applied before data aggregation
 	 *   (since 1.93.0). Note that certain content will break the syntax of the system query option
 	 *   <code>$apply</code> and result in an invalid request. If the OData service supports the
 	 *   proposal <a href="https://issues.oasis-open.org/browse/ODATA-1452">ODATA-1452</a>, then
@@ -4935,19 +4965,18 @@ sap.ui.define([
 	 * @ui5-transform-hint replace-param oAggregation."grandTotal like 1.84" false
 	 */
 	ODataListBinding.prototype.setAggregation = function (oAggregation) {
-		var mParameters;
-
 		/*
 		 * Returns the use case of data aggregation (recursive hierarchy, pure data aggregation, or
-		 * none at all) as <code>true</code>, <code>false</code>, or <code>undefined</code>.
+		 * none at all) as <code>false</code>, <code>true</code>, or <code>undefined</code>.
 		 *
 		 * @param {object} [oAggregation]
 		 *   An object holding the information needed for data aggregation
 		 * @returns {boolean|undefined}
 		 *   The use case of data aggregation
+		 * @see _Helper.isDataAggregation
 		 */
 		function useCase(oDataAggregationObject) {
-			return oDataAggregationObject && !!oDataAggregationObject.hierarchyQualifier;
+			return oDataAggregationObject && !oDataAggregationObject.hierarchyQualifier;
 		}
 
 		this.checkTransient();
@@ -4960,18 +4989,29 @@ sap.ui.define([
 		if (this.hasPendingChanges()) {
 			throw new Error("Cannot set $$aggregation due to pending changes");
 		}
-		if (useCase(this.mParameters.$$aggregation) !== useCase(oAggregation)
-				&& this.getKeepAlivePredicates().length) {
+		const bOldUseCase = useCase(this.mParameters.$$aggregation);
+		const bNewUseCase = useCase(oAggregation);
+		if (bOldUseCase !== bNewUseCase && this.getKeepAlivePredicates().length) {
 			throw new Error("Cannot set $$aggregation due to a kept-alive context");
 		}
 
-		mParameters = Object.assign({}, this.mParameters);
+		const mParameters = Object.assign({}, this.mParameters);
 		if (oAggregation === undefined) {
 			delete mParameters.$$aggregation;
 		} else {
 			mParameters.$$aggregation = _Helper.clone(oAggregation);
 		}
 		this.applyParameters(mParameters, "");
+		if (!!bOldUseCase !== !!bNewUseCase) {
+			// if data aggregation is turned on or off, set change reason accordingly
+			if (bNewUseCase) {
+				if (this.sChangeReason === "AddVirtualContext") {
+					this.sChangeReason = undefined;
+				}
+			} else if (this.oModel.bAutoExpandSelect) {
+				this.sChangeReason ??= "AddVirtualContext";
+			}
+		}
 	};
 
 	/**

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

@@ -40,13 +40,12 @@ sap.ui.define([
 	"sap/ui/model/odata/type/Single",
 	"sap/ui/model/odata/type/Stream",
 	"sap/ui/model/odata/type/String",
-	"sap/ui/model/odata/type/TimeOfDay",
-	"sap/ui/thirdparty/URI"
+	"sap/ui/model/odata/type/TimeOfDay"
 ], function (AnnotationHelper, ValueListType, _Helper, assert, Log, JSTokenizer, ObjectPath,
 		ManagedObject, SyncPromise, BindingMode, ChangeReason, ClientListBinding, BaseContext,
 		ContextBinding, MetaModel, PropertyBinding, OperationMode, Boolean, Byte, EdmDate,
 		DateTimeOffset, Decimal, Double, Guid, Int16, Int32, Int64, Raw, SByte, Single, Stream,
-		String, TimeOfDay, URI) {
+		String, TimeOfDay) {
 	"use strict";
 	/*eslint max-nested-callbacks: 0 */
 
@@ -204,7 +203,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.141.2
+		 * @version 1.143.0
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor
@@ -1211,7 +1210,7 @@ sap.ui.define([
 				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"...
+				// parent for next "15.2 SimpleIdentifier"...
 				// (normally the schema child containing the current object)
 				oSchemaChild, // ...as object
 				sSchemaChildName, // ...as qualified name
@@ -1285,7 +1284,7 @@ sap.ui.define([
 				}
 
 				// "the annotation applies to all overloads of the action or function or all
-				// parameters of that name across all overloads" [OData-Part3]
+				// parameters of that name across all overloads" [OData-CSDL-XML-v4.01]
 				sTarget += sSuffix;
 				// any object (no array!) should do here to skip repeated handling of overloads
 				vResult = mScope;
@@ -1589,7 +1588,7 @@ sap.ui.define([
 							if (bSplitSegment) {
 								// no special preparations needed, but handle overloads below!
 							} else if (sSegment[0] !== "@" && sSegment.includes(".", 1)) {
-								// "17.3 QualifiedName": scope lookup
+								// "15.3 QualifiedName": scope lookup
 								return scopeLookup(sSegment);
 							} else if (bResultIsObject && "$Type" in vResult) {
 								// implicit $Type insertion, e.g. at (navigation) property
@@ -1612,7 +1611,7 @@ sap.ui.define([
 								}
 								vBindingParameterType = UNBOUND;
 							} else if (!i) {
-								// "17.2 SimpleIdentifier" (or placeholder):
+								// "15.2 SimpleIdentifier" (or placeholder):
 								// lookup inside schema child (which is determined lazily)
 								sTarget = sName = sSchemaChildName
 									??= mScope.$EntityContainer;
@@ -1623,7 +1622,7 @@ sap.ui.define([
 									}
 									if (isParameter(sSegment, vResult[0])) {
 										// path evaluation relative to an operation overload
-										// @see [OData-CSDL-JSON-v4.01] "14.4.1.2 Path Evaluation"
+										// @see [OData-CSDL-XML-v4.01] "14.4.1.2 Path Evaluation"
 										// or ".../@$ui5.overload/0/$Parameter/<i>/$Name/$" to refer
 										// back to (overloaded) operation's parameter
 										return true;
@@ -1774,8 +1773,8 @@ sap.ui.define([
 					oEntitySetOrSingleton = undefined;
 					sSomePath = sSomePath.slice(1);
 				} else if (oEntitySetOrSingleton) {
-					// "14.5.12 Expression edm:Path" within an annotation targeting an entity set or
-					// a singleton
+					// "14.4.1.7 Expression edm:Path" within an annotation targeting an entity set
+					// or a singleton
 					if (!sSomePath) { // "an empty path resolves to the entity set or singleton"
 						vResult = oEntitySetOrSingleton;
 						oEntitySetOrSingleton = vLocation = undefined;
@@ -2294,27 +2293,6 @@ sap.ui.define([
 			});
 	};
 
-	/**
-	 * Returns the absolute service URL corresponding to the given relative $metadata URL.
-	 *
-	 * @param {string} sUrl
-	 *   A $metadata URL, for example "../ValueListService/$metadata?sap-client=123", interpreted
-	 *   relative to this meta model's URL
-	 * @returns {string}
-	 *   The corresponding absolute service URL
-	 *
-	 * @private
-	 */
-	ODataMetaModel.prototype.getAbsoluteServiceUrl = function (sUrl) {
-		// Note: make our $metadata URL absolute because URI#absoluteTo requires an absolute base
-		// URL (and it fails if the base URL starts with "..")
-		var sAbsoluteUrl = new URI(this.sUrl).absoluteTo(document.baseURI).pathname().toString();
-
-		// sUrl references the metadata document, make it absolute based on our $metadata URL to get
-		// rid of ".." segments and remove the filename part
-		return new URI(sUrl).absoluteTo(sAbsoluteUrl).filename("").toString();
-	};
-
 	/**
 	 * Builds the completely reduced path or a list of all reductions of the given path based on
 	 * metadata. Removes adjacent partner navigation properties and reduces binding paths to
@@ -2612,7 +2590,7 @@ sap.ui.define([
 	 */
 	ODataMetaModel.prototype.getOrCreateSharedModel = function (sUrl, bCopyAnnotations,
 			bAutoExpandSelect, sQualifiedParentName) {
-		sUrl = this.getAbsoluteServiceUrl(sUrl);
+		sUrl = _Helper.makeAbsolute(sUrl, this.sUrl, /*bServiceUrl*/true);
 		const sMapKey = !!bAutoExpandSelect + sUrl; // no separator needed as sUrl.startsWith("/")
 		let mSharedModelByUrl = this.mSharedModelByUrl;
 		if (!bCopyAnnotations) {
@@ -2868,8 +2846,8 @@ sap.ui.define([
 					return null;
 				}
 
-				sUrl = that.getAbsoluteServiceUrl(
-					_Helper.setLanguage(oCodeList.Url, that.sLanguage));
+				sUrl = _Helper.makeAbsolute(_Helper.setLanguage(oCodeList.Url, that.sLanguage),
+					that.sUrl, /*bServiceUrl*/true);
 				// separator needed (Note: path must not include hash)
 				sCacheKey = oCodeList.CollectionPath + "#" + sUrl;
 				oPromise = mCodeListUrl2Promise[sCacheKey];
@@ -3083,16 +3061,14 @@ sap.ui.define([
 	 * </pre>
 	 *
 	 * The basic idea is that every path described in <a href=
-	 * "https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part3-csdl.html#_Attribute_Target"
-	 * >"14.2.1 Attribute Target"</a> in specification "OData Version 4.0 Part 3: Common Schema
-	 * Definition Language" is a valid absolute path within the metadata model if a leading slash is
-	 * added; for example
+	 * "https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html#_Toc38530407"
+	 * >"14.2.2 Target"</a> in specification "OData Common Schema Definition Language (CSDL)
+	 * XML Representation Version 4.01" is a valid absolute path within the metadata model if a
+	 * leading slash is added; for example
 	 * "/" + "MySchema.MyEntityContainer/MyEntitySet/MyComplexProperty/MyNavigationProperty". Also,
-	 * every path described in "14.5.2 Expression edm:AnnotationPath",
-	 * "14.5.11 Expression edm:NavigationPropertyPath", "14.5.12 Expression edm:Path", and
-	 * "14.5.13 Expression edm:PropertyPath" is a valid relative path within the metadata model
-	 * if a suitable prefix is added which addresses an entity container, entity set, singleton,
-	 * complex type, entity type, or property; for example
+	 * every path described in "14.4.1.1 Path Syntax" is a valid relative path within the metadata
+	 * model if a suitable prefix is added which addresses an entity container, entity set,
+	 * singleton, complex type, entity type, or property; for example
 	 * "/MySchema.MyEntityType/MyProperty" + "@vCard.Address#work/FullName".
 	 *
 	 * The absolute path is split into segments and followed step-by-step, starting at the global
@@ -3133,25 +3109,24 @@ sap.ui.define([
 	 * this, a path must not continue if it comes across a non-object value. Such a string value can
 	 * be a qualified name (example path "/$EntityContainer/..."), a simple identifier (example path
 	 * "/TEAMS/$NavigationPropertyBinding/TEAM_2_EMPLOYEES/...") including the special name
-	 * "$ReturnType" (since 1.71.0), or even a path according to "14.5.12 Expression edm:Path" etc.
+	 * "$ReturnType" (since 1.71.0), or even a path according to "14.4.1.1 Path Syntax"
 	 * (example path "/TEAMS/@com.sap.vocabularies.UI.v1.LineItem/0/Value/$Path/...".
 	 *
 	 * Segments starting with an "@" character, for example "@com.sap.vocabularies.Common.v1.Label",
 	 * address annotations at the current object. As the first segment, they refer to the single
-	 * entity container. For objects which can only be annotated inline (see "14.3 Element
-	 * edm:Annotation" minus "14.2.1 Attribute Target"), the object already contains the
-	 * annotations as a property. For objects which can (only or also) be annotated via external
-	 * targeting, the object does not contain any annotation as a property. Such annotations MUST
-	 * be accessed via a path. Such objects include operations (that is, actions and functions) and
-	 * their parameters, which can be annotated for a single overload or for all overloads at the
-	 * same time.
+	 * entity container. For objects which can only be annotated inline (see "14.2 Annotation" minus
+	 * "14.2.2 Target"), the object already contains the annotations as a property. For objects
+	 * which can (only or also) be annotated via external targeting, the object does not contain any
+	 * annotation as a property. Such annotations MUST be accessed via a path. Such objects include
+	 * operations (that is, actions and functions) and their parameters, which can be annotated for
+	 * a single overload or for all overloads at the same time.
 	 *
 	 * Segments starting with an OData name followed by an "@" character, for example
 	 * "/TEAMS@Org.OData.Capabilities.V1.TopSupported", address annotations at an entity set,
 	 * singleton, or property, not at the corresponding type. In contrast,
 	 * "/TEAMS/@com.sap.vocabularies.Common.v1.Deletable" (note the separating slash) addresses an
 	 * annotation at the entity set's type. This is in line with the special rule of
-	 * "14.5.12 Expression edm:Path" regarding annotations at a navigation property itself.
+	 * "14.4.1.2 Path Evaluation" regarding annotations at a navigation property itself.
 	 *
 	 * "@" can be used as a segment to address a map of all annotations of the current object. This
 	 * is useful for iteration, for example via
@@ -3163,14 +3138,14 @@ sap.ui.define([
 	 * annotation can have a qualifier, for example "@first#foo@second#bar". Note: If the first
 	 * annotation's value is a record, a separate segment addresses an annotation of that record,
 	 * not an annotation of the first annotation itself.
-	 * In a similar way, annotations of "7.2 Element edm:ReferentialConstraint",
-	 * "7.3 Element edm:OnDelete", "10.2 Element edm:Member" and
-	 * "14.5.14.2 Element edm:PropertyValue" are addressed by segments like
-	 * "&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
+	 * In a similar way, annotations of "8.5 Element edm:ReferentialConstraint",
+	 * "8.6 Element edm:OnDelete", "10.3 Element edm:Member" and
+	 * "14.4.12 Element edm:PropertyValue" are addressed by segments like
+	 * "&lt;8.5 Attribute Property>@...", "$OnDelete@...", "&lt;10.3 Attribute Name>@..." and
+	 * "&lt;14.4.12 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.html"
-	 * >"OData Version 4.0 Part 3: Common Schema Definition Language"</a>).
+	 * "https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html"
+	 * >"OData Common Schema Definition Language (CSDL) XML Representation Version 4.01"</a>).
 	 *
 	 * Annotations starting with "@@", for example
 	 * "@@sap.ui.model.odata.v4.AnnotationHelper.isMultiple" or "@@.AH.isMultiple" or
@@ -3472,7 +3447,7 @@ sap.ui.define([
 	 *   this method. If the value list model is the data model associated with this meta model,
 	 *   this flag has no effect. Supported since 1.68.0
 	 * @param {sap.ui.model.odata.v4.Context} [oContext]
-	 *   Context to resolve "14.5.12 Expression edm:Path" references contained in a
+	 *   Context to resolve "14.4.1.7 Expression edm:Path" references contained in a
 	 *   "com.sap.vocabularies.Common.v1.ValueListRelevantQualifiers" annotation. Supported since
 	 *   1.84.0
 	 * @returns {Promise<Object<object>>}
@@ -3784,7 +3759,7 @@ sap.ui.define([
 		for (sReferenceUri in mScope.$Reference) {
 			oReference = mScope.$Reference[sReferenceUri];
 			// interpret reference URI relative to metadata URL
-			sReferenceUri = new URI(sReferenceUri).absoluteTo(this.sUrl).toString();
+			sReferenceUri = _Helper.makeAbsolute(sReferenceUri, this.sUrl);
 
 			if ("$IncludeAnnotations" in oReference) {
 				this._reportAndThrowError("Unsupported IncludeAnnotations", sUrl);