@openui5/sap.ui.core 1.93.3 → 1.96.2

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

@@ -652,11 +652,13 @@ sap.ui.define([
 	 *
 	 *   This model is read-only.
 	 *
+	 *   This model is not prepared to be inherited from.
+	 *
 	 * @extends sap.ui.model.MetaModel
 	 * @hideconstructor
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 */
 	var ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 		/*
@@ -1289,7 +1291,7 @@ sap.ui.define([
 			 *   Whether to continue after this step
 			 */
 			function step(sSegment, i, aSegments) {
-				var iIndexOfAt, bSplitSegment;
+				var iIndexOfAt, bResultIsObject, bSplitSegment;
 
 				if (sSegment === "$Annotations") {
 					return log(WARNING, "Invalid segment: $Annotations");
@@ -1328,8 +1330,9 @@ sap.ui.define([
 
 					if (typeof vResult === "string"
 						&& !(bSplitSegment && (sSegment === "@sapui.name" || sSegment[1] === "@"))
+						&& !(bODataMode && oSchemaChild && oSchemaChild.$kind === "EnumType")
 						// indirection: treat string content as a meta model path unless followed by
-						// a computed annotation
+						// a computed annotation or if it is an (Edm.Int64) enum member value
 						&& !steps(vResult, aSegments.slice(0, i))) {
 						return false;
 					}
@@ -1341,23 +1344,24 @@ sap.ui.define([
 							// technical property, switch to pure "JSON" drill-down
 							bODataMode = false;
 						} else {
+							bResultIsObject = typeof vResult === "object";
 							if (bSplitSegment) {
 								// no special preparations needed, but handle overloads below!
 							} else if (sSegment[0] !== "@" && sSegment.includes(".", 1)) {
 								// "17.3 QualifiedName": scope lookup
 								return scopeLookup(sSegment);
-							} else if (vResult && "$Type" in vResult) {
+							} else if (bResultIsObject && "$Type" in vResult) {
 								// implicit $Type insertion, e.g. at (navigation) property
 								if (!scopeLookup(vResult.$Type, "$Type")) {
 									return false;
 								}
-							} else if (vResult && "$Action" in vResult) {
+							} else if (bResultIsObject && "$Action" in vResult) {
 								// implicit $Action insertion at action import
 								if (!scopeLookup(vResult.$Action, "$Action")) {
 									return false;
 								}
 								vBindingParameterType = UNBOUND;
-							} else if (vResult && "$Function" in vResult) {
+							} else if (bResultIsObject && "$Function" in vResult) {
 								// implicit $Function insertion at function import
 								if (!scopeLookup(vResult.$Function, "$Function")) {
 									return false;
@@ -1462,19 +1466,18 @@ sap.ui.define([
 								aSegments[i].slice(0, iIndexOfAt)).join("/"));
 						}
 					}
-					if (!vResult || typeof vResult !== "object") {
-						// Note: even an OData path cannot continue here (e.g. by type cast)
-						vResult = undefined;
-						return !bInsideAnnotation && log(DEBUG, "Invalid segment: ", sSegment);
-					}
 					if (bODataMode && sSegment[0] === "@") { // annotation(s) via external targeting
 						// Note: inline annotations are reached via above fast path for pure "JSON"
 						// drill-down
-						vBindingParameterType = vResult.$Type || vBindingParameterType;
+						vBindingParameterType = vResult && vResult.$Type || vBindingParameterType;
 						vResult = mScope.$Annotations[sTarget] || {};
 						bODataMode = false; // switch to pure "JSON" drill-down
 					} else if (sSegment === "$" && i + 1 < aSegments.length) {
 						return log(WARNING, "Unsupported path after $");
+					} else if (!vResult || typeof vResult !== "object") {
+						// Note: even an OData path cannot continue here (e.g. by type cast)
+						vResult = undefined;
+						return !bInsideAnnotation && log(DEBUG, "Invalid segment: ", sSegment);
 					}
 				}
 
@@ -1660,7 +1663,7 @@ sap.ui.define([
 
 		// First fetch the complete metapath to ensure that everything is in mScope
 		// This also ensures that the metadata is valid
-		return this.fetchObject(this.getMetaPath(sResolvedPath)).then(function () {
+		return this.fetchObject(_Helper.getMetaPath(sResolvedPath)).then(function () {
 			// Then fetch mScope
 			return that.fetchEntityContainer();
 		}).then(function (mScope) {
@@ -2078,7 +2081,8 @@ sap.ui.define([
 						&& aSegments0[i + 1] === "$Parameter") {
 					// Filter via the binding parameter
 					aOverloadMetadata = that.getObject(
-						that.getMetaPath(aSegments0.slice(0, i + 1).join("/") + "/@$ui5.overload")
+						_Helper.getMetaPath(aSegments0.slice(0, i + 1).join("/")
+							+ "/@$ui5.overload")
 					);
 					// Note: This must be a bound operation with a binding parameter; otherwise it
 					// would be in the first segment and the loop would not touch it due to
@@ -2097,7 +2101,7 @@ sap.ui.define([
 			return j < iBasePathLength || sSegment[0] === "#" || sSegment[0] === "@"
 					|| rNumber.test(sSegment) || sSegment === "$Parameter"
 				? {} // simply an object w/o $Partner and $isCollection
-				: that.getObject(that.getMetaPath(aSegments.slice(0, j + 1).join("/"))) || {};
+				: that.getObject(_Helper.getMetaPath(aSegments.slice(0, j + 1).join("/"))) || {};
 		});
 		mPaths[sPath] = true;
 		if (!(bNoReduceBeforeCollection
@@ -2226,7 +2230,7 @@ sap.ui.define([
 	 * @since 1.37.0
 	 */
 	ODataMetaModel.prototype.getMetaContext = function (sPath) {
-		return new BaseContext(this, this.getMetaPath(sPath));
+		return new BaseContext(this, _Helper.getMetaPath(sPath));
 	};
 
 	/**
@@ -3082,7 +3086,8 @@ sap.ui.define([
 	 *   instead, see {@link sap.ui.model.odata.v4.ODataModel#bindList}.
 	 *
 	 *   For fixed values, only one mapping is expected and the qualifier is ignored. The mapping
-	 *   is available with key "".
+	 *   is available with key "" and has an additional property "$qualifier" which is the original
+	 *   qualifier (useful in case of "ValueListRelevantQualifiers" annotation).
 	 *
 	 *   The promise is rejected with an error if there is no value list information available
 	 *   for the given property path. Use {@link #getValueListType} to determine if value list
@@ -3110,7 +3115,7 @@ sap.ui.define([
 	 */
 	ODataMetaModel.prototype.requestValueListInfo = function (sPropertyPath, bAutoExpandSelect,
 			oContext) {
-		var sPropertyMetaPath = this.getMetaPath(sPropertyPath),
+		var sPropertyMetaPath = _Helper.getMetaPath(sPropertyPath),
 			sParentMetaPath = sPropertyMetaPath.slice(0, sPropertyMetaPath.lastIndexOf("/"))
 				.replace("/$Parameter", ""),
 			sQualifiedName = sParentMetaPath.slice(sParentMetaPath.lastIndexOf("/") + 1),
@@ -3210,7 +3215,7 @@ sap.ui.define([
 					});
 				});
 			})).then(function () {
-				var aQualifiers;
+				var aRelevantQualifiers = mAnnotationByTerm[sValueListRelevantQualifiers];
 
 				// add all mappings in the data service (or local annotation files)
 				Object.keys(mAnnotationByTerm).filter(function (sTerm) {
@@ -3219,28 +3224,36 @@ sap.ui.define([
 					addMapping(mAnnotationByTerm[sTerm], getValueListQualifier(sTerm), that.sUrl,
 						that.oModel);
 				});
-				aQualifiers = Object.keys(oValueListInfo);
 
 				// Each reference must have contributed at least one qualifier. So if oValueListInfo
 				// is empty, there cannot have been a reference.
-				if (!aQualifiers.length) {
+				if (isEmptyObject(oValueListInfo)) {
 					throw new Error("No annotation '" + sValueListReferences.slice(1) + "' for " +
 						sPropertyPath);
 				}
+
+				return aRelevantQualifiers && oContext && oContext.getBinding
+					? that.filterValueListRelevantQualifiers(oValueListInfo, aRelevantQualifiers,
+						sPropertyMetaPath + sValueListRelevantQualifiers, oContext)
+					: oValueListInfo;
+			}).then(function (mValueListByRelevantQualifier) {
+				var aQualifiers, mValueListMapping;
+
 				if (bFixedValues) {
-					// With fixed values, only one mapping may exist. Return it for qualifier "".
-					if (aQualifiers.length > 1) {
+					aQualifiers = Object.keys(mValueListByRelevantQualifier);
+					// With fixed values, only one mapping should exist. Return it for qualifier "".
+					if (aQualifiers.length !== 1) {
 						throw new Error("Annotation '" + sValueListWithFixedValues.slice(1)
-							+ "' but multiple '" + sValueList.slice(1)
+							+ "' but not exactly one '" + sValueList.slice(1)
 							+ "' for property " + sPropertyPath);
 					}
-					return {"" : oValueListInfo[aQualifiers[0]]};
+					mValueListMapping = mValueListByRelevantQualifier[aQualifiers[0]];
+					mValueListMapping.$qualifier = aQualifiers[0];
+
+					return {"" : mValueListMapping};
 				}
-				aQualifiers = mAnnotationByTerm[sValueListRelevantQualifiers];
-				return aQualifiers && oContext && oContext.getBinding
-					? that.filterValueListRelevantQualifiers(oValueListInfo, aQualifiers,
-						sPropertyMetaPath + sValueListRelevantQualifiers, oContext)
-					: oValueListInfo;
+
+				return mValueListByRelevantQualifier;
 			});
 		});
 	};
@@ -3440,4 +3453,4 @@ sap.ui.define([
 	};
 
 	return ODataMetaModel;
-});
+});

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

@@ -175,6 +175,8 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @class Model implementation for OData V4.
 	 *
+	 *   This model is not prepared to be inherited from.
+	 *
 	 *   Every resource path (relative to the service root URL, no query options) according to
 	 *   "4 Resource Path" in specification "OData Version 4.0 Part 2: URL Conventions" is
 	 *   a valid data binding path within this model if a leading slash is added; for example
@@ -208,7 +210,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.Model
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 */
 	var ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */
@@ -221,6 +223,7 @@ sap.ui.define([
 						sParameter,
 						sServiceUrl,
 						oUri,
+						mUriParameters,
 						that = this;
 
 					// do not pass any parameters to Model
@@ -255,7 +258,13 @@ sap.ui.define([
 					}
 					this.sOperationMode = mParameters.operationMode;
 					// Note: strict checking for model's URI parameters, but "sap-*" is allowed
-					this.mUriParameters = this.buildQueryOptions(oUri.query(true), false, true);
+					mUriParameters = this.buildQueryOptions(oUri.query(true), false, true);
+					// BEWARE: these are shared across all bindings!
+					this.mUriParameters = mUriParameters;
+					if (sap.ui.getCore().getConfiguration().getStatistics()) {
+						// Note: this way, "sap-statistics" is not sent within $batch
+						mUriParameters = Object.assign({"sap-statistics" : true}, mUriParameters);
+					}
 					this.sServiceUrl = oUri.query("").toString();
 					this.sGroupId = mParameters.groupId;
 					if (this.sGroupId === undefined) {
@@ -297,7 +306,7 @@ sap.ui.define([
 					// BEWARE: do not share mHeaders between _MetadataRequestor and _Requestor!
 					this.oMetaModel = new ODataMetaModel(
 						_MetadataRequestor.create(this.mMetadataHeaders, sODataVersion,
-							Object.assign({}, this.mUriParameters, mParameters.metadataUrlParams)),
+							Object.assign({}, mUriParameters, mParameters.metadataUrlParams)),
 						this.sServiceUrl + "$metadata", mParameters.annotationURI, this,
 						mParameters.supportReferences);
 					this.oInterface = {
@@ -314,11 +323,11 @@ sap.ui.define([
 									that._submitBatch.bind(that, sGroupId, true));
 							}
 						},
-						reportBoundMessages : this.reportBoundMessages.bind(this),
-						reportUnboundMessages : this.reportUnboundMessages.bind(this)
+						reportStateMessages : this.reportStateMessages.bind(this),
+						reportTransitionMessages : this.reportTransitionMessages.bind(this)
 					};
 					this.oRequestor = _Requestor.create(this.sServiceUrl, this.oInterface,
-						this.mHeaders, this.mUriParameters, sODataVersion);
+						this.mHeaders, mUriParameters, sODataVersion);
 					this.changeHttpHeaders(mParameters.httpHeaders);
 					if (mParameters.earlyRequests) {
 						this.oMetaModel.fetchEntityContainer(true);
@@ -531,8 +540,8 @@ sap.ui.define([
 	 * @param {boolean} [mParameters.$$inheritExpandSelect]
 	 *   For operation bindings only: Whether $expand and $select from the parent binding are used
 	 *   in the request sent on {@link #execute}. If set to <code>true</code>, the binding must not
-	 *   set the $expand or $select parameter itself, the operation must be bound, and the return
-	 *   value and the binding parameter must belong to the same entity set.
+	 *   set the $expand itself, the operation must be bound, and the return value and the binding
+	 *   parameter must belong to the same entity set.
 	 * @param {boolean} [mParameters.$$ownRequest]
 	 *   Whether the binding always uses an own service request to read its data; only the value
 	 *   <code>true</code> is allowed.
@@ -552,7 +561,7 @@ sap.ui.define([
 	 * @throws {Error}
 	 *   If disallowed binding parameters are provided, for example if the binding parameter
 	 *   $$inheritExpandSelect is set to <code>true</code> and the binding is no operation binding
-	 *   or the binding has one of the parameters $expand or $select.
+	 *   or the binding has the parameter $expand.
 	 *
 	 * @public
 	 * @see sap.ui.model.Model#bindContext
@@ -599,7 +608,7 @@ sap.ui.define([
 	 * resolve to an absolute OData path for an entity set.
 	 *
 	 * @param {string} sPath
-	 *   The binding path in the model; must not be empty or end with a slash
+	 *   The binding path in the model; must not end with a slash
 	 * @param {sap.ui.model.Context} [oContext]
 	 *   The context which is required as base for a relative path
 	 * @param {sap.ui.model.Sorter|sap.ui.model.Sorter[]} [vSorters]
@@ -717,8 +726,7 @@ sap.ui.define([
 	 * transformed into a metadata context (see
 	 * {@link sap.ui.model.odata.v4.ODataMetaModel#getMetaContext}). The part following the
 	 * separator is then interpreted relative to this metadata context, even if it starts with
-	 * a '/'; a trailing '/' is allowed here, see
-	 * {@link sap.ui.model.odata.v4.ODataMetaModel#requestObject} for the effect it has.
+	 * a '/'; see {@link sap.ui.model.odata.v4.ODataMetaModel#requestObject} for more details.
 	 *
 	 * If the target type specified in the corresponding control property's binding info is "any"
 	 * and the binding is relative or points to metadata, the binding may have an object value;
@@ -726,15 +734,20 @@ sap.ui.define([
 	 * be {@link sap.ui.model.BindingMode.OneTime}.
 	 *
 	 * @param {string} sPath
-	 *   The binding path in the model; must not be empty. Must not end with a '/' unless the
-	 *   binding points to metadata.
+	 *   The binding path in the model; must not end with a slash
 	 * @param {sap.ui.model.Context} [oContext]
 	 *   The context which is required as base for a relative path
 	 * @param {object} [mParameters]
 	 *   Map of binding parameters which can be OData query options as specified in
-	 *   "OData Version 4.0 Part 2: URL Conventions" or the binding-specific parameter "$$groupId".
-	 *   All "5.2 Custom Query Options" are allowed except for those with a name starting with
-	 *   "sap-" (unless starting with "sap-valid-"). All other query options lead to an error.
+	 *   "OData Version 4.0 Part 2: URL Conventions" or the binding-specific parameters as specified
+	 *   below. The following OData query options are allowed:
+	 *   <ul>
+	 *     <li> All "5.2 Custom Query Options" except for those with a name starting with "sap-"
+	 *       (unless starting with "sap-valid-")
+	 *     <li> The $apply, $filter, and $search "5.1 System Query Options" if the path ends with a
+	 *       "$count" segment.
+	 *   </ul>
+	 *   All other query options lead to an error.
 	 *   Query options specified for the binding overwrite model query options.
 	 *   Note: The binding only creates its own data service request if it is absolute or if it is
 	 *   relative to a context created via {@link #createBindingContext}. The binding parameters are
@@ -1183,6 +1196,7 @@ sap.ui.define([
 		}
 
 		if (bIsBound) {
+			sResourcePath = sResourcePath && sResourcePath.split("?")[0]; // remove query string
 			aTargets = [resolveTarget(oRawMessage.target)];
 			if (oRawMessage.additionalTargets) {
 				oRawMessage.additionalTargets.forEach(function (sTarget) {
@@ -1199,7 +1213,7 @@ sap.ui.define([
 			code : oRawMessage.code,
 			descriptionUrl : sMessageLongtextUrl || undefined,
 			message : oRawMessage.message,
-			persistent : bIsBound ? oRawMessage.transition : true,
+			persistent : !bIsBound || oRawMessage.transition,
 			processor : this,
 			// Note: "" instead of undefined makes filtering easier (agreement with FE!)
 			target : bIsBound ? aTargets : "",
@@ -1658,53 +1672,6 @@ sap.ui.define([
 		});
 	};
 
-	/**
-	 * Reports the given bound OData messages by firing a <code>messageChange</code> event with
-	 * the new messages.
-	 *
-	 * @param {string} sResourcePath
-	 *   The resource path of the cache that saw the messages; used to resolve the targets and
-	 *   the longtext URL
-	 * @param {object} mPathToODataMessages
-	 *   Maps a cache-relative path with key predicates or indices to an array of messages suitable
-	 *   for {@link #createUI5Message}
-	 * @param {string[]} [aCachePaths]
-	 *   An array of cache-relative paths of the entities for which non-persistent messages have to
-	 *   be removed; if the array is not given, all entities are affected
-	 *
-	 * @private
-	 */
-	ODataModel.prototype.reportBoundMessages = function (sResourcePath, mPathToODataMessages,
-			aCachePaths) {
-		var sDataBindingPath = "/" + sResourcePath,
-			aNewMessages = [],
-			aOldMessages = [],
-			that = this;
-
-		Object.keys(mPathToODataMessages).forEach(function (sCachePath) {
-			mPathToODataMessages[sCachePath].forEach(function (oRawMessage) {
-				aNewMessages.push(that.createUI5Message(oRawMessage, sResourcePath, sCachePath));
-			});
-		});
-		(aCachePaths || [""]).forEach(function (sCachePath) {
-			var sPath = _Helper.buildPath(sDataBindingPath, sCachePath);
-
-			Object.keys(that.mMessages).forEach(function (sMessageTarget) {
-				if (sMessageTarget === sPath
-						|| sMessageTarget.startsWith(sPath + "/")
-						|| sMessageTarget.startsWith(sPath + "(")) {
-					aOldMessages = aOldMessages.concat(
-						that.mMessages[sMessageTarget].filter(function (oMessage) {
-							return !oMessage.persistent;
-						}));
-				}
-			});
-		});
-		if (aNewMessages.length || aOldMessages.length) {
-			this.fireMessageChange({newMessages : aNewMessages, oldMessages : aOldMessages});
-		}
-	};
-
 	/**
 	 * Reports a technical error by firing a <code>messageChange</code> event with a new message and
 	 * logging the error to the console. Takes care that the error is only reported once via the
@@ -1737,8 +1704,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataModel.prototype.reportError = function (sLogMessage, sReportingClassName, oError) {
-		var sDetails,
-			oRawMessages;
+		var sDetails;
 
 		if (oError.canceled === "noDebugLog") {
 			return;
@@ -1759,20 +1725,61 @@ sap.ui.define([
 		}
 		oError.$reported = true;
 
-		oRawMessages = _Helper.extractMessages(oError);
-		if (oRawMessages.bound.length) {
-			this.reportBoundMessages(
-				oError.resourcePath.split("?")[0],
-				{"" : oRawMessages.bound},
-				[]
-			);
+		this.reportTransitionMessages(_Helper.extractMessages(oError), oError.resourcePath);
+	};
+
+	/**
+	 * Reports the given OData state messages by firing a <code>messageChange</code> event with
+	 * the new messages.
+	 *
+	 * Note that this method may also report transition messages that have been transported via the
+	 * messages property of an entity.
+	 *
+	 * @param {string} sResourcePath
+	 *   The resource path of the cache that saw the messages; used to resolve the targets and
+	 *   the longtext URL
+	 * @param {object} mPathToODataMessages
+	 *   Maps a cache-relative path with key predicates or indices to an array of messages suitable
+	 *   for {@link #createUI5Message}
+	 * @param {string[]} [aCachePaths]
+	 *   An array of cache-relative paths of the entities for which non-persistent messages have to
+	 *   be removed; if the array is not given, all entities are affected
+	 *
+	 * @private
+	 */
+	 ODataModel.prototype.reportStateMessages = function (sResourcePath, mPathToODataMessages,
+			aCachePaths) {
+		var sDataBindingPath = "/" + sResourcePath,
+			aNewMessages = [],
+			aOldMessages = [],
+			that = this;
+
+		Object.keys(mPathToODataMessages).forEach(function (sCachePath) {
+			mPathToODataMessages[sCachePath].forEach(function (oRawMessage) {
+				aNewMessages.push(that.createUI5Message(oRawMessage, sResourcePath, sCachePath));
+			});
+		});
+		(aCachePaths || [""]).forEach(function (sCachePath) {
+			var sPath = _Helper.buildPath(sDataBindingPath, sCachePath);
+
+			Object.keys(that.mMessages).forEach(function (sMessageTarget) {
+				if (sMessageTarget === sPath
+						|| sMessageTarget.startsWith(sPath + "/")
+						|| sMessageTarget.startsWith(sPath + "(")) {
+					aOldMessages = aOldMessages.concat(
+						that.mMessages[sMessageTarget].filter(function (oMessage) {
+							return !oMessage.persistent;
+						}));
+				}
+			});
+		});
+		if (aNewMessages.length || aOldMessages.length) {
+			this.fireMessageChange({newMessages : aNewMessages, oldMessages : aOldMessages});
 		}
-		// The longtextUrls are already absolute, so sResourcePath is not needed here
-		this.reportUnboundMessages(oRawMessages.unbound);
 	};
 
 	/**
-	 * Reports the given unbound OData messages by firing a <code>messageChange</code> event with
+	 * Reports the given OData transition messages by firing a <code>messageChange</code> event with
 	 * the new messages.
 	 *
 	 * @param {object[]} aMessages
@@ -1782,12 +1789,13 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	ODataModel.prototype.reportUnboundMessages = function (aMessages, sResourcePath) {
+	ODataModel.prototype.reportTransitionMessages = function (aMessages, sResourcePath) {
 		var that = this;
 
 		if (aMessages && aMessages.length) {
 			this.fireMessageChange({
 				newMessages : aMessages.map(function (oMessage) {
+					oMessage.transition = true;
 					return that.createUI5Message(oMessage, sResourcePath);
 				})
 			});

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

@@ -93,6 +93,15 @@ sap.ui.define([
 	 * @private
 	 */
 
+	/**
+	 * Binding specific code for suspend.
+	 *
+	 * @private
+	 */
+	ODataParentBinding.prototype.doSuspend = function () {
+		// nothing to do here
+	};
+
 	/**
 	 * Fire event 'patchCompleted' to attached listeners, if the last PATCH request is completed.
 	 *
@@ -425,7 +434,7 @@ sap.ui.define([
 		return this.oCachePromise.then(function (oCache) {
 			if (oCache && that.bRelative) {
 				return that.fetchResourcePath(that.oContext).then(function (sResourcePath) {
-					if (oCache.$resourcePath === sResourcePath) {
+					if (oCache.getResourcePath() === sResourcePath) {
 						return updateDependents();
 					}
 					return that.refreshInternal(""); // entity of context changed
@@ -472,10 +481,10 @@ sap.ui.define([
 				return oCache.create(oUpdateGroupLock, vCreatePath, sPathInCache,
 					sTransientPredicate, oInitialData, fnErrorCallback, fnSubmitCallback
 				).then(function (oCreatedEntity) {
-					if (oCache.$resourcePath) {
+					if (that.mCacheByResourcePath) {
 						// Ensure that cache containing non-transient created entity is recreated
 						// when the parent binding changes to another row and back again.
-						delete that.mCacheByResourcePath[oCache.$resourcePath];
+						delete that.mCacheByResourcePath[oCache.getResourcePath()];
 					}
 					return oCreatedEntity;
 				});
@@ -644,17 +653,16 @@ sap.ui.define([
 		// getBaseForPathReduction must be called early, because the (virtual) parent context may be
 		// lost again when the path is needed
 		var sBaseForPathReduction = this.getBaseForPathReduction(),
-			sBaseMetaPath,
+			sBaseMetaPath = _Helper.getMetaPath(oContext.getPath()),
 			bCacheImmutable,
 			oCanUseCachePromise,
-			sFullMetaPath,
+			// whether this binding is an operation or depends on one
+			bDependsOnOperation = oContext.getPath().includes("(...)"),
 			iIndex = oContext.getIndex(),
 			bIsAdvertisement = sChildPath[0] === "#",
 			oMetaModel = this.oModel.getMetaModel(),
 			aPromises,
 			sResolvedChildPath = this.oModel.resolve(sChildPath, oContext),
-			// whether this binding is an operation or depends on one
-			bDependsOnOperation = oContext.getPath().includes("(...)"),
 			that = this;
 
 		/*
@@ -668,12 +676,27 @@ sap.ui.define([
 			if (bIsAdvertisement) {
 				// Ensure entity type metadata is loaded even for advertisement so that sync access
 				// to key properties is possible
-				return oMetaModel.fetchObject(sFullMetaPath.slice(0,
-					sFullMetaPath.lastIndexOf("/") + 1));
+				return oMetaModel.fetchObject(sBaseMetaPath + "/");
 			}
 
 			return _Helper.fetchPropertyAndType(that.oModel.oInterface.fetchMetadata,
-				sFullMetaPath);
+				getStrippedMetaPath(sResolvedChildPath));
+		}
+
+		/*
+		 * Returns the meta path corresponding to the given path, with its annotation part stripped
+		 * off.
+		 *
+		 * @param {string} sPath - A path
+		 * @returns {string} The meta path with its annotation part stripped off
+		 */
+		function getStrippedMetaPath(sPath) {
+			var iIndex;
+
+			sPath = _Helper.getMetaPath(sPath);
+			iIndex = sPath.indexOf("@"); // Note: sPath[0] !== "@"
+
+			return iIndex > 0 ? sPath.slice(0, iIndex) : sPath;
 		}
 
 		if (bDependsOnOperation && !sResolvedChildPath.includes("/$Parameter/")
@@ -692,8 +715,6 @@ sap.ui.define([
 			|| oContext.isKeepAlive() // kept-alive contexts have no index when not in aContexts
 			|| this.oCache === null
 			|| this.oCache && this.oCache.hasSentRequest();
-		sBaseMetaPath = oMetaModel.getMetaPath(oContext.getPath());
-		sFullMetaPath = oMetaModel.getMetaPath(sResolvedChildPath);
 		aPromises = [
 			this.doFetchQueryOptions(this.oContext),
 			// After access to complete meta path of property, the metadata of all prefix paths
@@ -703,11 +724,11 @@ sap.ui.define([
 			vChildQueryOptions
 		];
 		oCanUseCachePromise = SyncPromise.all(aPromises).then(function (aResult) {
-			var sChildMetaPath,
-				mChildQueryOptions = aResult[2],
+			var mChildQueryOptions = aResult[2],
 				mWrappedChildQueryOptions,
 				mLocalQueryOptions = aResult[0],
 				oProperty = aResult[1],
+				sReducedChildMetaPath,
 				sReducedPath;
 
 			if (Array.isArray(oProperty)) { // Arrays are only used for functions and actions
@@ -716,15 +737,10 @@ sap.ui.define([
 			}
 
 			sReducedPath = oMetaModel.getReducedPath(sResolvedChildPath, sBaseForPathReduction);
-
-			if (sChildPath === "$count" || sChildPath.endsWith("/$count")
-					|| sChildPath[0] === "@") {
-				return sReducedPath;
-			}
-
-			sChildMetaPath = _Helper.getRelativePath(_Helper.getMetaPath(sReducedPath),
+			sReducedChildMetaPath = _Helper.getRelativePath(getStrippedMetaPath(sReducedPath),
 				sBaseMetaPath);
-			if (sChildMetaPath === undefined) {
+
+			if (sReducedChildMetaPath === undefined) {
 				// the child's data does not fit into this bindings's cache, try the parent
 				that.bHasPathReductionToParent = true;
 				return that.oContext.getBinding().fetchIfChildCanUseCache(that.oContext,
@@ -732,7 +748,8 @@ sap.ui.define([
 					vChildQueryOptions);
 			}
 
-			if (bDependsOnOperation) {
+			if (bDependsOnOperation || sReducedChildMetaPath === "$count"
+					|| sReducedChildMetaPath.endsWith("/$count")) {
 				return sReducedPath;
 			}
 
@@ -742,17 +759,18 @@ sap.ui.define([
 				that.bAggregatedQueryOptionsInitial = false;
 			}
 			if (bIsAdvertisement) {
-				mWrappedChildQueryOptions = {"$select" : [sChildMetaPath.slice(1)]};
+				mWrappedChildQueryOptions = {"$select" : [sReducedChildMetaPath.slice(1)]};
 				return that.aggregateQueryOptions(mWrappedChildQueryOptions, sBaseMetaPath,
 						bCacheImmutable)
 					? sReducedPath
 					: undefined;
 			}
-			if (sChildMetaPath === ""
+			if (sReducedChildMetaPath === ""
 				|| oProperty
 				&& (oProperty.$kind === "Property" || oProperty.$kind === "NavigationProperty")) {
 				mWrappedChildQueryOptions = _Helper.wrapChildQueryOptions(sBaseMetaPath,
-					sChildMetaPath, mChildQueryOptions, that.oModel.oInterface.fetchMetadata);
+					sReducedChildMetaPath, mChildQueryOptions,
+					that.oModel.oInterface.fetchMetadata);
 				if (mWrappedChildQueryOptions) {
 					return that.aggregateQueryOptions(mWrappedChildQueryOptions, sBaseMetaPath,
 							bCacheImmutable)
@@ -761,14 +779,14 @@ sap.ui.define([
 				}
 				return undefined;
 			}
-			if (sChildMetaPath === "value") { // symbolic name for operation result
+			if (sReducedChildMetaPath === "value") { // symbolic name for operation result
 				return that.aggregateQueryOptions(mChildQueryOptions, sBaseMetaPath,
 						bCacheImmutable)
 					? sReducedPath
 					: undefined;
 			}
 			Log.error("Failed to enhance query options for auto-$expand/$select as the path '"
-					+ sFullMetaPath + "' does not point to a property",
+					+ sResolvedChildPath + "' does not point to a property",
 				JSON.stringify(oProperty), sClassName);
 			return undefined;
 		}).then(function (sReducedPath) {
@@ -1348,6 +1366,7 @@ sap.ui.define([
 		});
 		this.oResumePromise.$resolve = fnResolve;
 		this.removeReadGroupLock();
+		this.doSuspend();
 	};
 
 	/**