@openui5/sap.ui.core 1.120.0 → 1.120.2

package/src/sap/ui/model/FilterProcessor.js

@@ -23,8 +23,11 @@ sap.ui.define(['./Filter', 'sap/base/Log'],
 	 * Groups filters according to their path and combines filters on the same path using "OR" and filters on
 	 * different paths using "AND", all multi-filters contained are ANDed.
 	 *
-	 * @param {sap.ui.model.Filter[]} aFilters the filters to be grouped
-	 * @return {sap.ui.model.Filter} Single Filter containing all filters of the array combined or undefined
+	 * @param {sap.ui.model.Filter[]} [aFilters] The filters to be grouped
+	 * @return {sap.ui.model.Filter|undefined} A single filter containing all filters of the array combined or
+	 *   <code>undefined</code> if no filters are given
+	 * @throws {Error} If the {@link sap.ui.model.Filter.NONE} is contained in <code>aFilters</code> together
+	 *   with other filters
 	 * @public
 	 * @since 1.71
 	 * @static
@@ -49,11 +52,9 @@ sap.ui.define(['./Filter', 'sap/base/Log'],
 		if (aFilters.length === 1) {
 			return aFilters[0];
 		}
+		Filter.checkFilterNone(aFilters);
 		// Collect filters on same path, make sure to keep order as before for compatibility with tests
-		if (aFilters.some(function(oFilter) {
-			if (oFilter === Filter.NONE) {
-				return true;
-			}
+		aFilters.forEach(function(oFilter) {
 			if (oFilter.aFilters || oFilter.sVariable) { // multi/lambda filter
 				sCurPath = "__multiFilter";
 			} else {
@@ -63,11 +64,7 @@ sap.ui.define(['./Filter', 'sap/base/Log'],
 				mSamePath[sCurPath] = [];
 			}
 			mSamePath[sCurPath].push(oFilter);
-
-			return false;
-		})) {
-			return Filter.NONE;
-		}
+		});
 		// Create ORed multifilters for all filter groups
 		for (var sPath in mSamePath) {
 			aResult.push(getFilter(mSamePath[sPath], sPath === "__multiFilter")); // multi filters are ANDed
@@ -79,9 +76,12 @@ sap.ui.define(['./Filter', 'sap/base/Log'],
 	/**
 	 * Combines control filters and application filters using AND and returns the resulting filter
 	 *
-	 * @param {sap.ui.model.Filter[]} aFilters control filters
-	 * @param {sap.ui.model.Filter[]} aApplicationFilters application filters
-	 * @return {sap.ui.model.Filter} Single Filter containing all filters of the array combined or undefined
+	 * @param {sap.ui.model.Filter[]} [aFilters] The control filters
+	 * @param {sap.ui.model.Filter[]} [aApplicationFilters] The application filters
+	 * @return {sap.ui.model.Filter|undefined} A single filter containing all filters of the arrays combined or
+	 *   <code>undefined</code> if no filters are given
+	 * @throws {Error} If the {@link sap.ui.model.Filter.NONE} is contained in <code>aFilters</code> or
+	 *   <code>aApplicationFilters</code> together with other filters
 	 * @private
 	 * @since 1.58
 	 * @static
@@ -89,8 +89,9 @@ sap.ui.define(['./Filter', 'sap/base/Log'],
 	FilterProcessor.combineFilters = function(aFilters, aApplicationFilters) {
 		var oGroupedFilter, oGroupedApplicationFilter, oFilter, aCombinedFilters = [];
 
-		oGroupedFilter = this.groupFilters(aFilters);
-		oGroupedApplicationFilter = this.groupFilters(aApplicationFilters);
+		oGroupedFilter = FilterProcessor.groupFilters(aFilters);
+		oGroupedApplicationFilter = FilterProcessor.groupFilters(aApplicationFilters);
+
 		if (oGroupedFilter === Filter.NONE || oGroupedApplicationFilter === Filter.NONE) {
 			return Filter.NONE;
 		}
@@ -119,6 +120,8 @@ sap.ui.define(['./Filter', 'sap/base/Log'],
 	 * @param {function} fnGetValue the method to get the actual value to filter on
 	 * @param {object} [mNormalizeCache] cache for normalized filter values
 	 * @return {array} a new array instance containing the filtered data set
+	 * @throws {Error} If the {@link sap.ui.model.Filter.NONE} is contained in <code>vFilters</code> together
+	 *   with other filters
 	 * @private
 	 * @static
 	 */

package/src/sap/ui/model/ManagedObjectBindingSupport.js

@@ -440,7 +440,7 @@ sap.ui.define([
 							oClone.destroy("KeepDom");
 							break;
 						default:
-							Log.error("Unknown diff type \"" + oDiff.type + "\"");
+							Log.error("[FUTURE FATAL] Unknown diff type \"" + oDiff.type + "\"");
 					}
 				}
 
@@ -667,7 +667,7 @@ sap.ui.define([
 						// 2. Global lookup
 						TypeClass = ObjectPath.get(sTypeName);
 						if (typeof TypeClass === "function" && !TypeClass._sapUiLazyLoader) {
-							Log.error("[FUTURE] The type class '" + sTypeName + "' is exported to the global namespace without being set as an export value of a UI5 module. " +
+							Log.error("[FUTURE FATAL] The type class '" + sTypeName + "' is exported to the global namespace without being set as an export value of a UI5 module. " +
 							"This scenario will not be supported in the future and a separate UI5 module needs to be created which exports this type class.");
 						} else {
 							// 3. requireSync fallback

package/src/sap/ui/model/MetaModel.js

@@ -16,7 +16,7 @@ sap.ui.define(['./Model'],
 	 * @extends sap.ui.model.Model
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @public
 	 * @alias sap.ui.model.MetaModel

package/src/sap/ui/model/Model.js

@@ -51,7 +51,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.message.MessageProcessor
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @public
 	 * @alias sap.ui.model.Model
@@ -1164,12 +1164,14 @@ sap.ui.define([
 	 *   Single filter or an array of filter instances
 	 * @throws {Error}
 	 *   If at least one filter uses an <code>sap.ui.model.FilterOperator</code> that is not
-	 *   supported by the related model instance
+	 *   supported by the related model instance or if the {@link sap.ui.model.Filter.NONE} filter instance is contained
+	 *   in <code>vFilters</code> together with other filters
 	 * @private
 	 * @ui5-restricted sap.ui.model
 	 */
-	Model.prototype.checkFilterOperation = function(vFilters) {
-		_traverseFilter(vFilters, function (oFilter) {
+	Model.prototype.checkFilter = function(vFilters) {
+		Filter.checkFilterNone(vFilters);
+		Model._traverseFilter(vFilters, function (oFilter) {
 			if (this.mUnsupportedFilterOperators[oFilter.sOperator]) {
 				throw new Error("Filter instances contain an unsupported FilterOperator: " + oFilter.sOperator);
 			}
@@ -1204,7 +1206,7 @@ sap.ui.define([
 	 *   Check function which is called for each filter instance in the tree
 	 * @private
 	 */
-	function _traverseFilter (vFilters, fnCheck) {
+	Model._traverseFilter = function(vFilters, fnCheck) {
 		vFilters = vFilters || [];
 
 		if (vFilters instanceof Filter) {
@@ -1218,12 +1220,12 @@ sap.ui.define([
 			fnCheck(oFilter);
 
 			// check subfilter for lambda expressions (e.g. Any, All, ...)
-			_traverseFilter(oFilter.oCondition, fnCheck);
+			Model._traverseFilter(oFilter.oCondition, fnCheck);
 
 			// check multi filter if necessary
-			_traverseFilter(oFilter.aFilters, fnCheck);
+			Model._traverseFilter(oFilter.aFilters, fnCheck);
 		}
-	}
+	};
 
 	/**
 	 * Introduces data binding support on the ManagedObject prototype via mixin.

package/src/sap/ui/model/SelectionModel.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/base/EventProvider', "sap/base/assert"],
 	 * @extends sap.ui.base.EventProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @param {int} iSelectionMode <code>sap.ui.model.SelectionModel.SINGLE_SELECTION</code> or <code>sap.ui.model.SelectionModel.MULTI_SELECTION</code>
 	 *

package/src/sap/ui/model/SimpleType.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Type
 	 * @public
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 */
 	var SimpleType = Type.extend("sap.ui.model.SimpleType", /** @lends sap.ui.model.SimpleType.prototype */ {
 

package/src/sap/ui/model/TreeAutoExpandMode.js

@@ -12,7 +12,7 @@ sap.ui.define([],
 	/**
 	 * Different modes for setting the auto expand mode on tree or analytical bindings.
 	 *
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @enum {string}
 	 * @alias sap.ui.model.TreeAutoExpandMode
 	 * @protected

package/src/sap/ui/model/Type.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/base/Object'],
 	 *
 	 * @extends sap.ui.base.Object
 	 * @public
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 */
 	var Type = BaseObject.extend("sap.ui.model.Type", /** @lends sap.ui.model.Type.prototype */ {
 

package/src/sap/ui/model/analytics/odata4analytics.js

@@ -3421,14 +3421,14 @@ sap.ui.define([
 			var sOptionString = "";
 			// 1. Process conditions
 			aUI5Filter.sort(function(a, b) {
-				if (a.sPath == b.sPath) {
+				// default path to "" to ensure that the array contains all multi-filters, that don't have a path,
+				// at the beginning
+				const sAPath = a.sPath || "";
+				const sBPath = b.sPath || "";
+				if (sAPath === sBPath) {
 					return 0;
 				}
-				if (a.sPath > b.sPath) {
-					return 1;
-				} else {
-					return -1;
-				}
+				return sAPath > sBPath ? 1 : -1;
 			});
 
 			var sPropertyName = aUI5Filter[0].sPath;

package/src/sap/ui/model/json/JSONModel.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @public
 	 * @alias sap.ui.model.json.JSONModel
 	 */

package/src/sap/ui/model/message/MessageModel.js

@@ -29,7 +29,7 @@ sap.ui.define(['sap/ui/model/BindingMode', 'sap/ui/model/ClientModel', 'sap/ui/m
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @public
 	 * @alias sap.ui.model.message.MessageModel

package/src/sap/ui/model/odata/ODataAnnotations.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @author SAP SE
 	 * @version
-	 * 1.120.0
+	 * 1.120.2
 	 *
 	 * @public
 	 * @deprecated As of version 1.66, please use {@link sap.ui.model.odata.v2.ODataAnnotations} instead.

package/src/sap/ui/model/odata/ODataListBinding.js

@@ -69,7 +69,7 @@ sap.ui.define([
 			this.oCombinedFilter = null;
 
 			// check filter integrity
-			this.oModel.checkFilterOperation(this.aApplicationFilters);
+			this.oModel.checkFilter(this.aApplicationFilters);
 
 			// load the entity type for the collection only once and not e.g. every time when filtering
 			if (!this.oModel.getServiceMetadata()) {
@@ -873,6 +873,9 @@ sap.ui.define([
 	 *   depending on whether the filtering has been done
 	 * @return {this}
 	 *   Returns <code>this</code> to facilitate method chaining or the success state
+	 * @throws {Error} If one of the filters uses an operator that is not supported by the underlying model
+	 *   implementation or if the {@link sap.ui.model.Filter.NONE} filter instance is contained in
+	 *   <code>aFilters</code> together with other filters
 	 *
 	 * @public
 	 */
@@ -889,7 +892,7 @@ sap.ui.define([
 		}
 
 		// check filter integrity
-		this.oModel.checkFilterOperation(aFilters);
+		this.oModel.checkFilter(aFilters);
 
 		if (sFilterType == FilterType.Application) {
 			this.aApplicationFilters = aFilters;

package/src/sap/ui/model/odata/ODataMessageParser.js

@@ -22,7 +22,7 @@ var sClassName = "sap.ui.model.odata.ODataMessageParser",
 	// shortcuts for enums
 	MessageType = coreLibrary.MessageType,
 	// This map is used to translate back-end response severity values to the values defined in the
-	// enumeration sap.ui.core.MessageType
+	// enumeration sap.ui.core.message.MessageType
 	mSeverity2MessageType = {
 		"error" : MessageType.Error,
 		"info" : MessageType.Information,
@@ -85,7 +85,7 @@ var sClassName = "sap.ui.model.odata.ODataMessageParser",
  * @extends sap.ui.core.message.MessageParser
  *
  * @author SAP SE
- * @version 1.120.0
+ * @version 1.120.2
  * @public
  * @alias sap.ui.model.odata.ODataMessageParser
  */
@@ -531,7 +531,7 @@ ODataMessageParser.prototype._createTarget = function (sODataTarget, mRequestInf
 	sODataTarget = sCanonicalTarget || sODataTarget;
 
 	return {
-		deepPath : this._metadata._getReducedPath(sDeepPath || sODataTarget),
+		deepPath : ODataUtils._normalizeKey(this._metadata._getReducedPath(sDeepPath || sODataTarget)),
 		target : ODataUtils._normalizeKey(sODataTarget)
 	};
 };

package/src/sap/ui/model/odata/ODataMetaModel.js

@@ -881,7 +881,7 @@ sap.ui.define([
 	 * {@link #loaded loaded} has been resolved!
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 * @alias sap.ui.model.odata.ODataMetaModel
 	 * @extends sap.ui.model.MetaModel
 	 * @public

package/src/sap/ui/model/odata/ODataMetadata.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * Implementation to access OData metadata
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.ODataMetadata

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

@@ -78,7 +78,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @public
 	 * @deprecated As of version 1.48, please use {@link sap.ui.model.odata.v2.ODataModel} instead.

package/src/sap/ui/model/odata/type/Boolean.js

@@ -87,7 +87,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @alias sap.ui.model.odata.type.Boolean
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Byte.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @alias sap.ui.model.odata.type.Byte
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Currency.js

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.type.Currency
 	 * @public
 	 * @since 1.63.0
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 */
 	var Currency = BaseCurrency.extend("sap.ui.model.odata.type.Currency", {
 		constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/Date.js

@@ -75,7 +75,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @alias sap.ui.model.odata.type.Date
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/DateTime.js

@@ -61,7 +61,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.DateTimeBase
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @alias sap.ui.model.odata.type.DateTime
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/DateTimeBase.js

@@ -92,7 +92,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.27.0
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 */
 	var DateTimeBase = ODataType.extend("sap.ui.model.odata.type.DateTimeBase", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/DateTimeOffset.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.DateTimeBase
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @alias sap.ui.model.odata.type.DateTimeOffset
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/DateTimeWithTimezone.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @public
 	 * @see {sap.ui.model.odata.v2.ODataModel#bindProperty}
 	 * @since 1.99.0
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 */
 	var DateTimeWithTimezone = CompositeType.extend("sap.ui.model.odata.type.DateTimeWithTimezone",
 		{

package/src/sap/ui/model/odata/type/Decimal.js

@@ -171,7 +171,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @alias sap.ui.model.odata.type.Decimal
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Double.js

@@ -73,7 +73,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @alias sap.ui.model.odata.type.Double
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Guid.js

@@ -62,7 +62,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @alias sap.ui.model.odata.type.Guid
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Int.js

@@ -63,7 +63,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @abstract
 	 * @alias sap.ui.model.odata.type.Int

package/src/sap/ui/model/odata/type/Int16.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @alias sap.ui.model.odata.type.Int16
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Int32.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @alias sap.ui.model.odata.type.Int32
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Int64.js

@@ -119,7 +119,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @alias sap.ui.model.odata.type.Int64
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/ODataType.js

@@ -116,7 +116,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @abstract
 	 * @alias sap.ui.model.odata.type.ODataType

package/src/sap/ui/model/odata/type/Raw.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 */
 	var Raw = ODataType.extend("sap.ui.model.odata.type.Raw", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/SByte.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @alias sap.ui.model.odata.type.SByte
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Single.js

@@ -73,7 +73,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @alias sap.ui.model.odata.type.Single
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Stream.js

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.51.0
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 */
 	var Stream = ODataType.extend("sap.ui.model.odata.type.Stream", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/String.js

@@ -84,7 +84,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @alias sap.ui.model.odata.type.String
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Time.js

@@ -138,7 +138,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @alias sap.ui.model.odata.type.Time
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/TimeOfDay.js

@@ -92,7 +92,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 */
 	var TimeOfDay = ODataType.extend("sap.ui.model.odata.type.TimeOfDay", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/Unit.js

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.type.Unit
 	 * @public
 	 * @since 1.63.0
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 */
 	var Unit = BaseUnit.extend("sap.ui.model.odata.type.Unit", {
 		constructor : function (oFormatOptions, oConstraints, aDynamicFormatOptionNames) {

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

@@ -64,7 +64,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.93.0
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 */
 	var Context = BaseContext.extend("sap.ui.model.odata.v2.Context", {
 			constructor : function (oModel, sPath, sDeepPath, oCreatePromise, bInactive,

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class Annotation loader for OData V2 services
 	 *
 	 * @author SAP SE
-	 * @version 1.120.0
+	 * @version 1.120.2
 	 *
 	 * @public
 	 * @since 1.37.0

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

@@ -149,7 +149,7 @@ sap.ui.define([
 			this.bRemovePersistedCreatedAfterRefresh = false;
 
 			// check filter integrity
-			this.oModel.checkFilterOperation(this.aApplicationFilters);
+			this.oModel.checkFilter(this.aApplicationFilters);
 
 			if (mParameters && (mParameters.batchGroupId || mParameters.groupId)) {
 				this.sGroupId = mParameters.groupId || mParameters.batchGroupId;
@@ -1733,6 +1733,9 @@ sap.ui.define([
 	 * @param {sap.ui.model.FilterType} [sFilterType=Control] Type of the filter which should be adjusted. If it is not given, type <code>Control</code> is assumed
 	 * @param {boolean} [bReturnSuccess=false] Whether the success indicator should be returned instead of <code>this</code>
 	 * @return {this} Reference to <code>this</code> to facilitate method chaining or a boolean success indicator
+	 * @throws {Error} If one of the filters uses an operator that is not supported by the underlying model
+	 *   implementation or if the {@link sap.ui.model.Filter.NONE} filter instance is contained in
+	 *   <code>aFilters</code> together with other filters
 	 *
 	 * @public
 	 */
@@ -1751,7 +1754,7 @@ sap.ui.define([
 		}
 
 		// check filter integrity
-		this.oModel.checkFilterOperation(aFilters);
+		this.oModel.checkFilter(aFilters);
 
 		if (sFilterType === FilterType.Application) {
 			this.aApplicationFilters = aFilters;