@openui5/sap.ui.core 1.128.0 → 1.130.0

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

@@ -758,6 +758,16 @@ sap.ui.define([
 				}
 			}
 
+			const aSeparateRequestRanges = that.mSeparateProperty2ReadRequest?.[sSegment];
+			if (aSeparateRequestRanges) {
+				// separate properties always operate on entities of that.aElements
+				const iIndex = that.aElements.indexOf(oValue);
+				if (aSeparateRequestRanges.some(
+						(oRange) => iIndex >= oRange.start && iIndex < oRange.end)) {
+					return undefined; // separate property request still pending
+				}
+			}
+
 			vPermissions = oValue[_Helper.getAnnotationKey(oValue, ".Permissions", sSegment)];
 			if (vPermissions === 0 || vPermissions === "None") {
 				return undefined;
@@ -783,6 +793,9 @@ sap.ui.define([
 								+ that.sResourcePath, sPropertyPath);
 						}
 					}
+					if (!bAgain && oValue[sSegment + "@$ui5.noData"]) {
+						return undefined; // Note: do not use null here!
+					}
 					if (!bTransient) {
 						// If there is no entity with a key predicate, try it with the cache root
 						// object (in case of SimpleCache, the root object of CollectionCache is an
@@ -1128,32 +1141,6 @@ sap.ui.define([
 	 * @public
 	 */
 
-	/**
-	 * Returns an array containing all current elements of a collection or single cache for the
-	 * given relative path; the array is annotated with the collection's $count. If there are
-	 * pending requests, the corresponding promises will be ignored and set to
-	 * <code>undefined</code>.
-	 *
-	 * @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) {
-		var aAllElements;
-
-		if (sPath) {
-			return this.getValue(sPath);
-		}
-		aAllElements = this.aElements.map(function (oElement) {
-			return oElement instanceof SyncPromise ? undefined : oElement;
-		});
-		aAllElements.$count = this.aElements.$count;
-
-		return aAllElements;
-	};
-
 	/**
 	 * Returns the collection at the given path and removes it from the cache if it is marked as
 	 * transferable.
@@ -1242,6 +1229,34 @@ sap.ui.define([
 				this.getDownloadQueryOptions(mQueryOptions), false, true);
 	};
 
+	/**
+	 * Returns an array containing elements of a collection or single cache for the given relative
+	 * path; the array is annotated with the collection's $count. If no range is given, all elements
+	 * are returned. If there are pending requests, the corresponding promises will be ignored and
+	 * set to <code>undefined</code>.
+	 *
+	 * @param {string} [sPath]
+	 *   Relative path to drill-down into, may be empty (only for collection cache)
+	 * @param {number} [iStart]
+	 *   The start index of the range (inclusive)
+	 * @param {number} [iEnd]
+	 *   The end index of the range (exclusive)
+	 * @returns {object[]|undefined} The cache elements
+	 *
+	 * @public
+	 */
+	_Cache.prototype.getElements = function (sPath, iStart, iEnd) {
+		const aElements = this.getValue(sPath);
+		if (!aElements) {
+			return undefined;
+		}
+		const aFilteredElements = aElements.slice(iStart, iEnd)
+			.map((oElement) => (oElement instanceof SyncPromise ? undefined : oElement));
+		aFilteredElements.$count = aElements.$count;
+
+		return aFilteredElements;
+	};
+
 	/**
 	 * Returns the query options for late properties.
 	 *
@@ -2549,12 +2564,14 @@ sap.ui.define([
 	 *   The deep resource path to be used to build the target path for bound messages
 	 * @param {boolean} [bSharedRequest]
 	 *   If this parameter is set, the cache is read-only and modifying calls lead to an error.
+	 * @param {string[]} [aSeparateProperties]
+	 *   An array of properties which are requested separately
 	 *
 	 * @alias sap.ui.model.odata.v4.lib._CollectionCache
 	 * @constructor
 	 */
 	function _CollectionCache(oRequestor, sResourcePath, mQueryOptions, bSortExpandSelect,
-			sDeepResourcePath, bSharedRequest) {
+			sDeepResourcePath, bSharedRequest, aSeparateProperties) {
 		_Cache.call(this, oRequestor, sResourcePath, mQueryOptions, bSortExpandSelect,
 			sDeepResourcePath, bSharedRequest);
 
@@ -2578,6 +2595,12 @@ sap.ui.define([
 		// - iStart: the start (inclusive)
 		// - iEnd: the end (exclusive)
 		this.aReadRequests = [];
+		this.aSeparateProperties = aSeparateProperties ?? []; // properties to be loaded separately
+		// maps separate property to an array of requested $skip/$top ranges (see aReadRequests)
+		this.mSeparateProperty2ReadRequest = {};
+		this.aSeparateProperties.forEach((sProperty) => {
+			this.mSeparateProperty2ReadRequest[sProperty] = [];
+		});
 		this.bServerDrivenPaging = false;
 		this.oSyncPromiseAll = undefined;
 	}
@@ -2718,6 +2741,8 @@ sap.ui.define([
 			that = this;
 
 		oGroupLock.unlock();
+		that.registerChangeListener(sPath, oListener);
+
 		if (this.aElements.$byPredicate[sFirstSegment]) {
 			oSyncPromise = SyncPromise.resolve(); // sync access possible
 		} else if ((oGroupLock === _GroupLock.$cached || sFirstSegment !== "$count")
@@ -2737,9 +2762,6 @@ sap.ui.define([
 		}
 
 		return oSyncPromise.then(function () {
-			// register afterwards to avoid that updateExisting fires updates before the first
-			// response
-			that.registerChangeListener(sPath, oListener);
 			return that.drillDown(that.aElements, sPath, oGroupLock, bCreateOnDemand);
 		});
 	};
@@ -2823,17 +2845,41 @@ sap.ui.define([
 	 * Returns the query string with $filter adjusted as needed to exclude non-transient created
 	 * elements (which have all key properties available).
 	 *
+	 * @param {string} [sSeparateProperty]
+	 *   If set, only expand the given property; types must already be available (see #getTypes) to
+	 *   determine the origin's key properties
 	 * @returns {string}
 	 *   The query string; it is empty if there are no options; it starts with "?" otherwise
 	 *
 	 * @private
 	 */
-	_CollectionCache.prototype.getQueryString = function () {
+	_CollectionCache.prototype.getQueryString = function (sSeparateProperty) {
 		var sExclusiveFilter = this.getExclusiveFilter(),
 			mQueryOptions = Object.assign({}, this.mQueryOptions),
 			sFilterOptions = mQueryOptions.$filter,
 			sQueryString = this.sQueryString;
 
+		if (this.aSeparateProperties.length) {
+			if (sSeparateProperty) {
+				delete mQueryOptions.$count;
+				mQueryOptions.$expand = {
+					[sSeparateProperty] : mQueryOptions.$expand[sSeparateProperty]
+				};
+				mQueryOptions.$select = [];
+				_Helper.selectKeyProperties(mQueryOptions, this.getTypes()[this.sMetaPath]);
+			} else {
+				mQueryOptions.$expand = {...mQueryOptions.$expand};
+				this.aSeparateProperties.forEach((sProperty) => {
+					delete mQueryOptions.$expand[sProperty];
+				});
+				if (_Helper.isEmptyObject(mQueryOptions.$expand)) {
+					delete mQueryOptions.$expand;
+				}
+			}
+			sQueryString = this.oRequestor.buildQueryString(this.sMetaPath, mQueryOptions, false,
+				this.bSortExpandSelect, true);
+		}
+
 		if (sExclusiveFilter) {
 			if (sFilterOptions) {
 				mQueryOptions.$filter = "(" + sFilterOptions + ") and " + sExclusiveFilter;
@@ -2855,6 +2901,9 @@ sap.ui.define([
 	 *   The start index of the range
 	 * @param {number} iEnd
 	 *   The index after the last element
+	 * @param {string} [sSeparateProperty]
+	 *   If set, only expand the given property; types must already be available (see #getTypes) to
+	 *   determine the origin's key properties
 	 * @returns {string}
 	 *   The resource path including the query string
 	 * @throws {Error}
@@ -2862,9 +2911,10 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	_CollectionCache.prototype.getResourcePathWithQuery = function (iStart, iEnd) {
+	_CollectionCache.prototype.getResourcePathWithQuery = function (iStart, iEnd,
+			sSeparateProperty) {
 		var iCreated = this.aElements.$created,
-			sQueryString = this.getQueryString(),
+			sQueryString = this.getQueryString(sSeparateProperty),
 			sDelimiter = sQueryString ? "&" : "?",
 			iExpectedLength = iEnd - iStart,
 			sResourcePath = this.sResourcePath + sQueryString;
@@ -3029,6 +3079,11 @@ sap.ui.define([
 						throw new Error("Modified on client and on server: "
 							+ this.sResourcePath + sPredicate);
 					} // else: ETag changed, ignore kept element!
+
+					const iIndex = aElements.indexOf(oKeptElement);
+					if (iIndex >= 0 && iIndex !== iStart + i - iOffset) {
+						throw new Error("Duplicate predicate: " + sPredicate);
+					}
 				}
 				aElements.$byPredicate[sPredicate] = oElement;
 			}
@@ -3489,12 +3544,66 @@ sap.ui.define([
 			that.aReadRequests.splice(that.aReadRequests.indexOf(oReadRequest), 1);
 		});
 
+		this.requestSeparateProperties(iStart, iEnd, oPromise);
+
 		// Note: oPromise MUST be a SyncPromise for performance reasons, see SyncPromise#all
 		this.fill(oPromise, iStart, iEnd);
 
 		return oPromise;
 	};
 
+	/**
+	 * Requests the separate properties for the given range and merges them into the aElements list.
+	 *
+	 * @param {number} iStart
+	 *   The start index of the range
+	 * @param {number} iEnd
+	 *   The index after the last element
+	 * @param {sap.ui.base.SyncPromise} oMainPromise
+	 *   A promise which is resolved when the main request is finished
+	 * @returns {Promise<void>}
+	 *   A promise which is resolved without a defined result at no defined point in time
+	 *
+	 * @private
+	 */
+	_CollectionCache.prototype.requestSeparateProperties = async function (iStart, iEnd,
+			oMainPromise) {
+		if (!this.aSeparateProperties.length) {
+			return;
+		}
+
+		// types are needed for selecting the key properties, see #getQueryString called by
+		// #getResourcePathWithQuery
+		const oTypes = await this.fetchTypes();
+		const oReadRange = {start : iStart, end : iEnd};
+		const aRequestPromises = this.aSeparateProperties.map((sProperty) => {
+			this.mSeparateProperty2ReadRequest[sProperty].push(oReadRange);
+			return this.oRequestor.request("GET",
+				this.getResourcePathWithQuery(iStart, iEnd, sProperty),
+				this.oRequestor.lockGroup("$single", this));
+		});
+
+		await oMainPromise;
+		aRequestPromises.forEach(async (oRequestPromise, i) => {
+			const oResult = await oRequestPromise;
+			const sProperty = this.aSeparateProperties[i];
+			const iRangeIndex = this.mSeparateProperty2ReadRequest[sProperty].indexOf(oReadRange);
+			if (iRangeIndex < 0) { // stop import after #reset
+				return;
+			}
+			this.mSeparateProperty2ReadRequest[sProperty].splice(iRangeIndex, 1);
+			this.visitResponse(oResult, oTypes, undefined, undefined, iStart);
+			for (const oSeparateData of oResult.value) {
+				const sPredicate = _Helper.getPrivateAnnotation(oSeparateData, "predicate");
+				const oElement = this.aElements.$byPredicate[sPredicate];
+				if (oElement) {
+					_Helper.updateSelected(this.mChangeListeners, sPredicate, oElement,
+						oSeparateData, [sProperty]);
+				}
+			}
+		});
+	};
+
 	/**
 	 * Returns a promise to be resolved when the side effects have been applied to the elements
 	 * with the given key predicates. All other elements from the back end are discarded!
@@ -3711,6 +3820,9 @@ sap.ui.define([
 		this.aReadRequests?.forEach((oReadRequest) => {
 			oReadRequest.bObsolete = true;
 		});
+		for (const sProperty in this.mSeparateProperty2ReadRequest) {
+			this.mSeparateProperty2ReadRequest[sProperty] = [];
+		}
 		if (mChangeListeners[""]) {
 			this.mChangeListeners[""] = mChangeListeners[""];
 			_Helper.fireChange(this.mChangeListeners, "");
@@ -3881,8 +3993,9 @@ sap.ui.define([
 				this.sResourcePath + this.sQueryString, oGroupLock, undefined, undefined,
 				fnDataRequested, undefined, this.sMetaPath));
 		}
+		that.registerChangeListener("", oListener);
+
 		return this.oPromise.then(function (oResult) {
-			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;
@@ -3924,7 +4037,7 @@ sap.ui.define([
 	 * @param {boolean} [bPost]
 	 *   Whether the cache uses POST requests. If <code>true</code>, the initial request must be
 	 *   done via {@link #post}. {@link #fetchValue} expects to have cache data, but may initiate
-	 *   requests for late properties. If <code>false<code>, {@link #post} throws an error.
+	 *   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]
@@ -4426,13 +4539,15 @@ sap.ui.define([
 	 *   If this parameter is set, multiple requests for a cache using the same resource path will
 	 *   always return the same, shared cache. This cache is read-only, modifying calls lead to an
 	 *   error.
+	 * @param {string[]} [aSeparateProperties]
+	 *   An array of properties which are requested separately
 	 * @returns {sap.ui.model.odata.v4.lib._Cache}
 	 *   The cache
 	 *
 	 * @public
 	 */
 	_Cache.create = function (oRequestor, sResourcePath, mQueryOptions, bSortExpandSelect,
-			sDeepResourcePath, bSharedRequest) {
+			sDeepResourcePath, bSharedRequest, aSeparateProperties) {
 		var iCount, aKeys, sPath, oSharedCollectionCache, mSharedCollectionCacheByPath;
 
 		if (bSharedRequest) {
@@ -4469,7 +4584,7 @@ sap.ui.define([
 		}
 
 		return new _CollectionCache(oRequestor, sResourcePath, mQueryOptions, bSortExpandSelect,
-				sDeepResourcePath);
+				sDeepResourcePath, bSharedRequest, aSeparateProperties);
 	};
 
 	/**

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

@@ -6,14 +6,18 @@
 
 //Provides class sap.ui.model.odata.v4.lib._Helper
 sap.ui.define([
+	"./_Parser",
 	"sap/base/Log",
 	"sap/base/util/deepEqual",
 	"sap/base/util/isEmptyObject",
 	"sap/base/util/merge",
 	"sap/base/util/uid",
 	"sap/ui/base/SyncPromise",
+	"sap/ui/model/Filter",
+	"sap/ui/model/FilterOperator",
 	"sap/ui/thirdparty/URI"
-], function (Log, deepEqual, isEmptyObject, merge, uid, SyncPromise, URI) {
+], function (_Parser, Log, deepEqual, isEmptyObject, merge, uid, SyncPromise, Filter,
+		FilterOperator, URI) {
 	"use strict";
 
 	var rAmpersand = /&/g,
@@ -691,7 +695,7 @@ sap.ui.define([
 
 		/**
 		 * Drills down into the given object according to the given path, creating missing objects
-		 * along the way, and setting a <code>null<code> value at the end in case the final
+		 * along the way, and setting a "...@$ui5.noData" annotation at the end in case the final
 		 * property is missing.
 		 *
 		 * @param {object} oObject
@@ -707,7 +711,12 @@ sap.ui.define([
 		createMissing : function (oObject, aSegments) {
 			aSegments.reduce(function (oCurrent, sSegment, i) {
 				if (!(sSegment in oCurrent)) { // Note: TypeError if !oCurrent
-					oCurrent[sSegment] = i + 1 < aSegments.length ? {} : null;
+					if (i + 1 < aSegments.length) {
+						oCurrent[sSegment] = {};
+					} else {
+						oCurrent[sSegment] = undefined;
+						oCurrent[sSegment + "@$ui5.noData"] = true;
+					}
 				}
 				return oCurrent[sSegment];
 			}, oObject);
@@ -1404,6 +1413,52 @@ sap.ui.define([
 			return _Helper.getAnnotation(oMessage, ".ContentID");
 		},
 
+		/**
+		 * Calculates the filter for the given key predicate.
+		 *
+		 * @param {string} sPredicate - The key predicate (for example, of a message target)
+		 * @param {object} oEntityType - The metadata for the entity type
+		 * @param {sap.ui.model.odata.v4.ODataMetaModel} oMetaModel - The meta model
+		 * @param {string} sMetaPath - The meta path to the entity type
+		 * @param {boolean} [bIgnore$Key]
+		 *   Whether to ignore the entity type's $Key, except to resolve an unnamed key like ('42');
+		 *   this allows for fake predicates with non-key properties as used for data aggregation
+		 * @returns {sap.ui.model.Filter} A filter for the given key predicate
+		 *
+		 * @public
+		 */
+		getFilterForPredicate : function (sPredicate, oEntityType, oMetaModel,
+				sMetaPath, bIgnore$Key) {
+			var aFilters,
+				mValueByKeyOrAlias = _Parser.parseKeyPredicate(sPredicate);
+
+			if ("" in mValueByKeyOrAlias) {
+				// unnamed key e.g. {"" : ('42')} => replace it by the name of the only key property
+				mValueByKeyOrAlias[oEntityType.$Key[0]] = mValueByKeyOrAlias[""];
+				delete mValueByKeyOrAlias[""];
+			}
+
+			aFilters = (bIgnore$Key ? Object.keys(mValueByKeyOrAlias) : oEntityType.$Key)
+			.map(function (vKey) {
+				var sKeyOrAlias, sKeyPath;
+
+				if (typeof vKey === "string") {
+					sKeyPath = sKeyOrAlias = vKey;
+				} else {
+					sKeyOrAlias = Object.keys(vKey)[0]; // alias
+					sKeyPath = vKey[sKeyOrAlias];
+				}
+
+				return new Filter(sKeyPath, FilterOperator.EQ,
+					_Helper.parseLiteral(decodeURIComponent(mValueByKeyOrAlias[sKeyOrAlias]),
+						oMetaModel.getObject(sMetaPath + "/" + sKeyPath + "/$Type"), sKeyPath));
+			});
+
+			return aFilters.length === 1
+				? aFilters[0]
+				: new Filter({and : true, filters : aFilters});
+		},
+
 		/**
 		 * Returns a filter identifying the given instance via its key properties.
 		 *
@@ -1824,7 +1879,7 @@ sap.ui.define([
 		/**
 		 * Inherits a property value according to the given path from the given source object to the
 		 * given target. That is, the value is copied unless the target already has a value. Creates
-		 * missing objects along the way.
+		 * missing objects along the way. Copies a "...@$ui5.noData" annotation at the property.
 		 *
 		 * Like the following, but for paths ;-)
 		 * if (!(sProperty in oTarget)) {
@@ -1858,6 +1913,9 @@ sap.ui.define([
 					oSource = oSource[sSegment];
 					oTarget = oTarget[sSegment];
 				} else if (bMissing) {
+					if (oSource[sSegment + "@$ui5.noData"]) {
+						oTarget[sSegment + "@$ui5.noData"] = true;
+					}
 					oTarget[sSegment] = oSource[sSegment];
 				}
 			});
@@ -2230,9 +2288,11 @@ sap.ui.define([
 		 * @param {string} [sOrderby]
 		 *   The new value for the query option "$orderby"
 		 * @param {string[]} [aFilters]
-		 *   An array that consists of two filters, the first one ("$filter") has to be be applied
-		 *   after and the second one ("$$filterBeforeAggregate") has to be applied before
-		 *   aggregating the data. Both can be <code>undefined</code>.
+		 *   An array that consists of three filters where each can be <code>undefined</code>. The
+		 *   first one ("$filter") has to be applied after data aggregation. The second one
+		 *   ("$$filterBeforeAggregate") can be applied before data aggregation. The third one
+		 *   ("$$filterOnAggregate") has to be applied before data aggregation and already contains
+		 *   the special syntax "$these/aggregate(...)" because it relates to aggregates.
 		 * @returns {object}
 		 *   The merged map of query options
 		 *
@@ -2242,8 +2302,8 @@ sap.ui.define([
 			var mResult;
 
 			function set(sProperty, sValue) {
-				if (sValue && (!mQueryOptions || mQueryOptions[sProperty] !== sValue)) {
-					mResult ??= mQueryOptions ? _Helper.clone(mQueryOptions) : {};
+				if (sValue && mQueryOptions?.[sProperty] !== sValue) {
+					mResult ??= {...mQueryOptions};
 					mResult[sProperty] = sValue;
 				}
 			}
@@ -2252,6 +2312,7 @@ sap.ui.define([
 			if (aFilters) {
 				set("$filter", aFilters[0]);
 				set("$$filterBeforeAggregate", aFilters[1]);
+				set("$$filterOnAggregate", aFilters[2]);
 			}
 			return mResult || mQueryOptions;
 		},

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

@@ -91,6 +91,7 @@ sap.ui.define([
 		this.oModelInterface = oModelInterface;
 		this.oOptimisticBatch = null; // optimistic batch processing off
 		this.sQueryParams = _Helper.buildQuery(mQueryParams); // Used for $batch and CSRF token only
+		this.oRetryAfterPromise = null;
 		this.mRunningChangeRequests = {}; // map from group ID to a SyncPromise[]
 		this.iSessionTimer = 0;
 		this.iSerialNumber = 0;
@@ -1396,7 +1397,7 @@ sap.ui.define([
 						// methods it must be possible to insert the ETag from the header
 						oResponse = vRequest.method === "GET" ? null : {};
 					}
-					that.reportHeaderMessages(vRequest.url,
+					that.reportHeaderMessages(vRequest.$resourcePath,
 						getResponseHeader.call(vResponse, "sap-messages"));
 					sETag = getResponseHeader.call(vResponse, "ETag");
 					if (sETag) {
@@ -1425,6 +1426,7 @@ sap.ui.define([
 					"HTTP request was not processed because $batch failed");
 
 				oRequestError.cause = oError;
+				oRequestError.$reported = true; // do not create a message for this error
 				reject(oRequestError, aRequests);
 				throw oError;
 			}).finally(function () {
@@ -1568,7 +1570,9 @@ sap.ui.define([
 	/**
 	 * Returns a promise that will be resolved once the CSRF token has been refreshed, or rejected
 	 * if that fails. Makes sure that only one HEAD request is underway at any given time and
-	 * shares the promise accordingly.
+	 * shares the promise accordingly. If the HEAD request fails with a 503 HTTP status code and
+	 * a "Retry-After" response header, the promise is also resolved because the next request (in
+	 * {@link #sendRequest}) will also fail with 503 and is handled there.
 	 *
 	 * @param {string} [sOldSecurityToken]
 	 *   Security token that caused a 403. A new token is only fetched if the old one is still
@@ -1611,7 +1615,12 @@ sap.ui.define([
 						fnResolve();
 					}, function (jqXHR) {
 						that.oSecurityTokenPromise = null;
-						fnReject(_Helper.createError(jqXHR, "Could not refresh security token"));
+						if (jqXHR.status === 503 && jqXHR.getResponseHeader("Retry-After")) {
+							fnResolve();
+						} else {
+							fnReject(
+								_Helper.createError(jqXHR, "Could not refresh security token"));
+						}
 					});
 			});
 		}
@@ -1891,7 +1900,7 @@ sap.ui.define([
 					aRequests[iChangeSetNo].push(oRequest);
 				}
 				if (sGroupId === "$single") {
-					that.submitBatch("$single");
+					that.submitBatch("$single").catch(that.oModelInterface.getReporter());
 				}
 			});
 			oRequest.$promise = oPromise;
@@ -1913,7 +1922,7 @@ sap.ui.define([
 				sMethod === "GET" ? {"sap-cancel-on-close" : "true"} : undefined),
 			JSON.stringify(oPayload), sOriginalResourcePath
 		).then(function (oResponse) {
-			that.reportHeaderMessages(oResponse.resourcePath, oResponse.messages);
+			that.reportHeaderMessages(sOriginalResourcePath, oResponse.messages);
 			return that.doConvertResponse(
 				// Note: "text/plain" used for $count
 				typeof oResponse.body === "string" ? JSON.parse(oResponse.body) : oResponse.body,
@@ -2025,7 +2034,7 @@ sap.ui.define([
 				if (that.bWithCredentials) {
 					oAjaxSettings.xhrFields = {withCredentials : true};
 				}
-				return jQuery.ajax(sRequestUrl, oAjaxSettings)
+				jQuery.ajax(sRequestUrl, oAjaxSettings)
 				.then(function (/*{object|string}*/vResponse, _sTextStatus, jqXHR) {
 					var sETag = jqXHR.getResponseHeader("ETag"),
 						sCsrfToken = jqXHR.getResponseHeader("X-CSRF-Token");
@@ -2072,6 +2081,27 @@ sap.ui.define([
 						that.refreshSecurityToken(sOldCsrfToken).then(function () {
 							send(true);
 						}, fnReject);
+					} else if (jqXHR.status === 503 && jqXHR.getResponseHeader("Retry-After")
+							&& (that.oRetryAfterPromise
+								|| that.oModelInterface.getRetryAfterHandler())) {
+						if (!that.oRetryAfterPromise) {
+							const oRetryAfterError = _Helper.createError(jqXHR, "");
+							that.oRetryAfterPromise = that.oModelInterface.getRetryAfterHandler()(
+								oRetryAfterError);
+							that.oRetryAfterPromise.finally(() => {
+								that.oRetryAfterPromise = null;
+							}).catch(() => { /* catch is only needed due to finally */ });
+							that.oRetryAfterPromise.catch((oError) => {
+								// own error reason is not reported to the message model
+								if (oError === oRetryAfterError) {
+									that.oModelInterface
+										.reportError(oError.message, sClassName, oError);
+								} else {
+									oError.$reported = true;
+								}
+							});
+						}
+						that.oRetryAfterPromise.then(send, fnReject);
 					} else {
 						sMessage = "Communication error";
 						if (sContextId) {
@@ -2091,7 +2121,9 @@ sap.ui.define([
 				});
 			}
 
-			if (that.oSecurityTokenPromise && sMethod !== "GET") {
+			if (that.oRetryAfterPromise) {
+				that.oRetryAfterPromise.then(send, fnReject);
+			} else if (that.oSecurityTokenPromise && sMethod !== "GET") {
 				that.oSecurityTokenPromise.then(send);
 			} else {
 				send();
@@ -2309,11 +2341,16 @@ sap.ui.define([
 	 *   A catch handler function expecting an <code>Error</code> instance. This function will call
 	 *   {@link sap.ui.model.odata.v4.ODataModel#reportError} if the error has not been reported
 	 *   yet
+	 * @param {function} oModelInterface.getRetryAfterHandler
+	 *   A function that returns the "Retry-After" handler,
+	 *   see also {@link sap.ui.model.odata.v4.ODataModel#setRetryAfterHandler}
 	 * @param {function():boolean} oModelInterface.isIgnoreETag
 	 *   Tells whether an entity's ETag should be actively ignored (If-Match:*) for PATCH requests.
 	 * @param {function} oModelInterface.onCreateGroup
 	 *   A callback function that is called with the group name as parameter when the first
 	 *   request is added to a group
+	 * @param {function} oModelInterface.reportError
+	 *   A function to report OData errors
 	 * @param {function} oModelInterface.reportStateMessages
 	 *   A function to report OData state messages
 	 * @param {function} oModelInterface.reportTransitionMessages