@openui5/sap.ui.core 1.95.0 → 1.96.0

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

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 /**
  * OData-based DataBinding
  *
@@ -14,6 +14,7 @@
 
 //Provides class sap.ui.model.odata.v2.ODataModel
 sap.ui.define([
+	"./_CreatedContextsCache",
 	"./Context",
 	"./ODataAnnotations",
 	"./ODataContextBinding",
@@ -31,6 +32,7 @@ sap.ui.define([
 	"sap/base/util/merge",
 	"sap/base/util/uid",
 	"sap/base/util/UriParameters",
+	"sap/ui/base/SyncPromise",
 	"sap/ui/core/library",
 	"sap/ui/core/message/Message",
 	"sap/ui/core/message/MessageParser",
@@ -50,12 +52,12 @@ sap.ui.define([
 	"sap/ui/thirdparty/datajs",
 	"sap/ui/thirdparty/URI",
 	"sap/ui/util/isCrossOriginURL"
-], function(Context, ODataAnnotations, ODataContextBinding, ODataListBinding, ODataTreeBinding,
-		assert, Log, encodeURL, deepEqual, deepExtend, each, extend, isEmptyObject, isPlainObject,
-		merge, uid, UriParameters, coreLibrary, Message, MessageParser, BindingMode, BaseContext,
-		FilterProcessor, Model, CountMode, MessageScope, ODataMetadata, ODataMetaModel,
-		ODataMessageParser, ODataPropertyBinding, ODataUtils, OperationMode, UpdateMethod, OData,
-	    URI, isCrossOriginURL
+], function(_CreatedContextsCache, Context, ODataAnnotations, ODataContextBinding, ODataListBinding,
+		ODataTreeBinding, assert, Log, encodeURL, deepEqual, deepExtend, each, extend,
+		isEmptyObject, isPlainObject, merge, uid, UriParameters, SyncPromise, coreLibrary, Message,
+		MessageParser, BindingMode, BaseContext, FilterProcessor, Model, CountMode, MessageScope,
+		ODataMetadata, ODataMetaModel, ODataMessageParser, ODataPropertyBinding, ODataUtils,
+		OperationMode, UpdateMethod, OData, URI, isCrossOriginURL
 ) {
 
 	"use strict";
@@ -199,7 +201,7 @@ sap.ui.define([
 	 * This model is not prepared to be inherited from.
 	 *
 	 * @author SAP SE
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel
@@ -342,6 +344,7 @@ sap.ui.define([
 			this.mChangedEntities4checkUpdate = {};
 			this.bPersistTechnicalMessages = bPersistTechnicalMessages === undefined
 				? undefined : !!bPersistTechnicalMessages;
+			this.oCreatedContextsCache = new _CreatedContextsCache();
 
 			if (oMessageParser) {
 				oMessageParser.setProcessor(this);
@@ -1963,6 +1966,12 @@ sap.ui.define([
 	 * @param {Object<string,string>} [mParameters.custom] Optional map of custom query parameters (name/value pairs); names of custom parameters must not start with <code>$</code>
 	 * @param {sap.ui.model.odata.CountMode} [mParameters.countMode] Count mode for this binding;
 	 *           if not specified, the default count mode for this model is used
+	 * @param {string} [mParameters.createdEntitiesKey=""]
+	 *   A key used in combination with the resolved path of the binding to identify the entities
+	 *   created via the binding's {@link #create} method.
+	 *
+	 *   <b>Note:</b> Different controls or control aggregation bindings to the same collection must
+	 *   have different <code>createdEntitiesKey</code> values.
 	 * @param {sap.ui.model.odata.OperationMode} [mParameters.operationMode] Operation mode for this binding;
 	 *           if not specified, the default operation mode of this model is used
 	 * @param {boolean} [mParameters.faultTolerant] Turns on the fault tolerance mode, data is not reset if a backend request returns an error
@@ -4221,7 +4230,6 @@ sap.ui.define([
 								+ sKey.slice(sKey.indexOf("("));
 						}
 						this._updateContext(oContext, '/' + sKey, oRequest.deepPath);
-						oContext.bCreated = false;
 						oContext.setUpdated(true);
 						// register function to reset updated flag call as callAfterUpdate
 						this.callAfterUpdate(function() {
@@ -4986,43 +4994,60 @@ sap.ui.define([
 	};
 
 	/**
-	 * Trigger a <code>DELETE</code> request to the OData service that was specified in the model constructor.
+	 * Trigger a <code>DELETE</code> request to the OData service that was specified in the model
+	 * constructor.
 	 *
-	 * @param {string} sPath A string containing the path to the data that should be removed.
-	 *		The path is concatenated to the service URL which was specified in the model constructor.
-	 * @param {object} [mParameters] Optional, can contain the following attributes:
-	 * @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>.
-	 * @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 {string} [mParameters.eTag] If specified, the <code>If-Match</code> header will be set to this ETag.
-	 * @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 {string} sPath
+	 *   A string containing the path to the data that should be removed. The path is concatenated
+	 *   to the service URL which was specified in the model constructor.
+	 * @param {object} [mParameters]
+	 *   Optional, can contain the following attributes:
+	 * @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>.
+	 * @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 {string} [mParameters.eTag]
+	 *   If specified, the <code>If-Match</code> header will be set to this ETag.
+	 * @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.
 	 *
-	 * @return {object} An object which has an <code>abort</code> function to abort the current request.
+	 * @return {object} An object which has an <code>abort</code> function to abort the current
+	 *   request.
 	 *
 	 * @public
 	 */
 	ODataModel.prototype.remove = function(sPath, mParameters) {
-		var oContext, sKey, fnSuccess, fnError, oRequest, sUrl, sGroupId,
-		sChangeSetId, sETag, bRefreshAfterChange,
-		mUrlParams, mHeaders, aUrlParams, sMethod, mRequests,
-		bDeferred, that = this, sNormalizedPath, sDeepPath, bCanonical = this.bCanonicalRequests;
+		var sChangeSetId, oContext, oContextToRemove, sDeepPath, bDeferred, fnError, sETag,
+			sGroupId, mHeaders, sKey, sMethod, sNormalizedPath, bRefreshAfterChange, oRequest,
+			mRequests, fnSuccess, sUrl, aUrlParams, mUrlParams,
+			bCanonical = this.bCanonicalRequests,
+			that = this;
 
 		if (mParameters) {
 			sGroupId = mParameters.groupId || mParameters.batchGroupId;
 			sChangeSetId = mParameters.changeSetId;
-			oContext  = mParameters.context;
+			oContext = mParameters.context;
 			fnSuccess = mParameters.success;
-			fnError   = mParameters.error;
-			sETag     = mParameters.eTag;
-			mHeaders  = mParameters.headers;
+			fnError = mParameters.error;
+			sETag = mParameters.eTag;
+			mHeaders = mParameters.headers;
 			mUrlParams = mParameters.urlParameters;
 			bRefreshAfterChange = mParameters.refreshAfterChange;
 			bCanonical = mParameters.canonicalRequest;
@@ -5043,20 +5068,23 @@ sap.ui.define([
 		sDeepPath = this.resolveDeep(sPath, oContext);
 
 		function handleSuccess(oData, oResponse) {
-			sKey = sUrl.substr(sUrl.lastIndexOf('/') + 1);
-			//remove query params if any
-			if (sKey.indexOf('?') !== -1) {
-				sKey = sKey.substr(0, sKey.indexOf('?'));
-			}
 			that._removeEntity(sKey);
-
+			if (oContextToRemove && oContextToRemove.isTransient() === false) {
+				that.oCreatedContextsCache.findAndRemoveContext(oContextToRemove);
+			}
 			if (fnSuccess) {
 				fnSuccess(oData, oResponse);
 			}
 		}
 
 		return this._processRequest(function(requestHandle) {
-			sUrl = that._createRequestUrlWithNormalizedPath(sNormalizedPath, aUrlParams, that.bUseBatch);
+			sUrl = that._createRequestUrlWithNormalizedPath(sNormalizedPath, aUrlParams,
+				that.bUseBatch);
+			sKey = sUrl.substr(sUrl.lastIndexOf('/') + 1);
+			//remove query params if any
+			sKey = sKey.split("?")[0];
+			oContextToRemove = that.mContexts["/" + sKey];
+
 			oRequest = that._createRequest(sUrl, sDeepPath, sMethod, mHeaders, undefined, sETag,
 				undefined, true);
 
@@ -5065,7 +5093,8 @@ sap.ui.define([
 				mRequests = that.mDeferredRequests;
 			}
 
-			that._pushToRequestQueue(mRequests, sGroupId, sChangeSetId, oRequest, handleSuccess, fnError, requestHandle, bRefreshAfterChange);
+			that._pushToRequestQueue(mRequests, sGroupId, sChangeSetId, oRequest, handleSuccess,
+				fnError, requestHandle, bRefreshAfterChange);
 
 			return oRequest;
 		}, fnError, bDeferred);
@@ -5953,6 +5982,7 @@ sap.ui.define([
 			oEntityMetadata) {
 		var // created either via #createEntry or via #callFunction
 			oCreated = oEntityMetadata && oEntityMetadata.created,
+			bExcludePersistent = true,
 			// determine group synchronously otherwise #_resolveGroup might return a different group
 			// if for example the entity has been deleted already
 			sGroupId = this._resolveGroup(sKey).groupId,
@@ -5964,10 +5994,15 @@ sap.ui.define([
 		});
 		if (bDeleteCreatedEntities && oCreated) {
 			this._removeEntity(sKey);
+			if (oCreated.abort) {
+				oCreated.abort(ODataModel._createAbortedError());
+			}
+			bExcludePersistent = false;
 		} else {
 			delete this.mChangedEntities[sKey];
 		}
-		sap.ui.getCore().getMessageManager().removeMessages(this.getMessagesByEntity(sKey, true));
+		sap.ui.getCore().getMessageManager().removeMessages(this.getMessagesByEntity(sKey,
+			bExcludePersistent));
 
 		return pMetaDataLoaded;
 	};
@@ -6437,9 +6472,13 @@ sap.ui.define([
 	 * against the newly created object.
 	 *
 	 * For each created entry a request is created and stored in a request queue.
-	 * The request queue can be submitted by calling {@link #submitChanges}. To delete a created
-	 * entry from the request queue call {@link #resetChanges} with the context path and the
-	 * <code>bDeleteCreatedEntities</code> parameter set to <code>true</code>.
+	 * The request queue can be submitted by calling {@link #submitChanges}. As long as the context
+	 * is transient (see {@link sap.ui.model.odata.v2.Context#isTransient}),
+	 * {@link sap.ui.model.odata.v2.ODataModel#resetChanges} with the
+	 * <code>bDeleteCreatedEntities</code> parameter set to <code>true</code> can be used to delete
+	 * the created entity again.
+	 *
+	 * If the creation of the entity on the server failed, it is repeated automatically.
 	 *
 	 * The optional parameter <code>mParameters.properties</code> can be used as follows:
 	 * <ul>
@@ -6454,8 +6493,8 @@ sap.ui.define([
 	 *
 	 * If there are no values specified, the properties will have <code>undefined</code> values.
 	 *
-	 * Please note that deep creates (including data defined by navigation properties) are not
-	 * supported.
+	 * The <code>properties</code> can be modified via property bindings relative to the returned
+	 * context instance.
 	 *
 	 * The parameter <code>expand</code> is supported since 1.78.0. If this parameter is set, the
 	 * given navigation properties are expanded automatically with the same $batch request in which
@@ -6482,6 +6521,14 @@ sap.ui.define([
 	 *   </li>
 	 * </ul>
 	 *
+	 * Note: If a server requires a property in the request, you must supply this property in the
+	 * initial data, for example if the server requires a unit for an amount. This also applies if
+	 * this property has a default value.
+	 *
+	 * Note: A deep create (including data defined by navigation properties) is not supported. The
+	 * dependent entity has to be created using a second list binding, after this entity has been
+	 * saved successfully in the back-end system.
+	 *
 	 * @param {string} sPath
 	 *   The path to the EntitySet
 	 * @param {object} mParameters
@@ -6536,10 +6583,11 @@ sap.ui.define([
 	 *   If the <code>expand</code> parameter is used but the batch mode is disabled
 	 * @public
 	 */
-	ODataModel.prototype.createEntry = function(sPath, mParameters) {
-		var bCanonical, sChangeSetId, oContext, fnCreated, sDeepPath, fnError, sETag, sExpand,
-			sGroupId, mHeaders, sKey, sNormalizedPath, vProperties, bRefreshAfterChange, oRequest,
-			mRequests, fnSuccess, sUrl, aUrlParams, mUrlParams,
+	ODataModel.prototype.createEntry = function (sPath, mParameters) {
+		var bCanonical, sChangeSetId, oContext, fnCreated, pCreate, fnCreatedPromiseResolve,
+			sDeepPath, fnError, sETag, sExpand, sGroupId, mHeaders, sKey, sNormalizedPath,
+			vProperties, bRefreshAfterChange, oRequest, mRequests, fnSuccess, sUrl, aUrlParams,
+			mUrlParams,
 			oEntity = {},
 			sMethod = "POST",
 			that = this;
@@ -6649,6 +6697,7 @@ sap.ui.define([
 						oData = Object.assign({}, oCreateData, oData);
 						fnSuccessFromParameters(oData, oCreateResponse);
 					}
+					fnCreatedPromiseResolve();
 				};
 				fnError = function (oError) {
 					if (oCreateData) {
@@ -6661,6 +6710,8 @@ sap.ui.define([
 						if (fnSuccessFromParameters) {
 							fnSuccessFromParameters(oCreateData, oCreateResponse);
 						}
+						fnCreatedPromiseResolve();
+
 						return;
 					}
 					if (!bCreateFailed) {
@@ -6679,12 +6730,19 @@ sap.ui.define([
 						bCreateFailed = false;
 					}
 				};
+			} else {
+				fnSuccess = function (oData, oCreateResponse) {
+					if (fnSuccessFromParameters) {
+						fnSuccessFromParameters(oData, oCreateResponse);
+					}
+					fnCreatedPromiseResolve();
+				};
 			}
 			oEntity.__metadata = {
 				type: "" + oEntityMetadata.entityType,
 				uri: that.sServiceUrl + '/' + sKey,
-				created: {//store path for later POST
-					key: sNormalizedPath.substring(1),
+				created: {
+					key: sNormalizedPath.substring(1), //store path for later POST
 					success: fnSuccess,
 					error: fnError,
 					headers: mHeaders,
@@ -6695,6 +6753,13 @@ sap.ui.define([
 				},
 				deepPath: sDeepPath
 			};
+			pCreate = new SyncPromise(function (resolve, reject) {
+				fnCreatedPromiseResolve = resolve;
+				oEntity.__metadata.created.abort = reject;
+			});
+			pCreate.catch(function () {
+				// avoid uncaught in promise if the caller of #createEntry does not use the promise
+			});
 
 			sKey = that._addEntity(merge({}, oEntity));
 			that.mChangedEntities[sKey] = oEntity;
@@ -6713,8 +6778,8 @@ sap.ui.define([
 				oEntity.__metadata.created.expandRequest = oExpandRequest;
 				oEntity.__metadata.created.contentID = sUID;
 			}
-			oCreatedContext = that.getContext("/" + sKey, sDeepPath); // context wants a path
-			oCreatedContext.bCreated = true;
+
+			oCreatedContext = that.getContext("/" + sKey, sDeepPath, pCreate);
 
 			oRequest.key = sKey;
 			oRequest.created = true;
@@ -7636,15 +7701,17 @@ sap.ui.define([
 	 *   The absolute path
 	 * @param {string} [sDeepPath]
 	 *   The absolute deep path representing the same data as the given <code>sPath</code>
+	 * @param {sap.ui.base.SyncPromise} [oCreatePromise]
+	 *   A created promise as specified in the constructor of {@link sap.ui.model.odata.v2.Context}
 	 * @returns {sap.ui.model.odata.v2.Context}
 	 *   The ODate V2 context for the given path
 	 * @private
 	 */
-	ODataModel.prototype.getContext = function (sPath, sDeepPath) {
+	ODataModel.prototype.getContext = function (sPath, sDeepPath, oCreatePromise) {
 		var oContext = this.mContexts[sPath];
 
 		if (!oContext) {
-			oContext = this.mContexts[sPath] = new Context(this, sPath, sDeepPath);
+			oContext = this.mContexts[sPath] = new Context(this, sPath, sDeepPath, oCreatePromise);
 		} else {
 			oContext.setDeepPath(sDeepPath || oContext.getDeepPath() || sPath);
 		}
@@ -7909,6 +7976,7 @@ sap.ui.define([
 	 */
 	ODataModel._createAbortedError = function () {
 		return {
+			aborted : true,
 			headers : {},
 			message : "Request aborted",
 			responseText : "",
@@ -7917,5 +7985,17 @@ sap.ui.define([
 		};
 	};
 
+	/**
+	 * Gets the cache for contexts of entities created via
+	 * {@link sap.ui.model.odata.v2.ODataListBinding#create}.
+	 *
+	 * @returns {sap.ui.model.odata.v2._CreatedContextsCache} The created entities cache
+	 *
+	 * @private
+	 */
+	ODataModel.prototype._getCreatedContextsCache = function () {
+		return this.oCreatedContextsCache;
+	};
+
 	return ODataModel;
 });

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

@@ -3,7 +3,7 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
+/*eslint-disable max-len */
 // Provides the OData model implementation of a tree binding
 sap.ui.define([
 	"sap/base/assert",
@@ -92,7 +92,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.TreeBinding
 	 * @hideconstructor
 	 * @public
-	 * @version 1.95.0
+	 * @version 1.96.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/v2/_CreatedContextsCache.js

@@ -0,0 +1,129 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+//Provides class sap.ui.model.odata.v2._CreatedContextsCache
+sap.ui.define([
+], function () {
+	"use strict";
+
+	/**
+	 * Maps a binding path and a list ID, as given as <code>createdEntitiesKey</code> parameter to
+	 * {@link sap.ui.model.odata.v2.ODataModel#bindList}, to a list of contexts for created
+	 * entities, if the entities are created via
+	 * {@link sap.ui.model.odata.v2.ODataListBinding#create}.
+	 *
+	 * @alias sap.ui.model.odata.v2._CreatedContextsCache
+	 * @constructor
+	 * @private
+	 */
+	function _CreatedContextsCache() {
+		// binding path => { list ID => array of created OData V2 contexts }
+		this.mCache = {};
+	}
+
+	/**
+	 * Adds a context to the list of contexts for created entities for the given path and list ID.
+	 *
+	 * @param {sap.ui.model.odata.v2.Context} oCreatedContext
+	 *   The context for a created entity
+	 * @param {string} sPath
+	 *   The resolved binding path
+	 * @param {string} sListID
+	 *   The identifier for the list showing the data
+	 *
+	 * @private
+	 */
+	_CreatedContextsCache.prototype.addContext = function (oCreatedContext, sPath, sListID) {
+		var aContexts, mListIDToContexts;
+
+		mListIDToContexts = this.mCache[sPath];
+		if (!mListIDToContexts) {
+			mListIDToContexts = this.mCache[sPath] = {};
+		}
+		aContexts = mListIDToContexts[sListID];
+		if (!aContexts) {
+			aContexts = mListIDToContexts[sListID] = [];
+		}
+		// currently we support only bAtEnd === false in ODataListBinding#create
+		aContexts.unshift(oCreatedContext);
+	};
+
+	/**
+	 * Finds and removes a context from the list of contexts for created entities.
+	 *
+	 * @param {sap.ui.model.odata.v2.Context} oCreatedContext
+	 *   The context for a created entity to be removed
+	 *
+	 * @private
+	 */
+	_CreatedContextsCache.prototype.findAndRemoveContext = function (oCreatedContext) {
+		var that = this;
+
+		Object.keys(this.mCache).some(function (sCachePath) {
+			var mListIDToContexts = that.mCache[sCachePath];
+
+			return Object.keys(mListIDToContexts).some(function (sListID) {
+				var aContexts = that.mCache[sCachePath][sListID];
+
+				if (aContexts.includes(oCreatedContext)) {
+					that.removeContext(oCreatedContext, sCachePath, sListID);
+
+					return true;
+				}
+
+				return false;
+			});
+		});
+	};
+
+	/**
+	 * Gets the contexts for created entities for the given path and list ID.
+	 *
+	 * @param {string} [sPath]
+	 *   The resolved binding path
+	 * @param {string} sListID
+	 *   The identifier for the list showing the data
+	 * @returns {sap.ui.model.odata.v2.Context[]}
+	 *   An array containing all contexts for created entities for the given path and list ID;
+	 *   returns an empty array if no path is given
+	 *
+	 * @private
+	 */
+	_CreatedContextsCache.prototype.getContexts = function (sPath, sListID) {
+		var mListIDToContexts = this.mCache[sPath],
+			aContexts = mListIDToContexts && mListIDToContexts[sListID];
+
+		return aContexts ? aContexts.slice() : [];
+	};
+
+	/**
+	 * Removes a context from the list of contexts for created entities for the given path and list
+	 * ID.
+	 *
+	 * @param {sap.ui.model.odata.v2.Context} oCreatedContext
+	 *   The context for a created entity to be removed
+	 * @param {sPath} sPath
+	 *   The resolved binding path
+	 * @param {string} sListID
+	 *   The identifier for the list showing the data
+	 *
+	 * @private
+	 */
+	_CreatedContextsCache.prototype.removeContext = function (oCreatedContext, sPath, sListID) {
+		var mListIDToContexts = this.mCache[sPath],
+			aContexts = mListIDToContexts[sListID];
+
+		aContexts.splice(aContexts.indexOf(oCreatedContext), 1);
+		if (!aContexts.length) {
+			delete mListIDToContexts[sListID];
+			if (!Object.keys(mListIDToContexts).length) {
+				delete this.mCache[sPath];
+			}
+		}
+	};
+
+	return _CreatedContextsCache;
+}, /* bExport= */ false);

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

@@ -98,7 +98,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.39.0
-	 * @version 1.95.0
+	 * @version 1.96.0
 	 */
 	var Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 			constructor : function (oModel, oBinding, sPath, iIndex, oCreatePromise, iGeneration) {

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

@@ -155,9 +155,9 @@ sap.ui.define([
 						throw new Error("Unsupported binding parameter $$inheritExpandSelect: "
 							+ "binding is not an operation binding");
 					}
-					if (mParameters.$expand || mParameters.$select) {
+					if (mParameters.$expand) {
 						throw new Error("Must not set parameter $$inheritExpandSelect on a binding "
-							+ "which has a $expand or $select binding parameter");
+							+ "which has a $expand binding parameter");
 					}
 					break;
 				case "$$operationMode":
@@ -291,7 +291,6 @@ sap.ui.define([
 				}
 				oCache.$deepResourcePath = sDeepResourcePath;
 				oCache.$generation = iGeneration;
-				oCache.$resourcePath = sResourcePath;
 			}
 		} else { // absolute binding
 			oCache = this.doCreateCache(sResourcePath, this.mCacheQueryOptions);