@openui5/sap.ui.core 1.106.0 → 1.107.1

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

@@ -36,6 +36,7 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/base/SyncPromise",
 	"sap/ui/core/cache/CacheManager",
+	"sap/ui/core/Configuration",
 	"sap/ui/core/library",
 	"sap/ui/core/message/Message",
 	"sap/ui/model/BindingMode",
@@ -45,18 +46,16 @@ sap.ui.define([
 	"sap/ui/thirdparty/URI"
 ], function (ODataContextBinding, ODataListBinding, ODataMetaModel, ODataPropertyBinding,
 		SubmitMode, _GroupLock, _Helper, _MetadataRequestor, _Parser, _Requestor, assert, Log,
-		SyncPromise, CacheManager, coreLibrary, Message, BindingMode, BaseContext, Model,
-		OperationMode, URI) {
+		SyncPromise, CacheManager, Configuration, coreLibrary, Message, BindingMode, BaseContext,
+		Model, OperationMode, URI) {
 	"use strict";
 
-	var rApplicationGroupID = /^\w+$/,
-		sClassName = "sap.ui.model.odata.v4.ODataModel",
+	var sClassName = "sap.ui.model.odata.v4.ODataModel",
 		// system query options allowed within a $expand query option
 		aExpandQueryOptions = ["$count", "$expand", "$filter", "$levels", "$orderby", "$search",
 			"$select"],
 		// binding-specific parameters allowed in getKeepAliveContext
 		aGetKeepAliveParameters = ["$$groupId", "$$patchWithoutSideEffects", "$$updateGroupId"],
-		rGroupID = /^(\$auto(\.\w+)?|\$direct|\w+)$/,
 		MessageType = coreLibrary.MessageType,
 		aMessageTypes = [
 			undefined,
@@ -219,7 +218,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.106.0
+		 * @version 1.107.1
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -245,9 +244,10 @@ sap.ui.define([
 	function constructor(mParameters) {
 		var sGroupId,
 			oGroupProperties,
-			sLanguageTag = sap.ui.getCore().getConfiguration().getLanguageTag(),
+			sLanguageTag = Configuration.getLanguageTag(),
 			sODataVersion,
 			sParameter,
+			mQueryParams,
 			sServiceUrl,
 			oUri,
 			mUriParameters,
@@ -286,7 +286,7 @@ sap.ui.define([
 		mUriParameters = this.buildQueryOptions(oUri.query(true), false, true);
 		// BEWARE: these are shared across all bindings!
 		this.mUriParameters = mUriParameters;
-		if (sap.ui.getCore().getConfiguration().getStatistics()) {
+		if (Configuration.getStatisticsEnabled()) {
 			// Note: this way, "sap-statistics" is not sent within $batch
 			mUriParameters = Object.assign({"sap-statistics" : true}, mUriParameters);
 		}
@@ -298,11 +298,11 @@ sap.ui.define([
 		if (this.sGroupId !== "$auto" && this.sGroupId !== "$direct") {
 			throw new Error("Group ID must be '$auto' or '$direct'");
 		}
-		this.checkGroupId(mParameters.updateGroupId, false, "Invalid update group ID: ");
+		_Helper.checkGroupId(mParameters.updateGroupId, false, "Invalid update group ID: ");
 		this.sUpdateGroupId = mParameters.updateGroupId || this.getGroupId();
 		this.mGroupProperties = {};
 		for (sGroupId in mParameters.groupProperties) {
-			that.checkGroupId(sGroupId, true);
+			_Helper.checkGroupId(sGroupId, true);
 			oGroupProperties = mParameters.groupProperties[sGroupId];
 			if (typeof oGroupProperties !== "object"
 					|| Object.keys(oGroupProperties).length !== 1
@@ -324,24 +324,26 @@ sap.ui.define([
 		}
 		this.bSharedRequests = mParameters.sharedRequests === true;
 
+		// BEWARE: do not share mHeaders between _MetadataRequestor and _Requestor!
 		this.mHeaders = {"Accept-Language" : sLanguageTag};
 		this.mMetadataHeaders = {"Accept-Language" : sLanguageTag};
 
-		// BEWARE: do not share mHeaders between _MetadataRequestor and _Requestor!
+		mQueryParams = Object.assign({}, mUriParameters, mParameters.metadataUrlParams);
 		this.oMetaModel = new ODataMetaModel(
-			_MetadataRequestor.create(this.mMetadataHeaders, sODataVersion,
-				Object.assign({}, mUriParameters, mParameters.metadataUrlParams)),
+			_MetadataRequestor.create(this.mMetadataHeaders, sODataVersion, mQueryParams),
 			this.sServiceUrl + "$metadata", mParameters.annotationURI, this,
-			mParameters.supportReferences);
+			mParameters.supportReferences, mQueryParams["sap-language"]);
 		this.oInterface = {
 			fetchEntityContainer : this.oMetaModel.fetchEntityContainer.bind(this.oMetaModel),
 			fetchMetadata : this.oMetaModel.fetchObject.bind(this.oMetaModel),
+			fireMessageChange : this.fireMessageChange.bind(this),
 			fireDataReceived : this.fireDataReceived.bind(this),
 			fireDataRequested : this.fireDataRequested.bind(this),
 			fireSessionTimeout : function () {
 				that.fireEvent("sessionTimeout");
 			},
 			getGroupProperty : this.getGroupProperty.bind(this),
+			getMessagesByPath : this.getMessagesByPath.bind(this),
 			getOptimisticBatchEnabler : this.getOptimisticBatchEnabler.bind(this),
 			getReporter : this.getReporter.bind(this),
 			onCreateGroup : function (sGroupId) {
@@ -417,7 +419,11 @@ sap.ui.define([
 	 * is not.
 	 *
 	 * If a back-end request fails, the 'dataReceived' event provides an <code>Error</code> in the
-	 * 'error' event parameter.
+	 * 'error' event parameter.  If multiple requests are processed within a single $batch
+	 * (or even a single change set), the order of 'dataReceived' events is not guaranteed. For
+	 * requests which are not processed because a previous request failed, <code>error.cause</code>
+	 * points to the root cause error - you should either ignore those events, or unwrap the error
+	 * to access the root cause immediately.
 	 *
 	 * @param {sap.ui.base.Event} oEvent
 	 * @param {object} oEvent.getParameters()
@@ -560,7 +566,7 @@ sap.ui.define([
 	 * @returns {this} <code>this</code> to allow method chaining
 	 *
 	 * @public
-	 * @since 1.105.0
+	 * @since 1.106.0
 	 */
 	ODataModel.prototype.attachDataReceived = function (fnFunction, oListener) {
 		return this.attachEvent("dataReceived", fnFunction, oListener);
@@ -1192,37 +1198,12 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataModel.prototype.checkBatchGroupId = function (sGroupId) {
-		this.checkGroupId(sGroupId);
+		_Helper.checkGroupId(sGroupId);
 		if (this.isDirectGroup(sGroupId)) {
 			throw new Error("Group ID does not use batch requests: " + sGroupId);
 		}
 	};
 
-	/**
-	 * Checks whether the given group ID is valid, which means it is either undefined, '$auto',
-	 * '$auto.*', '$direct' or an application group ID as specified in
-	 * {@link sap.ui.model.odata.v4.ODataModel}.
-	 *
-	 * @param {string} sGroupId
-	 *   The group ID
-	 * @param {boolean} [bApplicationGroup]
-	 *   Whether only an application group ID is considered valid
-	 * @param {string} [sErrorMessage]
-	 *   The error message to be used if group ID is not valid; the group ID will be appended
-	 * @throws {Error}
-	 *   For invalid group IDs
-	 *
-	 * @private
-	 */
-	ODataModel.prototype.checkGroupId = function (sGroupId, bApplicationGroup, sErrorMessage) {
-		if (!bApplicationGroup && sGroupId === undefined
-				|| typeof sGroupId === "string"
-					&& (bApplicationGroup ? rApplicationGroupID : rGroupID).test(sGroupId)) {
-			return;
-		}
-		throw new Error((sErrorMessage || "Invalid group ID: ") + sGroupId);
-	};
-
 	/**
 	 * Creates a binding context for the given path. A relative path can only be resolved if a
 	 * context is provided.
@@ -1447,7 +1428,7 @@ sap.ui.define([
 		if (sCanonicalPath[0] !== "/") {
 			throw new Error("Invalid path: " + sCanonicalPath);
 		}
-		this.checkGroupId(sGroupId);
+		_Helper.checkGroupId(sGroupId);
 		sGroupId = sGroupId || this.getUpdateGroupId();
 		if (this.isApiGroup(sGroupId)) {
 			throw new Error("Illegal update group ID: " + sGroupId);
@@ -1504,7 +1485,7 @@ sap.ui.define([
 	 * @returns {this} <code>this</code> to allow method chaining
 	 *
 	 * @public
-	 * @since 1.105.0
+	 * @since 1.106.0
 	 */
 	ODataModel.prototype.detachDataReceived = function (fnFunction, oListener) {
 		return this.detachEvent("dataReceived", fnFunction, oListener);
@@ -1538,6 +1519,31 @@ sap.ui.define([
 		return this.detachEvent("sessionTimeout", fnFunction, oListener);
 	};
 
+	/**
+	 * Requests the metadata for the given meta path and calculates the key predicate by taking the
+	 * key properties from the given entity instance.
+	 *
+	 * @param {string} sMetaPath
+	 *   An absolute metadata path to the entity set
+	 * @param {object} oEntity
+	 *   The entity instance with the key property values
+	 * @returns {sap.ui.base.SyncPromise<string|undefined>}
+	 *   A promise that gets resolved with the proper URI encoded key predicate, for example
+	 *   "(Sector='A%2FB%26C',ID='42')" or "('42')", or <code>undefined</code>, if at least one key
+	 *   property is undefined. It gets rejected if the metadata cannot be fetched or in case the
+	 *   entity has no key properties according to metadata.
+	 *
+	 * @private
+	 * @see #requestKeyPredicate
+	 */
+	ODataModel.prototype.fetchKeyPredicate = function (sMetaPath, oEntity) {
+		var mTypeForMetaPath = {};
+
+		return this.oRequestor.fetchType(mTypeForMetaPath, sMetaPath).then(function () {
+			return _Helper.getKeyPredicate(oEntity, sMetaPath, mTypeForMetaPath);
+		});
+	};
+
 	/**
 	 * @override
 	 * @see sap.ui.model.Model#filterMatchingMessages
@@ -1705,6 +1711,28 @@ sap.ui.define([
 		return mHeadersCopy;
 	};
 
+	/**
+	 * Takes the metadata for the given meta path and calculates the key predicate by taking the key
+	 * properties from the given entity instance.
+	 *
+	 * @param {string} sMetaPath
+	 *   An absolute metadata path to an entity set
+	 * @param {object} oEntity
+	 *   The entity instance with the key property values
+	 * @returns {string|undefined}
+	 *   The proper URI-encoded key predicate, for example "(Sector='A%2FB%26C',ID='42')" or
+	 *   "('42')", or <code>undefined</code> if at least one key property is undefined.
+	 * @throws {Error}
+	 *   If the key predicate cannot be determined synchronously
+	 *   (due to a pending metadata request), or if the metadata could not be fetched.
+	 *
+	 * @function
+	 * @public
+	 * @see #requestKeyPredicate
+	 * @since 1.107.0
+	 */
+	ODataModel.prototype.getKeyPredicate = _Helper.createGetMethod("fetchKeyPredicate", true);
+
 	/**
 	 * Returns messages of this model associated with the given context, that is messages belonging
 	 * to the object referred to by this context or a child object of that object. The messages are
@@ -1811,7 +1839,7 @@ sap.ui.define([
 	 * {@link sap.ui.model.odata.v4.Context#getBinding binding} during its lifetime.
 	 *
 	 * @param {string} sPath
-	 *   A list context path to an entity
+	 *   A list context path to an entity, see also {@link #requestKeyPredicate}
 	 * @param {boolean} [bRequestMessages]
 	 *   Whether to request messages for the context's entity
 	 * @param {object} [mParameters]
@@ -1859,7 +1887,7 @@ sap.ui.define([
 				throw new Error("Invalid parameter: " + sParameter);
 			}
 		});
-		sListPath = sPath.slice(0, this.getPredicateIndex(sPath));
+		sListPath = sPath.slice(0, _Helper.getPredicateIndex(sPath));
 		oListBinding = this.mKeepAliveBindingsByPath[sListPath];
 		if (!oListBinding) {
 			aListBindings = this.aAllBindings.filter(function (oBinding) {
@@ -1882,27 +1910,6 @@ sap.ui.define([
 		return oListBinding.getKeepAliveContext(sPath, bRequestMessages, mParameters.$$groupId);
 	};
 
-	/**
-	 * Returns the index of the key predicate in the last segment of the given path.
-	 *
-	 * @param {string} sPath - The path
-	 * @returns {number} The index of the key predicate
-	 * @throws {Error} If no path is given or the last segment contains no key predicate
-	 *
-	 * @private
-	 */
-	ODataModel.prototype.getPredicateIndex = function (sPath) {
-		var iPredicateIndex = sPath
-				? sPath.indexOf("(", sPath.lastIndexOf("/"))
-				: -1;
-
-		if (iPredicateIndex < 0 || !sPath.endsWith(")")) {
-			throw new Error("Not a list context path to an entity: " + sPath);
-		}
-
-		return iPredicateIndex;
-	};
-
 	/**
 	 * Returns the model's update group ID.
 	 *
@@ -1937,6 +1944,20 @@ sap.ui.define([
 		};
 	};
 
+	/**
+	 * Returns this model's root URL of the service to request data from (as defined by the
+	 * "serviceUrl" model parameter, see {@link sap.ui.model.odata.v4.ODataModel#constructor}),
+	 * without query options.
+	 *
+	 * @returns {string} The service URL
+	 *
+	 * @public
+	 * @since 1.107.0
+	 */
+	ODataModel.prototype.getServiceUrl = function () {
+		return this.sServiceUrl;
+	};
+
 	/**
 	 * Returns <code>true</code> if there are pending changes, meaning updates or created entities
 	 * (see {@link sap.ui.model.odata.v4.ODataListBinding#create}) that have not yet been
@@ -2098,7 +2119,7 @@ sap.ui.define([
 		if (typeof sGroupId === "boolean") {
 			throw new Error("Unsupported parameter bForceUpdate");
 		}
-		this.checkGroupId(sGroupId);
+		_Helper.checkGroupId(sGroupId);
 
 		// Note: getBindings() returns an array that contains all bindings with change listeners
 		// (owned by Model)
@@ -2363,6 +2384,27 @@ sap.ui.define([
 		return oEntityContext.requestCanonicalPath();
 	};
 
+	/**
+	 * Requests the metadata for the given meta path and calculates the key predicate by taking the
+	 * key properties from the given entity instance.
+	 *
+	 * @param {string} sMetaPath
+	 *   An absolute metadata path to the entity set
+	 * @param {object} oEntity
+	 *   The entity instance with the key property values
+	 * @returns {Promise<string|undefined>}
+	 *   A promise that gets resolved with the proper URI-encoded key predicate, for example
+	 *   "(Sector='A%2FB%26C',ID='42')" or "('42')", or <code>undefined</code> if at least one key
+	 *   property is undefined. It gets rejected if the metadata cannot be fetched, or in case the
+	 *   entity has no key properties according to the metadata.
+	 *
+	 * @function
+	 * @public
+	 * @see #getKeyPredicates
+	 * @since 1.107.0
+	 */
+	ODataModel.prototype.requestKeyPredicate = _Helper.createRequestMethod("fetchKeyPredicate");
+
 	/**
 	 * Requests side effects for the given paths on all affected root bindings.
 	 *
@@ -2600,7 +2642,7 @@ sap.ui.define([
 	/**
 	 * Returns a string representation of this object including the service URL.
 	 *
-	 * @return {string} A string description of this model
+	 * @returns {string} A string description of this model
 	 * @public
 	 * @since 1.37.0
 	 */

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

@@ -54,11 +54,13 @@ sap.ui.define([
 	 *
 	 * @param {function} fnFunction The function to call when the event occurs
 	 * @param {object} [oListener] Object on which to call the given function
+	 * @returns {this} <code>this</code> to allow method chaining
+	 *
 	 * @public
 	 * @since 1.59.0
 	 */
 	ODataParentBinding.prototype.attachPatchCompleted = function (fnFunction, oListener) {
-		this.attachEvent("patchCompleted", fnFunction, oListener);
+		return this.attachEvent("patchCompleted", fnFunction, oListener);
 	};
 
 	/**
@@ -66,11 +68,13 @@ sap.ui.define([
 	 *
 	 * @param {function} fnFunction The function to call when the event occurs
 	 * @param {object} [oListener] Object on which to call the given function
+	 * @returns {this} <code>this</code> to allow method chaining
+	 *
 	 * @public
 	 * @since 1.59.0
 	 */
 	ODataParentBinding.prototype.detachPatchCompleted = function (fnFunction, oListener) {
-		this.detachEvent("patchCompleted", fnFunction, oListener);
+		return this.detachEvent("patchCompleted", fnFunction, oListener);
 	};
 
 	/**
@@ -138,11 +142,13 @@ sap.ui.define([
 	 *
 	 * @param {function} fnFunction The function to call when the event occurs
 	 * @param {object} [oListener] Object on which to call the given function
+	 * @returns {this} <code>this</code> to allow method chaining
+	 *
 	 * @public
 	 * @since 1.59.0
 	 */
 	ODataParentBinding.prototype.attachPatchSent = function (fnFunction, oListener) {
-		this.attachEvent("patchSent", fnFunction, oListener);
+		return this.attachEvent("patchSent", fnFunction, oListener);
 	};
 
 	/**
@@ -150,11 +156,13 @@ sap.ui.define([
 	 *
 	 * @param {function} fnFunction The function to call when the event occurs
 	 * @param {object} [oListener] Object on which to call the given function
+	 * @returns {this} <code>this</code> to allow method chaining
+	 *
 	 * @public
 	 * @since 1.59.0
 	 */
 	ODataParentBinding.prototype.detachPatchSent = function (fnFunction, oListener) {
-		this.detachEvent("patchSent", fnFunction, oListener);
+		return this.detachEvent("patchSent", fnFunction, oListener);
 	};
 
 	/**

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

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.106.0
+		 * @version 1.107.1
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId
@@ -760,7 +760,7 @@ sap.ui.define([
 			throw reportError(new Error("Must not specify a group ID (" + sGroupId
 				+ ") with $$noPatch"));
 		}
-		this.oModel.checkGroupId(sGroupId);
+		_Helper.checkGroupId(sGroupId);
 		if (typeof vValue === "function" || (vValue && typeof vValue === "object")) {
 			throw reportError(new Error("Not a primitive value"));
 		}

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

@@ -76,7 +76,7 @@ sap.ui.define([
 			 *   corresponding number of milliseconds since 1 January, 1970 UTC.
 			 *   Otherwise the values are compared with the JavaScript operators <code>===</code>
 			 *   and <code>></code>.
-			 * @return {number}
+			 * @returns {number}
 			 *   The result of the comparison: <code>0</code> if the values are equal,
 			 *   <code>1</code> if the first value is larger, <code>-1</code> if the second value
 			 *   is larger, <code>NaN</code> if they cannot be compared

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

@@ -885,59 +885,71 @@ 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 {boolean} [bIsGrouped]
+	 *   Whether the list binding is grouped via its first sorter
 	 * @returns {sap.ui.model.odata.v4.lib._Cache}
 	 *   The cache
 	 * @throws {Error}
 	 *   If the system query option "$filter" is combined with group levels or with grand totals
-	 *   (unless "grandTotal like 1.84"), or if grand totals or group levels are combined with
-	 *   min/max, or if the system query options "$expand" or "$select" are combined with pure data
-	 *   aggregation (no recursive hierarchy), or if the system query option "$search" is combined
-	 *   with grand totals or group levels or a recursive hierarchy
+	 *   (unless "grandTotal like 1.84"), or if grand totals or group levels or recursive hierarchy
+	 *   are combined with min/max or with grouping via sorter, or if the system query options
+	 *   "$expand" or "$select" are combined with pure data aggregation (no recursive hierarchy), or
+	 *   if the system query option "$search" is combined with grand totals or group levels or a
+	 *   recursive hierarchy
 	 *
 	 * @public
 	 */
 	_AggregationCache.create = function (oRequestor, sResourcePath, sDeepResourcePath, oAggregation,
-			mQueryOptions, bSortExpandSelect, bSharedRequest) {
-		var bHasGrandTotal, bHasGroupLevels, bHasMinOrMax;
+			mQueryOptions, bSortExpandSelect, bSharedRequest, bIsGrouped) {
+		var bHasGrandTotal, bHasGroupLevels;
+
+		function checkExpandSelect() {
+			if ("$expand" in mQueryOptions) {
+				throw new Error("Unsupported system query option: $expand");
+			}
+			if ("$select" in mQueryOptions) {
+				throw new Error("Unsupported system query option: $select");
+			}
+		}
 
 		if (oAggregation) {
 			bHasGrandTotal = _AggregationHelper.hasGrandTotal(oAggregation.aggregate);
 			bHasGroupLevels = oAggregation.groupLevels && !!oAggregation.groupLevels.length;
-			bHasMinOrMax = _AggregationHelper.hasMinOrMax(oAggregation.aggregate);
 
-			if (mQueryOptions.$filter
-				&& (bHasGrandTotal && !oAggregation["grandTotal like 1.84"]
-					|| bHasGroupLevels)) {
-				throw new Error("Unsupported system query option: $filter");
-			}
-			if (mQueryOptions.$search
-					&& (bHasGrandTotal || bHasGroupLevels || oAggregation.hierarchyQualifier)) {
-				throw new Error("Unsupported system query option: $search");
-			}
-			if (bHasMinOrMax) {
+			if (_AggregationHelper.hasMinOrMax(oAggregation.aggregate)) {
 				if (bHasGrandTotal) {
 					throw new Error("Unsupported grand totals together with min/max");
 				}
 				if (bHasGroupLevels) {
 					throw new Error("Unsupported group levels together with min/max");
 				}
+				if (oAggregation.hierarchyQualifier) {
+					throw new Error("Unsupported recursive hierarchy together with min/max");
+				}
+				checkExpandSelect();
+
+				return _MinMaxHelper.createCache(oRequestor, sResourcePath, oAggregation,
+					mQueryOptions);
 			}
 
-			if (bHasGrandTotal || bHasGroupLevels || bHasMinOrMax
-					|| oAggregation.hierarchyQualifier) {
+			if (mQueryOptions.$filter
+				&& (bHasGrandTotal && !oAggregation["grandTotal like 1.84"]
+					|| bHasGroupLevels)) {
+				throw new Error("Unsupported system query option: $filter");
+			}
+
+			if (bHasGrandTotal || bHasGroupLevels || oAggregation.hierarchyQualifier) {
+				if (mQueryOptions.$search) {
+					throw new Error("Unsupported system query option: $search");
+				}
 				if (!oAggregation.hierarchyQualifier) {
-					if ("$expand" in mQueryOptions) {
-						throw new Error("Unsupported system query option: $expand");
-					}
-					if ("$select" in mQueryOptions) {
-						throw new Error("Unsupported system query option: $select");
-					}
+					checkExpandSelect();
+				}
+				if (bIsGrouped) {
+					throw new Error("Unsupported grouping via sorter");
 				}
 
-				return bHasMinOrMax
-					? _MinMaxHelper.createCache(oRequestor, sResourcePath, oAggregation,
-						mQueryOptions)
-					: new _AggregationCache(oRequestor, sResourcePath, oAggregation, mQueryOptions,
+				return new _AggregationCache(oRequestor, sResourcePath, oAggregation, mQueryOptions,
 						bHasGrandTotal);
 			}
 		}