@openui5/sap.ui.core 1.112.2 → 1.113.0

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

@@ -41,6 +41,7 @@ sap.ui.define([
 	 *   Whether a grand total is needed
 	 *
 	 * @alias sap.ui.model.odata.v4.lib._AggregationCache
+	 * @borrows sap.ui.model.odata.v4.lib._CollectionCache#addKeptElement as #addKeptElement
 	 * @borrows sap.ui.model.odata.v4.lib._CollectionCache#requestSideEffects as #requestSideEffects
 	 * @constructor
 	 * @extends sap.ui.model.odata.v4.lib._Cache
@@ -80,6 +81,7 @@ sap.ui.define([
 			}
 		}
 		this.oFirstLevel = this.createGroupLevelCache(null, bHasGrandTotal || !!fnLeaves);
+		this.addKeptElement = this.oFirstLevel.addKeptElement; // @borrows ...
 		this.requestSideEffects = this.oFirstLevel.requestSideEffects; // @borrows ...
 		this.oGrandTotalPromise = undefined;
 		if (bHasGrandTotal) {
@@ -131,17 +133,20 @@ sap.ui.define([
 	 *   level cache is given
 	 * @throws {Error}
 	 *   In case an unexpected element or placeholder would be overwritten, if the given offset is
-	 *   negative, if a resulting array index is out of bounds, or in case of a duplicate predicate
+	 *   negative, if a resulting array index is out of bounds, in case of a duplicate predicate, or
+	 *   if a kept-alive element has been modified on both client and server
 	 *
 	 * @private
 	 */
 	_AggregationCache.prototype.addElements = function (vReadElements, iOffset, oCache, iStart) {
 		var aElements = this.aElements,
-			sNodeProperty = this.oAggregation.$NodeProperty;
+			sHierarchyQualifier = this.oAggregation.hierarchyQualifier,
+			sNodeProperty = this.oAggregation.$NodeProperty,
+			that = this;
 
 		function addElement(oElement, i) {
 			var oOldElement = aElements[iOffset + i],
-				oOtherElement,
+				oKeptElement,
 				sPredicate = _Helper.getPrivateAnnotation(oElement, "predicate");
 
 			if (oOldElement) { // check before overwriting
@@ -153,10 +158,20 @@ sap.ui.define([
 			} else if (iOffset + i >= aElements.length) {
 				throw new Error("Array index out of bounds: " + (iOffset + i));
 			}
-			oOtherElement = aElements.$byPredicate[sPredicate];
-			if (oOtherElement && oOtherElement !== oElement
-					&& !(oOtherElement instanceof SyncPromise)) {
-				throw new Error("Duplicate predicate: " + sPredicate);
+			oKeptElement = aElements.$byPredicate[sPredicate];
+			if (oKeptElement && oKeptElement !== oElement
+					&& !(oKeptElement instanceof SyncPromise)) {
+				if (!sHierarchyQualifier) {
+					throw new Error("Duplicate predicate: " + sPredicate);
+				}
+				if (!oKeptElement["@odata.etag"]
+						|| oElement["@odata.etag"] === oKeptElement["@odata.etag"]) {
+					// no ETag used or known yet, or ETag unchanged
+					_Helper.updateNonExisting(oElement, oKeptElement);
+				} else if (that.hasPendingChangesForPath(sPredicate)) {
+					throw new Error("Modified on client and on server: "
+						+ that.sResourcePath + sPredicate);
+				} // else: ETag changed, ignore kept element!
 			}
 
 			aElements.$byPredicate[sPredicate] = aElements[iOffset + i] = oElement;
@@ -959,12 +974,66 @@ sap.ui.define([
 	};
 
 	/**
-	 * Refreshes the kept-alive elements. Nothing to do here, we have no kept-alive elements.
-	 *
-	 * @public
-	 * @see sap.ui.model.odata.v4.lib._CollectionCache#refreshKeptElements
+	 * @override sap.ui.model.odata.v4.lib._CollectionCache#refreshKeptElements
 	 */
-	_AggregationCache.prototype.refreshKeptElements = function () {};
+	_AggregationCache.prototype.refreshKeptElements = function (oGroupLock, fnOnRemove) {
+		// "super" call (like @borrows ...)
+		return this.oFirstLevel.refreshKeptElements.call(this, oGroupLock, fnOnRemove, true);
+	};
+
+	/**
+	 * @override sap.ui.model.odata.v4.lib._CollectionCache#reset
+	 */
+	_AggregationCache.prototype.reset = function (aKeptElementPredicates, sGroupId, mQueryOptions,
+			oAggregation, bIsGrouped) {
+		var fnResolve,
+			that = this;
+
+		if (bIsGrouped) {
+			throw new Error("Unsupported grouping via sorter");
+		}
+
+		aKeptElementPredicates.forEach(function (sPredicate) {
+			var oKeptElement = that.aElements.$byPredicate[sPredicate];
+
+			if (_Helper.hasPrivateAnnotation(oKeptElement, "placeholder")) {
+				throw new Error("Unexpected placeholder");
+			}
+			delete oKeptElement["@$ui5.node.isExpanded"];
+			delete oKeptElement["@$ui5.node.level"];
+			delete oKeptElement["@$ui5._"];
+			_Helper.setPrivateAnnotation(oKeptElement, "predicate", sPredicate);
+		});
+
+		this.oAggregation = oAggregation;
+		this.sDownloadUrl = _Cache.prototype.getDownloadUrl.call(this, "");
+		// "super" call (like @borrows ...)
+		this.oFirstLevel.reset.call(this, aKeptElementPredicates, sGroupId, mQueryOptions);
+		if (sGroupId) {
+			this.oBackup.oCountPromise = this.oCountPromise;
+			this.oBackup.oFirstLevel = this.oFirstLevel;
+		}
+		this.oCountPromise = undefined;
+		if (mQueryOptions.$count) {
+			this.oCountPromise = new SyncPromise(function (resolve) {
+				fnResolve = resolve;
+			});
+			this.oCountPromise.$resolve = fnResolve;
+		}
+		this.oFirstLevel = this.createGroupLevelCache();
+	};
+
+	/**
+	 * @override sap.ui.model.odata.v4.lib._CollectionCache#restore
+	 */
+	_AggregationCache.prototype.restore = function (bReally) {
+		if (bReally) {
+			this.oCountPromise = this.oBackup.oCountPromise;
+			this.oFirstLevel = this.oBackup.oFirstLevel;
+		}
+		// "super" call (like @borrows ...)
+		this.oFirstLevel.restore.call(this, bReally);
+	};
 
 	/**
 	 * Returns the cache's URL.
@@ -1162,10 +1231,6 @@ sap.ui.define([
 	 *   Example: Products
 	 * @param {string} sDeepResourcePath
 	 *   The deep resource path to be used to build the target path for bound messages
-	 * @param {object} [oAggregation]
-	 *   An object holding the information needed for data aggregation; see also "OData Extension
-	 *   for Data Aggregation Version 4.0"; must already be normalized by
-	 *   {@link _AggregationHelper.buildApply}
 	 * @param {object} mQueryOptions
 	 *   A map of key-value pairs representing the query string, the value in this pair has to
 	 *   be a string or an array of strings; if it is an array, the resulting query string
@@ -1174,6 +1239,10 @@ sap.ui.define([
 	 *   Examples:
 	 *   {foo : "bar", "bar" : "baz"} results in the query string "foo=bar&bar=baz"
 	 *   {foo : ["bar", "baz"]} results in the query string "foo=bar&foo=baz"
+	 * @param {object} [oAggregation]
+	 *   An object holding the information needed for data aggregation; see also "OData Extension
+	 *   for Data Aggregation Version 4.0"; must already be normalized by
+	 *   {@link _AggregationHelper.buildApply}
 	 * @param {boolean} [bSortExpandSelect]
 	 *   Whether the paths in $expand and $select shall be sorted in the cache's query string. When
 	 *   using min, max, grand total, or data aggregation they will always be sorted.
@@ -1196,8 +1265,8 @@ sap.ui.define([
 	 *
 	 * @public
 	 */
-	_AggregationCache.create = function (oRequestor, sResourcePath, sDeepResourcePath, oAggregation,
-			mQueryOptions, bSortExpandSelect, bSharedRequest, bIsGrouped) {
+	_AggregationCache.create = function (oRequestor, sResourcePath, sDeepResourcePath,
+			mQueryOptions, oAggregation, bSortExpandSelect, bSharedRequest, bIsGrouped) {
 		var bHasGrandTotal, bHasGroupLevels;
 
 		function checkExpandSelect() {

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

@@ -518,7 +518,7 @@ sap.ui.define([
 					+ (sPath || "")
 					+ ",HierarchyQualifier='" + sHierarchyQualifier
 					+ "',NodeProperty='" + sNodeProperty
-					+ "',Levels=" + (bAllLevels ? 9 : oAggregation.expandTo || 1)
+					+ "',Levels=" + (bAllLevels ? 999 : oAggregation.expandTo || 1)
 					+ ")";
 				if (bAllLevels) {
 					select("DistanceFromRootProperty");

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

@@ -168,6 +168,7 @@ sap.ui.define([
 				oEntity = vDeleteProperty
 					? vCacheData[vCachePath] || vCacheData.$byPredicate[vCachePath]
 					: vCacheData, // deleting at root level
+				oError,
 				sGroupId,
 				aMessages,
 				mHeaders,
@@ -223,8 +224,16 @@ sap.ui.define([
 				if (typeof sTransientGroup !== "string") {
 					throw new Error("No 'delete' allowed while waiting for server response");
 				}
-				that.oRequestor.removePost(sTransientGroup, oEntity);
-
+				if (vCacheData.$postBodyCollection) { // within a deep create
+					vCacheData.$postBodyCollection.splice(iIndex, 1);
+					that.removeElement(vCacheData, iIndex, sTransientPredicate, sParentPath);
+					fnCallback(iIndex, -1);
+					oError = new Error("Deleted from deep create");
+					oError.canceled = true;
+					_Helper.getPrivateAnnotation(oEntity, "reject")(oError);
+				} else {
+					that.oRequestor.removePost(sTransientGroup, oEntity);
+				}
 				return undefined;
 			}
 
@@ -361,20 +370,37 @@ sap.ui.define([
 			sName = aSegments.pop(),
 			oParent = this.fetchValue(_GroupLock.$cached, aSegments.join("/")).getResult(),
 			oPostBody = _Helper.getPrivateAnnotation(oParent, "postBody"),
+			aPostBodyCollection,
 			that = this;
 
-		this.checkSharedRequest();
-		if (sName in oParent) {
-			throw new Error("Deep create with initial data is not supported yet");
+		function setPostBodyCollection() {
+			aElements.$postBodyCollection = oPostBody[sName] = aPostBodyCollection;
 		}
-		aElements = oParent[sName] = [];
-		aElements.$count = aElements.$created = 0;
+
+		this.checkSharedRequest();
+		aElements = oParent[sName] = oParent[sName] || [];
+		aElements.$count = aElements.$created = aElements.length;
 		aElements.$byPredicate = {};
-		// allow creating on demand when there is a create in the child list
-		aElements.$postBodyCollection = function () {
-			aElements.$postBodyCollection = oPostBody[sName] = [];
-		};
+		aPostBodyCollection = oPostBody[sName] || [];
+		if (aElements.length) {
+			setPostBodyCollection();
+		} else {
+			// allow creating on demand when there is a create in the child list
+			aElements.$postBodyCollection = setPostBodyCollection;
+		}
 		aElements.$select = aSelect;
+		aElements.forEach(function (oElement, i) {
+			var sTransientPredicate = "($uid=" + _Helper.uid() + ")";
+
+			oElement["@$ui5.context.isTransient"] = true;
+			_Helper.setPrivateAnnotation(oElement, "postBody", aPostBodyCollection[i]);
+			_Helper.setPrivateAnnotation(oElement, "transient",
+				_Helper.getPrivateAnnotation(oParent, "transient"));
+			_Helper.setPrivateAnnotation(oElement, "transientPredicate", sTransientPredicate);
+			_Helper.setPrivateAnnotation(oElement, "promise",
+				_Helper.addDeepCreatePromise(oElement));
+			aElements.$byPredicate[sTransientPredicate] = oElement;
+		});
 		// add the collection type to mTypeForMetaPath
 		this.fetchTypes().then(function (mTypeForMetaPath) {
 			that.oRequestor.fetchType(mTypeForMetaPath,
@@ -593,7 +619,8 @@ sap.ui.define([
 
 				_Helper.deletePrivateAnnotation(oEntityData, "postBody");
 				_Helper.deletePrivateAnnotation(oEntityData, "transient");
-				oEntityData["@$ui5.context.isTransient"] = false;
+				// ensure that change listeners are informed via updateSelected
+				aResult[0]["@$ui5.context.isTransient"] = false;
 				_Helper.removeByPath(that.mPostRequests, sPath, oEntityData);
 				that.visitResponse(oCreatedEntity, aResult[1],
 					_Helper.getMetaPath(_Helper.buildPath(that.sMetaPath, sPath)),
@@ -621,8 +648,10 @@ sap.ui.define([
 				_Helper.updateSelected(that.mChangeListeners, sResultingPath, oEntityData,
 					oCreatedEntity, aSelect, /*fnCheckKeyPredicate*/ undefined,
 					/*bOkIfMissing*/ true);
-				// update properties from collections in a deep create
-				that.updateNestedCreates(sResultingPath, oEntityData, oCreatedEntity);
+				_Helper.setPrivateAnnotation(oEntityData, "deepCreate",
+					// update properties from collections in a deep create
+					that.updateNestedCreates(sResultingPath, oEntityData, oCreatedEntity)
+				);
 
 				that.removePendingRequest();
 				fnResolve(true);
@@ -1067,7 +1096,7 @@ sap.ui.define([
 					+ sOldPredicate + " to " + sNewPredicate);
 			}
 			// only check for ETag change if the cache contains one; otherwise either the cache
-			// element is empty (via #createEmptyElement) or the server did not send one last time
+			// element is empty (via #addKeptElement) or the server did not send one last time
 			if (oResource["@odata.etag"] && oData["@odata.etag"] !== oResource["@odata.etag"]) {
 				throw new Error("GET " + sRequestPath + ": ETag changed");
 			}
@@ -2319,17 +2348,20 @@ sap.ui.define([
 	};
 
 	/**
-	 * Creates key predicates and updates listeners for nested entity collections after a deep
-	 * create.
+	 * Creates key predicates and rebuilds the nested entity collections after a deep create (in the
+	 * assumption that the response may differ significantly from the request regarding order and
+	 * count).
 	 *
 	 * @param {string} sPath - The path of the created entity within the cache
 	 * @param {object} oEntity - The entity in the cache
 	 * @param {object} oCreatedEntity - The created entity from the response
+	 * @returns {boolean} Whether there actually was a deep create
 	 *
 	 * @private
 	 */
 	_Cache.prototype.updateNestedCreates = function (sPath, oEntity, oCreatedEntity) {
-		var that = this;
+		var bDeepCreate = false,
+			that = this;
 
 		Object.keys(oEntity).forEach(function (sSegment) {
 			var vCollection = oEntity[sSegment],
@@ -2339,37 +2371,38 @@ sap.ui.define([
 
 			if (vCollection && vCollection.$postBodyCollection) {
 				aCreatedCollection = oCreatedEntity[sSegment];
-				if (aCreatedCollection) { // otherwise no create was called in nested list binding
+				if (aCreatedCollection) { // it really is a deep create
 					sCollectionPath = sPath + "/" + sSegment;
 					aSelect = vCollection.$select
 						|| _Helper.getQueryOptionsForPath(that.mQueryOptions, sCollectionPath)
 							.$select;
+					// call all resolve functions
+					vCollection.forEach(function (oElement) {
+						_Helper.getPrivateAnnotation(oElement, "resolve")();
+					});
+					// rebuild the collection from the response only taking the selected properties
+					vCollection.$created = 0;
+					vCollection.$byPredicate = {};
+					vCollection.length = aCreatedCollection.length;
+					setCount(that.mChangeListeners, sCollectionPath, vCollection,
+						vCollection.length);
 					aCreatedCollection.forEach(function (oCreatedChildEntity, i) {
-						var oChildEntity = vCollection[i],
-							sPredicate
-								= _Helper.getPrivateAnnotation(oCreatedChildEntity, "predicate"),
-							fnResolve = _Helper.getPrivateAnnotation(oChildEntity, "resolve"),
-							sTransientPredicate = _Helper.getPrivateAnnotation(oChildEntity,
-								"transientPredicate");
+						var sPredicate
+								= _Helper.getPrivateAnnotation(oCreatedChildEntity, "predicate");
 
-						_Helper.updateTransientPaths(that.mChangeListeners, sTransientPredicate,
-							sPredicate);
-						vCollection.$byPredicate[sPredicate] = oChildEntity;
-						_Helper.updateSelected(that.mChangeListeners, sCollectionPath + sPredicate,
-							oChildEntity, oCreatedChildEntity, aSelect,
-							/*fnCheckKeyPredicate*/undefined, true);
-						_Helper.deletePrivateAnnotation(oChildEntity, "postBody");
-						_Helper.deletePrivateAnnotation(oChildEntity, "reject");
-						_Helper.deletePrivateAnnotation(oChildEntity, "resolve");
-						_Helper.deletePrivateAnnotation(oChildEntity, "transient");
-						delete oChildEntity["@$ui5.context.isTransient"];
-						fnResolve(oChildEntity); // resolve the create promise
+						vCollection.$byPredicate[sPredicate] = vCollection[i] = {};
+						// no change events, the listeners are recreated anyway
+						_Helper.updateSelected({}, sCollectionPath + sPredicate, vCollection[i],
+							oCreatedChildEntity, aSelect, /*fnCheckKeyPredicate*/undefined, true);
 					});
 				}
 				delete vCollection.$postBodyCollection;
 				delete vCollection.$select;
+				bDeepCreate = true;
 			}
 		});
+
+		return bDeepCreate;
 	};
 
 	/**
@@ -2658,27 +2691,6 @@ sap.ui.define([
 		}
 	};
 
-	/**
-	 * Creates an empty element for the given predicate to the cache, adds it to the cache and
-	 * returns it.
-	 *
-	 * @param {string} sPredicate - The predicate
-	 * @returns {object} The empty element
-	 * @throws {Error}
-	 *   If the cache is shared
-	 *
-	 * @public
-	 */
-	_CollectionCache.prototype.createEmptyElement = function (sPredicate) {
-		var oElement = {};
-
-		this.checkSharedRequest();
-		_Helper.setPrivateAnnotation(oElement, "predicate", sPredicate);
-		this.aElements.$byPredicate[sPredicate] = oElement;
-
-		return oElement;
-	};
-
 	/**
 	 * Replaces the old element at the given index with the given new element.
 	 *
@@ -3016,6 +3028,8 @@ sap.ui.define([
 	 *   A map from meta path to the entity type (as delivered by {@link #fetchTypes})
 	 * @returns {number}
 	 *   The number of newly created elements filtered out from the given result
+	 * @throws {Error}
+	 *   If a kept-alive element has been modified on both client and server
 	 *
 	 * @private
 	 */
@@ -3038,7 +3052,7 @@ sap.ui.define([
 				oKeptElement = aElements.$byPredicate[sPredicate];
 				if (oKeptElement) {
 					// only check for ETag change if the cache contains one; otherwise either the
-					// cache element is empty (via #createEmptyElement) or the server did not send
+					// cache element is empty (via #addKeptElement) or the server did not send
 					// one last time
 					if (!oKeptElement["@odata.etag"]
 							|| oElement["@odata.etag"] === oKeptElement["@odata.etag"]) {
@@ -3053,7 +3067,7 @@ sap.ui.define([
 					} else if (this.hasPendingChangesForPath(sPredicate)) {
 						throw new Error("Modified on client and on server: "
 							+ this.sResourcePath + sPredicate);
-					} // else: if POST and GET are in the same $batch, ETag cannot differ!
+					} // else: ETag changed, ignore kept element!
 				}
 				aElements.$byPredicate[sPredicate] = oElement;
 			}
@@ -3250,6 +3264,8 @@ sap.ui.define([
 	 * @param {function(string,number)} fnOnRemove
 	 *   A function which is called with predicate and index if a kept-alive or created element does
 	 *   no longer exist after refresh; the index is undefined for a non-created element
+	 * @param {boolean} [bDropApply]
+	 *   Whether to drop the "$apply" system query option from the resulting GET
 	 * @returns {Promise|undefined}
 	 *   A promise resolving without a defined result, or rejecting with an error if the refresh
 	 *   fails, or <code>undefined</code> if there are no kept-alive elements.
@@ -3258,7 +3274,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 */
-	_CollectionCache.prototype.refreshKeptElements = function (oGroupLock, fnOnRemove) {
+	_CollectionCache.prototype.refreshKeptElements = function (oGroupLock, fnOnRemove, bDropApply) {
 		var that = this,
 			// Note: at this time only kept-alive and created elements are in the cache, but we
 			// don't care if $byPredicate still contains two entries for the same element
@@ -3278,6 +3294,9 @@ sap.ui.define([
 			if (that.mLateQueryOptions) {
 				_Helper.aggregateExpandSelect(mQueryOptions, that.mLateQueryOptions);
 			}
+			if (bDropApply) {
+				delete mQueryOptions.$apply;
+			}
 			delete mQueryOptions.$count;
 			delete mQueryOptions.$orderby;
 			delete mQueryOptions.$search;
@@ -3297,8 +3316,10 @@ sap.ui.define([
 		}
 
 		/*
-		 * Tells whether a refresh is needed for the given predicate. Transient predicates and
-		 * elements with pending changes need no refresh.
+		 * Tells whether a refresh is needed for the given predicate. Transient predicates,
+		 * elements with pending changes, and empty elements just created via
+		 * {@link sap.ui.model.odata.v4.ODataModel#getKeepAliveContext} but not yet read, need no
+		 * refresh.
 		 *
 		 * @param {string} sPredicate - A key predicate
 		 * @returns {boolean} - Whether a refresh is needed
@@ -3307,6 +3328,7 @@ sap.ui.define([
 			var oElement = that.aElements.$byPredicate[sPredicate];
 
 			return _Helper.getPrivateAnnotation(oElement, "predicate") === sPredicate
+				&& Object.keys(oElement).length > 1 // entity has key properties
 				&& !that.hasPendingChangesForPath(sPredicate);
 		}
 
@@ -3535,13 +3557,22 @@ sap.ui.define([
 	 *   The group ID used for a side-effects refresh; if given, only inline creation
 	 *   rows and transient elements with a different batch group shall be kept in place and a
 	 *   backup shall be remembered for a later {@link #restore}
+	 * @param {object} [mQueryOptions]
+	 *   The new query options
+	 * @param {object} [_oAggregation]
+	 *   An object holding the information needed for data aggregation; see also "OData Extension
+	 *   for Data Aggregation Version 4.0"; must already be normalized by
+	 *   {@link _AggregationHelper.buildApply}
+	 * @param {boolean} [_bIsGrouped]
+	 *   Whether the list binding is grouped via its first sorter
 	 * @throws {Error}
 	 *   If a cache is shared and a group ID is given
 	 *
 	 * @public
 	 * @see _Cache#hasPendingChangesForPath
 	 */
-	_CollectionCache.prototype.reset = function (aKeptElementPredicates, sGroupId) {
+	_CollectionCache.prototype.reset = function (aKeptElementPredicates, sGroupId, mQueryOptions,
+			_oAggregation, _bIsGrouped) {
 		var mByPredicate = this.aElements.$byPredicate,
 			mChangeListeners = this.mChangeListeners,
 			iCreated = 0, // index (and finally number) of created elements that we keep
@@ -3564,6 +3595,10 @@ sap.ui.define([
 			};
 		}
 
+		if (mQueryOptions) {
+			this.setQueryOptions(mQueryOptions, true);
+		}
+
 		for (i = 0; i < this.aElements.$created; i += 1) {
 			oElement = this.aElements[i];
 			sTransientGroup = _Helper.getPrivateAnnotation(oElement, "transient");

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

@@ -297,7 +297,7 @@ sap.ui.define([
 		 * Converts the select paths into an object where each of the selected properties has the
 		 * value <code>true</code>, unless a (complex) parent property is also selected.
 		 *
-		 * @param {string[]} aSelect - The list of selected paths
+		 * @param {string[]} [aSelect] - The list of selected paths
 		 * @returns {object|boolean} - An object marking the selected properties or
 		 *    <code>true</code> if all properties are selected ("*")
 		 */
@@ -507,6 +507,7 @@ sap.ui.define([
 			}
 			if (sRetryAfter) {
 				iRetryAfter = parseInt(sRetryAfter);
+				// no need to use UI5Date.getInstance as only the timestamp is relevant
 				oResult.retryAfter = new Date(Number.isNaN(iRetryAfter)
 					? sRetryAfter
 					: Date.now() + iRetryAfter * 1000);
@@ -1401,6 +1402,25 @@ sap.ui.define([
 			return sPath.replace(rNotMetaContext, "").slice(1);
 		},
 
+		/**
+		 * Returns a list of properties that would be expected due to $select/$expand, but are
+		 * missing in vEntityOrCollection. Does not analyze $expand any further, only checks whether
+		 * there is data for the navigation property itself (relying on requestSideEffects to take
+		 * care of the details).
+		 *
+		 * @param {object|object[]} vEntityOrCollection - The entity (collection)
+		 * @param {object} mQueryOptions - The query options (only $select and $expand required)
+		 * @returns {string[]}
+		 *   A list of paths relative to vEntityOrCollection for which the property value is missing
+		 * @throws {Error} If there is a path containing "*"
+		 */
+		getMissingPropertyPaths : function (vEntityOrCollection, mQueryOptions) {
+			return (mQueryOptions.$select || []).concat(Object.keys(mQueryOptions.$expand || {}))
+				.filter(function (sPath) {
+					return _Helper.isMissingProperty(vEntityOrCollection, sPath);
+				});
+		},
+
 		/**
 		 * Returns the list of predicates corresponding to the given list of contexts, or
 		 * <code>null</code if at least one predicate is missing.
@@ -1802,6 +1822,41 @@ sap.ui.define([
 				&& !mParameters.$$aggregation.hierarchyQualifier;
 		},
 
+		/**
+		 * Returns whether the given property is missing in vEntityOrCollection. This is the case if
+		 * there is no value for it. It is not missing if a parent has a <code>null</code> value. In
+		 * a collection it is missing if any member misses it.
+		 *
+		 * @param {object|object[]} vEntityOrCollection - The entity (collection)
+		 * @param {string} sPath - The property path
+		 * @returns {boolean} Whether the property is missing
+		 * @throws {Error} If there is a path containing "*"
+		 */
+		isMissingProperty : function (vEntityOrCollection, sPath) {
+			var aSegments = sPath.split("/");
+
+			// Checks whether the sub-path in aSegments starting at index i is missing in vValue
+			function isMissing(vValue, i) {
+				var vProperty;
+
+				if (Array.isArray(vValue)) {
+					return vValue.some(function (vItem) {
+						return isMissing(vItem, i);
+					});
+				}
+				vProperty = vValue[aSegments[i]];
+				if (vProperty && typeof vProperty === "object" && i + 1 < aSegments.length) {
+					return isMissing(vProperty, i + 1);
+				}
+				return vProperty === undefined;
+			}
+
+			if (sPath.includes("*")) {
+				throw new Error("Unsupported property path " + sPath);
+			}
+			return isMissing(vEntityOrCollection, 0);
+		},
+
 		/**
 		 * Tells whether the value is a safe integer.
 		 *
@@ -2526,7 +2581,7 @@ sap.ui.define([
 						// copy complete collection; no change events as long as collection-valued
 						// properties are not supported; transient entity collections from a deep
 						// insert are handled elsewhere
-						if (!(vTargetProperty && vTargetProperty.$transient)) {
+						if (!(vTargetProperty && vTargetProperty.$postBodyCollection)) {
 							oTarget[sProperty] = vSourceProperty;
 						}
 					} else if (vSourceProperty && typeof vSourceProperty === "object"

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

@@ -115,6 +115,7 @@ sap.ui.define([
 		if (!aMatches) {
 			throw new Error("Not a valid Edm.DateTime value '" + sV2Value + "'");
 		}
+		// no need to use UI5Date.getInstance as only UTC is relevant
 		oDate = new Date(parseInt(aMatches[1]));
 		if (Number(aMatches[1] % (24 * 60 * 60 * 1000)) !== 0) {
 			throw new Error("Cannot convert Edm.DateTime value '" + sV2Value
@@ -171,6 +172,7 @@ sap.ui.define([
 				UTC : true
 			});
 		}
+		// no need to use UI5Date.getInstance as only UTC is relevant
 		return mPattern2Formatter[sPattern].format(new Date(iTicks)) + sOffset;
 	};
 
@@ -401,6 +403,7 @@ sap.ui.define([
 		}
 
 		iTicks = Date.UTC(1970, 0, 1, aMatches[1] || 0, aMatches[2] || 0, aMatches[3] || 0);
+		// no need to use UI5Date.getInstance as only UTC is relevant
 		oDate = new Date(iTicks);
 		return oTimeFormatter.format(oDate) + (aMatches[4] || "");
 	};

package/src/sap/ui/model/resource/ResourceModel.js

@@ -229,7 +229,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 */
 	var ResourceModel = Model.extend("sap.ui.model.resource.ResourceModel", /** @lends sap.ui.model.resource.ResourceModel.prototype */ {
 

package/src/sap/ui/model/type/Boolean.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/model/SimpleType', 'sap/ui/model/FormatException', 'sap/u
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Currency.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Date.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.

package/src/sap/ui/model/type/DateInterval.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 *
 	 * @alias sap.ui.model.type.DateInterval
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/DateTime.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.