@openui5/sap.ui.core 1.138.0 → 1.140.0

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

@@ -177,7 +177,7 @@ sap.ui.define([
 	 *   Enable/disable automatic refresh after change operations
 	 * @param {boolean} [mParameters.sequentializeRequests=false]
 	 *   Whether to sequentialize all requests, needed in case the service cannot handle parallel
-	 *   requests. <b>Deprecated</b> as of version 1.128.0, the concept has been discarded.
+	 *   requests. <b>Deprecated as of version 1.128.0</b>, the concept has been discarded.
 	 * @param {string} [mParameters.serviceUrl]
 	 *   Base URI of the service to request data from; this property is mandatory when the first
 	 *   method parameter <code>serviceUrl</code> is omitted, but ignored otherwise
@@ -198,16 +198,16 @@ sap.ui.define([
 	 *   If set to <code>true</code>, the user credentials are included in a cross-origin request. <b>Note:</b> This
 	 *   only works if all requests are asynchronous.
 	 * @param {string} [mParameters.password]
-	 *   <b>Deprecated</b> for security reasons. Use strong server side authentication instead.
+	 *   <b>Deprecated as of version 1.75.0</b> for security reasons. Use strong server side authentication instead.
 	 *   Password for the service.
 	 * @param {boolean} [mParameters.skipMetadataAnnotationParsing]
-	 *   <b>Deprecated</b> This parameter does not prevent creation of annotations from the metadata
-	 *   document in this model's metamodel.
+	 *   <b>Deprecated as of version 1.112.0</b> This parameter does not prevent creation of annotations from the
+	 *   metadata document in this model's metamodel.
 	 *   Whether to skip the automated loading of annotations from the metadata document. Loading
 	 *   annotations from metadata does not have any effects (except the lost performance by
 	 *   invoking the parser) if there are no annotations inside the metadata document
 	 * @param {string} [mParameters.user]
-	 *   <b>Deprecated</b> for security reasons. Use strong server side authentication instead.
+	 *   <b>Deprecated as of version 1.75.0</b> for security reasons. Use strong server side authentication instead.
 	 *   UserID for the service.
 	 *
 	 * @class
@@ -219,7 +219,7 @@ sap.ui.define([
 	 * This model is not prepared to be inherited from.
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel
@@ -325,7 +325,7 @@ sap.ui.define([
 			this.sWarmupUrl = sWarmupUrl;
 			this.bWarmup = !!sWarmupUrl;
 			this.mSupportedBindingModes = {"OneWay": true, "OneTime": true, "TwoWay":true};
-			this.mUnsupportedFilterOperators = {"Any": true, "All": true};
+			this.mUnsupportedFilterOperators = {All: true, Any: true, NotAll: true, NotAny: true};
 			this.sDefaultBindingMode = sDefaultBindingMode || BindingMode.OneWay;
 			this.bIsMessageScopeSupported = false;
 			this.iPendingDeferredRequests = 0;
@@ -467,7 +467,8 @@ sap.ui.define([
 				headers: this.mCustomHeaders,
 				combineEvents: true,
 				cacheKey: this._getAnnotationCacheKey(this.sMetadataUrl),
-				useCache: this.bUseCache
+				useCache: this.bUseCache,
+				withCredentials: this.bWithCredentials
 			});
 			if (!this.bDisableSoftStateHeader) {
 				delete this.mCustomHeaders["sap-contextid-accept"];
@@ -2103,10 +2104,10 @@ sap.ui.define([
 	 *   {@link topic:6c47b2b39db9404582994070ec3d57a2#loio62149734b5c24507868e722fe87a75db
 	 *   Optimizing Dependent Bindings}.
 	 * @param {string} [mParameters.batchGroupId]
-	 *   <b>Deprecated</b>, use <code>groupId</code> instead. Sets the batch group id to be used for
-	 *   requests originating from the binding.
+	 *   <b>Deprecated as of version 1.31.0</b>, use <code>groupId</code> instead. Sets the batch group id to be used
+	 *   for requests originating from the binding.
 	 * @param {int} [mParameters.threshold]
-	 *   Deprecated since 1.102.0, as {@link sap.ui.model.odata.OperationMode.Auto} is deprecated;
+	 *   <b>Deprecated as of version 1.102.0</b>, as {@link sap.ui.model.odata.OperationMode.Auto} is deprecated;
 	 *   the threshold that defines how many entries should be fetched at least by the binding if
 	 *   <code>operationMode</code> is set to <code>Auto</code>.
 	 * @throws {Error} If one of the filters uses an operator that is not supported by the underlying model
@@ -2136,33 +2137,22 @@ sap.ui.define([
 	 * single initial OData request.
 	 *
 	 * For services without the <code>hierarchy-node-descendant-count-for</code> annotation, the
-	 * <code>numberOfExpandedLevels</code> property is not supported and deprecated.
+	 * <code>numberOfExpandedLevels</code> property is not supported and deprecated since 1.44.5.
+	 *
+	 * The OData service must always return node collections which are sufficient to create a valid hierarchy on the
+	 * client. This means that for each node in the response all parent nodes up to the hierarchy root must also
+	 * be contained in the response. Note that this rule applies independent of any filters set for the binding.
+	 *
+	 * You must not define filters on tree annotation properties for this binding as this interferes with hierarchy
+	 * filters defined by the binding itself.
 	 *
-	 * <h3>Operation Modes</h3>
+	 * <h3>Notes On Operation Modes</h3>
 	 * For a full definition and explanation of all OData binding operation modes, see
 	 * {@link sap.ui.model.odata.OperationMode}.
 	 *
-	 * <h4>OperationMode.Server</h4>
-	 * Filtering on the <code>ODataTreeBinding</code> is only supported with filters of type
-	 * {@link sap.ui.model.FilterType.Application}. Be aware that this applies
-	 * only to filters which do not prevent the creation of a hierarchy. So filtering on a property
-	 * (e.g. a "Customer") is fine, as long as the application ensures that the responses from the
-	 * back end are sufficient to create a valid hierarchy on the client. Subsequent paging requests
-	 * for sibling and child nodes must also return responses, since the filters are sent with every
-	 * request. Using control-defined filters (see {@link sap.ui.model.FilterType.Control}) via the
-	 * {@link #filter} function is not supported for the operation mode <code>Server</code>.
-	 *
-	 * <h4>OperationMode.Client and OperationMode.Auto</h4>
-	 * The ODataTreeBinding supports control-defined filters only in operation modes
-	 * <code>Client</code> and <code>Auto</code>. With these operation modes, the filters and
-	 * sorters are applied on the client, like for the
-	 * {@link sap.ui.model.odata.v2.ODataListBinding}.
-	 *
 	 * The operation modes <code>Client</code> and <code>Auto</code> are only supported for services
 	 * which expose the hierarchy annotations mentioned above, but do <b>not</b> expose the
-	 * <code>hierarchy-node-descendant-count-for</code> annotation. Services with hierarchy
-	 * annotations including the <code>hierarchy-node-descendant-count-for</code> annotation, do
-	 * <b>not</b> support the operation modes <code>Client</code> and <code>Auto</code>.
+	 * <code>hierarchy-node-descendant-count-for</code> annotation.
 	 * <b>Note:</b> {@link sap.ui.model.odata.OperationMode.Auto} is deprecated since 1.102.0.
 	 *
 	 * <b>Note:</b> OData tree bindings do neither support
@@ -2203,8 +2193,8 @@ sap.ui.define([
 	 *   the referenced property has to be an integer type
 	 * @param {number} [mParameters.numberOfExpandedLevels=0]
 	 *   The number of levels that are auto-expanded initially. Setting this property might lead to
-	 *   multiple back-end requests. The auto-expand feature is <b>deprecated for services without
-	 *   the <code>hierarchy-node-descendant-count-for</code> annotation</b>
+	 *   multiple back-end requests. The auto-expand feature is <b>deprecated as of Version 1.44.5
+	 *   for services without the <code>hierarchy-node-descendant-count-for</code> annotation</b>
 	 * @param {number} [mParameters.rootLevel=0]
 	 *   The level of the topmost tree nodes
 	 * @param {string} [mParameters.groupId]
@@ -2214,22 +2204,15 @@ sap.ui.define([
 	 *   specified. {@link sap.ui.model.odata.OperationMode.Auto OperationMode.Auto} is only
 	 *   supported for services which expose the hierarchy annotations, yet do <b>NOT</b> expose the
 	 *   <code>hierarchy-node-descendant-count-for</code> annotation.
-	 *   <b>Note:</b> {@link sap.ui.model.odata.OperationMode.Auto} is deprecated since 1.102.0.
 	 * @param {number} [mParameters.threshold]
 	 *   Deprecated since 1.102.0, as {@link sap.ui.model.odata.OperationMode.Auto} is deprecated;
 	 *   the threshold that defines how many entries should be fetched at least by the binding if
 	 *   <code>operationMode</code> is set to <code>Auto</code>
 	 * @param {boolean} [mParameters.useServersideApplicationFilters]
-	 *   Deprecated since 1.102.0, as {@link sap.ui.model.odata.OperationMode.Auto} is deprecated;
-	 *   whether <code>$filter</code> statements should be used for the <code>$count</code> /
+	 *   Whether <code>$filter</code> statements should be used for the <code>$count</code> /
 	 *   <code>$inlinecount</code> requests and for the data request if the operation mode is
-	 *   {@link sap.ui.model.odata.OperationMode.Auto OperationMode.Auto}. Use this feature only
-	 *   if your back end supports pre-filtering the tree and is capable of responding with
-	 *   a complete tree hierarchy, including all inner nodes. To construct the hierarchy on the
-	 *   client, it is mandatory that all filter matches include their complete parent chain up to
-	 *   the root level. If {@link sap.ui.model.odata.OperationMode.Client OperationMode.Client} is
-	 *   used, the complete collection without filters is requested; filters are applied on the
-	 *   client side.
+	 *   {@link sap.ui.model.odata.OperationMode.Auto OperationMode.Auto} or
+	 *   {@link sap.ui.model.odata.OperationMode.Client OperationMode.Client}
 	 * @param {any} [mParameters.treeState]
 	 *   A tree state handle can be given to the <code>ODataTreeBinding</code> when two conditions
 	 *   are met: <ul>
@@ -2252,14 +2235,14 @@ sap.ui.define([
 	 *    <code>preliminaryContext</code> given on construction of the binding's model, see
 	 *    {@link sap.ui.model.odata.v2.ODataModel}
 	 * @param {string} [mParameters.batchGroupId]
-	 *   <b>Deprecated</b>, use <code>groupId</code> instead. Sets the batch group id to be used
+	 *   <b>Deprecated as of version 1.31.0</b>, use <code>groupId</code> instead. Sets the batch group id to be used
 	 *   for requests originating from this binding
 	 * @param {object} [mParameters.navigation]
 	 *   A map describing the navigation properties between entity sets, which is used for
 	 *   constructing and paging the tree. Keys in this object are entity names, whereas the values
 	 *   name the navigation properties.
 	 *
-	 *   <b>Deprecated: since 1.44</b> The use of navigation properties to build up the hierarchy
+	 *   <b>Deprecated as of version 1.44</b> The use of navigation properties to build up the hierarchy
 	 *   structure is deprecated. It is recommended to use the hierarchy annotations mentioned above
 	 *   instead.
 	 * @param {sap.ui.model.Sorter[]|sap.ui.model.Sorter} [vSorters=[]]
@@ -2784,8 +2767,8 @@ sap.ui.define([
 	 *   see {@link topic:6c47b2b39db9404582994070ec3d57a2#loio62149734b5c24507868e722fe87a75db
 	 *   Optimizing Dependent Bindings}.
 	 * @param {string} [mParameters.batchGroupId]
-	 *   <b>Deprecated</b>, use <code>groupId</code> instead. Sets the batch group id to be used for
-	 *   requests originating from the binding.
+	 *   <b>Deprecated as of version 1.31.0</b>, use <code>groupId</code> instead. Sets the batch group id to be used
+	 *   for requests originating from the binding.
 	 * @returns {sap.ui.model.odata.v2.ODataContextBinding} The new context binding
 	 * @see sap.ui.model.Model.prototype.bindContext
 	 * @public
@@ -2966,8 +2949,8 @@ sap.ui.define([
 	 * @param {string} sPath Path/name of the property
 	 * @param {object} [oContext] Context if available to access the property value
 	 * @param {boolean} [bIncludeExpandEntries=false]
-	 *   Deprecated, use {@link #getObject} function with 'select' and 'expand' parameters instead.
-	 *   Whether entities for navigation properties of this property which have been read via
+	 *   <b>Deprecated as of version 1.41.0</b>, use {@link #getObject} function with 'select' and 'expand' parameters
+	 *   instead. Whether entities for navigation properties of this property which have been read via
 	 *   <code>$expand</code> are part of the return value.
 	 * @returns {any} Value of the property
 	 * @throws {Error}
@@ -5305,7 +5288,7 @@ sap.ui.define([
 	 *   sure that the request is completed before the data is processed any further.
 	 * @param {Object<string,string>} [mParameters.urlParameters] A map containing the parameters that will be passed as query strings
 	 * @param {Object<string,string>} [mParameters.headers] A map of headers for this request
-	 * @param {string} [mParameters.batchGroupId] Deprecated - use <code>groupId</code> instead
+	 * @param {string} [mParameters.batchGroupId] <b>Deprecated as of version 1.31.0</b>, use <code>groupId</code> instead
 	 * @param {string} [mParameters.groupId] ID of a request group; requests belonging to the same group will be bundled in one batch request
 	 * @param {string} [mParameters.changeSetId] ID of the <code>ChangeSet</code> that this request should belong to
 	 * @param {boolean} [mParameters.refreshAfterChange] Since 1.46; defines whether to update all bindings after submitting this change operation.
@@ -5390,7 +5373,7 @@ sap.ui.define([
 	 *   <code>true</code>.
 	 * @param {Object<string,string>} [mParameters.urlParameters] A map containing the parameters that will be passed as query strings
 	 * @param {Object<string,string>} [mParameters.headers] A map of headers for this request
-	 * @param {string} [mParameters.batchGroupId] Deprecated - use <code>groupId</code> instead
+	 * @param {string} [mParameters.batchGroupId] <b>Deprecated as of version 1.31.0</b>, use <code>groupId</code> instead
 	 * @param {string} [mParameters.groupId] ID of a request group; requests belonging to the same group will be bundled in one batch request
 	 * @param {string} [mParameters.changeSetId] ID of the <code>ChangeSet</code> that this request should belong to
 	 * @param {boolean} [mParameters.refreshAfterChange] Since 1.46; defines whether to update all bindings after submitting this change operation.
@@ -5478,7 +5461,7 @@ sap.ui.define([
 	 * @param {Object<string,string>} [mParameters.headers]
 	 *   A map of headers for this request
 	 * @param {string} [mParameters.batchGroupId]
-	 *   Deprecated - use <code>groupId</code> instead
+	 *   <b>Deprecated as of version 1.31.0</b>, use <code>groupId</code> instead
 	 * @param {string} [mParameters.groupId]
 	 *   ID of a request group; requests belonging to the same group will be bundled in one batch
 	 *   request
@@ -5660,7 +5643,7 @@ sap.ui.define([
 	 *   Maps the function import parameter name as specified in the function import's metadata to
 	 *   its value; the value is formatted based on the parameter's type as specified in the metadata
 	 * @param {string} [mParameters.batchGroupId]
-	 *   <b>Deprecated - use <code>groupId</code> instead</b>
+	 *   <b>Deprecated as of version 1.31.0</b>, use <code>groupId</code> instead
 	 *
 	 * @return {object}
 	 *   An object which has a <code>contextCreated</code> function that returns a
@@ -5959,7 +5942,7 @@ sap.ui.define([
 	 *   failed. The handler can have the parameter: <code>oError</code> which contains additional error information.
 	 *   If the <code>GET</code> request has been aborted, the error has an <code>aborted</code> flag set to
 	 *   <code>true</code>.
-	 * @param {string} [mParameters.batchGroupId] Deprecated - use <code>groupId</code> instead
+	 * @param {string} [mParameters.batchGroupId] <b>Deprecated as of version 1.31.0</b>, use <code>groupId</code> instead
 	 * @param {string} [mParameters.groupId] ID of a request group; requests belonging to the same group will be bundled in one batch request
 	 * @param {boolean} [mParameters.updateAggregatedMessages]
 	 *   Whether messages for child entities belonging to the same business object as the requested
@@ -6394,9 +6377,9 @@ sap.ui.define([
 	 *   If all contained requests have been aborted, the error has an <code>aborted</code> flag set to
 	 *   <code>true</code>.
 	 * @param {string} [mParameters.batchGroupId]
-	 *   <b>Deprecated</b>, use <code>groupId</code> instead
+	 *   <b>Deprecated as of version 1.31.0</b>, use <code>groupId</code> instead
 	 * @param {boolean} [mParameters.merge]
-	 *   <b>Deprecated</b> since 1.38.0; use the <code>defaultUpdateMethod</code> constructor parameter instead.
+	 *   <b>Deprecated as of version 1.38.0</b>, use the <code>defaultUpdateMethod</code> constructor parameter instead.
 	 *   If unset, the update method is determined from the <code>defaultUpdateMethod</code> constructor parameter.
 	 *   If <code>true</code>, <code>sap.ui.model.odata.UpdateMethod.MERGE</code> is used for update operations;
 	 *   if set to <code>false</code>, <code>sap.ui.model.odata.UpdateMethod.PUT</code> is used.
@@ -6430,10 +6413,10 @@ sap.ui.define([
 	 * @param {function} [mParameters.success]
 	 *   A callback function which is called when the request has been successful
 	 * @param {string} [mParameters.batchGroupId]
-	 *   <b>Deprecated</b>, use <code>groupId</code> instead
+	 *   <b>Deprecated as of version 1.31.0</b>, use <code>groupId</code> instead
 	 * @param {boolean} [mParameters.merge]
-	 *   <b>Deprecated</b> since 1.38.0; whether the update method
-	 *   <code>sap.ui.model.odata.UpdateMethod.MERGE</code> is used
+	 *   <b>Deprecated as of version 1.38.0</b>, use the <code>defaultUpdateMethod</code> constructor parameter instead.
+	 *   Whether the update method <code>sap.ui.model.odata.UpdateMethod.MERGE</code> is used
 	 * @returns {object}
 	 *   An object which has an <code>abort</code> function
 	 * @throws {Error}
@@ -7342,7 +7325,7 @@ sap.ui.define([
 	 * @param {object} mParameters
 	 *   A map of the following parameters:
 	 * @param {string} [mParameters.batchGroupId]
-	 *   Deprecated - use <code>groupId</code> instead
+	 *   <b>Deprecated as of version 1.31.0</b>, use <code>groupId</code> instead
 	 * @param {string} [mParameters.changeSetId]
 	 *   The ID of the <code>ChangeSet</code> that this request should belong to
 	 * @param {sap.ui.model.Context} [mParameters.context]

package/src/sap/ui/model/odata/v2/ODataTreeBinding.js

@@ -28,6 +28,8 @@ sap.ui.define([
 		CountMode, ODataUtils, OperationMode) {
 	"use strict";
 
+	const sClassName = "sap.ui.model.odata.v2.ODataTreeBinding";
+
 	/**
 	 * Do <strong>NOT</strong> call this private constructor, but rather use
 	 * {@link sap.ui.model.odata.v2.ODataModel#bindTree} instead!
@@ -75,10 +77,10 @@ sap.ui.define([
 	 *   the threshold that defines how many entries should be fetched at least by the binding if
 	 *   <code>operationMode</code> is set to <code>Auto</code>
 	 * @param {boolean} [mParameters.useServersideApplicationFilters]
-	 *   Deprecated since 1.102.0, as {@link sap.ui.model.odata.OperationMode.Auto} is deprecated;
-	 *   whether <code>$filter</code> statements should be used for the <code>$count</code> /
+	 *   Whether <code>$filter</code> statements should be used for the <code>$count</code> /
 	 *   <code>$inlinecount</code> requests and for the data request if the operation mode is
-	 *   {@link sap.ui.model.odata.OperationMode.Auto OperationMode.Auto}
+	 *   {@link sap.ui.model.odata.OperationMode.Auto OperationMode.Auto} or
+	 *   {@link sap.ui.model.odata.OperationMode.Client OperationMode.Client}
 	 * @param {any} [mParameters.treeState]
 	 *   A tree state handle
 	 *  @param {sap.ui.model.odata.CountMode} [mParameters.countMode]
@@ -86,9 +88,9 @@ sap.ui.define([
 	 *  @param {boolean} [mParameters.usePreliminaryContext]
 	 *    Whether a preliminary context is used
 	 * @param {string} [mParameters.batchGroupId]
-	 *   <b>Deprecated</b>, use <code>groupId</code> instead
+	 *   <b>Deprecated as of version 1.31.0</b>, use <code>groupId</code> instead
 	 * @param {object} [mParameters.navigation]
-	 *   <b>Deprecated since 1.44:</b> A map describing the navigation properties between entity
+	 *   <b>Deprecated as of version 1.44</b>. A map describing the navigation properties between entity
 	 *   sets, which is used for constructing and paging the tree
 	 * @param {sap.ui.model.Sorter[]|sap.ui.model.Sorter} [vSorters=[]]
 	 *   The sorters used initially; call {@link #sort} to replace them
@@ -103,7 +105,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.TreeBinding
 	 * @hideconstructor
 	 * @public
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 */
 	var ODataTreeBinding = TreeBinding.extend("sap.ui.model.odata.v2.ODataTreeBinding", /** @lends sap.ui.model.odata.v2.ODataTreeBinding.prototype */ {
 
@@ -130,17 +132,6 @@ sap.ui.define([
 
 			this.mNormalizeCache = {};
 
-			vFilters = vFilters || [];
-			// The ODataTreeBinding expects there to be only an array in this.aApplicationFilters later on.
-			// Wrap the given application filters inside an array if necessary
-			if (vFilters instanceof Filter) {
-				vFilters = [vFilters];
-			}
-			if (vFilters.length > 1) {
-				vFilters = [FilterProcessor.groupFilters(vFilters)];
-			}
-			this.aApplicationFilters = vFilters;
-
 			// check filter integrity
 			this.oModel.checkFilter(this.aApplicationFilters);
 
@@ -1407,11 +1398,7 @@ sap.ui.define([
 			delete that.mRequestHandles[sRequestKey];
 			that.bNeedsUpdate = true;
 
-			// apply clientside filters, if any
-			if ((that.aApplicationFilters && that.aApplicationFilters.length > 0) ||
-				(that.aFilters && that.aFilters.length > 0)) {
-				that._applyFilter();
-			}
+			that._applyFilter();
 
 			// apply clientside sorters
 			if (that.aSorters && that.aSorters.length > 0) {
@@ -1674,14 +1661,6 @@ sap.ui.define([
 		// check filter integrity
 		this.oModel.checkFilter(aFilters);
 
-		// check if filtering is supported for the current binding configuration
-		if (sFilterType == FilterType.Control && (!this.bClientOperation || this.sOperationMode == OperationMode.Server)) {
-			Log.warning("Filtering with ControlFilters is ONLY possible if the ODataTreeBinding is running in OperationMode.Client or " +
-			"OperationMode.Auto, in case the given threshold is lower than the total number of tree nodes.");
-
-			return this;
-		}
-
 		// empty filters
 		if (!aFilters) {
 			aFilters = [];
@@ -1701,13 +1680,11 @@ sap.ui.define([
 			this.aApplicationFilters = aFilters;
 		}
 
-		if (!this.bInitial) {
-
-			// in client/auto mode: Always apply control filter.
-			// Clientside Application filters are only applied if "bUseServersideApplicationFilters" is set to false (default), otherwise
-			// the application filters will be applied on the backend.
-			if (this.bClientOperation && (sFilterType === FilterType.Control || (sFilterType === FilterType.Application && !this.bUseServersideApplicationFilters))) {
+		this._checkFilterForTreeProperties();
 
+		if (!this.bInitial) {
+			if (this.bClientOperation
+					&& (sFilterType === FilterType.Control || !this.bUseServersideApplicationFilters)) {
 				if (this.oAllKeys) {
 					this.oKeys = deepExtend({}, this.oAllKeys);
 					this.oLengths = deepExtend({}, this.oAllLengths);
@@ -1742,13 +1719,12 @@ sap.ui.define([
 	 */
 	ODataTreeBinding.prototype._applyFilter = function () {
 		var that = this;
-		var oCombinedFilter;
-
-		// if we do not use serverside application filters, we have to include them for the FilterProcessor
-		if (this.bUseServersideApplicationFilters) {
-			oCombinedFilter = FilterProcessor.groupFilters(this.aFilters);
-		} else {
-			oCombinedFilter = FilterProcessor.combineFilters(this.aFilters, this.aApplicationFilters);
+		const aClientApplicationFilters = this.bUseServersideApplicationFilters
+			? undefined
+			: this.aApplicationFilters;
+		const oCombinedFilter = FilterProcessor.combineFilters(this.aFilters, aClientApplicationFilters);
+		if (!oCombinedFilter) {
+			return;
 		}
 
 		// filter function for recursive filtering,
@@ -1777,6 +1753,46 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Returns the combination of the binding's application and control filters as a single multi-filter object.
+	 *
+	 * @returns {sap.ui.model.Filter|undefined} The combined filters as multi-filter or <code>undefined</code> if
+	 *   the binding has neither application nor control filters.
+	 *
+	 * @private
+	 */
+	ODataTreeBinding.prototype.getCombinedFilter = function () {
+		return FilterProcessor.combineFilters(this.aFilters, this.aApplicationFilters);
+	};
+
+	/**
+	 * Checks if the binding's application and control filters refer to one of the tree annotation properties and log
+	 * an error in this case.
+	 *
+	 * @private
+	 */
+	ODataTreeBinding.prototype._checkFilterForTreeProperties = function () {
+		if (!this.oTreeProperties) {
+			return;
+		}
+
+		const aTreePropertyPaths = Object.values(this.oTreeProperties);
+		const checkSingleFilter = (oFilter) => {
+			if (oFilter.aFilters?.length) { // multi-filter
+				oFilter.aFilters.forEach((oMultiFilterPart) => {
+					checkSingleFilter(oMultiFilterPart);
+				});
+			} else if (aTreePropertyPaths.includes(oFilter.sPath)) {
+				Log.error("Filter for tree annotation property '" + oFilter.sPath + "' is not allowed", undefined,
+					sClassName);
+			}
+		};
+		const oCombinedFilter = this.getCombinedFilter();
+		if (oCombinedFilter) {
+			checkSingleFilter(oCombinedFilter);
+		}
+	};
+
 	/*
 	 * @private
 	 */
@@ -2169,6 +2185,7 @@ sap.ui.define([
 	ODataTreeBinding.prototype._initialize = function (fnFireEvent) {
 		this.bInitial = false;
 		this.bHasTreeAnnotations = this._hasTreeAnnotations();
+		this._checkFilterForTreeProperties();
 		this.oEntityType = this._getEntityType();
 		this._processSelectParameters();
 		this._applyAdapter(fnFireEvent);
@@ -2562,24 +2579,27 @@ sap.ui.define([
 	};
 
 	/**
-	 * Creates valid odata filter strings for the application filters, given in "this.aApplicationFilters".
-	 * Also sets the created filter-string to "this.sFilterParams".
-	 * @returns {string} the concatenated OData filters
+	 * Creates the OData filter string for the binding's application and control filters considering client mode and
+	 * bUseServersideApplicationFilters.
+	 *
+	 * @returns {string} the created OData filter string
 	 *
 	 * @private
 	 */
 	ODataTreeBinding.prototype.getFilterParams = function() {
-		var oGroupedFilter;
-		if (this.aApplicationFilters) {
-			this.aApplicationFilters = Array.isArray(this.aApplicationFilters) ? this.aApplicationFilters : [this.aApplicationFilters];
-			if (this.aApplicationFilters.length > 0 && !this.sFilterParams) {
-				oGroupedFilter = FilterProcessor.groupFilters(this.aApplicationFilters);
-				this.sFilterParams = ODataUtils._createFilterParams(oGroupedFilter, this.oModel.oMetadata, this.oEntityType);
-				// Add a bracket around filter params, as they will be combined with tree specific filters
-				this.sFilterParams = this.sFilterParams ? "(" + this.sFilterParams + ")" : "";
-			}
-		} else {
-			this.sFilterParams = "";
+		const aServerApplicationFilters = this.bUseServersideApplicationFilters
+			? this.aApplicationFilters
+			: undefined;
+		const oCombinedFilter = this.bClientOperation
+			? FilterProcessor.combineFilters(undefined, aServerApplicationFilters)
+			: FilterProcessor.combineFilters(this.aFilters, this.aApplicationFilters);
+
+		this.sFilterParams = "";
+		if (oCombinedFilter) {
+			const sFilterParams = ODataUtils._createFilterParams(
+				oCombinedFilter, this.oModel.oMetadata, this.oEntityType);
+			// Add a bracket around filter params, as they will be combined with tree specific filters
+			this.sFilterParams = sFilterParams && `(${sFilterParams})`;
 		}
 
 		return this.sFilterParams;
@@ -2596,9 +2616,11 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.table, sap.ui.export
 	 */
 	ODataTreeBinding.prototype.getFilterInfo = function (bIncludeOrigin) {
-		return this.aApplicationFilters[0]
-			? this.aApplicationFilters[0].getAST(bIncludeOrigin)
-			: null;
+		const oCombinedFilter = this.getCombinedFilter();
+		if (oCombinedFilter) {
+			return oCombinedFilter.getAST(bIncludeOrigin);
+		}
+		return null;
 	};
 
 	/**

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

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.39.0
-		 * @version 1.138.0
+		 * @version 1.140.0
 		 */
 		Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 				constructor : constructor
@@ -641,20 +641,24 @@ sap.ui.define([
 	 *
 	 * @param {boolean} bSelected
 	 *   Whether this context is to be selected
-	 * @param {boolean} [bDoNotUpdateAnnotation]
-	 *   Whether the client-side annotation "@$ui5.context.isSelected" should not be updated
+	 * @param {boolean} [bSilent]
+	 *   Whether the client-side annotation "@$ui5.context.isSelected" should not be updated and
+	 *   the binding should not be informed via
+	 *   {@link sap.ui.model.odata.v4.ODataListBinding#onKeepAliveChanged}
 	 * @returns {boolean}
 	 *   Whether the selection state of this context has changed
 	 *
 	 * @private
 	 * @see #setSelected
 	 */
-	Context.prototype.doSetSelected = function (bSelected, bDoNotUpdateAnnotation) {
+	Context.prototype.doSetSelected = function (bSelected, bSilent) {
 		if (this.bSelected === bSelected) {
 			return false;
 		}
 		this.bSelected = bSelected;
-		this.oBinding.onKeepAliveChanged(this); // selected contexts are effectively kept alive
+		if (!bSilent) {
+			this.oBinding.onKeepAliveChanged(this); // selected contexts are effectively kept alive
+		}
 		const oHeaderContext = this.oBinding.getHeaderContext();
 		if (oHeaderContext === this) {
 			if (!bSelected) {
@@ -666,7 +670,7 @@ sap.ui.define([
 		}
 
 		// Note: data binding may cause #setSelected to be called redundantly!
-		if (!bDoNotUpdateAnnotation) {
+		if (!bSilent) {
 			this.withCache((oCache, sPath) => {
 				if (this.oBinding) {
 					oCache.setProperty("@$ui5.context.isSelected", bSelected, sPath);
@@ -1023,9 +1027,9 @@ sap.ui.define([
 	/**
 	 * Returns the value for the given path relative to this context. The function allows access to
 	 * the complete data the context points to (if <code>sPath</code> is "") or any part thereof.
-	 * The data is a JSON structure as described in <a href=
-	 * "https://docs.oasis-open.org/odata/odata-json-format/v4.0/odata-json-format-v4.0.html"
-	 * >"OData JSON Format Version 4.0"</a>.
+	 * The data is a JSON structure as described in
+	 * <a href="https://docs.oasis-open.org/odata/odata-json-format/v4.0/">
+	 * "OData JSON Format Version 4.0"</a>.
 	 * Note that the function clones the result. Modify values via
 	 * {@link sap.ui.model.odata.v4.ODataPropertyBinding#setValue}.
 	 *
@@ -1182,9 +1186,9 @@ sap.ui.define([
 	/**
 	 * Returns the value for the given path. The function allows access to the complete data the
 	 * context points to (if <code>sPath</code> is "") or any part thereof. The data is a JSON
-	 * structure as described in <a href=
-	 * "https://docs.oasis-open.org/odata/odata-json-format/v4.0/odata-json-format-v4.0.html"
-	 * >"OData JSON Format Version 4.0"</a>.
+	 * structure as described in
+	 * <a href="https://docs.oasis-open.org/odata/odata-json-format/v4.0/">
+	 * "OData JSON Format Version 4.0"</a>.
 	 * Note that the function returns the cache instance. Do not modify the result, use
 	 * {@link sap.ui.model.odata.v4.ODataPropertyBinding#setValue} instead.
 	 *
@@ -1699,9 +1703,9 @@ sap.ui.define([
 	/**
 	 * Returns a promise on the value for the given path relative to this context. The function
 	 * allows access to the complete data the context points to (if <code>sPath</code> is "") or
-	 * any part thereof. The data is a JSON structure as described in <a href=
-	 * "https://docs.oasis-open.org/odata/odata-json-format/v4.0/odata-json-format-v4.0.html"
-	 * >"OData JSON Format Version 4.0"</a>.
+	 * any part thereof. The data is a JSON structure as described in
+	 * <a href="https://docs.oasis-open.org/odata/odata-json-format/v4.0/">
+	 * "OData JSON Format Version 4.0"</a>.
 	 * Note that the function clones the result. Modify values via {@link #setProperty}.
 	 *
 	 * The header context of a list binding only delivers <code>$count</code> and

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

@@ -361,7 +361,7 @@ sap.ui.define([
 		if (this.bRelative) { // quasi-absolute or relative binding
 			// mCacheByResourcePath has to be reset if parameters are changing
 			oCache = this.mCacheByResourcePath && this.mCacheByResourcePath[sResourcePath];
-			iGeneration = oContext.getGeneration && oContext.getGeneration() || 0;
+			iGeneration = oContext.getGeneration?.() ?? 0;
 			if (oCache && oCache.$generation >= iGeneration) {
 				oCache.setActive(true);
 			} else {
@@ -430,7 +430,7 @@ sap.ui.define([
 	 * @param {string} sResourcePath
 	 *   The resource path, for example "EMPLOYEES"
 	 * @param {object} mQueryOptions
-	 *   The query options
+	 *   A map of key-value pairs representing the query string (requires "copy on write"!)
 	 * @param {sap.ui.model.Context} [oContext]
 	 *   The context instance to be used, must be <code>undefined</code> for absolute bindings
 	 * @param {string} [sDeepResourcePath=sResourcePath]

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

@@ -74,7 +74,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.138.0
+		 * @version 1.140.0
 		 *
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
@@ -1683,9 +1683,9 @@ sap.ui.define([
 	/**
 	 * Returns a promise on the value for the given path relative to this binding. The function
 	 * allows access to the complete data the binding points to (if <code>sPath</code> is "") or
-	 * any part thereof. The data is a JSON structure as described in <a href=
-	 * "https://docs.oasis-open.org/odata/odata-json-format/v4.0/odata-json-format-v4.0.html"
-	 * >"OData JSON Format Version 4.0"</a>.
+	 * any part thereof. The data is a JSON structure as described in
+	 * <a href="https://docs.oasis-open.org/odata/odata-json-format/v4.0/">
+	 * "OData JSON Format Version 4.0"</a>.
 	 * Note that the function clones the result. Modify values via
 	 * {@link sap.ui.model.odata.v4.Context#setProperty}.
 	 *