@openui5/sap.ui.core 1.115.0 → 1.116.0

package/src/sap/ui/model/odata/type/ODataType.js

@@ -43,8 +43,8 @@
  * <tr><td><code>float</code></td><td>The value is converted to a <code>number</code>. Supported by
  * all numeric types.</td></tr>
  * <tr><td><code>object</code></td><td>The value is converted to a <code>Date</code> so that it can
- * be displayed in a date or time picker. Supported by {@link sap.ui.model.odata.type.Date} and
- * {@link sap.ui.model.odata.type.DateTimeOffset} since 1.69.0.
+ * be displayed in a date or time picker. Supported by {@link sap.ui.model.odata.type.Date},
+ * {@link sap.ui.model.odata.type.DateTime} and {@link sap.ui.model.odata.type.DateTimeOffset} since 1.69.0.
  * </td></tr>
  * <tr><td><code>any</code></td><td>A technical format. The value is simply passed through. Only
  * supported by <code>format</code>, not by <code>parse</code>. Supported by all types.</td></tr>
@@ -116,7 +116,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 *
 	 * @abstract
 	 * @alias sap.ui.model.odata.type.ODataType

package/src/sap/ui/model/odata/type/Raw.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 */
 	var Raw = ODataType.extend("sap.ui.model.odata.type.Raw", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/SByte.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 *
 	 * @alias sap.ui.model.odata.type.SByte
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Single.js

@@ -73,7 +73,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 *
 	 * @alias sap.ui.model.odata.type.Single
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Stream.js

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.51.0
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 */
 	var Stream = ODataType.extend("sap.ui.model.odata.type.Stream", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/String.js

@@ -84,7 +84,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 *
 	 * @alias sap.ui.model.odata.type.String
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Time.js

@@ -138,7 +138,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 *
 	 * @alias sap.ui.model.odata.type.Time
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/TimeOfDay.js

@@ -92,7 +92,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 */
 	var TimeOfDay = ODataType.extend("sap.ui.model.odata.type.TimeOfDay", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/Unit.js

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.type.Unit
 	 * @public
 	 * @since 1.63.0
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 */
 	var Unit = BaseUnit.extend("sap.ui.model.odata.type.Unit", {
 		constructor : function (oFormatOptions, oConstraints, aDynamicFormatOptionNames) {

package/src/sap/ui/model/odata/v2/Context.js

@@ -64,7 +64,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.93.0
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 */
 	var Context = BaseContext.extend("sap.ui.model.odata.v2.Context", {
 			constructor : function (oModel, sPath, sDeepPath, oCreatePromise, bInactive,
@@ -217,7 +217,8 @@ sap.ui.define([
 	 *   see {@link #setRefreshAfterChange}. If given, this overrules the model-wide
 	 *   <code>refreshAfterChange</code> flag for this operation only.
 	 * @returns {Promise<undefined>} A promise resolving with <code>undefined</code> in case of
-	 *   successful deletion or rejecting with an error in case the deletion failed
+	 *   successful deletion or rejecting with an error in case the deletion failed. If the <code>DELETE</code> request
+	 *   has been aborted, the error has an <code>aborted</code> flag set to <code>true</code>.
 	 * @throws {Error}
 	 *   If the given parameter map contains any other parameter than those documented above in case
 	 *   of a persistent context

package/src/sap/ui/model/odata/v2/ODataAnnotations.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class Annotation loader for OData V2 services
 	 *
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 *
 	 * @public
 	 * @since 1.37.0

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

@@ -1935,8 +1935,14 @@ sap.ui.define([
 	 *   batch request
 	 * @param {boolean} [mParameters.inactive]
 	 *   Whether the created context is inactive. An inactive context will only be sent to the
-	 *   server after the first property update. From then on it behaves like any other created
-	 *   context.
+	 *   server when it has become active after a property update. From then on it behaves like any
+	 *   other created context.<br>
+	 *   When a property update happens on an inactive context, the
+	 *   {@link sap.ui.model.odata.v2.ODataListBinding#event:createActivate 'createActivate'} event
+	 *   is fired, and the context becomes active, unless the event handler prevents this. While
+	 *   inactive, the context does not count as a
+	 *   {@link sap.ui.model.odata.v2.ODataModel#hasPendingChanges pending change} and does not
+	 *   contribute to the {@link #getCount count}.
 	 * @param {function} [mParameters.success]
 	 *   The success callback function
 	 * @returns {sap.ui.model.odata.v2.Context}
@@ -2225,15 +2231,20 @@ sap.ui.define([
 	 *   Set of entity types that are affected by side-effects requests
 	 * @param {string} [sGroupId]
 	 *   The ID of a request group
+	 * @returns {boolean}
+	 *   Whether the list binding is affected by the side effect
 	 *
 	 * @private
 	 */
 	ODataListBinding.prototype._refreshForSideEffects = function (oAffectedEntityTypes, sGroupId) {
-		if (!this._isExpandedListUsable() && oAffectedEntityTypes.has(this.oEntityType)) {
+		var bIsAffected = !this._hasTransientParentContext() && oAffectedEntityTypes.has(this.oEntityType);
+
+		if (bIsAffected && !this._isExpandedListUsable()) {
 			this.sRefreshGroupId = sGroupId;
 			this._refresh();
 			this.sRefreshGroupId = undefined;
 		}
+		return bIsAffected;
 	};
 
 	/**

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

@@ -213,7 +213,7 @@ sap.ui.define([
 	 * This model is not prepared to be inherited from.
 	 *
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel
@@ -5092,26 +5092,27 @@ sap.ui.define([
 	 * supported and may not work. These should be done separately and directly on the corresponding entry.
 	 *
 	 * @param {string} sPath A string containing the path to the data that should be updated.
-	 * 		The path is concatenated to the sServiceUrl which was specified
-	 * 		in the model constructor.
+	 *   The path is concatenated to the sServiceUrl which was specified
+	 *   in the model constructor.
 	 * @param {object} oData Data of the entry that should be updated.
 	 * @param {object} [mParameters] Optional, can contain the following attributes:
 	 * @param {object} [mParameters.context] If specified the sPath has to be is relative to the path given with the context.
 	 * @param {function} [mParameters.success] A callback function which is called when the data has been successfully updated.
 	 * @param {function} [mParameters.error] A callback function which is called when the request failed.
-	 * 		The handler can have the parameter <code>oError</code> which contains additional error information.
+	 *   The handler can have the parameter <code>oError</code> which contains additional error information.
+	 *   If the <code>PUT/MERGE</code> request has been aborted, the error has an <code>aborted</code> flag set to
+	 *   <code>true</code>.
 	 * @param {string} [mParameters.eTag] If specified, the <code>If-Match</code> header will be set to this ETag.
-	 * 		Caution: This feature in not officially supported as using asynchronous requests can lead
-	 * 		to data inconsistencies. If you decide to use this feature nevertheless, you have to make
-	 * 		sure that the request is completed before the data is processed any further.
+	 *   Caution: This feature in not officially supported as using asynchronous requests can lead
+	 *   to data inconsistencies. If you decide to use this feature nevertheless, you have to make
+	 *   sure that the request is completed before the data is processed any further.
 	 * @param {Object<string,string>} [mParameters.urlParameters] A map containing the parameters that will be passed as query strings
 	 * @param {Object<string,string>} [mParameters.headers] A map of headers for this request
 	 * @param {string} [mParameters.batchGroupId] Deprecated - use <code>groupId</code> instead
 	 * @param {string} [mParameters.groupId] ID of a request group; requests belonging to the same group will be bundled in one batch request
 	 * @param {string} [mParameters.changeSetId] ID of the <code>ChangeSet</code> that this request should belong to
-	 * @param {boolean} [mParameters.refreshAfterChange] Since 1.46; defines whether to update all bindings after submitting this change operation. See {@link #setRefreshAfterChange}
-	           If given, this overrules the model-wide <code>refreshAfterChange</code> flag for this operation only.
-	 *
+	 * @param {boolean} [mParameters.refreshAfterChange] Since 1.46; defines whether to update all bindings after submitting this change operation.
+	 *   See {@link #setRefreshAfterChange}. If given, this overrules the model-wide <code>refreshAfterChange</code> flag for this operation only.
 	 * @return {object} An object which has an <code>abort</code> function to abort the current request.
 	 *
 	 * @public
@@ -5177,24 +5178,26 @@ sap.ui.define([
 	 * {@link #createEntry} or {@link sap.ui.model.odata.v2.ODataListBinding#create} instead.
 	 *
 	 * @param {string} sPath A string containing the path to the collection where an entry
-	 *		should be created. The path is concatenated to the service URL
-	 *		which was specified in the model constructor.
+	 *   should be created. The path is concatenated to the service URL
+	 *   which was specified in the model constructor.
 	 * @param {object} oData Data of the entry that should be created.
 	 * @param {object} [mParameters] Optional parameter map containing any of the following properties:
 	 * @param {object} [mParameters.context] If specified , <code>sPath</code> has to be relative to the path given with the context.
 	 * @param {function} [mParameters.success] A callback function which is called when the data has
-	 *		been successfully retrieved. The handler can have the
-	 *		following parameters: <code>oData</code> and <code>response</code>. The <code>oData</code> parameter contains the data of the newly created entry if it is provided by the backend.
-	 *		The <code>response</code> parameter contains information about the response of the request.
+	 *   been successfully retrieved. The handler can have the
+	 *   following parameters: <code>oData</code> and <code>response</code>. The <code>oData</code> parameter contains the data of the newly created entry if it is provided by the backend.
+	 *   The <code>response</code> parameter contains information about the response of the request.
 	 * @param {function} [mParameters.error] A callback function which is called when the request failed.
-	 *		The handler can have the parameter <code>oError</code> which contains additional error information.
+	 *   The handler can have the parameter <code>oError</code> which contains additional error information.
+	 *   If the <code>POST</code> request has been aborted, the error has an <code>aborted</code> flag set to
+	 *   <code>true</code>.
 	 * @param {Object<string,string>} [mParameters.urlParameters] A map containing the parameters that will be passed as query strings
 	 * @param {Object<string,string>} [mParameters.headers] A map of headers for this request
 	 * @param {string} [mParameters.batchGroupId] Deprecated - use <code>groupId</code> instead
 	 * @param {string} [mParameters.groupId] ID of a request group; requests belonging to the same group will be bundled in one batch request
 	 * @param {string} [mParameters.changeSetId] ID of the <code>ChangeSet</code> that this request should belong to
-	 * @param {boolean} [mParameters.refreshAfterChange] Since 1.46; defines whether to update all bindings after submitting this change operation. See {@link #setRefreshAfterChange}
-	           If given, this overrules the model-wide <code>refreshAfterChange</code> flag for this operation only.
+	 * @param {boolean} [mParameters.refreshAfterChange] Since 1.46; defines whether to update all bindings after submitting this change operation.
+	 *   See {@link #setRefreshAfterChange}. If given, this overrules the model-wide <code>refreshAfterChange</code> flag for this operation only.
 	 * @return {object} An object which has an <code>abort</code> function to abort the current request.
 	 *
 	 * @public
@@ -5270,6 +5273,8 @@ sap.ui.define([
 	 * @param {function} [mParameters.error]
 	 *   A callback function which is called when the request failed. The handler can have the
 	 *   parameter: <code>oError</code> which contains additional error information.
+	 *   If the <code>DELETE</code> request has been aborted, the error has an <code>aborted</code> flag set to
+	 *   <code>true</code>.
 	 * @param {string} [mParameters.eTag]
 	 *   If specified, the <code>If-Match</code> header will be set to this ETag.
 	 * @param {Object<string,string>} [mParameters.urlParameters]
@@ -5407,6 +5412,7 @@ sap.ui.define([
 	 * @param {function} [mParameters.error]
 	 *   A callback function which is called when the request failed. The handler can have the
 	 *   parameter: <code>oError</code> which contains additional error information.
+	 *   If the request has been aborted, the error has an <code>aborted</code> flag set to <code>true</code>.
 	 * @param {string} [mParameters.eTag]
 	 *   If the function import changes an entity, the ETag for this entity can be passed with this
 	 *   parameter
@@ -5745,16 +5751,18 @@ sap.ui.define([
 	 *   ignored, use <code>mParameters.urlParameters</code> instead
 	 * @param {object} [mParameters] Optional parameter map containing any of the following properties:
 	 * @param {object} [mParameters.context] If specified, <code>sPath</code> has to be relative to the path
-	 * 		given with the context.
+	 *   given with the context.
 	 * @param {Object<string,string>} [mParameters.urlParameters] A map containing the parameters that will be passed as query strings
 	 * @param {sap.ui.model.Filter[]} [mParameters.filters] An array of filters to be included in the request URL
 	 * @param {sap.ui.model.Sorter[]} [mParameters.sorters] An array of sorters to be included in the request URL
 	 * @param {function} [mParameters.success] A callback function which is called when the data has
-	 *		been successfully retrieved. The handler can have the
-	 *		following parameters: <code>oData</code> and <code>response</code>. The <code>oData</code> parameter contains the data of the retrieved data.
-	 *		The <code>response</code> parameter contains further information about the response of the request.
+	 *   been successfully retrieved. The handler can have the
+	 *   following parameters: <code>oData</code> and <code>response</code>. The <code>oData</code> parameter contains the data of the retrieved data.
+	 *   The <code>response</code> parameter contains further information about the response of the request.
 	 * @param {function} [mParameters.error] A callback function which is called when the request
-	 * 		failed. The handler can have the parameter: <code>oError</code> which contains additional error information.
+	 *   failed. The handler can have the parameter: <code>oError</code> which contains additional error information.
+	 *   If the <code>GET</code> request has been aborted, the error has an <code>aborted</code> flag set to
+	 *   <code>true</code>.
 	 * @param {string} [mParameters.batchGroupId] Deprecated - use <code>groupId</code> instead
 	 * @param {string} [mParameters.groupId] ID of a request group; requests belonging to the same group will be bundled in one batch request
 	 * @param {boolean} [mParameters.updateAggregatedMessages]
@@ -5889,10 +5897,10 @@ sap.ui.define([
 	 * @param {Object<string,string>} [mParameters.urlParameters]
 	 *   URL parameters for the side-effects request as a map from a URL parameter name to its
 	 *   string value including <code>$expand</code> and <code>$select</code>
-	 * @returns {Promise}
-	 *   The promise on the outcome of the side-effects request; resolves with
-	 *   <code>undefined</code> if the request is processed successfully, or rejects with an error
-	 *   object if the request fails
+	 * @returns {Promise<Array<sap.ui.model.odata.v2.ODataListBinding>>}
+	 *   The promise on the outcome of the side-effects request; resolves with the array of affected
+	 *   list bindings if the request is processed successfully, or rejects with an error object if
+	 *   the request fails
 	 * @throws {Error}
 	 *   If the given parameters map contains any other parameter than those documented above
 	 *
@@ -5913,6 +5921,7 @@ sap.ui.define([
 
 		return new Promise(function (resolve, reject) {
 			var oAffectedEntityTypes = new Set(),
+				aAffectedListBindings = [],
 				sExpands = mParameters.urlParameters && mParameters.urlParameters["$expand"];
 
 			that._read("", {
@@ -5921,7 +5930,7 @@ sap.ui.define([
 					error : reject,
 					groupId : mParameters.groupId,
 					success : function (/*oData, oResponse*/) {
-						resolve();
+						resolve(aAffectedListBindings);
 					},
 					updateAggregatedMessages : true,
 					urlParameters : mParameters.urlParameters
@@ -5936,7 +5945,9 @@ sap.ui.define([
 				});
 				that.getBindings().forEach(function (oBinding) {
 					if (oBinding.isA("sap.ui.model.odata.v2.ODataListBinding")) {
-						oBinding._refreshForSideEffects(oAffectedEntityTypes, mParameters.groupId);
+						if (oBinding._refreshForSideEffects(oAffectedEntityTypes, mParameters.groupId)) {
+							aAffectedListBindings.push(oBinding);
+						}
 					}
 				});
 			}
@@ -6180,7 +6191,10 @@ sap.ui.define([
 	 * and change sets of the actual batch request which was sent to the backend.
 	 * The changeResponses contain the actual response of that change set in the <code>response</code> property.
 	 * For each change set there is also a <code>__changeResponse</code> property.
-	 * @param {function} [mParameters.error] A callback function which is called when the request failed. The handler can have the parameter: <code>oError</code> which contains additional error information
+	 * @param {function} [mParameters.error] A callback function which is called when the request failed.
+	 *   The handler can have the parameter: <code>oError</code> which contains additional error information.
+	 *   If all contained requests have been aborted, the error has an <code>aborted</code> flag set to
+	 *   <code>true</code>.
 	 * @param {string} [mParameters.batchGroupId]
 	 *   <b>Deprecated</b>, use <code>groupId</code> instead
 	 * @param {boolean} [mParameters.merge]
@@ -6442,7 +6456,7 @@ sap.ui.define([
 	 * @param {array} [aPath]
 	 *   Paths to be reset; if no array is passed, all changes are reset
 	 * @param {boolean} [bAll=false]
-	 *   Whether also deferred requests are taken into account
+	 *   Whether also deferred requests are taken into account so that they are aborted
 	 * @param {boolean} [bDeleteCreatedEntities=false]
 	 *   Whether to delete the entities created via {@link #createEntry} or {@link #callFunction};
 	 *   since 1.95.0

package/src/sap/ui/model/odata/v2/ODataTreeBinding.js

@@ -93,7 +93,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.TreeBinding
 	 * @hideconstructor
 	 * @public
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 */
 	var ODataTreeBinding = TreeBinding.extend("sap.ui.model.odata.v2.ODataTreeBinding", /** @lends sap.ui.model.odata.v2.ODataTreeBinding.prototype */ {
 

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

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.39.0
-		 * @version 1.115.0
+		 * @version 1.116.0
 		 */
 		Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 				constructor : constructor
@@ -1333,7 +1333,7 @@ sap.ui.define([
 		this.oBinding.checkSuspended();
 
 		return Promise.all(aPaths.map(function (sPath) {
-			return that.oBinding.fetchIfChildCanUseCache(that, sPath, SyncPromise.resolve({}))
+			return that.oBinding.fetchIfChildCanUseCache(that, sPath, undefined, true)
 				.then(function (sReducedPath) {
 					if (sReducedPath) {
 						return that.fetchPrimitiveValue(sReducedPath, bExternalFormat);
@@ -1836,7 +1836,7 @@ sap.ui.define([
 				if (!sMessagesPath) {
 					throw new Error("Missing @com.sap.vocabularies.Common.v1.Messages");
 				}
-				return that.oBinding.fetchIfChildCanUseCache(that, sMessagesPath, {});
+				return that.oBinding.fetchIfChildCanUseCache(that, sMessagesPath, undefined, true);
 			}).then(function (sReducedPath) {
 				return that.fetchValue(sReducedPath);
 			}).catch(this.oModel.getReporter());
@@ -1844,6 +1844,7 @@ sap.ui.define([
 
 		this.bKeepAlive = bKeepAlive;
 		this.fnOnBeforeDestroy = bKeepAlive ? fnOnBeforeDestroy : undefined;
+		this.oBinding.onKeepAliveChanged(this);
 	};
 
 	/**
@@ -1961,6 +1962,9 @@ sap.ui.define([
 			throw new Error("Must not select a deleted entity: " + this);
 		}
 		this.bSelected = bSelected;
+		if (this.oBinding) {
+			this.oBinding.onKeepAliveChanged(this); // selected contexts are effectively kept alive
+		}
 	};
 
 	/**

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

@@ -455,17 +455,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
 	 */
 
@@ -522,14 +522,16 @@ sap.ui.define([
 		}
 
 		aPromises = [
-			this.fetchQueryOptionsForOwnCache(oContext, bIgnoreParentCache),
+			this.fetchOrGetQueryOptionsForOwnCache(oContext, bIgnoreParentCache),
 			this.oModel.oRequestor.ready()
 		];
 		this.mCacheQueryOptions = undefined;
 		this.oCachePromise = SyncPromise.all(aPromises).then(function (aResult) {
 			var mQueryOptions = aResult[0].mQueryOptions;
 
-			that.sReducedPath = aResult[0].sReducedPath;
+			if (aResult[0].sReducedPath) {
+				that.sReducedPath = aResult[0].sReducedPath;
+			}
 
 			// If there are mQueryOptions, the binding must create a cache. Do not create a cache
 			// for a virtual context or if below a transient context
@@ -568,51 +570,79 @@ 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 sReducedPath 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.isPending()) {
+					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
 			|| !sResolvedPath // 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
 				&& !_Helper.isDataAggregation(this.mParameters)) {
 			// For auto-$expand/$select, wait for query options of dependent bindings:
@@ -620,8 +650,8 @@ sap.ui.define([
 			// 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);
 				})
@@ -635,7 +665,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
@@ -645,28 +675,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);
 	};
 
 	/**