@openui5/sap.ui.core 1.131.1 → 1.132.0

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -74,7 +74,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.131.1
+		 * @version 1.132.0
 		 *
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
@@ -232,8 +232,10 @@ sap.ui.define([
 			return that.refreshDependentBindings("", oGroupLock.getGroupId(), true);
 		}
 
-		oPromise = oMetaModel.fetchObject(sResolvedMetaPath + "/@$ui5.overload")
-			.then(function (aOperationMetadata) {
+		oPromise = SyncPromise.all([
+				oMetaModel.fetchObject(sResolvedMetaPath + "/@$ui5.overload"),
+				this.ready2Inherit()
+			]).then(function ([aOperationMetadata]) {
 				var fnGetEntity, iIndex, sPath;
 
 				if (!aOperationMetadata) {
@@ -626,7 +628,7 @@ sap.ui.define([
 
 			oResult = fnOnStrictHandlingFailed(
 				_Helper.extractMessages(oError).map(function (oRawMessage) {
-					return that.oModel.createUI5Message(oRawMessage);
+					return oModel.createUI5Message(oRawMessage);
 				})
 			);
 
@@ -646,7 +648,7 @@ sap.ui.define([
 		if (bAction && fnGetEntity) {
 			vEntity = fnGetEntity();
 		}
-		if (bIgnoreETag && !(bAction && oOperationMetadata.$IsBound && vEntity)) {
+		if (bIgnoreETag && !(bAction && oOperationMetadata.$IsBound && vEntity !== null)) {
 			throw new Error("Not a bound action: " + sPath);
 		}
 		if (this.bInheritExpandSelect
@@ -1292,7 +1294,8 @@ sap.ui.define([
 	 *   request like '$auto' (since 1.121.0).
 	 * @param {boolean} [bIgnoreETag]
 	 *   Whether the entity's ETag should be actively ignored (If-Match:*); supported for bound
-	 *   actions only, since 1.90.0. Ignored if there is no ETag (since 1.93.0).
+	 *   actions only, since 1.90.0. This parameter is ignored if there is no ETag (since 1.93.0)
+	 *   unless no data has been read so far (since 1.132.0).
 	 * @param {function(sap.ui.core.message.Message[]):Promise<boolean>} [fnOnStrictHandlingFailed]
 	 *   If this callback is given for an action, the preference "handling=strict" is applied. If
 	 *   the service responds with the HTTP status code 412 and a
@@ -1494,6 +1497,20 @@ sap.ui.define([
 			&& !oMetadata.$EntitySetPath.includes("/"); // case 3
 	};
 
+	/**
+	 * Returns a sync promise that tells whether we are ready to inherit $expand/$select.
+	 *
+	 * @returns {sap.ui.base.SyncPromise}
+	 *   A sync promise that resolves without a defined result as soon as we are ready to inherit
+	 *   $expand/$select
+	 *
+	 * @private
+	 */
+	ODataContextBinding.prototype.ready2Inherit = function () {
+		return this.bInheritExpandSelect && this.bRelative && this.oContext.getBinding?.().ready()
+			|| SyncPromise.resolve();
+	};
+
 	/**
 	 * Refreshes all dependent bindings with the given parameters and waits for them to have
 	 * finished.

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -59,7 +59,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.131.1
+		 * @version 1.132.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
@@ -1867,8 +1867,19 @@ sap.ui.define([
 			return SyncPromise.resolve(null);
 		}
 
+		const sMetaPath = _Helper.getMetaPath(this.getResolvedPath());
+		// Note: All paths in mChildPathsReducedToParent start with the partner navigation property
+		// of the last segment in the binding's path because they are backlinks. When wrapped, this
+		// results in exactly one $expand.
+		const mAdditionalExpand = {};
+		for (const sChildPath in this.mChildPathsReducedToParent) {
+			const mQueryOptions = _Helper.wrapChildQueryOptions(sMetaPath, sChildPath, {},
+				this.oModel.oInterface.fetchMetadata, /*bDoNotSelectKeyProperties*/true);
+			_Helper.aggregateExpandSelect(mAdditionalExpand, mQueryOptions);
+		}
+
 		return this.withCache(function (oCache, sPath) {
-			return oCache.getDownloadUrl(sPath, mUriParameters);
+			return oCache.getDownloadUrl(sPath, mUriParameters, mAdditionalExpand);
 		});
 	};
 
@@ -1878,6 +1889,8 @@ sap.ui.define([
 	 * {@link sap.ui.filter.Filter.NONE} is set as any of the dynamic filters, it will override
 	 * all static filters.
 	 *
+	 * As a side effect, this method computes <code>$$aggregation.$leafLevelAggregated</code>.
+	 *
 	 * @param {sap.ui.model.Context} oContext
 	 *   The context instance to be used; it is given as a parameter and this.oContext is unused
 	 *   because setContext calls this method (indirectly) before calling the superclass to ensure
@@ -1896,6 +1909,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataListBinding.prototype.fetchFilter = function (oContext, sStaticFilter) {
+		let aFiltersNoThese;
 		const oMetaModel = this.oModel.getMetaModel();
 		const oMetaContext = oMetaModel.getMetaContext(this.oModel.resolve(this.sPath, oContext));
 
@@ -1917,7 +1931,7 @@ sap.ui.define([
 			}
 
 			bToLower = sEdmType === "Edm.String" && oFilter.bCaseSensitive === false;
-			sFilterPath = bThese
+			sFilterPath = bThese && !aFiltersNoThese?.includes(oFilter)
 				? setCase(`$these/aggregate(${oFilter.sPath})`)
 				: setCase(decodeURIComponent(oFilter.sPath));
 			sValue = setCase(_Helper.formatLiteral(oFilter.oValue1, sEdmType));
@@ -2043,20 +2057,26 @@ sap.ui.define([
 
 		const oCombinedFilter
 			= FilterProcessor.combineFilters(this.aFilters, this.aApplicationFilters);
-		if (!oCombinedFilter) {
-			return SyncPromise.resolve([sStaticFilter]);
-		}
-		if (oCombinedFilter === Filter.NONE) {
-			return SyncPromise.resolve(["false"]);
-		}
 
 		const oPromise = _Helper.isDataAggregation(this.mParameters)
 			? oMetaModel.fetchObject(oMetaContext.getPath() + "/")
-			: SyncPromise.resolve();
+			: SyncPromise.resolve(); // Note: no oEntityType available below!
 
 		return oPromise.then((oEntityType) => {
-			const aFilters = _AggregationHelper.splitFilter(oCombinedFilter,
-				this.mParameters.$$aggregation, oEntityType);
+			const oAggregation = this.mParameters.$$aggregation;
+			if (oEntityType) {
+				oAggregation.$leafLevelAggregated
+					= !oEntityType.$Key?.every((sKey) => sKey in oAggregation.group);
+			}
+
+			if (!oCombinedFilter) {
+				return [sStaticFilter];
+			}
+			if (oCombinedFilter === Filter.NONE) {
+				return ["false"];
+			}
+			const aFilters = _AggregationHelper.splitFilter(oCombinedFilter, oAggregation);
+			aFiltersNoThese = aFilters[3];
 
 			return SyncPromise.all([
 				fetchFilter(aFilters[0], {}, /*bWithinAnd*/sStaticFilter)
@@ -2509,7 +2529,7 @@ sap.ui.define([
 				aElements = oCache.getElements(sPath);
 			}, "", /*bSync*/true);
 
-		if (aElements && this.createContexts(0, aElements)) {
+		if (aElements && this.createContexts(0, aElements, /*bCreateOnly*/true)) {
 			// In the case that a control has requested new data and the data request is already
 			// completed, but the new contexts are not yet created, we have to ensure that a change
 			// event is fired to inform the control about these new contexts.
@@ -4379,7 +4399,7 @@ sap.ui.define([
 			}
 		}
 		if (bSingle) {
-			this.oModel.withUnresolvedBindings("removeCachesAndMessages",
+			oModel.withUnresolvedBindings("removeCachesAndMessages",
 				oContext.getPath().slice(1));
 
 			return this.refreshSingle(oContext, this.lockGroup(sGroupId), /*bAllowRemoval*/false,
@@ -4642,7 +4662,10 @@ sap.ui.define([
 	 *   </ul>
 	 * @param {string[]} [oAggregation.groupLevels]
 	 *   A list of groupable property names used to determine group levels. They may, but don't need
-	 *   to, be repeated in <code>oAggregation.group</code>. Group levels cannot be combined with:
+	 *   to, be repeated in <code>oAggregation.group</code>. Since 1.132.0, the last group level is
+	 *   interpreted as the leaf level in case there are no other groups than those given here. In
+	 *   that case, {@link #getAggregation} returns a shorter <code>groupLevels</code> list.
+	 *   Group levels cannot be combined with:
 	 *   <ul>
 	 *     <li> filtering for aggregated properties,
 	 *     <li> "$search" (since 1.93.0),
@@ -4793,7 +4816,9 @@ sap.ui.define([
 					this.oHeaderContext ??= Context.create(this.oModel, this, sResolvedPath);
 					if (this.mParameters.$$aggregation) {
 						_AggregationHelper.setPath(this.mParameters.$$aggregation, sResolvedPath);
-					} else if (this.bHasPathReductionToParent && this.oModel.bAutoExpandSelect) {
+					} else if (!_Helper.isEmptyObject(this.mChildPathsReducedToParent)
+							&& this.oModel.bAutoExpandSelect) {
+						// restart auto-$expand/$select
 						this.mCanUseCachePromiseByChildPath = {};
 						this.sChangeReason = "AddVirtualContext"; // JIRA: CPOUI5ODATAV4-848
 					}

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -58,7 +58,7 @@ sap.ui.define([
 			}
 		}),
 		oBooleanType,
-		mCodeListUrl2Promise = new Map(),
+		mCodeListUrl2Promise = {},
 		DEBUG = Log.Level.DEBUG,
 		aInt64Names = ["$count", "@$ui5.node.groupLevelCount", "@$ui5.node.level"],
 		oInt64Type,
@@ -68,7 +68,6 @@ sap.ui.define([
 		rPredicate = /\(.*\)$/,
 		oRawType = new Raw(),
 		rRightBraces = /\$\)/g,
-		mSharedModelByUrl = new Map(),
 		mSupportedEvents = {
 			messageChange : true
 		},
@@ -158,7 +157,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.131.1
+		 * @version 1.132.0
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor
@@ -552,6 +551,7 @@ sap.ui.define([
 		//   "B." : {"/B/$metadata" : true} // namespace already read
 		// }
 		this.mSchema2MetadataUrl = {};
+		this.mSharedModelByUrl = {}; // see #getOrCreateSharedModel
 		this.mSupportedBindingModes = {OneTime : true, OneWay : true};
 		this.bSupportReferences = bSupportReferences !== false; // default is true
 		// ClientListBinding#filter calls checkFilter on the model; ClientModel does
@@ -1009,6 +1009,8 @@ sap.ui.define([
 	 */
 	ODataMetaModel.prototype.destroy = function () {
 		this.oMetaModelForAnnotations = undefined;
+		Object.values(this.mSharedModelByUrl).forEach((oModel) => oModel.destroy());
+		this.mSharedModelByUrl = undefined;
 
 		MetaModel.prototype.destroy.apply(this);
 	};
@@ -2493,40 +2495,50 @@ sap.ui.define([
 	/**
 	 * Creates an OData model for the given URL, normalizes the path, caches it, and retrieves it
 	 * from the cache upon further requests. The model is read-only ("OneWay") and can, thus, safely
-	 * be shared. It shares this meta model's security token. The function expects that the metadata
-	 * and the local annotation files have already been loaded.
+	 * be shared across multiple calls to this method (but not across multiple meta models). It
+	 * shares this meta model's security token and "Retry-After" handler. Annotations are copied if
+	 * requested; in this case it is expected that the metadata and the local annotation files have
+	 * already been loaded.
 	 *
 	 * @param {string} sUrl
 	 *   The (relative) $metadata URL, for example "../ValueListService/$metadata"
-	 * @param {string} [sGroupId]
-	 *   The group ID, for example "$direct"
+	 * @param {boolean} [bCopyAnnotations]
+	 *   Whether to copy annotations to the shared model, which is a value list model - not a code
+	 *   list model!
 	 * @param {boolean} [bAutoExpandSelect]
 	 *   Whether the model is to be created with autoExpandSelect
 	 * @returns {sap.ui.model.odata.v4.ODataModel}
-	 *   The value list model
+	 *   The shared model
 	 *
 	 * @private
 	 */
-	ODataMetaModel.prototype.getOrCreateSharedModel = function (sUrl, sGroupId, bAutoExpandSelect) {
-		var sCacheKey,
-			oSharedModel;
-
+	ODataMetaModel.prototype.getOrCreateSharedModel = function (sUrl, bCopyAnnotations,
+			bAutoExpandSelect) {
 		sUrl = this.getAbsoluteServiceUrl(sUrl);
-		sCacheKey = !!bAutoExpandSelect + sUrl;
-		oSharedModel = mSharedModelByUrl.get(sCacheKey);
+		const sMapKey = !!bAutoExpandSelect + sUrl; // no separator needed as sUrl.startsWith("/")
+		let mSharedModelByUrl = this.mSharedModelByUrl;
+		if (!bCopyAnnotations) {
+			// #requestCodeList must not fail, but no need to share if already destroyed
+			mSharedModelByUrl ??= {};
+		}
+		let oSharedModel = mSharedModelByUrl[sMapKey];
 		if (!oSharedModel) {
 			oSharedModel = new this.oModel.constructor({
 				autoExpandSelect : bAutoExpandSelect,
-				groupId : sGroupId,
+				groupId : bCopyAnnotations ? undefined : "$direct",
 				httpHeaders : this.oModel.getHttpHeaders(),
 				metadataUrlParams : this.sLanguage && {"sap-language" : this.sLanguage},
 				operationMode : OperationMode.Server,
 				serviceUrl : sUrl,
 				sharedRequests : true
 			});
-			oSharedModel.getMetaModel()._copyAnnotations(this.oMetaModelForAnnotations ?? this);
-
-			mSharedModelByUrl.set(sCacheKey, oSharedModel);
+			if (bCopyAnnotations) {
+				oSharedModel.getMetaModel()._copyAnnotations(this.oMetaModelForAnnotations ?? this);
+			}
+			oSharedModel.setRetryAfterHandler((oError) => {
+				return this.oModel.getOrCreateRetryAfterPromise(oError);
+			});
+			mSharedModelByUrl[sMapKey] = oSharedModel;
 		}
 		return oSharedModel;
 	};
@@ -2739,14 +2751,17 @@ sap.ui.define([
 					return null;
 				}
 
-				sUrl = _Helper.setLanguage(oCodeList.Url, that.sLanguage);
-				sCacheKey = that.getAbsoluteServiceUrl(sUrl) + "#" + oCodeList.CollectionPath;
-				oPromise = mCodeListUrl2Promise.get(sCacheKey);
+				sUrl = that.getAbsoluteServiceUrl(
+					_Helper.setLanguage(oCodeList.Url, that.sLanguage));
+				// separator needed (Note: path must not include hash)
+				sCacheKey = oCodeList.CollectionPath + "#" + sUrl;
+				oPromise = mCodeListUrl2Promise[sCacheKey];
 				if (oPromise) {
 					return oPromise;
 				}
 
-				oCodeListModel = that.getOrCreateSharedModel(sUrl, "$direct");
+				const bDestroyAlreadyCalled = !that.mSharedModelByUrl;
+				oCodeListModel = that.getOrCreateSharedModel(sUrl);
 				oCodeListMetaModel = oCodeListModel.getMetaModel();
 				sTypePath = "/" + oCodeList.CollectionPath + "/";
 				oPromise = oCodeListMetaModel.requestObject(sTypePath).then(function (oType) {
@@ -2849,9 +2864,12 @@ sap.ui.define([
 							return aContexts.reduce(addCustomizing, {});
 						}).finally(function () {
 							oCodeListBinding.destroy();
+							if (bDestroyAlreadyCalled) {
+								oCodeListModel.destroy();
+							}
 						});
 				});
-				mCodeListUrl2Promise.set(sCacheKey, oPromise);
+				mCodeListUrl2Promise[sCacheKey] = oPromise;
 
 				return oPromise;
 			});
@@ -3334,7 +3352,9 @@ sap.ui.define([
 	 *   data model. Since 1.80.0, that model's parameter "sharedRequests" is set automatically (see
 	 *   {@link sap.ui.model.odata.v4.ODataModel#constructor}). If the value list model is the data
 	 *   model associated with this meta model, use the binding-specific parameter "$$sharedRequest"
-	 *   instead, see {@link sap.ui.model.odata.v4.ODataModel#bindList}.
+	 *   instead, see {@link sap.ui.model.odata.v4.ODataModel#bindList}. Since 1.132.0, the data
+	 *   model's {@link sap.ui.model.odata.v4.ODataModel#setRetryAfterHandler "Retry-After" handler}
+	 *   is reused by default, but can of course be overwritten.
 	 *
 	 *   For fixed values, only one mapping is expected and the qualifier is ignored. The mapping
 	 *   is available with key "" and has an additional property "$qualifier" which is the original
@@ -3404,7 +3424,7 @@ sap.ui.define([
 			function addMapping(mValueListMapping, sQualifier, sMappingUrl, oModel) {
 				if ("CollectionRoot" in mValueListMapping) {
 					oModel = that.getOrCreateSharedModel(mValueListMapping.CollectionRoot,
-						undefined, bAutoExpandSelect);
+						/*bCopyAnnotations*/true, bAutoExpandSelect);
 					if (oValueListInfo[sQualifier]
 							&& oValueListInfo[sQualifier].$model === oModel) {
 						// same model -> allow overriding the qualifier
@@ -3438,8 +3458,8 @@ sap.ui.define([
 
 				// fetch mappings for each entry and wait for all
 				return Promise.all(aMappingUrls.map(function (sMappingUrl) {
-					var oValueListModel = that.getOrCreateSharedModel(sMappingUrl, undefined,
-							bAutoExpandSelect);
+					var oValueListModel = that.getOrCreateSharedModel(sMappingUrl,
+							/*bCopyAnnotations*/true, bAutoExpandSelect);
 
 					// fetch the mappings for the given mapping URL
 					return that.fetchValueListMappings(oValueListModel,
@@ -3666,5 +3686,14 @@ sap.ui.define([
 		return mScope;
 	};
 
+	/**
+	 * Clears the cache used in {@link #requestCodeList}. To be used by test code only!
+	 *
+	 * @private
+	 */
+	ODataMetaModel.clearCodeListsCache = function () {
+		mCodeListUrl2Promise = {};
+	};
+
 	return ODataMetaModel;
 });

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -240,7 +240,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.131.1
+		 * @version 1.132.0
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -2627,13 +2627,17 @@ sap.ui.define([
 	 *   parameter
 	 * @param {boolean} [bSilent]
 	 *   Whether the created UI5 messages should only be returned without reporting them
+	 * @param {string} [sOriginalResourcePath]
+	 *   The "original resource path" to be used to build the target path for bound messages that
+	 *   do not address "$Parameter/...", useful in case of a return value context (R.V.C.)
 	 * @returns {sap.ui.core.message.Message[]|undefined}
 	 *   An array of <code>aMessages</code> transformed to UI5 message instances, or
 	 *   <code>undefined</code> in case there are no messages
 	 *
 	 * @private
 	 */
-	ODataModel.prototype.reportTransitionMessages = function (aMessages, sResourcePath, bSilent) {
+	ODataModel.prototype.reportTransitionMessages = function (aMessages, sResourcePath, bSilent,
+			sOriginalResourcePath) {
 		var sContextPath, oOperationMetadata;
 
 		if (!aMessages.length) {
@@ -2658,7 +2662,8 @@ sap.ui.define([
 			if (oOperationMetadata) {
 				oMessage = _Helper.clone(oMessage);
 				// make targets absolute, will not be adjusted again in #createUI5Message
-				_Helper.adjustTargets(oMessage, oOperationMetadata, undefined, sContextPath);
+				_Helper.adjustTargets(oMessage, oOperationMetadata, undefined, sContextPath,
+					sOriginalResourcePath);
 			}
 			oMessage.transition = true;
 
@@ -3050,7 +3055,7 @@ sap.ui.define([
 			// $$canonicalPath is not allowed, binding path and resource path are (almost) identical
 			const oTemporaryBinding = this.mKeepAliveBindingsByPath[oBinding.getResolvedPath()];
 			if (oTemporaryBinding) {
-				return oTemporaryBinding.oCachePromise;
+				return oTemporaryBinding.ready();
 			}
 		}
 		return SyncPromise.resolve();

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -35,8 +35,9 @@ sap.ui.define([
 		// auto-$expand/$select: promises to wait until child bindings have provided
 		// their path and query options
 		this.aChildCanUseCachePromises = [];
-		// whether the binding has a child with a path to the parent binding via path reduction
-		this.bHasPathReductionToParent = false;
+		// the child paths that are handled by the parent binding due to path reduction, see
+		// #fetchIfChildCanUseCache and ODLB#fetchDownloadUrl
+		this.mChildPathsReducedToParent = {};
 		// counts the sent but not yet completed PATCHes
 		this.iPatchCounter = 0;
 		// whether all sent PATCHes have been successfully processed
@@ -646,6 +647,8 @@ sap.ui.define([
 	ODataParentBinding.prototype.destroy = function () {
 		this.mAggregatedQueryOptions = undefined;
 		this.aChildCanUseCachePromises = [];
+		// cannot be set to undefined, it might be modified after destruction
+		this.mChildPathsReducedToParent = {};
 		this.removeReadGroupLock();
 		this.oRefreshPromise = undefined;
 		this.oResumePromise = undefined;
@@ -857,7 +860,7 @@ sap.ui.define([
 
 			if (sReducedChildMetaPath === undefined) {
 				// the child's data does not fit into this bindings's cache, try the parent
-				that.bHasPathReductionToParent = true;
+				that.mChildPathsReducedToParent[sChildPath] = true;
 				return oParentContext.getBinding().fetchIfChildCanUseCache(oParentContext,
 					_Helper.getRelativePath(sResolvedChildPath, oParentContext.getPath()),
 					mChildQueryOptions, bIsProperty);
@@ -971,7 +974,8 @@ sap.ui.define([
 			mConvertedQueryOptions,
 			sMetaPath,
 			oModel = this.oModel,
-			mQueryOptions = this.getQueryOptionsFromParameters();
+			mQueryOptions = this.getQueryOptionsFromParameters(),
+			that = this;
 
 		if (!(oModel.bAutoExpandSelect && mQueryOptions.$select)) {
 			return SyncPromise.resolve(mQueryOptions);
@@ -987,16 +991,22 @@ sap.ui.define([
 				sMetaSelectPath = sMetaSelectPath.slice(0, -1);
 			}
 
-			return _Helper.fetchPropertyAndType(fnFetchMetadata, sMetaSelectPath).then(function () {
-				var mWrappedQueryOptions = _Helper.wrapChildQueryOptions(
+			return _Helper.fetchPropertyAndType(fnFetchMetadata, sMetaSelectPath)
+				.then(function (oProperty) {
+					if (!oProperty && !sMetaSelectPath.endsWith("/*")) {
+						throw new Error("Invalid (navigation) property '" + sSelectPath
+							+ "' in $select of " + that);
+					}
+
+					const mWrappedQueryOptions = _Helper.wrapChildQueryOptions(
 						sMetaPath, sSelectPath, {}, fnFetchMetadata);
 
-				if (mWrappedQueryOptions) {
-					_Helper.aggregateExpandSelect(mConvertedQueryOptions, mWrappedQueryOptions);
-				} else {
-					_Helper.addToSelect(mConvertedQueryOptions, [sSelectPath]);
-				}
-			});
+					if (mWrappedQueryOptions) {
+						_Helper.aggregateExpandSelect(mConvertedQueryOptions, mWrappedQueryOptions);
+					} else {
+						_Helper.addToSelect(mConvertedQueryOptions, [sSelectPath]);
+					}
+				});
 		})).then(function () {
 			return mConvertedQueryOptions;
 		});

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.131.1
+		 * @version 1.132.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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -60,7 +60,9 @@ sap.ui.define([
 		_Cache.call(this, oRequestor, sResourcePath, mQueryOptions, true);
 
 		this.oAggregation = oAggregation;
-		this.sDownloadUrl = _Cache.prototype.getDownloadUrl.call(this, "");
+		// #getDownloadUrl must be called early (for recursive hierarchy to determine
+		// $DistanceFromRoot and for data aggregation before adding $$leaves)
+		this.sToString = this.getDownloadUrl("");
 		this.aElements = [];
 		this.aElements.$byPredicate = {};
 		this.aElements.$count = undefined;
@@ -1099,14 +1101,6 @@ sap.ui.define([
 		return _AggregationHelper.buildApply(this.oAggregation, mQueryOptions, 0, true);
 	};
 
-	/**
-	 * @override
-	 * @see sap.ui.model.odata.v4.lib._Cache#getDownloadUrl
-	 */
-	_AggregationCache.prototype.getDownloadUrl = function (_sPath, _mCustomQueryOptions) {
-		return this.sDownloadUrl;
-	};
-
 	/**
 	 * Returns an array containing elements of this aggregation cache's flat list; the array is
 	 * annotated with the collection's $count. If no range is given, all elements are returned. If
@@ -2303,8 +2297,8 @@ sap.ui.define([
 		// "super" call (like @borrows ...)
 		const fnSuper = this.oFirstLevel.reset;
 		fnSuper.call(this, aKeptElementPredicates, sGroupId, mQueryOptions);
-		// reset modifies the cache's query options => recalculate the download URL
-		this.sDownloadUrl = _Cache.prototype.getDownloadUrl.call(this, "");
+		// reset modifies the cache's query options => recalculate result of #toString
+		this.sToString = this.getDownloadUrl("");
 		if (sGroupId) { // sGroupId means we are in a side-effects refresh
 			this.oBackup.oCountPromise = this.oCountPromise;
 			this.oBackup.oFirstLevel = this.oFirstLevel;
@@ -2422,16 +2416,11 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns the cache's URL.
-	 *
-	 * @returns {string} The URL
-	 *
-	 * @public
-	 * @see sap.ui.model.odata.v4.lib._AggregationCache#getDownloadUrl
+	 * @override
+	 * @see sap.ui.model.odata.v4.lib._Cache#toString
 	 */
-	// @override sap.ui.model.odata.v4.lib._Cache#toString
 	_AggregationCache.prototype.toString = function () {
-		return this.sDownloadUrl;
+		return this.sToString;
 	};
 
 	/**