@openui5/sap.ui.core 1.132.1 → 1.134.0

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

@@ -93,7 +93,7 @@ sap.ui.define([
 			serviceUrl : true,
 			sharedRequests : true,
 			supportReferences : true,
-			/** @deprecated As of Version 1.110.0 */
+			/** @deprecated As of version 1.110.0 */
 			synchronizationMode : true,
 			updateGroupId : true,
 			withCredentials : true
@@ -240,7 +240,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.132.1
+		 * @version 1.134.0
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -278,7 +278,7 @@ sap.ui.define([
 		// do not pass any parameters to Model
 		Model.call(this);
 
-		/** @deprecated As of Version 1.110.0 */
+		/** @deprecated As of version 1.110.0 */
 		if ("synchronizationMode" in mParameters && mParameters.synchronizationMode !== "None") {
 			throw new Error("Synchronization mode must be 'None'");
 		}
@@ -774,8 +774,8 @@ sap.ui.define([
 	 * @param {string|string[]} [mParameters.$select]
 	 *   A comma separated list or an array of items which determine the value for the
 	 *   "5.1.3 System Query Option $select". Since 1.75.0, when using the "autoExpandSelect" model
-	 *   parameter (see {@link sap.ui.model.odata.v4.ODataModel#constructor}), paths with navigation
-	 *   properties can be included and will contribute to the "5.1.2 System Query Option $expand".
+	 *   parameter (see {@link #constructor}), paths with navigation properties can be included and
+	 *   will contribute to the "5.1.2 System Query Option $expand".
 	 * @param {boolean} [mParameters.$$canonicalPath]
 	 *   Whether a binding relative to an {@link sap.ui.model.odata.v4.Context} uses the canonical
 	 *   path computed from its context's path for data service requests; only the value
@@ -783,7 +783,7 @@ sap.ui.define([
 	 * @param {string} [mParameters.$$groupId]
 	 *   The group ID to be used for <b>read</b> requests initiated by this binding; if not
 	 *   specified, either the parent binding's group ID (if the binding is relative) or the
-	 *   model's group ID is used, see {@link sap.ui.model.odata.v4.ODataModel#constructor}.
+	 *   model's group ID is used, see {@link #constructor}.
 	 *   Valid values are <code>undefined</code>, '$auto', '$auto.*', '$direct' or application group
 	 *   IDs as specified in {@link sap.ui.model.odata.v4.ODataModel}.
 	 * @param {boolean} [mParameters.$$inheritExpandSelect]
@@ -802,8 +802,7 @@ sap.ui.define([
 	 * @param {string} [mParameters.$$updateGroupId]
 	 *   The group ID to be used for <b>update</b> requests initiated by this binding;
 	 *   if not specified, either the parent binding's update group ID (if the binding is relative)
-	 *   or the model's update group ID is used, see
-	 *   {@link sap.ui.model.odata.v4.ODataModel#constructor}.
+	 *   or the model's update group ID is used, see {@link #constructor}.
 	 *   For valid values, see parameter "$$groupId".
 	 * @returns {sap.ui.model.odata.v4.ODataContextBinding}
 	 *   The context binding
@@ -917,8 +916,8 @@ sap.ui.define([
 	 * @param {string|string[]} [mParameters.$select]
 	 *   A comma separated list or an array of items which determine the value for the
 	 *   "5.1.3 System Query Option $select". Since 1.75.0, when using the "autoExpandSelect" model
-	 *   parameter (see {@link sap.ui.model.odata.v4.ODataModel#constructor}), paths with navigation
-	 *   properties can be included and will contribute to the "5.1.2 System Query Option $expand".
+	 *   parameter (see {@link #constructor}), paths with navigation properties can be included and
+	 *   will contribute to the "5.1.2 System Query Option $expand".
 	 * @param {object} [mParameters.$$aggregation]
 	 *   An object holding the information needed for data aggregation, see
 	 *   {@link sap.ui.model.odata.v4.ODataListBinding#setAggregation} for details.
@@ -940,7 +939,7 @@ sap.ui.define([
 	 * @param {string} [mParameters.$$groupId]
 	 *   The group ID to be used for <b>read</b> requests initiated by this binding; if not
 	 *   specified, either the parent binding's group ID (if the binding is relative) or the
-	 *   model's group ID is used, see {@link sap.ui.model.odata.v4.ODataModel#constructor}.
+	 *   model's group ID is used, see {@link #constructor}.
 	 *   Valid values are <code>undefined</code>, '$auto', '$auto.*', '$direct' or application group
 	 *   IDs as specified in {@link sap.ui.model.odata.v4.ODataModel}.
 	 * @param {sap.ui.model.odata.OperationMode} [mParameters.$$operationMode]
@@ -964,13 +963,13 @@ sap.ui.define([
 	 *   the main list becoming available faster, while the separate properties are merged as soon
 	 *   as the data is received. Note that the separate properties must be single valued and part
 	 *   of the '$expand' system query option, either automatically via the "autoExpandSelect" model
-	 *   parameter (see {@link sap.ui.model.odata.v4.ODataModel#constructor}) or manually. The
-	 *   <code>$$separate</code> parameter must not be combined with <code>$$aggregation</code>.
+	 *   parameter (see {@link #constructor}) or manually. The <code>$$separate</code> parameter
+	 *   must not be combined with <code>$$aggregation</code>.
 	 * @param {boolean} [mParameters.$$sharedRequest]
 	 *   Whether multiple bindings for the same resource path share the data, so that it is
 	 *   requested only once.
 	 *   This parameter can be inherited from the model's parameter "sharedRequests", see
-	 *   {@link sap.ui.model.odata.v4.ODataModel#constructor}. Supported since 1.80.0
+	 *   {@link #constructor}. Supported since 1.80.0
 	 *   <b>Note:</b> These bindings are read-only, so they may be especially useful for value
 	 *   lists; state messages (since 1.108.0) and the following APIs are <b>not</b> allowed
 	 *   <ul>
@@ -1005,8 +1004,7 @@ sap.ui.define([
 	 * @param {string} [mParameters.$$updateGroupId]
 	 *   The group ID to be used for <b>update</b> requests initiated by this binding;
 	 *   if not specified, either the parent binding's update group ID (if the binding is relative)
-	 *   or the model's update group ID is used,
-	 *   see {@link sap.ui.model.odata.v4.ODataModel#constructor}.
+	 *   or the model's update group ID is used, see {@link #constructor}.
 	 *   For valid values, see parameter "$$groupId".
 	 * @returns {sap.ui.model.odata.v4.ODataListBinding}
 	 *   The list binding
@@ -1081,7 +1079,7 @@ sap.ui.define([
 	 * @param {string} [mParameters.$$groupId]
 	 *   The group ID to be used for <b>read</b> requests initiated by this binding; if not
 	 *   specified, either the parent binding's group ID (if the binding is relative) or the
-	 *   model's group ID is used, see {@link sap.ui.model.odata.v4.ODataModel#constructor}.
+	 *   model's group ID is used, see {@link #constructor}.
 	 *   Valid values are <code>undefined</code>, '$auto', '$auto.*', '$direct' or application group
 	 *   IDs as specified in {@link sap.ui.model.odata.v4.ODataModel}.
 	 * @param {boolean} [mParameters.$$ignoreMessages]
@@ -1842,7 +1840,7 @@ sap.ui.define([
 	 *   The group ID
 	 *
 	 * @public
-	 * @see sap.ui.model.odata.v4.ODataModel#constructor
+	 * @see #constructor
 	 * @since 1.41.0
 	 */
 	ODataModel.prototype.getGroupId = function () {
@@ -1861,7 +1859,7 @@ sap.ui.define([
 	 * @throws {Error} If the name of the group property is not 'submit'
 	 *
 	 * @private
-	 * @see sap.ui.model.odata.v4.ODataModel#constructor
+	 * @see #constructor
 	 */
 	ODataModel.prototype.getGroupProperty = function (sGroupId, sPropertyName) {
 		switch (sPropertyName) {
@@ -1883,16 +1881,16 @@ sap.ui.define([
 	/**
 	 * Returns a map of HTTP headers used for data and metadata requests. While the "X-CSRF-Token"
 	 * header is not used for metadata requests, it is still included here if available. The
-	 * "SAP-ContextId" header is only included if requested explicitly (@since 1.86.0).
+	 * "SAP-ContextId" header is only included if requested explicitly (since 1.86.0).
 	 *
 	 * @param {boolean} [bIncludeContextId]
-	 *   Whether to include the "SAP-ContextId" header (@since 1.86.0)
+	 *   Whether to include the "SAP-ContextId" header (since 1.86.0)
 	 * @returns {Object<string>}
 	 *   The map of HTTP headers
 	 *
 	 * @public
 	 * @see #changeHttpHeaders
-	 * @since 1.71
+	 * @since 1.71.0
 	 */
 	ODataModel.prototype.getHttpHeaders = function (bIncludeContextId) {
 		var mHeadersCopy = Object.assign({}, this.mHeaders);
@@ -2173,8 +2171,7 @@ 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.
+	 * "serviceUrl" model parameter, see {@link #constructor}), without query options.
 	 *
 	 * @returns {string} The service URL
 	 *
@@ -2192,7 +2189,7 @@ sap.ui.define([
 	 *   The update group ID
 	 *
 	 * @public
-	 * @see sap.ui.model.odata.v4.ODataModel#constructor
+	 * @see #constructor
 	 * @since 1.41.0
 	 */
 	ODataModel.prototype.getUpdateGroupId = function () {
@@ -2692,7 +2689,7 @@ sap.ui.define([
 	 *   in case of success, or rejected with an instance of <code>Error</code> in case of failure,
 	 *   e.g. when the given context does not point to an entity
 	 *
-	 * @deprecated since 1.39.0
+	 * @deprecated As of version 1.39.0
 	 *   Use {@link sap.ui.model.odata.v4.Context#requestCanonicalPath} instead.
 	 * @public
 	 * @since 1.37.0
@@ -2770,7 +2767,7 @@ sap.ui.define([
 	 *   given group ID are running.
 	 *
 	 * @public
-	 * @see sap.ui.model.odata.v4.ODataModel#constructor
+	 * @see #constructor
 	 * @see #hasPendingChanges
 	 * @since 1.39.0
 	 */
@@ -2857,6 +2854,31 @@ sap.ui.define([
 		this.oAnnotationChangePromise = oAnnotationChangePromise;
 	};
 
+	/**
+	 * Sets the "odata.continue-on-error" preference once for the <b>current</b> batch request
+	 * associated with the given group ID. This method can be called early on, when that batch queue
+	 * is still empty, or even synchronously after {@link #submitBatch} - just as long as the $batch
+	 * request is not already being sent to the server. It needs to be called again for future
+	 * batch requests with the same group ID.
+	 *
+	 * @param {string} sGroupId
+	 *   A valid group ID as specified in {@link sap.ui.model.odata.v4.ODataModel}. Note that
+	 *   '$auto' should be avoided to control exactly which requests are affected by this
+	 *   preference. Using a {@link module:sap/base/util/uid UID} may be one way to achieve this,
+	 *   but take care to replace dashes with underscores.
+	 * @throws {Error}
+	 *   If the given group ID is not a valid group ID or has
+	 *   {@link sap.ui.model.odata.v4.SubmitMode.Direct}
+	 *
+	 * @private
+	 * @since 1.134.0
+	 * @ui5-restricted sap.fe
+	 */
+	ODataModel.prototype.setContinueOnError = function (sGroupId) {
+		this.checkBatchGroupId(sGroupId);
+		this.oRequestor.setContinueOnError(sGroupId);
+	};
+
 	/**
 	 * Sets a listener for HTTP responses which is called every time with the full set of headers
 	 * received.
@@ -2923,7 +2945,7 @@ sap.ui.define([
 	 * There are several preconditions on the usage of this API:
 	 * <ul>
 	 *   <li> Optimistic batch handling requires the "earlyRequests" model parameter; see
-	 *     {@link sap.ui.model.odata.v4.ODataModel#constructor},
+	 *     {@link #constructor},
 	 *   <li> the setter has to be called before the first $batch request is sent,
 	 *   <li> the setter may only be called once for an OData model,
 	 *   <li> the callback has to return a boolean, or a <code>Promise</code> resolving with a
@@ -2979,9 +3001,8 @@ sap.ui.define([
 	 * @param {function(Error):Promise<undefined>} fnRetryAfter
 	 *   A "Retry-After" handler
 	 *
-	 * @private
-	 * @ui5-restricted sap.fe
-	 * @since 1.129.0
+	 * @public
+	 * @since 1.134.0
 	 */
 	ODataModel.prototype.setRetryAfterHandler = function (fnRetryAfter) {
 		this.fnRetryAfter = fnRetryAfter;
@@ -3110,14 +3131,14 @@ sap.ui.define([
 		});
 	};
 
-	/** @deprecated */
+	/** @deprecated As of version 1.120.0 */
 	(() => {
 		const fnOriginalExtend = ODataModel.extend;
 		/**
 		 * DO NOT EXTEND THIS CLASS.
 		 *
 		 * @returns {function} The created class / constructor function
-		 * @deprecated
+		 * @deprecated As of version 1.120.0
 		 */
 		ODataModel.extend = function () {
 			Log.error("[FUTURE FATAL] sap.ui.model.odata.v4.ODataModel must not be extended");

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

@@ -294,8 +294,9 @@ sap.ui.define([
 	 * @throws {Error} If
 	 *   <ul>
 	 *     <li> there are pending changes that cannot be ignored,
-	 *     <li> the binding is {@link #isTransient transient} (part of a
-	 *       {@link sap.ui.model.odata.v4.ODataListBinding#create deep create}),
+	 *     <li> the binding is part of a
+	 *       {@link sap.ui.model.odata.v4.ODataListBinding#create deep create} because it is
+	 *       relative to a {@link sap.ui.model.odata.v4.Context#isTransient transient} context,
 	 *     <li> <code>mParameters</code> is missing, contains binding-specific or unsupported
 	 *       parameters, contains unsupported values, or contains the property "$expand" or
 	 *       "$select" when the model is in auto-$expand/$select mode.
@@ -599,6 +600,8 @@ sap.ui.define([
 	 * @throws {Error}
 	 *   If the cache promise for this binding is not yet fulfilled, or if the cache is shared
 	 *
+	 * @abstract
+	 * @function
 	 * @name sap.ui.model.odata.v4.ODataParentBinding#delete
 	 * @private
 	 */
@@ -642,7 +645,7 @@ sap.ui.define([
 	 * Destroys the object. The object must not be used anymore after this function was called.
 	 *
 	 * @public
-	 * @since 1.61
+	 * @since 1.61.0
 	 */
 	ODataParentBinding.prototype.destroy = function () {
 		this.mAggregatedQueryOptions = undefined;
@@ -1020,6 +1023,7 @@ sap.ui.define([
 	 * @returns {sap.ui.model.odata.v4.Context}
 	 *   A matching context or <code>undefined</code> if there is none
 	 *
+	 * @abstract
 	 * @function
 	 * @name sap.ui.model.odata.v4.ODataParentBinding#findContextForCanonicalPath
 	 * @private
@@ -1029,6 +1033,7 @@ sap.ui.define([
 	 * Fire event 'patchCompleted' to attached listeners, if the last PATCH request is completed.
 	 *
 	 * @param {boolean} bSuccess Whether the current PATCH request has been processed successfully
+	 *
 	 * @private
 	 */
 	ODataParentBinding.prototype.firePatchCompleted = function (bSuccess) {
@@ -1257,6 +1262,8 @@ sap.ui.define([
 	 * @param {string} sName - The parameter's name
 	 * @param {any} vOtherValue - The parameter's other value
 	 * @returns {boolean} Whether the parameter is "unchanged"
+	 *
+	 * @private
 	 */
 	ODataParentBinding.prototype.isUnchangedParameter = function (sName, vOtherValue) {
 		return this.mParameters[sName] === vOtherValue;

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.132.1
+		 * @version 1.134.0
 		 * @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
@@ -136,8 +136,7 @@ sap.ui.define([
 	 *       when it gets a new type via {@link #setType}, or when the data state is reset via
 	 *       {@link sap.ui.model.odata.v4.ODataModel#resetChanges},
 	 *       {@link sap.ui.model.odata.v4.ODataContextBinding#resetChanges},
-	 *       {@link sap.ui.model.odata.v4.ODataListBinding#resetChanges} or
-	 *       {@link sap.ui.model.odata.v4.ODataPropertyBinding#resetChanges},
+	 *       {@link sap.ui.model.odata.v4.ODataListBinding#resetChanges} or {@link #resetChanges},
 	 *     <li> {@link sap.ui.model.ChangeReason.Refresh Refresh} when the binding is refreshed,
 	 *     <li> {@link sap.ui.model.ChangeReason.Context Context} when the parent context is
 	 *       changed.
@@ -560,7 +559,7 @@ sap.ui.define([
 	 *   determined, or rejected in case of an error
 	 *
 	 * @public
-	 * @since 1.69
+	 * @since 1.69.0
 	 */
 	ODataPropertyBinding.prototype.requestValue = function () {
 		var that = this;

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

@@ -6,7 +6,7 @@
 
 //Provides class sap.ui.model.odata.v4.ODataUtils
 sap.ui.define([
-	"sap/ui/core/CalendarType",
+	"sap/base/i18n/date/CalendarType",
 	"sap/ui/core/format/DateFormat",
 	"sap/ui/model/odata/ODataUtils",
 	"sap/ui/model/odata/v4/lib/_Batch",

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

@@ -251,7 +251,13 @@ sap.ui.define([
 			if (oKeptElement && oKeptElement !== oElement
 					&& !(oKeptElement instanceof SyncPromise)) {
 				if (!sHierarchyQualifier || aElements.includes(oKeptElement)) {
-					throw new Error("Duplicate predicate: " + sPredicate);
+					const sNewPredicate = oCache.fixDuplicatePredicate(oElement, sPredicate);
+					if (sNewPredicate) {
+						sPredicate = sNewPredicate;
+						oKeptElement = oElement; // leads to no-op for _Helper.updateNonExisting
+					} else {
+						throw new Error("Duplicate key predicate: " + sPredicate);
+					}
 				}
 				if (!oKeptElement["@odata.etag"]
 						|| oElement["@odata.etag"] === oKeptElement["@odata.etag"]) {
@@ -381,6 +387,8 @@ sap.ui.define([
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock} [oGroupLock]
 	 *   An unlocked lock for the group to associate the clean-up request with; this indicates
 	 *   whether to collapse the node and all its descendants
+	 * @param {boolean} [bSilent]
+	 *   Whether no ("change") events should be fired
 	 * @param {boolean} [bNested]
 	 *   Whether the "collapse all" was performed at an ancestor
 	 * @returns {number}
@@ -389,10 +397,11 @@ sap.ui.define([
 	 * @public
 	 * @see #expand
 	 */
-	_AggregationCache.prototype.collapse = function (sGroupNodePath, oGroupLock, bNested) {
+	_AggregationCache.prototype.collapse = function (sGroupNodePath, oGroupLock, bSilent, bNested) {
 		const oGroupNode = this.getValue(sGroupNodePath);
 		const oCollapsed = _AggregationHelper.getCollapsedObject(oGroupNode);
-		_Helper.updateAll(this.mChangeListeners, sGroupNodePath, oGroupNode, oCollapsed);
+		_Helper.updateAll(bSilent ? {} : this.mChangeListeners, sGroupNodePath, oGroupNode,
+			oCollapsed);
 		const bAll = !!oGroupLock;
 		this.oTreeState.collapse(oGroupNode, bAll, bNested);
 
@@ -415,7 +424,7 @@ sap.ui.define([
 			}
 			if (bAll && oElement["@$ui5.node.isExpanded"]) {
 				iRemaining -= this.collapse(
-					_Helper.getPrivateAnnotation(oElement, "predicate"), oGroupLock, true);
+					_Helper.getPrivateAnnotation(oElement, "predicate"), oGroupLock, bSilent, true);
 			}
 			// exceptions of selection are effectively kept alive (with recursive hierarchy)
 			if (!this.isSelectionDifferent(oElement)) {
@@ -703,6 +712,9 @@ sap.ui.define([
 		if (sParentFilter) {
 			oCache.$parentFilter = sParentFilter;
 		}
+		if (!oAggregation.hierarchyQualifier) {
+			oCache.fixDuplicatePredicate = _AggregationCache.fixDuplicatePredicate.bind(oCache);
+		}
 
 		return oCache;
 	};
@@ -2681,8 +2693,6 @@ sap.ui.define([
 	 *   error.
 	 * @param {boolean} [bIsGrouped]
 	 *   Whether the list binding is grouped via its first sorter
-	 * @param {string[]} [aSeparateProperties]
-	 *   An array of properties which are requested separately
 	 * @returns {sap.ui.model.odata.v4.lib._Cache}
 	 *   The cache
 	 * @throws {Error}
@@ -2697,8 +2707,7 @@ sap.ui.define([
 	 * @public
 	 */
 	_AggregationCache.create = function (oRequestor, sResourcePath, sDeepResourcePath,
-			mQueryOptions, oAggregation, bSortExpandSelect, bSharedRequest, bIsGrouped,
-			aSeparateProperties) {
+			mQueryOptions, oAggregation, bSortExpandSelect, bSharedRequest, bIsGrouped) {
 		var bHasGrandTotal, bHasGroupLevels;
 
 		function checkExpandSelect() {
@@ -2768,7 +2777,22 @@ sap.ui.define([
 		}
 
 		return _Cache.create(oRequestor, sResourcePath, mQueryOptions, bSortExpandSelect,
-			sDeepResourcePath, bSharedRequest, aSeparateProperties);
+			sDeepResourcePath, bSharedRequest);
+	};
+
+	// @override sap.ui.model.odata.v4.lib._Cache#fixDuplicatePredicate
+	_AggregationCache.fixDuplicatePredicate = function (oElement, sPredicate) {
+		if (sPredicate === "('')" || sPredicate.includes("=''")) {
+			Log.warning("Duplicate key predicate: " + sPredicate, this.toString(),
+				"sap.ui.model.odata.v4.lib._AggregationCache");
+			const sNewPredicate = sPredicate.slice(0, -1) + ",$duplicate=" + _Helper.uid() + ")";
+			_Helper.setPrivateAnnotation(oElement, "predicate", sNewPredicate);
+			if (this.aElements.$byPredicate[sPredicate] === oElement) {
+				delete this.aElements.$byPredicate[sPredicate];
+				this.aElements.$byPredicate[sNewPredicate] = oElement;
+			}
+			return sNewPredicate;
+		}
 	};
 
 	return _AggregationCache;

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

@@ -25,6 +25,7 @@ sap.ui.define([
 					with : "string"
 				}
 			},
+			/** @deprecated As of version 1.89.0 */
 			"grandTotal like 1.84" : "boolean",
 			grandTotalAtBottomOnly : "boolean",
 			group : {
@@ -882,15 +883,12 @@ sap.ui.define([
 			});
 
 			aGroups.forEach(function (sGroup) {
-				var aAdditionally = oAggregation.group[sGroup].additionally;
-
-				if (aAdditionally) {
-					aAdditionally.forEach(function (sAdditionally) {
+				oAggregation.group[sGroup].additionally
+					?.forEach(function (sAdditionally) {
 						aAllProperties.push(sAdditionally.includes("/")
 							? sAdditionally.split("/")
 							: sAdditionally);
 					});
-				}
 			});
 
 			return aAllProperties;
@@ -977,8 +975,7 @@ sap.ui.define([
 			 */
 			function isUsedFor(sName, sGroup) {
 				return sName === sGroup
-					|| oAggregation.group[sGroup].additionally
-					&& oAggregation.group[sGroup].additionally.includes(sName);
+					|| oAggregation.group[sGroup].additionally?.includes(sName);
 			}
 
 			if (sOrderby) {
@@ -1193,9 +1190,9 @@ sap.ui.define([
 				// returns true if the array contains a filter affected by the side effect path
 				function hasAffectedFilter(aFilters0) {
 					return aFilters0.some(function (oFilter) {
-						return oFilter.aFilters
-							? hasAffectedFilter(oFilter.aFilters)
-							: isAffected(oFilter.sPath);
+						return oFilter.getFilters()
+							? hasAffectedFilter(oFilter.getFilters())
+							: isAffected(oFilter.getPath());
 					});
 				}
 
@@ -1333,9 +1330,9 @@ sap.ui.define([
 			 *   Whether the filter relates to an aggregate
 			 */
 			function isRelatedToAggregate(oFilter0) {
-				return oFilter0.aFilters
-					? oFilter0.aFilters.some(isRelatedToAggregate)
-					: oFilter0.sPath in oAggregation.aggregate;
+				return oFilter0.getFilters()
+					? oFilter0.getFilters().some(isRelatedToAggregate)
+					: oFilter0.getPath() in oAggregation.aggregate;
 			}
 
 			/*
@@ -1360,9 +1357,9 @@ sap.ui.define([
 			 *   A filter
 			 */
 			function split(oFilter0) {
-				if (oFilter0.aFilters && oFilter0.bAnd) {
-					oFilter0.aFilters.forEach(split);
-				} else if (oFilter0.sPath && isRelatedToUnit(oFilter0.sPath)) {
+				if (oFilter0.getFilters() && oFilter0.isAnd()) {
+					oFilter0.getFilters().forEach(split);
+				} else if (oFilter0.getPath() && isRelatedToUnit(oFilter0.getPath())) {
 					aFiltersNoAggregate.push(oFilter0);
 					aFiltersNoThese.push(oFilter0); // avoid "$these/..." here
 					aFiltersOnAggregate.push(oFilter0);