@openui5/sap.ui.core 1.104.0 → 1.105.0

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

@@ -108,11 +108,11 @@ sap.ui.define([
 		// creates the cache does not call #setActive)
 		this.iActiveUsages = 1;
 		this.mChangeListeners = {}; // map from path to an array of change listeners
+		this.mChangeRequests = {}; // map from path to an array of DELETE or PATCH promises
 		this.fnGetOriginalResourcePath = fnGetOriginalResourcePath;
 		// the point in time when the cache became inactive; active caches have Infinity so that
 		// they are always "newer"
 		this.iInactiveSince = Infinity;
-		this.mPatchRequests = {}; // map from path to an array of (PATCH) promises
 		this.mEditUrl2PatchPromise = {}; // map from edit URL to a PATCH promise for retry
 		// a promise with attached properties $count, $resolve existing while DELETEs or POSTs are
 		// being sent
@@ -147,11 +147,12 @@ sap.ui.define([
 	 * @param {boolean} [bDoNotRequestCount]
 	 *   Whether not to request the new count from the server; useful in case of
 	 *   {@link sap.ui.model.odata.v4.Context#replaceWith} where it is known that the count remains
-	 *   unchanged; w/o a lock this should be true
-	 * @param {function} fnCallback
-	 *   A function which is called after a transient entity has been deleted from the cache or
-	 *   after the entity has been deleted from the server and from the cache; the index of the
-	 *   entity and the entity list are both passed as parameter, or none of them
+	 *   unchanged; only used when deleting from an entity collection
+	 * @param {function} [fnCallback]
+	 *   A function which is called immediately when an entity has been deleted from the cache, or
+	 *   when it was re-inserted due to an error; only used when deleting from an entity collection,
+	 *   the index of the entity and an offset (-1 for deletion, 1 for re-insertion) are passed as
+	 *   parameter
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise which is resolved without a result in case of success, or rejected with an
 	 *   instance of <code>Error</code> in case of failure
@@ -163,23 +164,25 @@ sap.ui.define([
 			bDoNotRequestCount, fnCallback) {
 		var aSegments = sPath.split("/"),
 			vDeleteProperty = aSegments.pop(),
-			iIndex = rNumber.test(vDeleteProperty) ? Number(vDeleteProperty) : undefined,
 			sParentPath = aSegments.join("/"),
 			that = this;
 
 		this.checkSharedRequest();
-		this.addPendingRequest();
 
 		return this.fetchValue(_GroupLock.$cached, sParentPath).then(function (vCacheData) {
 			var vCachePath = _Cache.from$skip(vDeleteProperty, vCacheData),
+				oDeleted,
 				oEntity = vDeleteProperty
 					? vCacheData[vCachePath] || vCacheData.$byPredicate[vCachePath]
 					: vCacheData, // deleting at root level
 				mHeaders,
+				iIndex = typeof vCachePath === "number" ? vCachePath : undefined,
 				sKeyPredicate = _Helper.getPrivateAnnotation(oEntity, "predicate"),
 				sEntityPath = _Helper.buildPath(sParentPath,
 					Array.isArray(vCacheData) ? sKeyPredicate : vDeleteProperty),
-				sTransientGroup = _Helper.getPrivateAnnotation(oEntity, "transient");
+				oRequestPromise,
+				sTransientGroup = _Helper.getPrivateAnnotation(oEntity, "transient"),
+				sTransientPredicate = _Helper.getPrivateAnnotation(oEntity, "transientPredicate");
 
 			if (sTransientGroup) {
 				if (typeof sTransientGroup !== "string") {
@@ -188,50 +191,108 @@ sap.ui.define([
 				that.oRequestor.removePost(sTransientGroup, oEntity);
 				return undefined;
 			}
-			if (oEntity["$ui5.deleting"]) {
+			if (oEntity["@$ui5.context.isDeleted"]) {
 				throw new Error("Must not delete twice: " + sEditUrl);
 			}
-			oEntity["$ui5.deleting"] = true;
+			oEntity["@$ui5.context.isDeleted"] = true;
+			if (Array.isArray(vCacheData)) {
+				oDeleted = that.addDeleted(vCacheData, iIndex, sKeyPredicate, oGroupLock,
+					!!sTransientPredicate);
+				that.removeElement(vCacheData, iIndex, sKeyPredicate, sParentPath);
+				fnCallback(iIndex, -1);
+			}
 			mHeaders = {"If-Match" : oETagEntity || oEntity};
 			sEditUrl += that.oRequestor.buildQueryString(that.sMetaPath, that.mQueryOptions, true);
+			// the existence of an onCancel callback causes a pending change in the requestor
+			oRequestPromise = oGroupLock
+				? that.oRequestor.request("DELETE", sEditUrl, oGroupLock.getUnlockedCopy(),
+					mHeaders, undefined, undefined, /*onCancel*/function () {}, undefined,
+					_Helper.buildPath(that.getOriginalResourcePath(oEntity), sEntityPath))
+				: SyncPromise.resolve();
+			_Helper.addByPath(that.mChangeRequests, sEntityPath, oRequestPromise);
 			return SyncPromise.all([
-				oGroupLock
-					&& that.oRequestor.request("DELETE", sEditUrl, oGroupLock.getUnlockedCopy(),
-							mHeaders, undefined, undefined, undefined, undefined,
-							_Helper.buildPath(that.getOriginalResourcePath(oEntity), sEntityPath))
-						.catch(function (oError) {
-							if (oError.status !== 404) {
-								delete oEntity["$ui5.deleting"];
-								throw oError;
-							} // else: map 404 to 200
-						}),
+				oRequestPromise.catch(function (oError) {
+					if (oError.status !== 404) {
+						throw oError;
+					} // else: map 404 to 200
+				}),
 				iIndex === undefined // single element or kept-alive not in list
 					&& !bDoNotRequestCount
 					&& that.requestCount(oGroupLock || that.oRequestor.lockGroup("$auto", that)),
 				oGroupLock && oGroupLock.unlock() // unlock when all requests have been queued
 			]).then(function () {
 				if (Array.isArray(vCacheData)) {
-					fnCallback(
-						that.removeElement(vCacheData, iIndex, sKeyPredicate, sParentPath),
-						vCacheData);
-				} else {
-					if (vDeleteProperty) {
-						// set to null and notify listeners
-						_Helper.updateExisting(that.mChangeListeners, sParentPath,
-							vCacheData, _Cache.makeUpdateData([vDeleteProperty], null));
-					} else { // deleting at root level
-						oEntity["$ui5.deleted"] = true;
-					}
-					fnCallback();
+					vCacheData.$deleted.splice(vCacheData.$deleted.indexOf(oDeleted), 1);
+					delete vCacheData.$byPredicate[sKeyPredicate];
+					delete vCacheData.$byPredicate[sTransientPredicate];
+				} else if (vDeleteProperty) {
+					// set to null and notify listeners
+					_Helper.updateExisting(that.mChangeListeners, sParentPath,
+						vCacheData, _Cache.makeUpdateData([vDeleteProperty], null));
+				} else { // deleting at root level
+					oEntity["$ui5.deleted"] = true;
 				}
 				that.oRequestor.getModelInterface().reportStateMessages(that.sResourcePath,
 					{}, [sEntityPath]);
+			}, function (oError) {
+				var iDeletedIndex;
+
+				delete oEntity["@$ui5.context.isDeleted"];
+				if (Array.isArray(vCacheData)) {
+					addToCount(that.mChangeListeners, sParentPath, vCacheData, 1);
+					iIndex = oDeleted.index;
+					iDeletedIndex = vCacheData.$deleted.indexOf(oDeleted);
+					that.adjustIndexes(sParentPath, vCacheData, iIndex, 1, iDeletedIndex);
+					vCacheData.splice(iIndex, 0, oEntity);
+					vCacheData.$deleted.splice(iDeletedIndex, 1);
+					if (sTransientPredicate) {
+						vCacheData.$created += 1;
+						if (!sParentPath) {
+							that.iActiveElements += 1;
+						}
+					}
+					fnCallback(iIndex, 1);
+				}
+				throw oError;
+			}).finally(function () {
+				_Helper.removeByPath(that.mChangeRequests, sEntityPath, oRequestPromise);
 			});
-		}).finally(function () {
-			that.removePendingRequest();
 		});
 	};
 
+	/**
+	 * Adds an entry about a deleted entity to <code>aElements.$deleted</code>. Ensures that the
+	 * entries are ordered by entity index and deletion order (if two entities were deleted on the
+	 * same index, the second one must be behind).
+	 *
+	 * @param {object[]} aElements - The elements collection
+	 * @param {number} iIndex - The entity's index
+	 * @param {string} sPredicate - The entity's key predicate
+	 * @param {sap.ui.model.odata.v4.lib._GroupLock|undefined} oGroupLock - The deletion group lock
+	 * @param {boolean} bCreated - Whether the entity was created
+	 * @returns {object} The deletion info
+	 *
+	 * @private
+	 */
+	_Cache.prototype.addDeleted = function (aElements, iIndex, sPredicate, oGroupLock, bCreated) {
+		var oDeleted = {
+				created : bCreated,
+				groupId : oGroupLock && oGroupLock.getGroupId(),
+				predicate : sPredicate,
+				index : iIndex
+			},
+			i;
+
+		aElements.$deleted = aElements.$deleted || [];
+		for (i = 0; i < aElements.$deleted.length; i += 1) {
+			if (iIndex < aElements.$deleted[i].index) {
+				break;
+			}
+		}
+		aElements.$deleted.splice(i, 0, oDeleted);
+		return oDeleted;
+	};
+
 	/**
 	 * Adds one to the count of pending (that is, "currently being sent to the server") requests.
 	 *
@@ -250,6 +311,39 @@ sap.ui.define([
 		this.oPendingRequestsPromise.$count += 1;
 	};
 
+	/**
+	 * Adjusts the indexes in the collection.
+	 *
+	 * @param {string} sPath The path of the collection in the cache
+	 * @param {object[]} aElements The collection
+	 * @param {number} iIndex The index at which the element has been inserted or removed
+	 * @param {number} iOffset The offset (1 = insert, -1 = remove)
+	 * @param {number} iDeletedIndex The element's index in $deleted (only for re-insertion)
+	 * @param {boolean} bCreate Whether the insert is a create (and not reverting a delete)
+	 *
+	 * @private
+	 */
+	_Cache.prototype.adjustIndexes = function (sPath, aElements, iIndex, iOffset, iDeletedIndex,
+			bCreate) {
+		if (!sPath) {
+			// If the path is empty, we are in a _CollectionCache and aReadRequest exists
+			this.aReadRequests.forEach(function (oReadRequest) {
+				if (oReadRequest.iStart >= iIndex) {
+					oReadRequest.iStart += iOffset;
+					oReadRequest.iEnd += iOffset;
+				} // Note: no changes can happen inside *gaps*
+			});
+		}
+		(aElements.$deleted || []).forEach(function (oDeleted, i) {
+			if (iIndex < oDeleted.index || iDeletedIndex < i // before the deleted one
+					|| bCreate
+						&& (iIndex === 0 // create at start
+							|| !oDeleted.created)) { // the deleted one was not created
+				oDeleted.index += iOffset;
+			}
+		});
+	};
+
 	/**
 	 * Calculates and returns the key predicate for the given entity and stores it as private
 	 * annotation at the given entity. If at least one key property is <code>undefined</code>, no
@@ -335,19 +429,17 @@ sap.ui.define([
 
 		// Clean-up when the create has been canceled.
 		function cleanUp() {
+			var iIndex = aCollection.indexOf(oEntityData);
+
 			_Helper.removeByPath(that.mPostRequests, sPath, oEntityData);
-			aCollection.splice(aCollection.indexOf(oEntityData), 1);
+			aCollection.splice(iIndex, 1);
 			aCollection.$created -= 1;
 			if (!oEntityData["@$ui5.context.isInactive"]) {
 				that.iActiveElements -= 1;
 				addToCount(that.mChangeListeners, sPath, aCollection, -1);
 			}
 			delete aCollection.$byPredicate[sTransientPredicate];
-			if (!sPath) {
-				// Note: sPath is empty only in a CollectionCache, so we may call adjustReadRequests
-				// Note: index 0 is OK here (see "Must not request created element")
-				that.adjustReadRequests(0, -1);
-			}
+			that.adjustIndexes(sPath, aCollection, iIndex, -1);
 			oGroupLock.cancel();
 		}
 
@@ -457,10 +549,7 @@ sap.ui.define([
 		// if the nested collection is empty $byPredicate is not available, create it on demand
 		aCollection.$byPredicate = aCollection.$byPredicate || {};
 		aCollection.$byPredicate[sTransientPredicate] = oEntityData;
-		if (!sPath) {
-			// Note: sPath is empty only in a CollectionCache, so we may call adjustReadRequests
-			that.adjustReadRequests(0, 1);
-		}
+		that.adjustIndexes(sPath, aCollection, 0, 1, 0, true);
 
 		return oPostPathPromise.then(function (sPostPath) {
 			sPostPath += that.oRequestor.buildQueryString(that.sMetaPath, that.mQueryOptions, true);
@@ -478,7 +567,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 */
-	_Cache.prototype.deregisterChange = function (sPath, oListener) {
+	_Cache.prototype.deregisterChangeListener = function (sPath, oListener) {
 		if (!this.bSharedRequest) {
 			_Helper.removeByPath(this.mChangeListeners, sPath, oListener);
 		}
@@ -526,11 +615,12 @@ sap.ui.define([
 		 * @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
+		 * @param {boolean} [bAgain] - Whether we are trying again and must not cause a request
 		 * @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) {
+		function missingValue(oValue, sSegment, iPathLength, bAgain) {
 			var sPropertyName,
 				sPropertyPath = aSegments.slice(0, iPathLength).join("/"),
 				sPropertyMetaPath = _Helper.getMetaPath(sPropertyPath),
@@ -589,10 +679,10 @@ sap.ui.define([
 							oEntity = oData;
 							iEntityPathLength = 0;
 						}
-						return oEntity
+						return oEntity && !bAgain
 							&& that.fetchLateProperty(oGroupLock, oEntity,
 								aSegments.slice(0, iEntityPathLength).join("/"),
-								aSegments.slice(iEntityPathLength).join("/").split("@")[0],
+								aSegments.slice(iEntityPathLength).join("/"),
 								aSegments.slice(iEntityPathLength, iPathLength).join("/"))
 							|| invalidSegment(sSegment);
 					}
@@ -618,7 +708,7 @@ sap.ui.define([
 		}
 		aSegments = sPath.split("/");
 		return aSegments.reduce(function (oPromise, sSegment, i) {
-			return oPromise.then(function (vValue) {
+			return oPromise.then(function step(vValue, bAgain) {
 				var vIndex, aMatches, oParentValue;
 
 				if (sSegment === "$count") {
@@ -660,13 +750,17 @@ sap.ui.define([
 					vValue = vValue[vIndex];
 				}
 				// missing advertisement or annotation is not an error
-				vValue = vValue === undefined && sSegment[0] !== "#" && sSegment[0] !== "@"
-					? missingValue(oParentValue, sSegment, i + 1)
-					: vValue;
+				if (vValue === undefined && sSegment[0] !== "#" && sSegment[0] !== "@") {
+					vValue = missingValue(oParentValue, sSegment, i + 1, bAgain);
+					if (vValue instanceof SyncPromise && vValue.isPending()) {
+						return vValue.then(function () { // repeat step once late property fetched
+							return step(oParentValue, true);
+						});
+					}
+				}
 				if (sSegment.includes("@")) {
 					bInAnnotation = true;
 				}
-
 				return vValue;
 			});
 		}, oDataPromise);
@@ -688,7 +782,8 @@ sap.ui.define([
 	 *   The path of oResource relative to the cache
 	 * @param {string} sRequestedPropertyPath
 	 *   The path of the requested property relative to oResource; this property is requested from
-	 *   the server
+	 *   the server. For annotations, except client annotations, the annotated property is requested
+	 *   from the server.
 	 * @param {string} sMissingPropertyPath
 	 *   The path of the missing property relative to oResource; this property is returned so that
 	 *   drillDown can proceed
@@ -704,13 +799,14 @@ sap.ui.define([
 		var sFullResourceMetaPath,
 			sFullResourcePath,
 			sGroupId,
+			iIndexOfAt = sRequestedPropertyPath.indexOf("@"),
 			sMergeBasePath, // full resource path plus custom query options
 			oPromise,
 			mQueryOptions,
 			sRequestPath,
 			sResourceMetaPath = _Helper.getMetaPath(sResourcePath),
 			mTypeForMetaPath = this.fetchTypes().getResult(),
-			aUpdateProperties = [sRequestedPropertyPath],
+			aUpdateProperties,
 			that = this;
 
 		/*
@@ -732,9 +828,9 @@ sap.ui.define([
 				oEntityType = that.oRequestor.fetchType(mTypeForMetaPath, sMetaPath).getResult();
 			}
 			if (sBasePath) {
-				// Key properties and predicate must only be copied from the result for nested
-				// properties. The root property is already loaded and has them already. We check
-				// that they are unchanged in this case.
+				// The key properties must only be copied from the result for nested entities. The
+				// root entity is already loaded and has them already. We check that they are
+				// unchanged in this case.
 				(oEntityType.$Key || []).forEach(function (vKey) {
 					if (typeof vKey === "object") {
 						vKey = vKey[Object.keys(vKey)[0]]; // the path for the alias
@@ -752,8 +848,16 @@ sap.ui.define([
 		}
 
 		if (!this.mLateQueryOptions) {
-			return undefined;
+			return undefined; // no autoExpandSelect
+		}
+
+		if (iIndexOfAt >= 0) {
+			if (sRequestedPropertyPath.startsWith("@$ui5.", iIndexOfAt)) {
+				return undefined; // do not request for a client annotation
+			}
+			sRequestedPropertyPath = sRequestedPropertyPath.slice(0, iIndexOfAt);
 		}
+		aUpdateProperties = [sRequestedPropertyPath];
 
 		sFullResourceMetaPath = _Helper.buildPath(this.sMetaPath, sResourceMetaPath);
 		// sRequestedPropertyPath is also a metapath because the binding does not accept a path with
@@ -761,7 +865,7 @@ sap.ui.define([
 		mQueryOptions = _Helper.intersectQueryOptions(
 			_Helper.getQueryOptionsForPath(this.mLateQueryOptions, sResourcePath),
 			[sRequestedPropertyPath], this.oRequestor.getModelInterface().fetchMetadata,
-			sFullResourceMetaPath, {});
+			sFullResourceMetaPath);
 		if (!mQueryOptions) {
 			return undefined;
 		}
@@ -899,8 +1003,10 @@ sap.ui.define([
 	 * @param {string} [sPath]
 	 *   Relative path to drill-down into, may be empty (only for collection cache)
 	 * @returns {object[]} The cache elements
+	 *
+	 * @public
 	 */
-	 _Cache.prototype.getAllElements = function (sPath) {
+	_Cache.prototype.getAllElements = function (sPath) {
 		var aAllElements;
 
 		if (sPath) {
@@ -1044,8 +1150,8 @@ sap.ui.define([
 	 *   Whether there are any registered change listeners
 	 *
 	 * @public
-	 * @see #deregisterChange
-	 * @see #registerChange
+	 * @see #deregisterChangeListener
+	 * @see #registerChangeListener
 	 */
 	_Cache.prototype.hasChangeListeners = function () {
 		return !isEmptyObject(this.mChangeListeners);
@@ -1072,16 +1178,16 @@ sap.ui.define([
 			bIgnoreTransient) {
 		var that = this;
 
-		return Object.keys(this.mPatchRequests).some(function (sRequestPath) {
-			return isSubPath(sRequestPath, sPath)
+		return Object.keys(this.mChangeRequests).some(function (sRequestPath) {
+			return _Helper.hasPathPrefix(sRequestPath, sPath)
 				&& !(bIgnoreKeptAlive
-					&& that.mPatchRequests[sRequestPath].every(function (oPatchPromise) {
+					&& that.mChangeRequests[sRequestPath].every(function (oPatchPromise) {
 						return oPatchPromise.$isKeepAlive();
 					}));
 		}) || Object.keys(this.mPostRequests).some(function (sRequestPath) {
 			return bIgnoreTransient && !sRequestPath
 				? false // ignore transient elements on top level
-				: isSubPath(sRequestPath, sPath)
+				: _Helper.hasPathPrefix(sRequestPath, sPath)
 					&& that.mPostRequests[sRequestPath].some(function (oEntityData) {
 						return !oEntityData["@$ui5.context.isInactive"];
 					});
@@ -1331,7 +1437,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	_Cache.prototype.registerChange = function (sPath, oListener) {
+	_Cache.prototype.registerChangeListener = function (sPath, oListener) {
 		if (!this.bSharedRequest) {
 			_Helper.addByPath(this.mChangeListeners, sPath, oListener);
 		}
@@ -1358,32 +1464,33 @@ sap.ui.define([
 	 * @private
 	 */
 	_Cache.prototype.removeElement = function (aElements, iIndex, sPredicate, sPath) {
-		var oElement,
-			sTransientPredicate;
+		var oElement = aElements.$byPredicate[sPredicate],
+			bDeleted = oElement["@$ui5.context.isDeleted"],
+			sTransientPredicate = _Helper.getPrivateAnnotation(oElement, "transientPredicate");
 
-		oElement = aElements.$byPredicate[sPredicate];
 		if (iIndex !== undefined) {
 			// the element might have moved due to parallel insert/delete
 			iIndex = _Cache.getElementIndex(aElements, sPredicate, iIndex);
 			aElements.splice(iIndex, 1);
 			addToCount(this.mChangeListeners, sPath, aElements, -1);
 		}
-		delete aElements.$byPredicate[sPredicate];
-		sTransientPredicate = _Helper.getPrivateAnnotation(oElement, "transientPredicate");
+		if (!bDeleted) {
+			delete aElements.$byPredicate[sPredicate];
+		}
 		if (sTransientPredicate) {
 			aElements.$created -= 1;
 			if (!sPath) {
 				this.iActiveElements -= 1;
 			}
-			delete aElements.$byPredicate[sTransientPredicate];
+			if (!bDeleted) {
+				delete aElements.$byPredicate[sTransientPredicate];
+			}
 		}
-		if (!sPath && iIndex !== undefined) {
-			// Note: sPath is empty only in a CollectionCache, so we may use iLimit and
-			// adjustReadRequests
-			if (!sTransientPredicate) {
+		if (iIndex !== undefined) {
+			this.adjustIndexes(sPath, aElements, iIndex, -1);
+			if (!sPath && !sTransientPredicate) {
 				this.iLimit -= 1; // this doesn't change Infinity
 			}
-			this.adjustReadRequests(iIndex, -1);
 		}
 		return iIndex;
 	};
@@ -1524,15 +1631,15 @@ sap.ui.define([
 	_Cache.prototype.resetChangesForPath = function (sPath) {
 		var that = this;
 
-		Object.keys(this.mPatchRequests).forEach(function (sRequestPath) {
+		Object.keys(this.mChangeRequests).reverse().forEach(function (sRequestPath) {
 			var aPromises, i;
 
-			if (isSubPath(sRequestPath, sPath)) {
-				aPromises = that.mPatchRequests[sRequestPath];
+			if (_Helper.hasPathPrefix(sRequestPath, sPath)) {
+				aPromises = that.mChangeRequests[sRequestPath];
 				for (i = aPromises.length - 1; i >= 0; i -= 1) {
-					that.oRequestor.removePatch(aPromises[i]);
+					that.oRequestor.removeChangeRequest(aPromises[i]);
 				}
-				delete that.mPatchRequests[sRequestPath];
+				delete that.mChangeRequests[sRequestPath];
 			}
 		});
 
@@ -1762,7 +1869,7 @@ sap.ui.define([
 			 * resetChangesForPath has been called on the binding or model.
 			 */
 			function onCancel() {
-				_Helper.removeByPath(that.mPatchRequests, sFullPath, oPatchPromise);
+				_Helper.removeByPath(that.mChangeRequests, sFullPath, oPatchPromise);
 				// write the previous value into the cache
 				_Helper.updateExisting(that.mChangeListeners, sEntityPath, oEntity, oOldData);
 			}
@@ -1812,14 +1919,14 @@ sap.ui.define([
 					bAtFront, /*mQueryOptions*/ undefined, /*vOwner*/ undefined,
 					mergePatchRequests);
 				oPatchPromise.$isKeepAlive = fnIsKeepAlive;
-				_Helper.addByPath(that.mPatchRequests, sFullPath, oPatchPromise);
+				_Helper.addByPath(that.mChangeRequests, sFullPath, oPatchPromise);
 				return SyncPromise.all([
 					oPatchPromise,
 					that.fetchTypes()
 				]).then(function (aResult) {
 					var oPatchResult = aResult[0];
 
-					_Helper.removeByPath(that.mPatchRequests, sFullPath, oPatchPromise);
+					_Helper.removeByPath(that.mChangeRequests, sFullPath, oPatchPromise);
 					if (bSkip) {
 						// if a PATCH is skipped, because it is merged into another, nothing to do!
 						return;
@@ -1843,7 +1950,7 @@ sap.ui.define([
 						onCancel();
 						throw oError;
 					}
-					_Helper.removeByPath(that.mPatchRequests, sFullPath, oPatchPromise);
+					_Helper.removeByPath(that.mChangeRequests, sFullPath, oPatchPromise);
 					if (oError.canceled) {
 						throw oError;
 					}
@@ -2202,23 +2309,6 @@ sap.ui.define([
 		this.aElements.$byPredicate[_Helper.getPrivateAnnotation(oElement, "predicate")] = oElement;
 	};
 
-	/**
-	 * Adjusts the indices for read requests.
-	 *
-	 * @param {number} iIndex The index at which an element has been added or removed
-	 * @param {number} iOffset The offset to add to the indices
-	 *
-	 * @private
-	 */
-	_CollectionCache.prototype.adjustReadRequests = function (iIndex, iOffset) {
-		this.aReadRequests.forEach(function (oReadRequest) {
-			if (oReadRequest.iStart >= iIndex) {
-				oReadRequest.iStart += iOffset;
-				oReadRequest.iEnd += iOffset;
-			} // Note: no changes can happen inside *gaps*
-		});
-	};
-
 	/**
 	 * Creates an empty element for the given predicate to the cache, adds it to the cache and
 	 * returns it.
@@ -2246,6 +2336,15 @@ sap.ui.define([
 	 * @public
 	 */
 	_CollectionCache.prototype.doReplaceWith = function (iIndex, oElement) {
+		var oOldElement = this.aElements[iIndex];
+
+		if (oOldElement && _Helper.hasPrivateAnnotation(oOldElement, "transientPredicate")
+				&& !_Helper.hasPrivateAnnotation(oElement, "transientPredicate")) {
+			// when replacing a created element (w/ transientPredicate), make sure the replacement
+			// also *looks* like a created one (but do not overwrite existing transientPredicate!)
+			_Helper.setPrivateAnnotation(oElement, "transientPredicate",
+				_Helper.getPrivateAnnotation(oElement, "predicate"));
+		}
 		this.aElements[iIndex] = oElement;
 		this.addKeptElement(oElement); // maintain $byPredicate
 	};
@@ -2305,7 +2404,7 @@ sap.ui.define([
 		return oSyncPromise.then(function () {
 			// register afterwards to avoid that updateExisting fires updates before the first
 			// response
-			that.registerChange(sPath, oListener);
+			that.registerChangeListener(sPath, oListener);
 			return that.drillDown(that.aElements, sPath, oGroupLock, bCreateOnDemand);
 		});
 	};
@@ -2343,7 +2442,8 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns a filter that excludes all created entities in this cache's collection.
+	 * Returns a filter that excludes all created entities in this cache's collection (including
+	 * those that have been deleted on the client again).
 	 *
 	 * @returns {string|undefined}
 	 *   The filter or <code>undefined</code> if there is no created entity.
@@ -2352,22 +2452,33 @@ sap.ui.define([
 	 */
 	_CollectionCache.prototype.getFilterExcludingCreated = function () {
 		var oElement,
-			sKeyFilter,
 			aKeyFilters = [],
 			mTypeForMetaPath,
-			i;
+			i,
+			that = this;
+
+		function addKeyFilter(oElement) {
+			var sKeyFilter;
+
+			mTypeForMetaPath = mTypeForMetaPath
+				|| that.fetchTypes().getResult(); // Note: $metadata already read
+			sKeyFilter = _Helper.getKeyFilter(oElement, that.sMetaPath, mTypeForMetaPath);
+			if (sKeyFilter) {
+				aKeyFilters.push(sKeyFilter);
+			}
+		}
 
 		for (i = 0; i < this.aElements.$created; i += 1) {
 			oElement = this.aElements[i];
 			if (!oElement["@$ui5.context.isTransient"]) {
-				mTypeForMetaPath = mTypeForMetaPath
-					|| this.fetchTypes().getResult(); // Note: $metadata already read
-				sKeyFilter = _Helper.getKeyFilter(oElement, this.sMetaPath, mTypeForMetaPath);
-				if (sKeyFilter) {
-					aKeyFilters.push(sKeyFilter);
-				}
+				addKeyFilter(oElement);
 			}
 		}
+		(this.aElements.$deleted || []).forEach(function (oDeleted) {
+			if (oDeleted.created) {
+				addKeyFilter(that.aElements.$byPredicate[oDeleted.predicate]);
+			}
+		});
 
 		return aKeyFilters.length ? "not (" + aKeyFilters.sort().join(" or ") + ")" : undefined;
 	};
@@ -2401,6 +2512,28 @@ sap.ui.define([
 		return sQueryString;
 	};
 
+	/**
+	 * Determines the offset to <code>$skip</code> due to deleted elements in other groups.
+	 *
+	 * @param {string} sGroupId - The group ID for the read request
+	 * @param {number} iStart - The start index for the read
+	 * @returns {number} The offset
+	 */
+	_CollectionCache.prototype.getReadOffset = function (sGroupId, iStart) {
+		var iOffset = 0;
+
+		(this.aElements.$deleted || []).forEach(function (oDeleteInfo) {
+			// if deleting in the same group, the entity is gone when the server reads
+			// created-persisted entities are excluded via filter
+			if (oDeleteInfo.groupId !== sGroupId && !oDeleteInfo.created
+					&& oDeleteInfo.index <= iStart) {
+				iOffset += 1;
+			}
+		});
+
+		return iOffset;
+	};
+
 	/**
 	 * Returns the resource path including the query string with $skip and $top if needed.
 	 *
@@ -2816,6 +2949,9 @@ sap.ui.define([
 	 *   The number of transient elements within the given group
 	 * @param {function} [fnDataRequested]
 	 *   The function is called when the back-end requests have been sent.
+	 * @returns {sap.ui.base.SyncPromise}
+	 *   A promise resolving without a defined result when the request is finished and rejecting in
+	 *   case of error
 	 * @throws {Error}
 	 *   If group ID is '$cached'. The error has a property <code>$cached = true</code>
 	 *
@@ -2823,7 +2959,8 @@ sap.ui.define([
 	 */
 	_CollectionCache.prototype.requestElements = function (iStart, iEnd, oGroupLock,
 			iTransientElements, fnDataRequested) {
-		var oPromise,
+		var iOffset = this.getReadOffset(oGroupLock.getGroupId(), iStart),
+			oPromise,
 			oReadRequest = {
 				iEnd : iEnd,
 				iStart : iStart
@@ -2833,8 +2970,9 @@ sap.ui.define([
 		this.aReadRequests.push(oReadRequest);
 		this.bSentRequest = true;
 		oPromise = SyncPromise.all([
-			this.oRequestor.request("GET", this.getResourcePathWithQuery(iStart, iEnd), oGroupLock,
-				undefined, undefined, fnDataRequested),
+			this.oRequestor.request("GET",
+				this.getResourcePathWithQuery(iStart + iOffset, iEnd + iOffset),
+				oGroupLock, undefined, undefined, fnDataRequested),
 			this.fetchTypes()
 		]).then(function (aResult) {
 			var iFiltered;
@@ -2855,6 +2993,8 @@ sap.ui.define([
 
 		// Note: oPromise MUST be a SyncPromise for performance reasons, see SyncPromise#all
 		this.fill(oPromise, iStart, iEnd);
+
+		return oPromise;
 	};
 
 	/**
@@ -2869,9 +3009,6 @@ sap.ui.define([
 	 *   The "14.5.11 Expression edm:NavigationPropertyPath" or
 	 *   "14.5.13 Expression edm:PropertyPath" strings describing which properties need to be loaded
 	 *   because they may have changed due to side effects of a previous update
-	 * @param {object} mNavigationPropertyPaths
-	 *   Hash set of collection-valued navigation property meta paths (relative to this cache's
-	 *   root) which need to be refreshed, maps string to <code>true</code>; is modified
 	 * @param {string[]} aPredicates
 	 *   The key predicates of the root elements to request side effects for
 	 * @param {boolean} bSingle
@@ -2886,8 +3023,8 @@ sap.ui.define([
 	 *
 	 * @public
 	 */
-	_CollectionCache.prototype.requestSideEffects = function (oGroupLock, aPaths,
-			mNavigationPropertyPaths, aPredicates, bSingle) {
+	_CollectionCache.prototype.requestSideEffects = function (oGroupLock, aPaths, aPredicates,
+			bSingle) {
 		var aElements,
 			iMaxIndex = -1,
 			mMergeableQueryOptions,
@@ -2902,15 +3039,13 @@ sap.ui.define([
 
 		if (this.oPendingRequestsPromise) {
 			return this.oPendingRequestsPromise.then(function () {
-				return that.requestSideEffects(oGroupLock, aPaths, mNavigationPropertyPaths,
-					aPredicates, bSingle);
+				return that.requestSideEffects(oGroupLock, aPaths, aPredicates, bSingle);
 			});
 		}
 
 		mQueryOptions = _Helper.intersectQueryOptions(
 			Object.assign({}, this.mQueryOptions, this.mLateQueryOptions), aPaths,
-			this.oRequestor.getModelInterface().fetchMetadata, this.sMetaPath,
-			mNavigationPropertyPaths, "", true);
+			this.oRequestor.getModelInterface().fetchMetadata, this.sMetaPath, "", true);
 		if (!mQueryOptions) {
 			return SyncPromise.resolve(); // micro optimization: use *sync.* promise which is cached
 		}
@@ -3193,7 +3328,7 @@ sap.ui.define([
 				fnDataRequested, undefined, this.sMetaPath));
 		}
 		return this.oPromise.then(function (oResult) {
-			that.registerChange("", oListener);
+			that.registerChangeListener("", oListener);
 			// Note: For a null value, null is returned due to "204 No Content". For $count,
 			// "a simple primitive integer value with media type text/plain" is returned.
 			return oResult && typeof oResult === "object" ? oResult.value : oResult;
@@ -3319,7 +3454,7 @@ sap.ui.define([
 			if (oResult && oResult["$ui5.deleted"]) {
 				throw new Error("Cannot read a deleted entity");
 			}
-			that.registerChange(sPath, oListener);
+			that.registerChangeListener(sPath, oListener);
 			return that.drillDown(oResult, sPath, oGroupLock, bCreateOnDemand);
 		});
 	};
@@ -3457,9 +3592,6 @@ sap.ui.define([
 	 *   The "14.5.11 Expression edm:NavigationPropertyPath" or
 	 *   "14.5.13 Expression edm:PropertyPath" strings describing which properties need to be loaded
 	 *   because they may have changed due to side effects of a previous update
-	 * @param {object} mNavigationPropertyPaths
-	 *   Hash set of collection-valued navigation property meta paths (relative to this cache's
-	 *   root) which need to be refreshed, maps string to <code>true</code>; is modified
 	 * @param {string} [sResourcePath=this.sResourcePath]
 	 *   A resource path relative to the service URL; it must not contain a query string
 	 * @returns {Promise|sap.ui.base.SyncPromise}
@@ -3470,8 +3602,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 */
-	_SingleCache.prototype.requestSideEffects = function (oGroupLock, aPaths,
-			mNavigationPropertyPaths, sResourcePath) {
+	_SingleCache.prototype.requestSideEffects = function (oGroupLock, aPaths, sResourcePath) {
 		var mMergeableQueryOptions,
 			mQueryOptions,
 			oResult,
@@ -3482,8 +3613,7 @@ sap.ui.define([
 
 		mQueryOptions = this.oPromise && _Helper.intersectQueryOptions(
 			Object.assign({}, this.mQueryOptions, this.mLateQueryOptions), aPaths,
-			this.oRequestor.getModelInterface().fetchMetadata,
-			this.sMetaPath, mNavigationPropertyPaths);
+			this.oRequestor.getModelInterface().fetchMetadata, this.sMetaPath);
 		if (!mQueryOptions) {
 			return SyncPromise.resolve();
 		}