@openui5/sap.ui.core 1.102.1 → 1.103.1

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

@@ -58,7 +58,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.102.1
+		 * @version 1.103.1
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId
@@ -1380,6 +1380,8 @@ sap.ui.define([
 		return oPromise.then(function (oResult) {
 			var oError;
 
+			// Without the bAsync flag we would need the following test twice: once here for the
+			// createContexts and once in the caller to be safe after the additional hop
 			if (!that.aContexts) {
 				oError = new Error("Binding already destroyed");
 				oError.canceled = true;
@@ -1689,6 +1691,31 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * @override
+	 * @see sap.ui.model.odata.v4.ODataParentBinding#findContextForCanonicalPath
+	 */
+	ODataListBinding.prototype.findContextForCanonicalPath = function (sCanonicalPath) {
+		var aKeptAliveContexts = Object.values(this.mPreviousContextsByPath)
+				.filter(function (oCandidate) {
+					return oCandidate.isKeepAlive();
+				});
+
+		function check(aContexts) {
+			return aContexts.find(function (oCandidate) {
+				var oPromise;
+
+				if (oCandidate) {
+					oPromise = oCandidate.fetchCanonicalPath();
+					oPromise.caught();
+					return oPromise.getResult() === sCanonicalPath;
+				}
+			});
+		}
+
+		return check(aKeptAliveContexts) || check(this.aContexts);
+	};
+
 	/**
 	 * Filters the list with the given filters. Since 1.97.0, if filters are unchanged, no request
 	 * is sent, regardless of pending changes.
@@ -1842,7 +1869,7 @@ sap.ui.define([
 	 * binding, its contexts are moved here, it is destroyed and its cache is returned.
 	 *
 	 * @param {string} sResourcePath
-	 *   The resoure path for the cache
+	 *   The resource path for the cache
 	 * @param {object} mQueryOptions
 	 *   The query options for the cache
 	 * @returns {sap.ui.model.odata.v4.lib._CollectionCache|undefined}

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

@@ -157,7 +157,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.102.1
+		 * @version 1.103.1
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor
@@ -2178,7 +2178,7 @@ sap.ui.define([
 		 * or a constraint if not needed.
 		 *
 		 * @param {string} sKey The constraint's name
-		 * @param {any} vValue The contraint's value
+		 * @param {any} vValue The constraint's value
 		 */
 		function setConstraint(sKey, vValue) {
 			if (vValue !== undefined) {
@@ -3245,10 +3245,10 @@ sap.ui.define([
 				})).then(function (aResults) {
 					// insert the returned mappings into oValueListInfo in the order of aMappingUrls
 					aMappingUrls.forEach(function (sMappingUrl, i) {
-						var mvalueListMappingByQualifier = aResults[i].valueListMappingByQualifier;
+						var mValueListMappingByQualifier = aResults[i].valueListMappingByQualifier;
 
-						Object.keys(mvalueListMappingByQualifier).forEach(function (sQualifier) {
-							addMapping(mvalueListMappingByQualifier[sQualifier], sQualifier,
+						Object.keys(mValueListMappingByQualifier).forEach(function (sQualifier) {
+							addMapping(mValueListMappingByQualifier[sQualifier], sQualifier,
 								sMappingUrl, aResults[i].$model);
 						});
 					});

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

@@ -214,7 +214,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.102.1
+		 * @version 1.103.1
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -888,7 +888,7 @@ sap.ui.define([
 				sExpandPath,
 				vValue = mOptions[sOptionName];
 
-			if (!bSystemQueryOptionsAllowed || aAllowed.indexOf(sOptionName) < 0) {
+			if (!bSystemQueryOptionsAllowed || !aAllowed.includes(sOptionName)) {
 					throw new Error("System query option " + sOptionName + " is not supported");
 			}
 			if ((sOptionName === "$expand" || sOptionName === "$select")
@@ -1255,6 +1255,69 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * Deletes the entity with the given canonical path on the server and in all bindings. Pending
+	 * changes in contexts for this entity or in dependents thereof are canceled.
+	 *
+	 * Deleting in the bindings is only possible if the given path is a canonical path, and all
+	 * paths follow these rules in addition to the OData 4.0 specification:
+	 * <ul>
+	 *   <li> Key properties are ordered just as in the metadata,
+	 *   <li> for single key properties, the name of the key is omitted,
+	 *   <li> for collection-valued navigation properties, all keys are present,
+	 *   <li> the key-value pairs are encoded via encodeURIComponent.
+	 * </ul>
+	 *
+	 * @param {string} sCanonicalPath
+	 *   The canonical path of the entity to delete, starting with a '/'
+	 * @param {string} [sGroupId]
+	 *   The group ID that is used for the DELETE request; if not specified, the model's
+	 *   {@link #getUpdateGroupId update group ID} is used; the resulting group ID must not have
+	 *   {@link sap.ui.model.odata.v4.SubmitMode.API}
+	 * @param {boolean} [bRejectIfNotFound]
+	 *   If <code>true</code>, deletion fails if the entity does not exist (HTTP status code 404 or
+	 *   412 due to the <code>If-Match: *</code> header); otherwise we assume that it has already
+	 *   been deleted by someone else and report success
+	 * @returns {Promise}
+	 *   A promise resolving when the delete succeeded, and rejecting with an instance of Error
+	 *   otherwise. In the latter case the HTTP status code of the response is given in the error's
+	 *   property <code>status</code>.
+	 * @throws {Error} If
+	 *   <ul>
+	 *     <li> the path does not start with a '/',
+	 *     <li> the given group ID is invalid,
+	 *     <li> the resulting group ID has {@link sap.ui.model.odata.v4.SubmitMode.API}.
+	 *   </ul>
+	 *
+	 * @public
+	 * @since 1.103.0
+	 */
+	ODataModel.prototype.delete = function (sCanonicalPath, sGroupId, bRejectIfNotFound) {
+		var that = this;
+
+		if (sCanonicalPath[0] !== "/") {
+			throw new Error("Invalid path: " + sCanonicalPath);
+		}
+		this.checkGroupId(sGroupId);
+		sGroupId = sGroupId || this.getUpdateGroupId();
+		if (this.isApiGroup(sGroupId)) {
+			throw new Error("Illegal update group ID: " + sGroupId);
+		}
+
+		return this.oRequestor.request("DELETE", sCanonicalPath.slice(1),
+			this.lockGroup(sGroupId, this, true, true),
+			{"If-Match" : "*"}
+		).catch(function (oError) {
+			if (oError.status !== 404 && oError.status !== 412 || bRejectIfNotFound) {
+				throw oError;
+			} // else: map 404/412 to 200
+		}).then(function () {
+			that.aAllBindings.forEach(function (oBinding) {
+				oBinding.onDelete(sCanonicalPath);
+			});
+		});
+	};
+
 	/**
 	 * Destroys this model, its requestor and its meta model.
 	 *
@@ -2033,7 +2096,7 @@ sap.ui.define([
 
 			// could be async, but normally in this state we should already have
 			// loaded the needed metadata
-			oType = that.oRequestor.fetchTypeForPath("/" + sMetaPath).getResult();
+			oType = that.oMetaModel.getObject("/" + sMetaPath + "/");
 
 			if (!(oType && oType.$Key)) {
 				bFailed = true;

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

@@ -102,6 +102,19 @@ sap.ui.define([
 		// nothing to do here
 	};
 
+	/**
+	 * Finds the context that matches the given canonical path.
+	 *
+	 * @param {string} sCanonicalPath
+	 *   The canonical path of an entity (as a context path with the leading "/")
+	 * @returns {sap.ui.model.odata.v4.Context}
+	 *   A matching context or <code>undefined</code> if there is none
+	 *
+	 * @function
+	 * @name sap.ui.model.odata.v4.ODataParentBinding#findContextForCanonicalPath
+	 * @private
+	 */
+
 	/**
 	 * Fire event 'patchCompleted' to attached listeners, if the last PATCH request is completed.
 	 *
@@ -246,7 +259,7 @@ sap.ui.define([
 			 * @returns {boolean} Whether the query options can be fulfilled by this binding
 			 */
 			function mergeSelectPath(sSelectPath) {
-				if (mAggregatedQueryOptions.$select.indexOf(sSelectPath) < 0) {
+				if (!mAggregatedQueryOptions.$select.includes(sSelectPath)) {
 					mAggregatedQueryOptions.$select.push(sSelectPath);
 				}
 				return true;
@@ -1067,6 +1080,22 @@ sap.ui.define([
 		return false;
 	};
 
+	/**
+	 * @override
+	 * @see sap.ui.model.odata.v4.ODataBinding#onDelete
+	 */
+	ODataParentBinding.prototype.onDelete = function (sCanonicalPath) {
+		var oContext = this.findContextForCanonicalPath(sCanonicalPath);
+
+		if (oContext) {
+			this.resetChangesForPath(this.getRelativePath(oContext.getPath()), []);
+			this.oModel.getDependentBindings(oContext).forEach(function (oBinding) {
+				oBinding.resetChanges();
+			});
+			this._delete(null, sCanonicalPath.slice(1), oContext);
+		}
+	};
+
 	/**
 	 * Recursively refreshes all dependent list bindings that have no own cache.
 	 *

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

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.102.1
+		 * @version 1.103.1
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId
@@ -369,10 +369,9 @@ sap.ui.define([
 		var that = this;
 
 		this.withCache(function (_oCache, sPath, oBinding) {
-			oBinding.doDeregisterChangeListener(sPath, that);
-		}).catch(function (oError) {
-			that.oModel.reportError("Error in deregisterChange", sClassName, oError);
-		}, /*sPath*/"", /*bSync*/false, /*bWithOrWithoutCache*/true);
+				oBinding.doDeregisterChangeListener(sPath, that);
+			}, /*sPath*/"", /*bSync*/false, /*bWithOrWithoutCache*/true)
+			.catch(this.oModel.getReporter());
 	};
 
 	/**
@@ -502,6 +501,14 @@ sap.ui.define([
 			.catch(this.oModel.getReporter());
 	};
 
+	/**
+	 * @override
+	 * @see sap.ui.model.odata.v4.ODataBinding#onDelete
+	 */
+	ODataPropertyBinding.prototype.onDelete = function () {
+		// nothing to do
+	};
+
 	/**
 	 * @override
 	 * @see sap.ui.model.odata.v4.ODataBinding#refreshInternal
@@ -515,7 +522,11 @@ sap.ui.define([
 			return SyncPromise.resolve();
 		}
 		return this.oCachePromise.then(function () {
-			that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/true, bKeepCacheOnError);
+			if (that.oCache && that.oCache.reset) {
+				that.oCache.reset();
+			} else {
+				that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/true, bKeepCacheOnError);
+			}
 
 			if (bCheckUpdate) {
 				return that.checkUpdateInternal(undefined, ChangeReason.Refresh, sGroupId);

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

@@ -83,8 +83,8 @@ sap.ui.define([
 		}
 		aAggregate.push(sAggregate);
 
-		if (sUnit && aAggregate.indexOf(sUnit) < 0 && aAliases.indexOf(sUnit, i + 1) < 0
-				&& aGroupBy.indexOf(sUnit) < 0) {
+		if (sUnit && !aAggregate.includes(sUnit) && !aAliases.includes(sUnit, i + 1)
+				&& !aGroupBy.includes(sUnit)) {
 			aAggregate.push(sUnit);
 		}
 	}
@@ -233,7 +233,7 @@ sap.ui.define([
 			});
 			aGroupBy = bIsLeafLevel
 				? Object.keys(oAggregation.group).sort().filter(function (sGroup) {
-					return oAggregation.groupLevels.indexOf(sGroup) < 0;
+					return !oAggregation.groupLevels.includes(sGroup);
 				})
 				: [oAggregation.groupLevels[iLevel - 1]];
 			if (!iLevel) {
@@ -559,14 +559,14 @@ sap.ui.define([
 			 */
 			function isUsedAtLeaf(sName) {
 				if (sName in oAggregation.group
-						&& (!iLevel || oAggregation.groupLevels.indexOf(sName) < 0)) {
+						&& (!iLevel || !oAggregation.groupLevels.includes(sName))) {
 					return true; // "quick path"
 				}
 
 				return Object.keys(oAggregation.aggregate).some(function (sAlias) {
 					return sName === oAggregation.aggregate[sAlias].unit;
 				}) || Object.keys(oAggregation.group).some(function (sGroup) {
-					return (!iLevel || oAggregation.groupLevels.indexOf(sGroup) < 0)
+					return (!iLevel || !oAggregation.groupLevels.includes(sGroup))
 						&& isUsedFor(sName, sGroup);
 				});
 			}
@@ -581,7 +581,7 @@ sap.ui.define([
 			function isUsedFor(sName, sGroup) {
 				return sName === sGroup
 					|| oAggregation.group[sGroup].additionally
-					&& oAggregation.group[sGroup].additionally.indexOf(sName) >= 0;
+					&& oAggregation.group[sGroup].additionally.includes(sName);
 			}
 
 			if (sOrderby) {

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

@@ -206,7 +206,7 @@ sap.ui.define([
 						}),
 				iIndex === undefined // single element or kept-alive not in list
 					&& !bDoNotRequestCount
-					&& that.requestCount(oGroupLock),
+					&& that.requestCount(oGroupLock || that.oRequestor.lockGroup("$auto", that)),
 				oGroupLock && oGroupLock.unlock() // unlock when all requests have been queued
 			]).then(function () {
 				if (Array.isArray(vCacheData)) {
@@ -398,8 +398,7 @@ sap.ui.define([
 				aSelect = _Helper.getQueryOptionsForPath(that.mQueryOptions, sPath).$select;
 				_Helper.updateSelected(that.mChangeListeners,
 					_Helper.buildPath(sPath, sPredicate || sTransientPredicate), oEntityData,
-					oCreatedEntity,
-					aSelect && aSelect.concat("@odata.etag")); // do not change $select
+					oCreatedEntity, aSelect);
 
 				that.removePendingRequest();
 				fnResolve(true);
@@ -508,6 +507,7 @@ sap.ui.define([
 		var oDataPromise = SyncPromise.resolve(oData),
 			oEntity,
 			iEntityPathLength,
+			bInAnnotation = false,
 			aSegments,
 			bTransient = false,
 			that = this;
@@ -522,21 +522,42 @@ sap.ui.define([
 		 * Determines the implicit value if the value is missing in the cache. Reports an invalid
 		 * segment if there is no @Core.Permissions: 'None' annotation and no implicit value.
 		 *
-		 * @param {object} oValue The object that is expected to have the value
-		 * @param {string} sSegment The path segment that is missing
-		 * @param {number} iPathLength The length of the path of the missing value
-		 * @returns {any} The value if it could be determined or undefined otherwise
+		 * @param {object} oValue - The object that is expected to have the value
+		 * @param {string} sSegment - The path segment that is missing
+		 * @param {number} iPathLength - The length of the path of the missing value
+		 * @returns {sap.ui.base.SyncPromise|undefined}
+		 *   Returns a SyncPromise which resolves with the value or returns undefined in some
+		 *   special cases.
 		 */
 		function missingValue(oValue, sSegment, iPathLength) {
 			var sPropertyPath = aSegments.slice(0, iPathLength).join("/"),
+				sPropertyName,
 				sReadLink,
 				sServiceUrl;
 
 			if (Array.isArray(oValue)) {
 				return invalidSegment(sSegment, sSegment === "0"); // missing key predicate or index
 			}
+
+			if (bInAnnotation) {
+				return invalidSegment(sSegment, true);
+			}
+
+			if (sSegment.includes("@")) { // missing property annotation
+				sPropertyName = sSegment.split("@")[0];
+				if (bTransient
+						|| sPropertyName in oValue
+						|| oValue[sPropertyName + "@$ui5.noData"]
+						|| (that.mQueryOptions
+							&& that.mQueryOptions.$select.includes(sPropertyPath.split("@")[0]))) {
+					// no use to send late request
+					return invalidSegment(sSegment, true);
+				}
+			}
+
 			return that.oRequestor.getModelInterface()
-				.fetchMetadata(that.sMetaPath + "/" + _Helper.getMetaPath(sPropertyPath))
+				.fetchMetadata(that.sMetaPath + "/"
+					+ _Helper.getMetaPath(sPropertyPath.split("@")[0]))
 				.then(function (oProperty) {
 					var vPermissions;
 
@@ -566,7 +587,7 @@ sap.ui.define([
 						return oEntity
 							&& that.fetchLateProperty(oGroupLock, oEntity,
 								aSegments.slice(0, iEntityPathLength).join("/"),
-								aSegments.slice(iEntityPathLength).join("/"),
+								aSegments.slice(iEntityPathLength).join("/").split("@")[0],
 								aSegments.slice(iEntityPathLength, iPathLength).join("/"))
 							|| invalidSegment(sSegment);
 					}
@@ -634,9 +655,14 @@ sap.ui.define([
 					vValue = vValue[vIndex];
 				}
 				// missing advertisement or annotation is not an error
-				return vValue === undefined && sSegment[0] !== "#" && !sSegment.includes("@")
+				vValue = vValue === undefined && sSegment[0] !== "#" && sSegment[0] !== "@"
 					? missingValue(oParentValue, sSegment, i + 1)
 					: vValue;
+				if (sSegment.includes("@")) {
+					bInAnnotation = true;
+				}
+
+				return vValue;
 			});
 		}, oDataPromise);
 	};
@@ -762,11 +788,12 @@ sap.ui.define([
 		// even when two late properties lead to the same request, each of them must be copied to
 		// the cache.
 		return oPromise.then(function (oData) {
-			var sPredicate = _Helper.getPrivateAnnotation(oData, "predicate");
+			var sNewPredicate = _Helper.getPrivateAnnotation(oData, "predicate"),
+				sOldPredicate = _Helper.getPrivateAnnotation(oResource, "predicate");
 
-			if (sPredicate && _Helper.getPrivateAnnotation(oResource, "predicate") !== sPredicate) {
+			if (sOldPredicate && sNewPredicate && sOldPredicate !== sNewPredicate) {
 				throw new Error("GET " + sRequestPath + ": Key predicate changed from "
-					+ _Helper.getPrivateAnnotation(oResource, "predicate") + " to " + sPredicate);
+					+ sOldPredicate + " to " + sNewPredicate);
 			}
 			// we expect the server to always or never send an ETag for this entity
 			if (oResource["@odata.etag"] && oData["@odata.etag"] !== oResource["@odata.etag"]) {
@@ -1340,7 +1367,7 @@ sap.ui.define([
 			delete aElements.$byPredicate[sTransientPredicate];
 		}
 		if (!sPath && iIndex !== undefined) {
-			// Note: sPath is empty only in a CollectionCache, so we may use iLmit and
+			// Note: sPath is empty only in a CollectionCache, so we may use iLimit and
 			// adjustReadRequests
 			if (!sTransientPredicate) {
 				this.iLimit -= 1; // this doesn't change Infinity
@@ -2022,8 +2049,8 @@ sap.ui.define([
 						|| sProperty.endsWith("@mediaReadLink")) {
 					oInstance[sProperty] = _Helper.makeAbsolute(vPropertyValue, sContextUrl);
 				}
-				if (sProperty.includes("@")) { // ignore other annotations
-					return;
+				if (sProperty === sMessageProperty || sProperty.includes("@")) {
+					return; // ignore message property and other annotations
 				}
 				if (Array.isArray(vPropertyValue)) {
 					vPropertyValue.$created = 0; // number of (client-side) created elements
@@ -3163,20 +3190,27 @@ sap.ui.define([
 	 *   requests for late properties. If <code>false<code>, {@link #post} throws an error.
 	 * @param {string} [sMetaPath]
 	 *   Optional meta path in case it cannot be derived from the given resource path
-	 *
+	 * @param {boolean} [bEmpty]
+	 *   Whether the cache is initialized with an empty response so that all properties are fetched
+	 *   as late properties
 	 * @alias sap.ui.model.odata.v4.lib._SingleCache
 	 * @constructor
 	 * @private
 	 */
 	function _SingleCache(oRequestor, sResourcePath, mQueryOptions, bSortExpandSelect,
-			bSharedRequest, fnGetOriginalResourcePath, bPost, sMetaPath) {
+			bSharedRequest, fnGetOriginalResourcePath, bPost, sMetaPath, bEmpty) {
 		_Cache.call(this, oRequestor, sResourcePath, mQueryOptions, bSortExpandSelect,
 			fnGetOriginalResourcePath, bSharedRequest);
 
 		this.sMetaPath = sMetaPath || this.sMetaPath; // overrides Cache c'tor
 		this.bPost = bPost;
 		this.bPosting = false;
-		this.oPromise = null; // a SyncPromise for the current value
+		if (bEmpty) {
+			// simulates an empty response and ensure that all properties become late properties
+			this.oPromise = SyncPromise.resolve({});
+		} else {
+			this.oPromise = null; // a SyncPromise for the current value
+		}
 	}
 
 	// make SingleCache a Cache
@@ -3452,6 +3486,132 @@ sap.ui.define([
 		return oResult;
 	};
 
+	/**
+	 * Resets the property for the given path. This means that the next #fetchValue will request the
+	 * property again via #fetchLateProperty. Deletes also the entity's ETag within the cache in
+	 * order to allow that it may change.
+	 *
+	 * @param {string} sPath - The path to the property within the cache
+	 */
+	_SingleCache.prototype.resetProperty = function (sPath) {
+		var oData = this.oPromise.getResult();
+
+		if (oData) {
+			sPath.split("/").some(function (sProperty) {
+				// Note: all ETags that are reached by the given sPath are deleted in order to
+				// prevent that #fetchLateProperty throws "Key predicate changed from ..."
+				// Ideally only the ETag for the entity the property belongs to should be deleted.
+				// But because PATCH within SingletonPropertyCache is anyhow not supported we can
+				// delete all ETags so far
+				delete oData["@odata.etag"];
+				if (typeof oData[sProperty] === "object") {
+					oData = oData[sProperty];
+					return false;
+				}
+				delete oData[sProperty];
+				return true;
+			});
+		}
+	};
+
+	//*********************************************************************************************
+	// SingletonPropertyCache
+	//*********************************************************************************************
+	/**
+	 * Creates a cache for a property that belongs to an OData singleton by creating a _SingleCache
+	 * for the singleton and remembering the property path within that _SingleCache. All
+	 * _SingletonPropertyCaches that belong to the same singleton share the same _SingleCache if
+	 * they have the same query options.
+	 *
+	 * @param {sap.ui.model.odata.v4.lib._Requestor} oRequestor
+	 *   The requestor
+	 * @param {string} sResourcePath
+	 *   A resource path relative to the service URL
+	 * @param {object} [mQueryOptions]
+	 *   A map of key-value pairs representing the query string
+	 * @private
+	 */
+	function _SingletonPropertyCache(oRequestor, sResourcePath, mQueryOptions) {
+		var aSegments = sResourcePath.split("/"),
+			sSingleton = aSegments[0],
+			sSingletonKey = sSingleton + JSON.stringify(mQueryOptions),
+			mSingletonCacheByPath = oRequestor.$mSingletonCacheByPath;
+
+		_PropertyCache.call(this, oRequestor, sResourcePath,
+			{/*mQueryOptions will be passed to the _SingleCache*/});
+
+		if (!mSingletonCacheByPath) {
+			mSingletonCacheByPath = oRequestor.$mSingletonCacheByPath = {};
+		}
+		this.oSingleton = mSingletonCacheByPath[sSingletonKey];
+		if (!this.oSingleton) {
+			this.oSingleton = mSingletonCacheByPath[sSingletonKey]
+				= new _SingleCache(oRequestor, sSingleton, mQueryOptions,
+					/*bSortExpandSelect*/ undefined, /*bSharedRequest*/ undefined,
+					/*fnGetOriginalResourcePath*/ undefined, /*bPost*/ undefined,
+					/*sMetaPath*/ undefined, /*bEmpty*/ true);
+		}
+		this.sRelativePath = sResourcePath.split(sSingleton + "/")[1];
+	}
+
+	// make _SingletonPropertyCache a _PropertyCache
+	_SingletonPropertyCache.prototype = Object.create(_PropertyCache.prototype);
+
+	/**
+	 * Delegates to #fetchValue of its shared OData Singleton _SingleCache. Within the 1st call its
+	 * own relative property path is added to the mLateQueryOptions of its _SingleCache.
+	 *
+	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
+	 *   A lock for the group to associate the request with
+	 *   see {sap.ui.model.odata.v4.lib._Requestor#request} for details
+	 * @param {string} [_sPath]
+	 *   ignored for property caches, should be empty
+	 * @param {function} [fnDataRequested]
+	 *   The function is called just before the back-end request is sent.
+	 * @param {object} [oListener]
+	 *   A change listener that is added for the given path. Its method <code>onChange</code> is
+	 *   called with the new value if the property at that path is modified later
+	 * @param {boolean} [bCreateOnDemand]
+	 *   Unsupported
+	 * @returns {sap.ui.base.SyncPromise}
+	 *   A promise to be resolved with the value. It is rejected if the request for the data failed.
+	 * @throws {Error}
+	 *   If <code>bCreateOnDemand</code> is set or if group ID is '$cached' and the value is not
+	 *   cached (the error has a property <code>$cached = true</code> then)
+	 *
+	 * @public
+	 */
+	_SingletonPropertyCache.prototype.fetchValue = function (oGroupLock, _sPath, fnDataRequested,
+			oListener, bCreateOnDemand) {
+		var sPropertyPath = this.oSingleton.sResourcePath + "/" + this.sRelativePath,
+			mLateQueryOptions,
+			oMetadataPromise = this.oMetadataPromise || this.oRequestor.getModelInterface()
+				.fetchMetadata("/" + _Helper.getMetaPath(sPropertyPath)),
+			that = this;
+
+		return oMetadataPromise.then(function () {
+			if (!that.oMetadataPromise) {
+				mLateQueryOptions = that.oSingleton.getLateQueryOptions() || {};
+				_Helper.aggregateExpandSelect(mLateQueryOptions,
+					_Helper.wrapChildQueryOptions("/" + that.oSingleton.sResourcePath,
+						that.sRelativePath, {}, that.oRequestor.getModelInterface().fetchMetadata));
+				that.oSingleton.setLateQueryOptions(mLateQueryOptions);
+			}
+			that.oMetadataPromise = oMetadataPromise;
+			return that.oSingleton.fetchValue(oGroupLock, that.sRelativePath, fnDataRequested,
+				oListener, bCreateOnDemand);
+		});
+	};
+
+	/**
+	 * Resets the property for its own relative path within the singleton's single cache. This means
+	 * that the next #fetchValue will request the property again via #fetchLateProperty. Deletes
+	 * also the entity's ETag within the cache in order to allow that it may change.
+	 */
+	_SingletonPropertyCache.prototype.reset = function () {
+		this.oSingleton.resetProperty(this.sRelativePath);
+	};
+
 	//*********************************************************************************************
 	// "static" functions
 	//*********************************************************************************************
@@ -3550,7 +3710,10 @@ sap.ui.define([
 	 * @public
 	 */
 	_Cache.createProperty = function (oRequestor, sResourcePath, mQueryOptions) {
-		return new _PropertyCache(oRequestor, sResourcePath, mQueryOptions);
+		if (sResourcePath.includes("(") || sResourcePath.endsWith("/$count")) {
+			return new _PropertyCache(oRequestor, sResourcePath, mQueryOptions);
+		}
+		return new _SingletonPropertyCache(oRequestor, sResourcePath, mQueryOptions);
 	};
 
 	/**

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

@@ -48,7 +48,7 @@ sap.ui.define([
 			if (oItem) {
 				if (!mMap[sPath]) {
 					mMap[sPath] = [oItem];
-				} else if (mMap[sPath].indexOf(oItem) < 0) {
+				} else if (!mMap[sPath].includes(oItem)) {
 					mMap[sPath].push(oItem);
 				}
 			}
@@ -70,7 +70,7 @@ sap.ui.define([
 				aChildren.forEach(function (sPath) {
 					var aSegments;
 
-					if (aAncestors.indexOf(sPath) >= 0) {
+					if (aAncestors.includes(sPath)) {
 						mChildren[sPath] = true;
 						return;
 					}
@@ -97,7 +97,7 @@ sap.ui.define([
 		addToSelect : function (mQueryOptions, aSelectPaths) {
 			mQueryOptions.$select = mQueryOptions.$select || [];
 			aSelectPaths.forEach(function (sPath) {
-				if (mQueryOptions.$select.indexOf(sPath) < 0) {
+				if (!mQueryOptions.$select.includes(sPath)) {
 					mQueryOptions.$select.push(sPath);
 				}
 			});
@@ -2175,6 +2175,13 @@ sap.ui.define([
 					}
 				});
 
+				// Create annotations for a property which was selected but no data was received
+				Object.keys(vSelect).forEach(function (sProperty) {
+					if (!(sProperty in oTarget)) {
+						oTarget[sProperty + "@$ui5.noData"] = true;
+					}
+				});
+
 				return oTarget;
 			}