@openui5/sap.ui.core 1.96.21 → 1.96.23

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

@@ -364,17 +364,17 @@ sap.ui.define([
 	};
 
 	/**
-	 * Hook method for {@link #fetchQueryOptionsForOwnCache} to determine the query options for this
-	 * binding.
+	 * Hook method for {@link #fetchOrGetQueryOptionsForOwnCache} to determine the query options for
+	 * this binding.
 	 *
 	 * @param {sap.ui.model.Context} [oContext]
 	 *   The context instance to be used for a relative binding
-	 * @returns {sap.ui.base.SyncPromise}
-	 *   A promise resolving with the binding's query options
+	 * @returns {object|undefined|sap.ui.base.SyncPromise}
+	 *   The binding's query options (if any) or a promise resolving with them
 	 *
 	 * @abstract
 	 * @function
-	 * @name sap.ui.model.odata.v4.ODataBinding#doFetchQueryOptions
+	 * @name sap.ui.model.odata.v4.ODataBinding#doFetchOrGetQueryOptions
 	 * @private
 	 */
 
@@ -430,7 +430,7 @@ sap.ui.define([
 		}
 
 		aPromises = [
-			this.fetchQueryOptionsForOwnCache(oContext, bIgnoreParentCache),
+			this.fetchOrGetQueryOptionsForOwnCache(oContext, bIgnoreParentCache),
 			this.oModel.oRequestor.ready()
 		];
 		this.mCacheQueryOptions = undefined;
@@ -476,60 +476,88 @@ sap.ui.define([
 	 * @param {boolean} [bIgnoreParentCache]
 	 *   Whether the query options of the parent cache shall be ignored and own query options are
 	 *   determined (see {@link #fetchCache})
-	 * @returns {sap.ui.base.SyncPromise}
-	 *   A promise resolving with an object having two properties:
+	 * @returns {object|sap.ui.base.SyncPromise}
+	 *   An object having two properties (or a promise resolving with it):
 	 *   {object} mQueryOptions - The query options to create the cache for this binding or
 	 *     <code>undefined</code> if no cache is to be created
 	 *   {string} sReducedPath - The binding's absolute, reduced path in the cache hierarchy
 	 *
 	 * @private
 	 */
-	ODataBinding.prototype.fetchQueryOptionsForOwnCache = function (oContext, bIgnoreParentCache) {
+	ODataBinding.prototype.fetchOrGetQueryOptionsForOwnCache = function (oContext,
+			bIgnoreParentCache) {
 		var bHasNonSystemQueryOptions,
-			oQueryOptionsPromise,
+			vQueryOptions, // {object|undefined|sap.ui.base.SyncPromise}
 			sResolvedPath = this.oModel.resolve(this.sPath, oContext),
 			that = this;
 
 		/*
-		 * Wraps the given query options (promise) and adds sResolvedPath so that it can be returned
-		 * by fetchQueryOptionsForOwnCache.
+		 * Wraps the given query options and adds sReducedPath to create a result for
+		 * #fetchOrGetQueryOptionsForOwnCache.
 		 *
-		 * @param {object|sap.ui.base.SyncPromise} vQueryOptions
-		 *   The query options (promise)
+		 * @param {object} [mQueryOptions]
+		 *   Map of query options, or <code>undefined</code>
+		 * @param {boolean} [bDropEmptyObject]
+		 *   Whether an empty query options object should be replaced by <code>undefined</code>
 		 * @param {string} [sReducedPath=sResolvedPath]
 		 *   The reduced path
-		 * @returns {sap.ui.base.SyncPromise}
-		 *   A promise to be returned by fetchQueryOptionsForOwnCache
+		 * @returns {object}
+		 *   A result for #fetchOrGetQueryOptionsForOwnCache
 		 */
-		function wrapQueryOptions(vQueryOptions, sReducedPath) {
-			return SyncPromise.resolve(vQueryOptions).then(function (mQueryOptions) {
-				return {
-					mQueryOptions : mQueryOptions,
-					sReducedPath : sReducedPath || sResolvedPath
-				};
-			});
+		function _wrapQueryOptions(mQueryOptions, bDropEmptyObject, sReducedPath) {
+			if (bDropEmptyObject && mQueryOptions && _Helper.isEmptyObject(mQueryOptions)) {
+				mQueryOptions = undefined;
+			}
+			return {
+				mQueryOptions : mQueryOptions,
+				sReducedPath : sReducedPath || sResolvedPath
+			};
+		}
+
+		/*
+		 * Waits for <code>vQueryOptions</code> (if needed) and then creates a result for
+		 * #fetchOrGetQueryOptionsForOwnCache.
+		 *
+		 * @param {boolean} [bDropEmptyObject]
+		 *   Whether an empty query options object should be replaced by <code>undefined</code>
+		 * @param {string} [sReducedPath=sResolvedPath]
+		 *   The reduced path
+		 * @returns {object|sap.ui.base.SyncPromise}
+		 *   A result for #fetchOrGetQueryOptionsForOwnCache
+		 */
+		function wrapQueryOptions(bDropEmptyObject, sReducedPath) {
+			if (vQueryOptions instanceof SyncPromise) {
+				if (!vQueryOptions.isFulfilled()) {
+					return vQueryOptions.then(function (mQueryOptions) {
+						return _wrapQueryOptions(mQueryOptions, bDropEmptyObject, sReducedPath);
+					});
+				}
+				vQueryOptions = vQueryOptions.getResult();
+			}
+
+			return _wrapQueryOptions(vQueryOptions, bDropEmptyObject, sReducedPath);
 		}
 
 		if (this.oOperation // operation binding manages its cache on its own
 			|| this.bRelative && !oContext // unresolved binding
 			|| this.isMeta()) {
-			return wrapQueryOptions(undefined);
+			return _wrapQueryOptions();
 		}
 
 		// auto-$expand/$select and binding is a parent binding, so that it needs to wait until all
 		// its child bindings know via the corresponding promise in this.aChildCanUseCachePromises
 		// if they can use the parent binding's cache
 		// With $$aggregation, no auto-$expand/$select is needed
-		oQueryOptionsPromise = this.doFetchQueryOptions(oContext);
+		vQueryOptions = this.doFetchOrGetQueryOptions(oContext);
 		if (this.oModel.bAutoExpandSelect && this.aChildCanUseCachePromises
-				&& !(this.mParameters && this.mParameters.$$aggregation)) {
+				&& !this.mParameters.$$aggregation) {
 			// For auto-$expand/$select, wait for query options of dependent bindings:
 			// Promise.resolve() ensures all dependent bindings are created and have sent their
 			// query options promise to this binding via fetchIfChildCanUseCache.
 			// The aggregated query options of this binding and its dependent bindings are available
 			// in that.mAggregatedQueryOptions once all these promises are fulfilled.
-			oQueryOptionsPromise = SyncPromise.all([
-				oQueryOptionsPromise,
+			vQueryOptions = SyncPromise.all([
+				vQueryOptions,
 				Promise.resolve().then(function () {
 					return SyncPromise.all(that.aChildCanUseCachePromises);
 				})
@@ -543,7 +571,7 @@ sap.ui.define([
 		// parent cache is ignored or (quasi-)absolute binding
 		if (bIgnoreParentCache || !this.bRelative || !oContext.fetchValue)  {
 			// the binding shall create its own cache
-			return wrapQueryOptions(oQueryOptionsPromise);
+			return wrapQueryOptions();
 		}
 
 		// auto-$expand/$select: Use parent binding's cache if possible
@@ -553,27 +581,27 @@ sap.ui.define([
 					return sKey[0] !== "$" || sKey[1] === "$";
 				});
 			if (bHasNonSystemQueryOptions) {
-				return wrapQueryOptions(oQueryOptionsPromise);
+				return wrapQueryOptions();
 			}
 			return oContext.getBinding()
-				.fetchIfChildCanUseCache(oContext, that.sPath, oQueryOptionsPromise)
+				.fetchIfChildCanUseCache(oContext, that.sPath, vQueryOptions,
+					!this.mParameters) // duck typing for property binding
 				.then(function (sReducedPath) {
-					return wrapQueryOptions(sReducedPath ? undefined : oQueryOptionsPromise,
-						sReducedPath);
+					if (sReducedPath) {
+						vQueryOptions = undefined;
+					}
+					return wrapQueryOptions(false, sReducedPath);
 				});
 		}
 
 		// relative list or context binding with parameters which are not query options
 		// (such as $$groupId)
-		if (this.mParameters && Object.keys(this.mParameters).length) {
-			return wrapQueryOptions(oQueryOptionsPromise);
+		if (this.mParameters && !_Helper.isEmptyObject(this.mParameters)) {
+			return wrapQueryOptions();
 		}
 
 		// relative binding which may have query options from UI5 filter or sorter objects
-		return oQueryOptionsPromise.then(function (mQueryOptions) {
-			return wrapQueryOptions(
-				Object.keys(mQueryOptions).length ? mQueryOptions : undefined);
-		});
+		return wrapQueryOptions(true);
 	};
 
 	/**

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

@@ -106,7 +106,7 @@ sap.ui.define([
 	 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.21
+	 * @version 1.96.23
 	 *
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
@@ -751,9 +751,9 @@ sap.ui.define([
 
 	/**
 	 * @override
-	 * @see sap.ui.model.odata.v4.ODataBinding#doFetchQueryOptions
+	 * @see sap.ui.model.odata.v4.ODataBinding#doFetchOrGetQueryOptions
 	 */
-	ODataContextBinding.prototype.doFetchQueryOptions = function (oContext) {
+	ODataContextBinding.prototype.doFetchOrGetQueryOptions = function (oContext) {
 		return this.fetchResolvedQueryOptions(oContext);
 	};
 
@@ -1417,6 +1417,7 @@ sap.ui.define([
 		if (bParentHasChanges || sResumeChangeReason) {
 			this.mAggregatedQueryOptions = {};
 			this.bAggregatedQueryOptionsInitial = true;
+			this.mCanUseCachePromiseByChildPath = {};
 			this.removeCachesAndMessages("");
 			this.fetchCache(this.oContext);
 		}

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

@@ -76,7 +76,7 @@ sap.ui.define([
 	 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.21
+	 * @version 1.96.23
 	 * @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
@@ -380,7 +380,7 @@ sap.ui.define([
 			sApply = _AggregationHelper.buildApply(mParameters.$$aggregation).$apply;
 		}
 		this.mQueryOptions = this.oModel.buildQueryOptions(mParameters, true);
-		this.oQueryOptionsPromise = undefined; // @see #doFetchQueryOptions
+		this.oQueryOptionsPromise = undefined; // @see #doFetchOrGetQueryOptions
 		this.mParameters = mParameters; // store mParameters at binding after validation
 		if (sApply) {
 			this.mQueryOptions.$apply = sApply;
@@ -1040,9 +1040,9 @@ sap.ui.define([
 
 	/**
 	 * @override
-	 * @see sap.ui.model.odata.v4.ODataBinding#doFetchQueryOptions
+	 * @see sap.ui.model.odata.v4.ODataBinding#doFetchOrGetQueryOptions
 	 */
-	ODataListBinding.prototype.doFetchQueryOptions = function (oContext) {
+	ODataListBinding.prototype.doFetchOrGetQueryOptions = function (oContext) {
 		// Note: an absolute binding needs no parent context :-)
 		var sMetaPath = oContext && _Helper.getMetaPath(oContext.getPath()),
 			that = this;
@@ -2212,7 +2212,7 @@ sap.ui.define([
 	ODataListBinding.prototype.inheritQueryOptions = function (mQueryOptions, oContext) {
 		var mInheritedQueryOptions;
 
-		if (!Object.keys(this.mParameters).length) {
+		if (_Helper.isEmptyObject(this.mParameters)) {
 			// mix-in inherited static query options
 			mInheritedQueryOptions = this.getQueryOptionsForPath("", oContext);
 			if (mQueryOptions.$orderby && mInheritedQueryOptions.$orderby) {
@@ -3092,6 +3092,7 @@ sap.ui.define([
 					}
 					if (this.bHasPathReductionToParent && this.oModel.bAutoExpandSelect
 							&& !this.mParameters.$$aggregation) {
+						this.mCanUseCachePromiseByChildPath = {};
 						this.sChangeReason = "AddVirtualContext"; // JIRA: CPOUI5ODATAV4-848
 					}
 					if (oContext.getBinding

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

@@ -11,7 +11,6 @@ sap.ui.define([
 	"./lib/_Helper",
 	"sap/base/assert",
 	"sap/base/Log",
-	"sap/base/util/isEmptyObject",
 	"sap/base/util/JSTokenizer",
 	"sap/base/util/ObjectPath",
 	"sap/ui/base/ManagedObject",
@@ -43,11 +42,11 @@ sap.ui.define([
 	"sap/ui/model/odata/type/String",
 	"sap/ui/model/odata/type/TimeOfDay",
 	"sap/ui/thirdparty/URI"
-], function (AnnotationHelper, ValueListType, _Helper, assert, Log, isEmptyObject, 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) {
+], 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) {
 	"use strict";
 	/*global Map */
 	/*eslint max-nested-callbacks: 0 */
@@ -658,7 +657,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.21
+	 * @version 1.96.23
 	 */
 	var ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 		/*
@@ -1587,7 +1586,7 @@ sap.ui.define([
 			}
 
 			if (mFormatOptions) {
-				if (isEmptyObject(mFormatOptions)) {
+				if (_Helper.isEmptyObject(mFormatOptions)) {
 					mFormatOptions = undefined;
 				} else if ("parseKeepsEmptyString" in mFormatOptions
 						&& oProperty.$Type !== "Edm.String") {
@@ -3230,9 +3229,9 @@ sap.ui.define([
 
 				// Each reference must have contributed at least one qualifier. So if oValueListInfo
 				// is empty, there cannot have been a reference.
-				if (isEmptyObject(oValueListInfo)) {
-					throw new Error("No annotation '" + sValueListReferences.slice(1) + "' for " +
-						sPropertyPath);
+				if (_Helper.isEmptyObject(oValueListInfo)) {
+					throw new Error("No annotation '" + sValueListReferences.slice(1) + "' for "
+						+ sPropertyPath);
 				}
 
 				return aRelevantQualifiers && oContext && oContext.getBinding

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

@@ -210,7 +210,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.Model
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.21
+	 * @version 1.96.23
 	 */
 	var ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */

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

@@ -32,6 +32,7 @@ sap.ui.define([
 		this.mAggregatedQueryOptions = {};
 		// whether the aggregated query options are processed the first time
 		this.bAggregatedQueryOptionsInitial = true;
+		this.mCanUseCachePromiseByChildPath = {};
 		// auto-$expand/$select: promises to wait until child bindings have provided
 		// their path and query options
 		this.aChildCanUseCachePromises = [];
@@ -191,15 +192,16 @@ sap.ui.define([
 	 * "5.1.2 System Query Option $expand" and "5.1.3 System Query Option $select" in specification
 	 * "OData Version 4.0 Part 2: URL Conventions".
 	 *
-	 * @param {object} mQueryOptions The query options to be merged
-	 * @param {string} sBaseMetaPath This binding's meta path
-	 * @param {boolean} bCacheImmutable Whether the cache of this binding is immutable
+	 * @param {object} mQueryOptions - The query options to be merged
+	 * @param {string} sBaseMetaPath - This binding's meta path
+	 * @param {boolean} bCacheImmutable - Whether the cache of this binding is immutable
+	 * @param {boolean} [bIsProperty] - Whether the child is a property binding
 	 * @returns {boolean} Whether the query options can be fulfilled by this binding
 	 *
 	 * @private
 	 */
 	ODataParentBinding.prototype.aggregateQueryOptions = function (mQueryOptions, sBaseMetaPath,
-			bCacheImmutable) {
+			bCacheImmutable, bIsProperty) {
 		var mAggregatedQueryOptionsClone = _Helper.merge({},
 				bCacheImmutable && this.mLateQueryOptions || this.mAggregatedQueryOptions),
 			bChanged = false,
@@ -208,14 +210,19 @@ sap.ui.define([
 		/*
 		 * Recursively merges the given query options into the given aggregated query options.
 		 *
-		 * @param {object} mAggregatedQueryOptions The aggregated query options
-		 * @param {object} mQueryOptions0 The query options to merge into the aggregated query
-		 *   options
-		 * @param {string} sMetaPath The meta path for the current $expand
-		 * @param {boolean} [bInsideExpand] Whether the given query options are inside a $expand
-		 * @param {boolean} [bAdd] Whether to add the given query options because they are in a
-		 * $expand that has not been aggregated yet
-		 * @returns {boolean} Whether the query options can be fulfilled by this binding
+		 * @param {object} mAggregatedQueryOptions
+		 *   The aggregated query options
+		 * @param {object} mQueryOptions0
+		 *   The query options to merge into the aggregated query options
+		 * @param {string} [sMetaPath]
+		 *   The meta path for the current $expand (only used if cache is immutable)
+		 * @param {boolean} [bInsideExpand]
+		 *   Whether the given query options are inside a $expand
+		 * @param {boolean} [bAdd]
+		 *   Whether to add the given query options because they are in a $expand that has not been
+		 *   aggregated yet
+		 * @returns {boolean}
+		 *   Whether the query options can be fulfilled by this binding
 		 */
 		function merge(mAggregatedQueryOptions, mQueryOptions0, sMetaPath, bInsideExpand, bAdd) {
 			/*
@@ -256,8 +263,9 @@ sap.ui.define([
 
 			// Top-level all query options in the aggregate are OK, even if not repeated in the
 			// child. In a $expand the child must also have them (and the second loop checks that
-			// they're equal).
-			return (!bInsideExpand || Object.keys(mAggregatedQueryOptions).every(function (sName) {
+			// they're equal). Property bindings are an exception to this rule.
+			return (bIsProperty || !bInsideExpand
+				|| Object.keys(mAggregatedQueryOptions).every(function (sName) {
 					return sName in mQueryOptions0 || sName === "$count" || sName === "$expand"
 						|| sName === "$select";
 				}))
@@ -288,6 +296,9 @@ sap.ui.define([
 		if (merge(mAggregatedQueryOptionsClone, mQueryOptions, sBaseMetaPath)) {
 			if (!bCacheImmutable) {
 				this.mAggregatedQueryOptions = mAggregatedQueryOptionsClone;
+				if (this.mLateQueryOptions) {
+					merge(this.mLateQueryOptions, mQueryOptions);
+				}
 			} else if (bChanged) {
 				this.mLateQueryOptions = mAggregatedQueryOptionsClone;
 			}
@@ -634,13 +645,15 @@ sap.ui.define([
 	 * @param {sap.ui.model.odata.v4.Context} oContext
 	 *   A context of this binding which is the direct or indirect parent of the child binding.
 	 *   Initially it is the child binding's parent context (See
-	 *   {@link sap.ui.model.odata.v4.ODataBinding#fetchQueryOptionsForOwnCache}). When a binding
-	 *   delegates up to its parent binding, it passes its own parent context adjusting
+	 *   {@link sap.ui.model.odata.v4.ODataBinding#fetchOrGetQueryOptionsForOwnCache}). When a
+	 *   binding delegates up to its parent binding, it passes its own parent context adjusting
 	 *   <code>sChildPath</code> accordingly.
 	 * @param {string} sChildPath
 	 *   The child binding's binding path relative to <code>oContext</code>
-	 * @param {object|sap.ui.base.SyncPromise} vChildQueryOptions
-	 *   The child binding's (aggregated) query options or a promise resolving with them
+	 * @param {object|sap.ui.base.SyncPromise} [vChildQueryOptions={}]
+	 *   The child binding's (aggregated) query options (if any) or a promise resolving with them
+	 * @param {boolean} [bIsProperty]
+	 *   Whether the child is a property binding
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise resolved with the reduced path for the child binding if the child binding can use
 	 *   this binding's or an ancestor binding's cache; <code>undefined</code> otherwise.
@@ -649,11 +662,11 @@ sap.ui.define([
 	 * @see sap.ui.model.odata.v4.ODataMetaModel#getReducedPath
 	 */
 	ODataParentBinding.prototype.fetchIfChildCanUseCache = function (oContext, sChildPath,
-			vChildQueryOptions) {
+			vChildQueryOptions, bIsProperty) {
 		// getBaseForPathReduction must be called early, because the (virtual) parent context may be
 		// lost again when the path is needed
 		var sBaseForPathReduction = this.getBaseForPathReduction(),
-			sBaseMetaPath = _Helper.getMetaPath(oContext.getPath()),
+			sBaseMetaPath,
 			bCacheImmutable,
 			oCanUseCachePromise,
 			// whether this binding is an operation or depends on one
@@ -708,6 +721,23 @@ sap.ui.define([
 			return SyncPromise.resolve(sResolvedChildPath);
 		}
 
+		oCanUseCachePromise = this.mCanUseCachePromiseByChildPath[sChildPath];
+		if (oCanUseCachePromise && bIsProperty) {
+			return oCanUseCachePromise.then(function (sOldReducedPath) {
+				if (!sOldReducedPath) {
+					return undefined;
+				}
+				// Note: sResolvedChildPath could be "/SalesOrderList('42')/SO_2_SOITEM/0/Note"
+				// w/ index (thus getMetaPath helps), but getStrippedMetaPath makes no difference
+				if (!sChildPath.includes("/")
+					|| _Helper.getMetaPath(sOldReducedPath)
+						=== _Helper.getMetaPath(sResolvedChildPath)) {
+					return sResolvedChildPath;
+				}
+				return oMetaModel.getReducedPath(sResolvedChildPath, sBaseForPathReduction);
+			});
+		}
+
 		// Note: this.oCachePromise exists for all bindings except operation bindings; it might
 		// become pending again
 		bCacheImmutable = this.oCachePromise.isRejected()
@@ -715,16 +745,17 @@ sap.ui.define([
 			|| oContext.isKeepAlive() // kept-alive contexts have no index when not in aContexts
 			|| this.oCache === null
 			|| this.oCache && this.oCache.hasSentRequest();
+		sBaseMetaPath = _Helper.getMetaPath(oContext.getPath());
 		aPromises = [
-			this.doFetchQueryOptions(this.oContext),
+			this.doFetchOrGetQueryOptions(this.oContext),
 			// After access to complete meta path of property, the metadata of all prefix paths
 			// is loaded so that synchronous access in wrapChildQueryOptions via getObject is
-			// possible
+			// possible - as well as #getReducedPath
 			fetchPropertyAndType(),
 			vChildQueryOptions
 		];
 		oCanUseCachePromise = SyncPromise.all(aPromises).then(function (aResult) {
-			var mChildQueryOptions = aResult[2],
+			var mChildQueryOptions = aResult[2] || {},
 				mWrappedChildQueryOptions,
 				mLocalQueryOptions = aResult[0],
 				oProperty = aResult[1],
@@ -745,7 +776,7 @@ sap.ui.define([
 				that.bHasPathReductionToParent = true;
 				return that.oContext.getBinding().fetchIfChildCanUseCache(that.oContext,
 					_Helper.getRelativePath(sResolvedChildPath, that.oContext.getPath()),
-					vChildQueryOptions);
+					mChildQueryOptions, bIsProperty);
 			}
 
 			if (bDependsOnOperation || sReducedChildMetaPath === "$count"
@@ -761,7 +792,7 @@ sap.ui.define([
 			if (bIsAdvertisement) {
 				mWrappedChildQueryOptions = {"$select" : [sReducedChildMetaPath.slice(1)]};
 				return that.aggregateQueryOptions(mWrappedChildQueryOptions, sBaseMetaPath,
-						bCacheImmutable)
+						bCacheImmutable, bIsProperty)
 					? sReducedPath
 					: undefined;
 			}
@@ -773,7 +804,7 @@ sap.ui.define([
 					that.oModel.oInterface.fetchMetadata);
 				if (mWrappedChildQueryOptions) {
 					return that.aggregateQueryOptions(mWrappedChildQueryOptions, sBaseMetaPath,
-							bCacheImmutable)
+							bCacheImmutable, bIsProperty)
 						? sReducedPath
 						: undefined;
 				}
@@ -781,7 +812,7 @@ sap.ui.define([
 			}
 			if (sReducedChildMetaPath === "value") { // symbolic name for operation result
 				return that.aggregateQueryOptions(mChildQueryOptions, sBaseMetaPath,
-						bCacheImmutable)
+						bCacheImmutable, bIsProperty)
 					? sReducedPath
 					: undefined;
 			}
@@ -794,8 +825,8 @@ sap.ui.define([
 				if (that.oCache) {
 					that.oCache.setLateQueryOptions(that.mLateQueryOptions);
 				} else if (that.oCache === null) {
-					return that.oContext.getBinding().fetchIfChildCanUseCache(that.oContext,
-						that.sPath, SyncPromise.resolve(that.mLateQueryOptions))
+					return that.oContext.getBinding()
+						.fetchIfChildCanUseCache(that.oContext, that.sPath, that.mLateQueryOptions)
 						.then(function (sPath) {
 							return sPath && sReducedPath;
 						});
@@ -803,6 +834,9 @@ sap.ui.define([
 			}
 			return sReducedPath;
 		});
+		if (bIsProperty && !oContext.getPath().includes("($uid=")) {
+			this.mCanUseCachePromiseByChildPath[sChildPath] = oCanUseCachePromise;
+		}
 		this.aChildCanUseCachePromises.push(oCanUseCachePromise);
 		this.oCachePromise = SyncPromise.all([this.oCachePromise, oCanUseCachePromise])
 			.then(function (aResult) {
@@ -827,6 +861,7 @@ sap.ui.define([
 			that.oModel.reportError(that + ": Failed to enhance query options for "
 				+ "auto-$expand/$select for child " + sChildPath,  sClassName, oError);
 		});
+
 		return oCanUseCachePromise;
 	};
 
@@ -947,7 +982,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataParentBinding.prototype.getQueryOptionsForPath = function (sPath, oContext) {
-		if (Object.keys(this.mParameters).length) {
+		if (!_Helper.isEmptyObject(this.mParameters)) {
 			// binding has parameters -> all query options need to be defined at the binding
 			return _Helper.getQueryOptionsForPath(this.getQueryOptionsFromParameters(), sPath);
 		}
@@ -976,8 +1011,8 @@ sap.ui.define([
 	 * @function
 	 * @name sap.ui.model.odata.v4.ODataParentBinding.getQueryOptionsFromParameters
 	 * @private
-	 * @see sap.ui.model.odata.v4.ODataBinding#fetchQueryOptionsForOwnCache
-	 * @see sap.ui.model.odata.v4.ODataBinding#doFetchQueryOptions
+	 * @see sap.ui.model.odata.v4.ODataBinding#fetchOrGetQueryOptionsForOwnCache
+	 * @see sap.ui.model.odata.v4.ODataBinding#doFetchOrGetQueryOptions
 	 */
 
 	/**

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

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @mixes sap.ui.model.odata.v4.ODataBinding
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.21
+	 * @version 1.96.23
 	 * @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
@@ -97,7 +97,7 @@ sap.ui.define([
 				this.mQueryOptions = this.oModel.buildQueryOptions(_Helper.clone(mParameters),
 					/*bSystemQueryOptionsAllowed*/sPath.endsWith("$count"));
 				this.vValue = undefined;
-				// BEWARE: #doFetchQueryOptions uses #isRoot which relies on this.oContext!
+				// BEWARE: #doFetchOrGetQueryOptions uses #isRoot which relies on this.oContext!
 				this.fetchCache(oContext);
 				oModel.bindingCreated(this);
 			},
@@ -394,10 +394,10 @@ sap.ui.define([
 
 	/**
 	 * @override
-	 * @see sap.ui.model.odata.v4.ODataBinding#doFetchQueryOptions
+	 * @see sap.ui.model.odata.v4.ODataBinding#doFetchOrGetQueryOptions
 	 */
-	ODataPropertyBinding.prototype.doFetchQueryOptions = function () {
-		return this.isRoot() ? SyncPromise.resolve(this.mQueryOptions) : SyncPromise.resolve({});
+	ODataPropertyBinding.prototype.doFetchOrGetQueryOptions = function () {
+		return this.isRoot() ? this.mQueryOptions : undefined;
 	};
 
 	/**

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

@@ -10,10 +10,9 @@ sap.ui.define([
 	"./_Helper",
 	"./_Requestor",
 	"sap/base/Log",
-	"sap/base/util/isEmptyObject",
 	"sap/ui/base/SyncPromise",
 	"sap/ui/model/odata/ODataUtils"
-], function (_GroupLock, _Helper, _Requestor, Log, isEmptyObject, SyncPromise, ODataUtils) {
+], function (_GroupLock, _Helper, _Requestor, Log, SyncPromise, ODataUtils) {
 	"use strict";
 
 	var sClassName = "sap.ui.model.odata.v4.lib._Cache",
@@ -982,7 +981,7 @@ sap.ui.define([
 	 * @see #registerChange
 	 */
 	_Cache.prototype.hasChangeListeners = function () {
-		return !isEmptyObject(this.mChangeListeners);
+		return !_Helper.isEmptyObject(this.mChangeListeners);
 	};
 
 	/**
@@ -3029,7 +3028,7 @@ sap.ui.define([
 		if (oData) {
 			sHttpMethod = oData["X-HTTP-Method"] || sHttpMethod;
 			delete oData["X-HTTP-Method"];
-			if (this.oRequestor.isActionBodyOptional() && !Object.keys(oData).length) {
+			if (this.oRequestor.isActionBodyOptional() && _Helper.isEmptyObject(oData)) {
 				oData = undefined;
 			}
 		}

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

@@ -1553,6 +1553,10 @@ sap.ui.define([
 			return _Helper.getRelativePath(sPath, sBasePath) !== undefined;
 		},
 
+		// Trampoline property to allow for mocking function module in unit tests.
+		// @see sap.base.util.isEmptyObject
+		isEmptyObject : isEmptyObject,
+
 		/**
 		 * Tells whether the value is a safe integer.
 		 *
@@ -2164,7 +2168,7 @@ sap.ui.define([
 				}
 			}
 			if (oProperty.$kind === "Property") {
-				if (Object.keys(mChildQueryOptions).length > 0) {
+				if (!isEmptyObject(mChildQueryOptions)) {
 					Log.error("Failed to enhance query options for auto-$expand/$select as the"
 							+ " child binding has query options, but its path '" + sChildMetaPath
 							+ "' points to a structural property",

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

@@ -476,7 +476,7 @@ sap.ui.define([
 	_Requestor.prototype.checkForOpenRequests = function () {
 		var that = this;
 
-		if (Object.keys(this.mRunningChangeRequests).length // running change requests
+		if (!_Helper.isEmptyObject(this.mRunningChangeRequests) // running change requests
 			|| Object.keys(this.mBatchQueue).some(function (sGroupId) { // pending requests
 				return that.mBatchQueue[sGroupId].some(function (vRequest) {
 					return Array.isArray(vRequest) ? vRequest.length : true;