@openui5/sap.ui.core 1.91.0 → 1.93.2

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

@@ -22,20 +22,20 @@ sap.ui.define(function () {
 		 * {@link sap.ui.model.odata.v4.ODataModel#submitBatch}.
 		 * @public
 		 */
-		API: "API",
+		API : "API",
 
 		/**
 		 * Requests associated with the group ID are sent in a batch request which is triggered
 		 * automatically before rendering.
 		 * @public
 		 */
-		Auto: "Auto",
+		Auto : "Auto",
 
 		/**
 		 * Requests associated with the group ID are sent directly without batch.
 		 * @public
 		 */
-		Direct: "Direct"
+		Direct : "Direct"
 	};
 
 	return SubmitMode;

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

@@ -290,7 +290,7 @@ sap.ui.define([
 			 * Returns the string representation of the given parameter value.
 			 * @param {object} oParameterValue the parameter value
 			 * @param {boolean} bComplex whether the result is a complex binding or a simple binding
-			 * @param {boolean} [bRaw=false] whether the result will contain the raw value
+			 * @param {boolean} [bRaw] whether the result will contain the raw value
 			 */
 			function toString(oParameterValue, bComplex, bRaw) {
 				return Basics.resultToString(Expression.wrapExpression(oParameterValue), true,

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

@@ -8,13 +8,13 @@
 sap.ui.define([
 	"./_AggregationHelper",
 	"./_Cache",
-	"./_GrandTotalHelper",
+	"./_ConcatHelper",
 	"./_GroupLock",
 	"./_Helper",
 	"./_MinMaxHelper",
 	"sap/base/Log",
 	"sap/ui/base/SyncPromise"
-], function (_AggregationHelper, _Cache, _GrandTotalHelper, _GroupLock, _Helper, _MinMaxHelper,
+], function (_AggregationHelper, _Cache, _ConcatHelper, _GroupLock, _Helper, _MinMaxHelper,
 		Log, SyncPromise) {
 	"use strict";
 
@@ -48,7 +48,8 @@ sap.ui.define([
 	 */
 	function _AggregationCache(oRequestor, sResourcePath, oAggregation, mQueryOptions,
 			bHasGrandTotal) {
-		var fnLeaves = null,
+		var fnCount = function () {}, // no specific handling needed for "UI5__count" here
+			fnLeaves = null,
 			that = this;
 
 		_Cache.call(this, oRequestor, sResourcePath, mQueryOptions, true);
@@ -74,7 +75,7 @@ sap.ui.define([
 		this.oGrandTotalPromise = undefined;
 		if (bHasGrandTotal) {
 			this.oGrandTotalPromise = new SyncPromise(function (resolve) {
-				_GrandTotalHelper.enhanceCacheWithGrandTotal(that.oFirstLevel, oAggregation,
+				_ConcatHelper.enhanceCache(that.oFirstLevel, oAggregation, [fnLeaves,
 					function (oGrandTotal) {
 						var oGrandTotalCopy;
 
@@ -96,11 +97,10 @@ sap.ui.define([
 						_Helper.setPrivateAnnotation(oGrandTotal, "predicate", "()");
 
 						resolve(oGrandTotal);
-					}, fnLeaves);
+					}, fnCount]);
 			});
 		} else if (fnLeaves) {
-			_GrandTotalHelper.enhanceCacheWithGrandTotal(that.oFirstLevel, oAggregation, null,
-				fnLeaves);
+			_ConcatHelper.enhanceCache(that.oFirstLevel, oAggregation, [fnLeaves, fnCount]);
 		}
 	}
 
@@ -219,15 +219,14 @@ sap.ui.define([
 	 *
 	 * @param {object} [oGroupNode]
 	 *   The group node or <code>undefined</code> for the first level cache
-	 * @param {boolean} [bHasGrandTotalHelper]
-	 *   Whether the _GrandTotalHelper is involved (use only for the first level cache!)
+	 * @param {boolean} [bHasConcatHelper]
+	 *   Whether the _ConcatHelper is involved (use only for the first level cache!)
 	 * @returns {sap.ui.model.odata.v4.lib._CollectionCache}
 	 *   The group level cache
 	 *
 	 * @private
 	 */
-	_AggregationCache.prototype.createGroupLevelCache = function (oGroupNode,
-			bHasGrandTotalHelper) {
+	_AggregationCache.prototype.createGroupLevelCache = function (oGroupNode, bHasConcatHelper) {
 		var oAggregation = this.oAggregation,
 			aAllProperties = _AggregationHelper.getAllProperties(oAggregation),
 			oCache, aGroupBy, bLeaf, iLevel, mQueryOptions, bTotal;
@@ -251,8 +250,8 @@ sap.ui.define([
 						? " and (" + mQueryOptions.$$filterBeforeAggregate + ")"
 						: "");
 		}
-		if (!bHasGrandTotalHelper) {
-			// Note: UI5__count currently handled only by _GrandTotalHelper!
+		if (!bHasConcatHelper) {
+			// Note: UI5__count currently handled only by _ConcatHelper!
 			delete mQueryOptions.$count;
 			mQueryOptions = _AggregationHelper.buildApply(oAggregation, mQueryOptions, iLevel);
 		}
@@ -783,11 +782,13 @@ sap.ui.define([
 			bHasGroupLevels = !!oAggregation.groupLevels.length;
 			bHasMinOrMax = _AggregationHelper.hasMinOrMax(oAggregation.aggregate);
 
-			if (bHasGrandTotal && mQueryOptions.$filter && !oAggregation["grandTotal like 1.84"]) {
+			if (mQueryOptions.$filter
+				&& (bHasGrandTotal && !oAggregation["grandTotal like 1.84"]
+					|| bHasGroupLevels)) {
 				throw new Error("Unsupported system query option: $filter");
 			}
-			if (bHasGroupLevels && mQueryOptions.$filter) {
-				throw new Error("Unsupported system query option: $filter");
+			if (mQueryOptions.$search && (bHasGrandTotal || bHasGroupLevels)) {
+				throw new Error("Unsupported system query option: $search");
 			}
 			if (bHasMinOrMax) {
 				if (bHasGrandTotal) {

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

@@ -32,6 +32,7 @@ sap.ui.define([
 				}
 			},
 			groupLevels : ["string"],
+			search : "string",
 			subtotalsAtBottomOnly : "boolean"
 		},
 		rComma = /,|%2C|%2c/,
@@ -317,6 +318,9 @@ sap.ui.define([
 					sApply = "concat(" + sLeaves + "," + sApply + ")";
 				}
 			}
+			if (oAggregation.search) {
+				sApply = "search(" + oAggregation.search + ")/" + sApply;
+			}
 			if (mQueryOptions.$$filterBeforeAggregate) {
 				sApply = "filter(" + mQueryOptions.$$filterBeforeAggregate + ")/" + sApply;
 				delete mQueryOptions.$$filterBeforeAggregate;
@@ -367,7 +371,7 @@ sap.ui.define([
 					_AggregationHelper.checkTypeof(vValue[sKey], vType[bIsMap ? "*" : sKey],
 						sPath + "/" + sKey);
 				});
-			} else if (typeof vValue !== vType) {
+			} else if (typeof vValue !== vType) { // eslint-disable-line valid-typeof
 				throw new Error("Not a " + vType + " value for '" + sPath + "'");
 			}
 		},

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

@@ -11,8 +11,9 @@ sap.ui.define([
 	"./_Requestor",
 	"sap/base/Log",
 	"sap/base/util/isEmptyObject",
-	"sap/ui/base/SyncPromise"
-], function (_GroupLock, _Helper, _Requestor, Log, isEmptyObject, SyncPromise) {
+	"sap/ui/base/SyncPromise",
+	"sap/ui/model/odata/ODataUtils"
+], function (_GroupLock, _Helper, _Requestor, Log, isEmptyObject, SyncPromise, ODataUtils) {
 	"use strict";
 
 	var sClassName = "sap.ui.model.odata.v4.lib._Cache",
@@ -85,7 +86,7 @@ sap.ui.define([
 	 *   A resource path relative to the service URL
 	 * @param {object} [mQueryOptions]
 	 *   A map of key-value pairs representing the query string
-	 * @param {boolean} [bSortExpandSelect=false]
+	 * @param {boolean} [bSortExpandSelect]
 	 *   Whether the paths in $expand and $select shall be sorted in the cache's query string;
 	 *   note that this flag can safely be ignored for all "new" features (after 1.47) which
 	 *   should just sort always
@@ -93,7 +94,7 @@ sap.ui.define([
 	 *   A function that returns the cache's original resource path to be used to build the target
 	 *   path for bound messages; if it is not given or returns nothing, <code>sResourcePath</code>
 	 *   is used instead. See {@link #getOriginalResourcePath}.
-	 * @param {boolean} [bSharedRequest=false]
+	 * @param {boolean} [bSharedRequest]
 	 *   If this parameter is set, the cache is read-only and modifying calls lead to an error.
 	 *
 	 * @alias sap.ui.model.odata.v4.lib._Cache
@@ -1045,7 +1046,7 @@ sap.ui.define([
 	 *   The function is called just before the back-end request is sent.
 	 *   If no back-end request is needed, the function is not called.
 	 * @returns {sap.ui.base.SyncPromise}
-	 *   A promise which resolves with the new entity when it is updated in the cache.
+	 *   A promise which resolves without a defined result when it is updated in the cache.
 	 * @throws {Error} If the cache is shared
 	 *
 	 * @public
@@ -1087,8 +1088,6 @@ sap.ui.define([
 				var oElement = aResult[0];
 
 				that.replaceElement(aElements, iIndex, sPredicate, oElement, aResult[1], sPath);
-
-				return oElement;
 			});
 		});
 	};
@@ -1609,7 +1608,7 @@ sap.ui.define([
 	 *   Path of the entity, relative to the cache (as used by change listeners)
 	 * @param {string} [sUnitOrCurrencyPath]
 	 *   Path of the unit or currency for the property, relative to the entity
-	 * @param {boolean} [bPatchWithoutSideEffects=false]
+	 * @param {boolean} [bPatchWithoutSideEffects]
 	 *   Whether the PATCH response is ignored, except for a new ETag
 	 * @param {function} [fnPatchSent]
 	 *   The function is called just before a back-end request is sent for the first time.
@@ -2002,11 +2001,11 @@ sap.ui.define([
 	 *   A resource path relative to the service URL
 	 * @param {object} [mQueryOptions]
 	 *   A map of key-value pairs representing the query string
-	 * @param {boolean} [bSortExpandSelect=false]
+	 * @param {boolean} [bSortExpandSelect]
 	 *   Whether the paths in $expand and $select shall be sorted in the cache's query string
 	 * @param {string} [sDeepResourcePath=sResourcePath]
 	 *   The deep resource path to be used to build the target path for bound messages
-	 * @param {boolean} [bSharedRequest=false]
+	 * @param {boolean} [bSharedRequest]
 	 *   If this parameter is set, the cache is read-only and modifying calls lead to an error.
 	 *
 	 * @alias sap.ui.model.odata.v4.lib._CollectionCache
@@ -2218,56 +2217,6 @@ sap.ui.define([
 		return sQueryString;
 	};
 
-	/**
-	 * Calculates the index range to be read for the given start, length and prefetch length.
-	 * Checks if <code>aElements</code> entries are available for half the prefetch length left and
-	 * right to it. If not, the full prefetch length is added to this side.
-	 *
-	 * @param {number} iStart
-	 *   The start index for the data request
-	 * @param {number} iLength
-	 *   The number of requested entries
-	 * @param {number} iPrefetchLength
-	 *   The number of entries to prefetch before and after the given range; <code>Infinity</code>
-	 *   is supported
-	 * @returns {object}
-	 *   Returns an object with a member <code>start</code> for the start index for the next
-	 *   read and <code>length</code> for the number of entries to be read.
-	 *
-	 * @private
-	 */
-	_CollectionCache.prototype.getReadRange = function (iStart, iLength, iPrefetchLength) {
-		var aElements = this.aElements;
-
-		// Checks whether aElements contains at least one <code>undefined</code> entry within the
-		// given start (inclusive) and end (exclusive).
-		function isDataMissing(iStart, iEnd) {
-			var i;
-			for (i = iStart; i < iEnd; i += 1) {
-				if (aElements[i] === undefined) {
-					return true;
-				}
-			}
-			return false;
-		}
-
-		if (isDataMissing(iStart + iLength, iStart + iLength + iPrefetchLength / 2)) {
-			iLength += iPrefetchLength;
-		}
-		if (isDataMissing(Math.max(iStart - iPrefetchLength / 2, 0), iStart)) {
-			iLength += iPrefetchLength;
-			iStart -= iPrefetchLength;
-			if (iStart < 0) {
-				iLength += iStart; // Note: Infinity + -Infinity === NaN
-				if (isNaN(iLength)) {
-					iLength = Infinity;
-				}
-				iStart = 0;
-			}
-		}
-		return {length : iLength, start : iStart};
-	};
-
 	/**
 	 * Returns the resource path including the query string with $skip and $top if needed.
 	 *
@@ -2346,8 +2295,7 @@ sap.ui.define([
 			if (sPredicate) {
 				oKeptElement = this.aElements.$byPredicate[sPredicate];
 				if (oKeptElement) {
-					if (oElement["@odata.etag"]
-							&& oElement["@odata.etag"] === oKeptElement["@odata.etag"]) {
+					if (oElement["@odata.etag"] === oKeptElement["@odata.etag"]) {
 						oElement = oKeptElement;
 					} else if (this.hasPendingChangesForPath(sPredicate)) {
 						throw new Error("Modified on client and on server: "
@@ -2429,11 +2377,8 @@ sap.ui.define([
 	_CollectionCache.prototype.read = function (iIndex, iLength, iPrefetchLength, oGroupLock,
 			fnDataRequested) {
 		var aElementsRange,
-			iEnd,
-			iGapStart = -1,
 			oPromise = this.oPendingRequestsPromise || this.aElements.$tail,
-			oRange,
-			i, n, that = this;
+			that = this;
 
 		if (iIndex < 0) {
 			throw new Error("Illegal index " + iIndex + ", must be >= 0");
@@ -2448,34 +2393,23 @@ sap.ui.define([
 			});
 		}
 
-		oRange = this.getReadRange(iIndex, iLength, this.bServerDrivenPaging ? 0 : iPrefetchLength);
-		iEnd = Math.min(oRange.start + oRange.length, this.aElements.$created + this.iLimit);
-		n = Math.min(iEnd, Math.max(oRange.start, this.aElements.length) + 1);
-
-		for (i = oRange.start; i < n; i += 1) {
-			if (this.aElements[i] !== undefined) {
-				if (iGapStart >= 0) {
-					this.requestElements(iGapStart, i, oGroupLock.getUnlockedCopy(),
-						fnDataRequested);
-					fnDataRequested = undefined;
-					iGapStart = -1;
-				}
-			} else if (iGapStart < 0) {
-				iGapStart = i;
-			}
-		}
-		if (iGapStart >= 0) {
-			this.requestElements(iGapStart, iEnd, oGroupLock.getUnlockedCopy(), fnDataRequested);
-		}
+		ODataUtils._getReadIntervals(this.aElements, iIndex, iLength,
+				this.bServerDrivenPaging ? 0 : iPrefetchLength,
+				this.aElements.$created + this.iLimit)
+			.forEach(function (oInterval) {
+				that.requestElements(oInterval.start, oInterval.end, oGroupLock.getUnlockedCopy(),
+					fnDataRequested);
+				fnDataRequested = undefined;
+			});
 
 		oGroupLock.unlock();
 
-		aElementsRange = this.aElements.slice(iIndex, iEnd);
-		if (this.aElements.$tail) { // Note: if available, it must be ours!
+		aElementsRange = this.aElements.slice(iIndex, iIndex + iLength + iPrefetchLength);
+		if (this.aElements.$tail && iIndex + iLength > this.aElements.length) {
 			aElementsRange.push(this.aElements.$tail);
 		}
 		return SyncPromise.all(aElementsRange).then(function () {
-			var aElements = that.aElements.slice(iIndex, iEnd);
+			var aElements = that.aElements.slice(iIndex, iIndex + iLength);
 
 			aElements.$count = that.aElements.$count;
 
@@ -2801,7 +2735,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns a promise to be resolved with an OData object for the requested property value.
+	 * Returns a promise to be resolved with the requested property value.
 	 *
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
 	 *   A lock for the group to associate the request with
@@ -2839,11 +2773,10 @@ sap.ui.define([
 				fnDataRequested, undefined, this.sMetaPath));
 		}
 		return this.oPromise.then(function (oResult) {
-			// for a null value, null is returned due to "204 No Content". But it is expected in the
-			// value property of an object
-			oResult = oResult || {value : null};
 			that.registerChange("", oListener);
-			return oResult.value;
+			// 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;
 		});
 	};
 
@@ -2873,9 +2806,9 @@ sap.ui.define([
 	 *   A resource path relative to the service URL
 	 * @param {object} [mQueryOptions]
 	 *   A map of key-value pairs representing the query string
-	 * @param {boolean} [bSortExpandSelect=false]
+	 * @param {boolean} [bSortExpandSelect]
 	 *   Whether the paths in $expand and $select shall be sorted in the cache's query string
-	 * @param {boolean} [bSharedRequest=false]
+	 * @param {boolean} [bSharedRequest]
 	 *   If this parameter is set, the cache is read-only and modifying calls lead to an error.
 	 * @param {function} [fnGetOriginalResourcePath]
 	 *   A function that returns the cache's original resource path to be used to build the target
@@ -2992,7 +2925,14 @@ sap.ui.define([
 	 *   The entity which contains the ETag to be sent as "If-Match" header with the POST request.
 	 * @param {boolean} [bIgnoreETag]
 	 *   Whether the entity's ETag should be actively ignored (If-Match:*); used only in case an
-	 *   entity is given
+	 *   entity is given and an ETag is present
+	 * @param {function} [fnOnStrictHandlingFailed]
+	 *   If this callback is given, then the preference "handling=strict" is applied.
+	 *   If the request fails with an error having <code>oError.strictHandlingFailed</code> set,
+	 *   this error is passed to the callback which returns a promise. If this promise resolves with
+	 *   <code>true</code> the action is repeated w/o the preference, otherwise this function's
+	 *   result promise is rejected with an <code>Error</code> instance <code>oError</code> where
+	 *   <code>oError.canceled === true</code>.
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise to be resolved with the result of the request.
 	 * @throws {Error}
@@ -3001,11 +2941,48 @@ sap.ui.define([
 	 *
 	 * @public
 	 */
-	_SingleCache.prototype.post = function (oGroupLock, oData, oEntity, bIgnoreETag) {
+	_SingleCache.prototype.post = function (oGroupLock, oData, oEntity, bIgnoreETag,
+			fnOnStrictHandlingFailed) {
 		var sGroupId,
+			mHeaders = oEntity
+				? {"If-Match" : bIgnoreETag && "@odata.etag" in oEntity ? "*" : oEntity}
+				: {},
 			sHttpMethod = "POST",
 			that = this;
 
+		function post(oGroupLock0) {
+			that.bPosting = true;
+
+			// BEWARE! Avoid finally here! BCP: 2070200175
+			return SyncPromise.all([
+				that.oRequestor.request(sHttpMethod,
+					that.sResourcePath + that.sQueryString, oGroupLock0, mHeaders, oData),
+				that.fetchTypes()
+			]).then(function (aResult) {
+				that.visitResponse(aResult[0], aResult[1]);
+				that.bPosting = false;
+
+				return aResult[0];
+			}, function (oError) {
+				that.bPosting = false;
+				if (fnOnStrictHandlingFailed && oError.strictHandlingFailed) {
+					return fnOnStrictHandlingFailed(oError).then(function (bConfirm) {
+						var oCanceledError;
+
+						if (bConfirm) {
+							delete mHeaders["Prefer"];
+							return post(oGroupLock0.getUnlockedCopy());
+						}
+
+						oCanceledError = Error("Action canceled due to strict handling");
+						oCanceledError.canceled = true;
+						throw oCanceledError;
+					});
+				}
+				throw oError;
+			});
+		}
+
 		this.checkSharedRequest();
 		if (!this.bPost) {
 			throw new Error("POST request not allowed");
@@ -3031,22 +3008,11 @@ sap.ui.define([
 			}
 		}
 
-		this.bPosting = true;
 		this.bSentRequest = true;
-		this.oPromise = SyncPromise.all([
-			this.oRequestor.request(sHttpMethod, this.sResourcePath + this.sQueryString, oGroupLock,
-				oEntity && {"If-Match" : bIgnoreETag ? "*" : oEntity}, oData),
-			this.fetchTypes()
-		]).then(function (aResult) {
-			that.visitResponse(aResult[0], aResult[1]);
-			that.bPosting = false;
-
-			return aResult[0];
-		}, function (oError) {
-			// BEWARE! Avoid finally here! BCP: 2070200175
-			that.bPosting = false;
-			throw oError;
-		});
+		if (fnOnStrictHandlingFailed) {
+			mHeaders["Prefer"] = "handling=strict";
+		}
+		this.oPromise = post(oGroupLock);
 
 		return this.oPromise;
 	};
@@ -3109,6 +3075,9 @@ sap.ui.define([
 			var oNewValue = aResult[0],
 				oOldValue = aResult[2];
 
+			// ensure that the new value has a predicate although key properties were not requested
+			_Helper.setPrivateAnnotation(oNewValue, "predicate",
+				_Helper.getPrivateAnnotation(oOldValue, "predicate"));
 			// visit response to report the messages
 			that.visitResponse(oNewValue, aResult[1]);
 			_Helper.updateAll(that.mChangeListeners, "", oOldValue, oNewValue, function (sPath) {
@@ -3142,11 +3111,11 @@ 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 {boolean} [bSortExpandSelect=false]
+	 * @param {boolean} [bSortExpandSelect]
 	 *   Whether the paths in $expand and $select shall be sorted in the cache's query string
 	 * @param {string} [sDeepResourcePath=sResourcePath]
 	 *   The deep resource path to be used to build the target path for bound messages
-	 * @param {boolean} [bSharedRequest=false]
+	 * @param {boolean} [bSharedRequest]
 	 *   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.
@@ -3238,9 +3207,9 @@ 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 {boolean} [bSortExpandSelect=false]
+	 * @param {boolean} [bSortExpandSelect]
 	 *   Whether the paths in $expand and $select shall be sorted in the cache's query string
-	 * @param {boolean} [bSharedRequest=false]
+	 * @param {boolean} [bSharedRequest]
 	 *   If this parameter is set, multiple requests for a cache using the same resource path might
 	 *   always return the same, shared cache. This cache is read-only, modifying calls lead to an
 	 *   error.
@@ -3329,4 +3298,4 @@ sap.ui.define([
 	};
 
 	return _Cache;
-}, /* bExport= */false);
+}, /* bExport= */false);

package/src/sap/ui/model/odata/v4/lib/{_GrandTotalHelper.js → _ConcatHelper.js}

@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-//Provides class sap.ui.model.odata.v4.lib._GrandTotalHelper
+//Provides class sap.ui.model.odata.v4.lib._ConcatHelper
 sap.ui.define([
 	"./_AggregationHelper"
 ], function (_AggregationHelper) {
@@ -12,8 +12,9 @@ sap.ui.define([
 
 	return {
 		/**
-		 * Enhances the given cache, so that the (leaf) count and/or grand total are requested
-		 * together with the first request. Subsequent requests remain unchanged.
+		 * Enhances the given cache, so that additional rows are requested together with the first
+		 * request using "concat"; this means that $count needs to be requested as "UI5__count"
+		 * instead, in a separate row. Subsequent requests remain unchanged.
 		 *
 		 * @param {sap.ui.model.odata.v4.lib._CollectionCache} oCache
 		 *   The cache to be enhanced
@@ -22,19 +23,22 @@ sap.ui.define([
 		 *   <a href="http://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/">OData
 		 *   Extension for Data Aggregation Version 4.0</a>; must already be normalized by
 		 *   {@link _AggregationHelper.buildApply}
-		 * @param {function} [fnGrandTotal]
-		 *   Callback for the grand total response
-		 * @param {function} [fnLeaves]
-		 *   Callback for the leaf count response
+		 * @param {function[]} [aAdditionalRowHandlers]
+		 *   Handlers for the additional response rows (which are automatically scanned for
+		 *   "UI5__count"); if a handler is missing, the corresponding row is assumed to be missing
+		 *   as well
+		 * @param {object} [mAlias2MeasureAndMethod]
+		 *   A map which is filled by {@link _AggregationHelper.buildApply} in case an aggregatable
+		 *   property requests minimum or maximum values.
 		 */
-		enhanceCacheWithGrandTotal : function (oCache, oAggregation, fnGrandTotal, fnLeaves) {
+		enhanceCache : function (oCache, oAggregation, aAdditionalRowHandlers,
+				mAlias2MeasureAndMethod) {
 			var bFollowUp;
 
 			/**
 			 * Returns the resource path including the query string with "$apply" which includes the
-			 * aggregation functions for (leaf) count and grand total and "skip()/top()" as
-			 * transformations. Follow-up requests do not aggregate the (leaf) count and grand
-			 * total again.
+			 * aggregation functions for additional rows and thus uses "skip()/top()" as
+			 * transformations. Follow-up requests do not aggregate these additional rows again.
 			 *
 			 * This function is used to replace <code>getResourcePathWithQuery</code> of the first
 			 * level cache and needs to be called on the first level cache.
@@ -43,16 +47,17 @@ sap.ui.define([
 			 *   The start index of the range
 			 * @param {number} iEnd
 			 *   The index after the last element
-			 * @returns {string} The resource path including the query string
+			 * @returns {string}
+			 *   The resource path including the query string
 			 */
 			// @override sap.ui.model.odata.v4.lib._CollectionCache#getResourcePathWithQuery
-			// Note: same as in _MinMaxHelper
 			oCache.getResourcePathWithQuery = function (iStart, iEnd) {
+				// Note: ignore existing mQueryOptions.$apply, e.g. from ODLB#updateAnalyticalInfo
 				var mQueryOptionsWithApply = _AggregationHelper.buildApply(oAggregation,
 						Object.assign({}, this.mQueryOptions, {
 							$skip : iStart,
 							$top : iEnd - iStart
-						}), 1, bFollowUp);
+						}), 1, bFollowUp, mAlias2MeasureAndMethod);
 
 				bFollowUp = true; // next request is a follow-up
 
@@ -61,28 +66,30 @@ sap.ui.define([
 			};
 
 			/**
-			 * Handles a GET response wich may contain grand total or (leaf) count, each in a row of
-			 * its own.
+			 * Handles a GET response wich contains additional rows.
 			 *
 			 * @param {number} iStart
 			 *   The index of the first element to request ($skip)
 			 * @param {number} iEnd
 			 *   The index after the last element to request ($skip + $top)
-			 * @param {object} oResult The result of the GET request
-			 * @param {object} mTypeForMetaPath A map from meta path to the entity type (as
-			 *   delivered by {@link #fetchTypes})
+			 * @param {object} oResult
+			 *   The result of the GET request
+			 * @param {object} mTypeForMetaPath
+			 *   A map from meta path to the entity type (as delivered by {@link #fetchTypes})
 			 */
 			// @override sap.ui.model.odata.v4.lib._CollectionCache#handleResponse
 			oCache.handleResponse = function (iStart, iEnd, oResult, mTypeForMetaPath) {
-				if (fnLeaves) {
-					fnLeaves(oResult.value.shift());
-				}
-				if (fnGrandTotal) {
-					fnGrandTotal(oResult.value.shift());
-				}
+				aAdditionalRowHandlers.forEach(function (fnHandler) {
+					var oAdditionalRow;
 
-				// Note: drop row with UI5__count only
-				oResult["@odata.count"] = oResult.value.shift().UI5__count;
+					if (fnHandler) {
+						oAdditionalRow = oResult.value.shift();
+						if ("UI5__count" in oAdditionalRow) {
+							oResult["@odata.count"] = oAdditionalRow.UI5__count;
+						}
+						fnHandler(oAdditionalRow);
+					}
+				});
 
 				// revert to prototype and call it
 				delete this.handleResponse;

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *   The group ID
 	 * @param {object} oOwner
 	 *   The lock's owner for debugging
-	 * @param {boolean} [bLocked=false]
+	 * @param {boolean} [bLocked]
 	 *   Whether the lock is locked
 	 * @param {boolean} [bModifying]
 	 *   Whether the reason for the group lock is a modifying request
@@ -158,7 +158,7 @@ sap.ui.define([
 	/**
 	 * Unlocks the lock. Resolves all promises returned by {@link #waitFor}.
 	 *
-	 * @param {boolean} [bForce=false]
+	 * @param {boolean} [bForce]
 	 *   Whether unlock may be called multiple times.
 	 * @throws {Error}
 	 *   If unlock is called a second time without <code>bForce</code>