@openui5/sap.ui.core 1.93.3 → 1.96.2

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.93.3
+	 * @version 1.96.2
 	 */
 	var ODataTreeBinding = TreeBinding.extend("sap.ui.model.odata.v2.ODataTreeBinding", /** @lends sap.ui.model.odata.v2.ODataTreeBinding.prototype */ {
 
@@ -1503,23 +1503,29 @@ sap.ui.define([
 	/**
 	 * Applies the given filters to the ODataTreeBinding.
 	 *
-	 * Please note that filters of type <code>FilterType.Control</code> are not supported for <code>OperationMode.Server</code>,
-	 * here only filters of type <code>FilterType.Application</code> are allowed. Filters given via the constructor are always
-	 * of type <code>Application</code> and will be sent with every backend request.
-	 * See the constructor documentation for more information.
+	 * Please note that filters of type <code>FilterType.Control</code> are not supported for
+	 * <code>OperationMode.Server</code>,
+	 * here only filters of type <code>FilterType.Application</code> are allowed. Filters given via
+	 * {@link sap.ui.model.odata.v2.ODataModel#bindTree} are always
+	 * of type <code>Application</code> and will be sent with every back-end request.
+	 * For more information, see {@link sap.ui.model.odata.v2.ODataModel#bindTree}.
 	 *
-	 * Since 1.34.0, complete client-side filtering is supported for <code>OperationMode.Client</code> and also in
-	 * <code>OperationMode.Auto</code> if the backend count is lower than the threshold.
+	 * Since 1.34.0, complete client-side filtering is supported for
+	 * <code>OperationMode.Client</code> and also in <code>OperationMode.Auto</code> if the
+	 * back-end count is lower than the threshold.
 	 * In this case, all types of filters will be applied on the client.
-	 * See also: {@link sap.ui.model.odata.OperationMode.Auto}, {@link sap.ui.model.FilterType}.
-	 *
-	 * For the <code>OperationMode.Client</code> and <code>OperationMode.Auto</code>, you may also specify the
-	 * binding parameter <code>useServersideApplicationFilters</code> in the constructor. If it is set, the filters of type
-	 * <code>Application</code> will always be applied on the backend and trigger an OData request.
-	 * See the constructor documentation for more information.
-	 *
-	 * @param {sap.ui.model.Filter[]|sap.ui.model.Filter} aFilters Filter or array of filters to apply
-	 * @param {sap.ui.model.FilterType} sFilterType Type of the filter which should be adjusted. If it is not given,
+	 * See also: {@link sap.ui.model.odata.OperationMode.Auto} and {@link sap.ui.model.FilterType}.
+	 *
+	 * For the <code>OperationMode.Client</code> and <code>OperationMode.Auto</code>, you may also
+	 * specify the <code>useServersideApplicationFilters</code>  binding parameter when creating an
+	 * instance. If it is set, the filters of type <code>Application</code> will always be applied
+	 * on the back end and trigger an OData request.
+	 * For more information, see {@link sap.ui.model.odata.v2.ODataModel#bindTree}.
+	 *
+	 * @param {sap.ui.model.Filter[]|sap.ui.model.Filter} aFilters
+	 *   Filter or array of filters to apply
+	 * @param {sap.ui.model.FilterType} sFilterType
+	 *   Type of the filter which should be adjusted. If it is not given,
 	 *   the type <code>FilterType.Control</code> is assumed
 	 * @return {this} Returns <code>this</code> to facilitate method chaining
 	 * @see sap.ui.model.TreeBinding.prototype.filter
@@ -1955,23 +1961,20 @@ sap.ui.define([
 	};
 
 	/**
-	 * Initialize binding. Fires a change if data is already available ($expand) or a refresh.
-	 * If metadata is not yet available, do nothing, method will be called again when
-	 * metadata is loaded.
+	 * Initializes the binding. Fires a refresh event once initialization is completed in case the
+	 * binding is resolved, or immediately in case it is unresolved.
 	 *
 	 * @returns {sap.ui.model.odata.v2.ODataTreeBinding} The binding instance
+	 *
 	 * @public
 	 */
-	ODataTreeBinding.prototype.initialize = function() {
+	ODataTreeBinding.prototype.initialize = function () {
 		if (this.oModel.oMetadata && this.oModel.oMetadata.isLoaded() && this.bInitial) {
-
-			// relative bindings will be properly initialized once the context is set
-			var bIsRelative = this.isRelative();
-			if (!bIsRelative || (bIsRelative && this.oContext)) {
-				this._initialize();
+			if (this.isResolved()) {
+				this._initialize(this._fireRefresh.bind(this, {reason : ChangeReason.Refresh}));
+			} else {
+				this._fireRefresh({reason : ChangeReason.Refresh});
 			}
-
-			this._fireRefresh({reason: ChangeReason.Refresh});
 		}
 		return this;
 	};
@@ -1979,17 +1982,20 @@ sap.ui.define([
 	/**
 	 * Private initialize.
 	 * Triggers metadata checks for annotations and applies adapters if necessary.
+	 *
+	 * @param {function} fnFireEvent
+	 *   A function which fires an event once the adapter has been applied
+	 * @returns {sap.ui.model.odata.v2.ODataTreeBinding}
+	 *   The binding instance
+	 *
 	 * @private
 	 */
-	ODataTreeBinding.prototype._initialize = function () {
+	ODataTreeBinding.prototype._initialize = function (fnFireEvent) {
 		this.bInitial = false;
 		this.bHasTreeAnnotations = this._hasTreeAnnotations();
 		this.oEntityType = this._getEntityType();
-
-		// build up the $select, based on the given select-properties and the known/necessary annotated properties
 		this._processSelectParameters();
-
-		this._applyAdapter();
+		this._applyAdapter(fnFireEvent);
 
 		return this;
 	};
@@ -1998,9 +2004,10 @@ sap.ui.define([
 	 * Sets the binding context.
 	 *
 	 * @param {sap.ui.model.Context} [oContext] The new binding context
+	 *
 	 * @private
 	 */
-	ODataTreeBinding.prototype.setContext = function(oContext) {
+	ODataTreeBinding.prototype.setContext = function (oContext) {
 		if (oContext && oContext.isPreliminary() && !this.bUsePreliminaryContext) {
 			return;
 		}
@@ -2013,21 +2020,17 @@ sap.ui.define([
 
 		if (Context.hasChanged(this.oContext, oContext)) {
 			this.oContext = oContext;
-
 			if (!this.isRelative()) {
 				return;
 			}
 
 			if (this.getResolvedPath()) {
 				this.resetData();
-				this._initialize(); // triggers metadata/annotation check
-				this._fireChange({ reason: ChangeReason.Context });
-			} else {
-				// path could not be resolved, but some data was already available, so we fire a context-change
-				if (!isEmptyObject(this.oAllKeys) || !isEmptyObject(this.oKeys) || !isEmptyObject(this._aNodes)) {
-					this.resetData();
-					this._fireChange({ reason: ChangeReason.Context });
-				}
+				this._initialize(this._fireChange.bind(this, {reason : ChangeReason.Context}));
+			} else if (!isEmptyObject(this.oAllKeys) || !isEmptyObject(this.oKeys)
+					|| !isEmptyObject(this._aNodes)) { // binding is now unresolved, but has data
+				this.resetData();
+				this._fireChange({reason : ChangeReason.Context});
 			}
 		}
 	};
@@ -2078,57 +2081,68 @@ sap.ui.define([
 	};
 
 	/**
-	 * Applies a TreeBindingAdapter, depending on the metadata.
-	 * Either a hierarchical paging adapter (nav-props & annotations) or a
-	 * flat paging adapter (magnitude) is applied.
+	 * Applies a TreeBindingAdapter, depending on the metadata. Either a hierarchical paging adapter
+	 * (nav-props & annotations) or a flat paging adapter (magnitude) is applied.
+	 *
+	 * @param {function} fnFireEvent A function which is called after the adapter has been applied
 	 * @private
 	 */
-	ODataTreeBinding.prototype._applyAdapter = function () {
-		var sMagnitudeAnnotation = "hierarchy-node-descendant-count-for";
-		var sSiblingRankAnnotation = "hierarchy-sibling-rank-for";
-		var sPreorderRankAnnotation = "hierarchy-preorder-rank-for";
+	ODataTreeBinding.prototype._applyAdapter = function (fnFireEvent) {
+		var sAbsolutePath, oEntityType, i, j, sKeyProperty, sName,
+			sAdapterModuleName = "sap/ui/model/odata/ODataTreeBindingAdapter",
+			sMagnitudeAnnotation = "hierarchy-node-descendant-count-for",
+			sPreorderRankAnnotation = "hierarchy-preorder-rank-for",
+			sSiblingRankAnnotation = "hierarchy-sibling-rank-for",
+			that = this;
 
-		if (this.bHasTreeAnnotations) {
+		if (!this.bHasTreeAnnotations && !this.oNavigationPaths) {
+			Log.error("Neither hierarchy annotations, "
+				 + "nor navigation properties are specified to build the tree.", this);
+			return;
+		}
 
-			var sAbsolutePath = this.getResolvedPath();
+		if (this.bHasTreeAnnotations) {
+			sAbsolutePath = this.getResolvedPath();
 			// remove url parameters if any to get correct path for entity type resolving
 			if (sAbsolutePath.indexOf("?") !== -1) {
 				sAbsolutePath = sAbsolutePath.split("?")[0];
 			}
-			var oEntityType = this.oModel.oMetadata._getEntityTypeByPath(sAbsolutePath);
-			var that = this;
-
+			oEntityType = this.oModel.oMetadata._getEntityTypeByPath(sAbsolutePath);
 			//Check if all required properties are available
 			each(oEntityType.property, function(iIndex, oProperty) {
 				if (!oProperty.extensions) {
 					return true;
 				}
 				each(oProperty.extensions, function(iIndex, oExtension) {
-					var sName = oExtension.name;
+					sName = oExtension.name;
 					if (oExtension.namespace === that.oModel.oMetadata.mNamespaces["sap"] &&
-							(sName == sMagnitudeAnnotation || sName == sSiblingRankAnnotation || sName == sPreorderRankAnnotation)) {
+							(sName == sMagnitudeAnnotation || sName == sSiblingRankAnnotation
+								|| sName == sPreorderRankAnnotation)) {
 						that.oTreeProperties[sName] = oProperty.name;
 					}
 				});
 			});
-
 			//perform magnitude annotation check
-			this.oTreeProperties[sMagnitudeAnnotation] = this.oTreeProperties[sMagnitudeAnnotation] ||
-				(this.mParameters.treeAnnotationProperties && this.mParameters.treeAnnotationProperties.hierarchyNodeDescendantCountFor);
-
-			// apply the flat auto-expand mixin if the necessary annotations were found (in Server-Mode)
-			// exception: the binding runs in operation-mode "Client"
-			// In this case there is no need for the advanced auto expand, since everything is loaded anyway.
-			if (this.oTreeProperties[sMagnitudeAnnotation] && this.sOperationMode == OperationMode.Server) {
-				var i, j, sKeyProperty;
+			this.oTreeProperties[sMagnitudeAnnotation] = this.oTreeProperties[sMagnitudeAnnotation]
+				|| (this.mParameters.treeAnnotationProperties
+					&& this.mParameters.treeAnnotationProperties.hierarchyNodeDescendantCountFor);
+			// apply flat auto-expand mixin if the necessary annotations were found (in Server-Mode)
+			// exception: the binding runs in operation-mode "Client". In this case, there is no
+			// need for the advanced auto expand, since everything is loaded anyway.
+			if (this.oTreeProperties[sMagnitudeAnnotation]
+					&& this.sOperationMode == OperationMode.Server) {
 				// Add Flat-specific tree properties
-				this.oTreeProperties[sSiblingRankAnnotation] = this.oTreeProperties[sSiblingRankAnnotation] ||
-					(this.mParameters.treeAnnotationProperties && this.mParameters.treeAnnotationProperties.hierarchySiblingRankFor);
-				this.oTreeProperties[sPreorderRankAnnotation] = this.oTreeProperties[sPreorderRankAnnotation] ||
-					(this.mParameters.treeAnnotationProperties && this.mParameters.treeAnnotationProperties.hierarchyPreorderRankFor);
-
+				this.oTreeProperties[sSiblingRankAnnotation] =
+					this.oTreeProperties[sSiblingRankAnnotation]
+					|| (this.mParameters.treeAnnotationProperties
+						&& this.mParameters.treeAnnotationProperties.hierarchySiblingRankFor);
+				this.oTreeProperties[sPreorderRankAnnotation] =
+					this.oTreeProperties[sPreorderRankAnnotation]
+					|| (this.mParameters.treeAnnotationProperties
+						&& this.mParameters.treeAnnotationProperties.hierarchyPreorderRankFor);
 				if (this.mParameters.restoreTreeStateAfterChange) {
-					if (this.oTreeProperties[sSiblingRankAnnotation] && this.oTreeProperties[sPreorderRankAnnotation]) {
+					if (this.oTreeProperties[sSiblingRankAnnotation]
+							&& this.oTreeProperties[sPreorderRankAnnotation]) {
 						this._bRestoreTreeStateAfterChange = true;
 						// Collect entity type key properties
 						this._aTreeKeyProperties = [];
@@ -2136,21 +2150,23 @@ sap.ui.define([
 							this._aTreeKeyProperties.push(oEntityType.key.propertyRef[i].name);
 						}
 					} else {
-						Log.warning("Tree state restoration not possible: Missing annotation \"hierarchy-sibling-rank-for\" and/or \"hierarchy-preorder-rank-for\"");
+						Log.warning("Tree state restoration not possible: Missing annotation "
+							+ "\"hierarchy-sibling-rank-for\" and/or "
+							+ "\"hierarchy-preorder-rank-for\"");
 						this._bRestoreTreeStateAfterChange = false;
 					}
 				} else {
 					this._bRestoreTreeStateAfterChange = false;
 				}
-
-
-				// make sure the magnitude is added to the $select if it was not added by the application anyway
+				// make sure magnitude is added to $select if not added by the application anyway
 				if (this.mParameters && this.mParameters.select) {
-					if (this.mParameters.select.indexOf(this.oTreeProperties[sMagnitudeAnnotation]) === -1) {
+					if (this.mParameters.select.indexOf(this.oTreeProperties[sMagnitudeAnnotation])
+							=== -1) {
 						this.mParameters.select += "," + this.oTreeProperties[sMagnitudeAnnotation];
 					}
 					if (this._bRestoreTreeStateAfterChange) {
-						// Retrieve all key properties to allow filtering on them during tree state restoration (PreorderPosition requests)
+						// Retrieve all key properties to allow filtering on them during tree state
+						// restoration (PreorderPosition requests)
 						for (j = this._aTreeKeyProperties.length - 1; j >= 0; j--) {
 							sKeyProperty = this._aTreeKeyProperties[j];
 							if (this.mParameters.select.indexOf(sKeyProperty) === -1) {
@@ -2160,25 +2176,19 @@ sap.ui.define([
 					}
 					this.sCustomParams = this.oModel.createCustomParams(this.mParameters);
 				}
-				// apply flat paging adapter
-				var ODataTreeBindingFlat = sap.ui.requireSync("sap/ui/model/odata/ODataTreeBindingFlat");
-				ODataTreeBindingFlat.apply(this);
-			} else {
-				// apply hierarchical paging adapter
-				var ODataTreeBindingAdapter = sap.ui.requireSync("sap/ui/model/odata/ODataTreeBindingAdapter");
-				ODataTreeBindingAdapter.apply(this);
-			}
-		} else if (this.oNavigationPaths) {
-			// apply hierarchical paging adapter
-			var ODataTreeBindingAdapter = sap.ui.requireSync("sap/ui/model/odata/ODataTreeBindingAdapter");
-			ODataTreeBindingAdapter.apply(this);
-		} else {
-			Log.error("Neither hierarchy annotations, nor navigation properties are specified to build the tree.", this);
+				sAdapterModuleName = "sap/ui/model/odata/ODataTreeBindingFlat";
+			}
 		}
+		sap.ui.require([sAdapterModuleName], function (oAdapterModule) {
+			oAdapterModule.apply(that);
+			fnFireEvent();
+		});
 	};
 
 	/**
-	 * Internal function to evaluate the select parameters for the binding.
+	 * Internal function to build up the $select, based on the select from the binding parameters
+	 * and the properties being the target of the tree annotations.
+	 *
 	 * @private
 	 */
 	ODataTreeBinding.prototype._processSelectParameters = function () {
@@ -2313,10 +2323,13 @@ sap.ui.define([
 	};
 
 	/**
-	 * Sets the rootLevel
-	 * The root level is the level of the topmost tree nodes, which will be used as an entry point for OData services.
-	 * This is only possible (and necessary) for OData services implementing the hierarchy annotation specification,
-	 * or when providing the annotation information locally as a binding parameter. See the constructor for API documentation on this.
+	 * Sets the <code>rootLevel</code>.
+	 * The root level is the level of the topmost tree nodes that will be used as an entry point
+	 * for OData services.
+	 * This is only possible (and necessary) for OData services implementing the hierarchy
+	 * annotation specification,
+	 * or when providing the annotation information locally as a binding parameter.
+	 * For more information, see {@link sap.ui.model.odata.v2.ODataModel#bindTree}.
 	 * @param {int} iRootLevel
 	 *
 	 * @public

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.93.3
+	 * @version 1.96.2
 	 */
 	var Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 			constructor : function (oModel, oBinding, sPath, iIndex, oCreatePromise, iGeneration) {
@@ -1440,7 +1440,8 @@ sap.ui.define([
 	 * @since 1.67.0
 	 */
 	Context.prototype.setProperty = function (sPath, vValue, sGroupId, bRetry) {
-		var oGroupLock = null;
+		var oGroupLock = null,
+			that = this;
 
 		this.oBinding.checkSuspended();
 		if (typeof vValue === "function" || (vValue && typeof vValue === "object")) {
@@ -1456,6 +1457,8 @@ sap.ui.define([
 				if (oGroupLock) {
 					oGroupLock.unlock(true);
 				}
+				that.oModel.reportError("Failed to update path " + that.oModel.resolve(sPath, that),
+					sClassName, oError);
 				throw oError;
 			});
 	};
@@ -1559,4 +1562,4 @@ sap.ui.define([
 	Object.defineProperty(oModule, "VIRTUAL", {value : iVIRTUAL});
 
 	return oModule;
-}, /* bExport= */ false);
+}, /* bExport= */ false);

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

@@ -13,8 +13,8 @@ sap.ui.define([
 ], function (_Helper, SyncPromise, ChangeReason, OperationMode, Context) {
 	"use strict";
 
-	var aChangeReasonPrecedence = [ChangeReason.Change, ChangeReason.Refresh, ChangeReason.Sort,
-			ChangeReason.Filter],
+	var aChangeReasonPrecedence = [ChangeReason.Context, ChangeReason.Change, ChangeReason.Refresh,
+			ChangeReason.Sort, ChangeReason.Filter],
 		sClassName = "sap.ui.model.odata.v4.ODataBinding",
 		// Whether a path segment is an index or contains a transient predicate
 		rIndexOrTransientPredicate = /\/\d|\(\$uid=/;
@@ -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);
@@ -1306,4 +1305,4 @@ sap.ui.define([
 	});
 
 	return asODataBinding;
-}, /* bExport= */ false);
+}, /* bExport= */ false);