@openui5/sap.ui.core 1.125.0 → 1.126.1

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

@@ -931,7 +931,8 @@ sap.ui.define([
 	/**
 	 * Calculates the index range to be read for the given start, length and prefetch length.
 	 * Checks if <code>aElements</code> entries are available for at least half the prefetch length
-	 * left and right to it. If not, the full prefetch length is added to this side.
+	 * left and right to it. If not, the full prefetch length is added to this side, starting at the first missing
+	 * index.
 	 *
 	 * @param {any[]} aElements
 	 *   The array of available elements
@@ -951,28 +952,35 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataUtils._getReadRange = function (aElements, iStart, iLength, iPrefetchLength, fnIsMissing) {
-		// Checks whether aElements contains at least one missing entry within the given start
-		// (inclusive) and end (exclusive).
-		function isDataMissing(iStart, iEnd) {
-			var i;
-			for (i = iStart; i < iEnd; i += 1) {
+		// Returns the index of the first missing element in the element range iFrom (inclusive) to iTo (exclusive) or
+		// -1 if no element is missing in the range
+		function getFirstMissingIndex(iFrom, iTo) {
+			const iStep = Math.sign(iTo - iFrom);
+			for (let i = iFrom; i !== iTo; i += iStep) {
 				if (aElements[i] === undefined || fnIsMissing?.(aElements[i])) {
-					return true;
+					return i;
 				}
 			}
-			return false;
+
+			return -1;
 		}
 
 		// Make sure that "half the prefetch length" is an integer. Round it up so that at least the
 		// half is checked on both sides. (With a prefetch of 5 for example, 3 elements are checked
 		// both to the left and to the right.)
 		const iHalfPrefetchLength = Math.ceil(iPrefetchLength / 2);
-		if (isDataMissing(iStart + iLength, iStart + iLength + iHalfPrefetchLength)) {
-			iLength += iPrefetchLength;
-		}
-		if (isDataMissing(Math.max(iStart - iHalfPrefetchLength, 0), iStart)) {
-			iLength += iPrefetchLength;
-			iStart -= iPrefetchLength;
+		let iFirstMissingIndex = getFirstMissingIndex(iStart + iLength, iStart + iLength + iHalfPrefetchLength);
+		if (iFirstMissingIndex !== -1) {
+			const iAvailableElements = iFirstMissingIndex - (iStart + iLength);
+			iLength += iAvailableElements + iPrefetchLength;
+		}
+		// for start index 0, both iFrom and iTo passed to getFirstMissingIndex are -1, so that it returns -1
+		iFirstMissingIndex = getFirstMissingIndex(iStart - 1, Math.max(iStart - 1 - iHalfPrefetchLength, -1));
+		if (iFirstMissingIndex !== -1) {
+			const iAvailableElements = iStart - 1 - iFirstMissingIndex;
+			const iAdditionalElements = iAvailableElements + iPrefetchLength;
+			iLength += iAdditionalElements;
+			iStart -= iAdditionalElements;
 			if (iStart < 0) {
 				iLength += iStart; // Note: Infinity + -Infinity === NaN
 				if (isNaN(iLength)) {

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.125.0
+	 * @version 1.126.1
 	 *
 	 * @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.125.0
+	 * @version 1.126.1
 	 *
 	 * @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.125.0
+	 * @version 1.126.1
 	 */
 	var Currency = BaseCurrency.extend("sap.ui.model.odata.type.Currency", {
 		constructor : function (oFormatOptions, oConstraints) {

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

@@ -76,7 +76,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @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.125.0
+	 * @version 1.126.1
 	 *
 	 * @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.125.0
+	 * @version 1.126.1
 	 */
 	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.125.0
+	 * @version 1.126.1
 	 *
 	 * @alias sap.ui.model.odata.type.DateTimeOffset
 	 * @param {object} [oFormatOptions]

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @public
 	 * @see {sap.ui.model.odata.v2.ODataModel#bindProperty}
 	 * @since 1.99.0
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 */
 	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.125.0
+	 * @version 1.126.1
 	 *
 	 * @alias sap.ui.model.odata.type.Decimal
 	 * @param {object} [oFormatOptions]

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

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

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

@@ -63,7 +63,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @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.125.0
+	 * @version 1.126.1
 	 *
 	 * @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.125.0
+	 * @version 1.126.1
 	 *
 	 * @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.125.0
+	 * @version 1.126.1
 	 *
 	 * @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.125.0
+	 * @version 1.126.1
 	 *
 	 * @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.125.0
+	 * @version 1.126.1
 	 *
 	 * @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.125.0
+	 * @version 1.126.1
 	 */
 	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.125.0
+	 * @version 1.126.1
 	 *
 	 * @alias sap.ui.model.odata.type.SByte
 	 * @param {object} [oFormatOptions]

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

@@ -74,7 +74,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @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.125.0
+	 * @version 1.126.1
 	 */
 	var Stream = ODataType.extend("sap.ui.model.odata.type.Stream", {
 			constructor : function (oFormatOptions, oConstraints) {

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

@@ -85,7 +85,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @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.125.0
+	 * @version 1.126.1
 	 *
 	 * @alias sap.ui.model.odata.type.Time
 	 * @param {object} [oFormatOptions]

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

@@ -93,7 +93,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 */
 	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.125.0
+	 * @version 1.126.1
 	 */
 	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.125.0
+	 * @version 1.126.1
 	 */
 	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.125.0
+	 * @version 1.126.1
 	 *
 	 * @public
 	 * @since 1.37.0

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

@@ -213,7 +213,7 @@ sap.ui.define([
 	 * This model is not prepared to be inherited from.
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel

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

@@ -103,7 +103,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.TreeBinding
 	 * @hideconstructor
 	 * @public
-	 * @version 1.125.0
+	 * @version 1.126.1
 	 */
 	var ODataTreeBinding = TreeBinding.extend("sap.ui.model.odata.v2.ODataTreeBinding", /** @lends sap.ui.model.odata.v2.ODataTreeBinding.prototype */ {
 

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

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.39.0
-		 * @version 1.125.0
+		 * @version 1.126.1
 		 */
 		Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 				constructor : constructor
@@ -360,8 +360,9 @@ sap.ui.define([
 
 	/**
 	 * Destroys this context, that is, it removes this context from all dependent bindings and drops
-	 * references to binding and model, so that the context cannot be used anymore; it keeps path
-	 * and index for debugging purposes.
+	 * references to {@link #getBinding binding} and {@link #getModel model}, so that the context
+	 * cannot be used anymore; it keeps path and index for debugging purposes. A destroyed context
+	 * can be recognized by calling {@link #getBinding}, which returns <code>undefined</code>.
 	 *
 	 * <b>BEWARE:</b> Do not call this function! The lifetime of an OData V4 context is completely
 	 * controlled by its binding.
@@ -435,8 +436,8 @@ sap.ui.define([
 
 			// Messages have been updated via _Cache#_delete; "that" is already destroyed; remove
 			// all dependent caches in all bindings
-			oModel.getAllBindings().forEach(function (oBinding) {
-				oBinding.removeCachesAndMessages(sResourcePathPrefix, true);
+			oModel.getAllBindings().forEach(function (oBinding0) {
+				oBinding0.removeCachesAndMessages(sResourcePathPrefix, true);
 			});
 		}).catch(function (oError) {
 			oModel.reportError("Failed to delete " + that.getPath(), sClassName, oError);
@@ -606,15 +607,32 @@ 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
+	 * @returns {boolean}
+	 *   Whether the selection state of the context has changed
 	 *
 	 * @private
 	 * @see #setSelected
 	 */
-	Context.prototype.doSetSelected = function (bSelected) {
-		this.bSelected = bSelected;
-		if (this.oBinding) {
-			this.oBinding.onKeepAliveChanged(this); // selected contexts are effectively kept alive
+	Context.prototype.doSetSelected = function (bSelected, bDoNotUpdateAnnotation) {
+		if (bSelected === this.bSelected) {
+			return false;
+		}
+
+		if (!bDoNotUpdateAnnotation) {
+			this.withCache((oCache, sPath) => {
+				if (this.oBinding) {
+					oCache.setProperty("@$ui5.context.isSelected", bSelected, sPath);
+				} // else: context already destroyed
+			}, "");
 		}
+
+		this.bSelected = bSelected;
+
+		this.oBinding?.onKeepAliveChanged(this); // selected contexts are effectively kept alive
+
+		return true;
 	};
 
 	/**
@@ -1015,6 +1033,32 @@ sap.ui.define([
 		return this.oBinding.getQueryOptionsForPath(sPath);
 	};
 
+	/**
+	 * Returns this node's sibling; either the next one (via offset +1) or the previous one (via
+	 * offset -1). Returns <code>null</code> if no such sibling exists (because this node is the
+	 * last or first sibling, respectively). If it's not known whether the requested sibling
+	 * exists, <code>undefined</code> is returned and {@link #requestSibling} can be used instead.
+	 *
+	 * @param {number} [iOffset=+1] - An offset, either -1 or +1
+	 * @returns {sap.ui.model.odata.v4.Context|null|undefined}
+	 *   The sibling's context, or <code>null</code> if no such sibling exists for sure, or
+	 *   <code>undefined</code> if we cannot tell
+	 * @throws {Error} If
+	 *   <ul>
+	 *     <li> the given offset is unsupported,
+	 *     <li> this context's root binding is suspended,
+	 *     <li> this context is {@link #isDeleted deleted}, {@link #isTransient transient}, or not
+	 *       part of a recursive hierarchy.
+	 *   </ul>
+	 *
+	 * @private
+	 * @since 1.126.0
+	 * @ui5-restricted sap.fe
+	 */
+	Context.prototype.getSibling = function (iOffset) {
+		return this.oBinding.fetchOrGetSibling(this, iOffset);
+	};
+
 	/**
 	 * Returns the group ID of the context's binding that is used for update requests. See
 	 * {@link sap.ui.model.odata.v4.ODataListBinding#getUpdateGroupId} and
@@ -1260,7 +1304,13 @@ sap.ui.define([
 	 *
 	 * The move potentially changes the {@link #getIndex index} of this context, of all of its
 	 * descendants, and of all other nodes affected by the move. Any index change can, however, only
-	 * be observed reliably for this context itself.
+	 * be observed reliably for this context itself or (since 1.126.0) the next sibling's context
+	 * if that is {@link #isKeepAlive kept alive} or {@link #isSelected selected} (and the
+	 * preconditions of {@link #setKeepAlive} hold). For a kept-alive or selected next sibling, the
+	 * index must be retrieved as soon as the returned promise resolves. If such a next sibling is
+	 * not one of the binding's {@link sap.ui.model.odata.v4.ODataListBinding#getCurrentContexts
+	 * current contexts} after the move, it is not in the collection anymore and thus loses its
+	 * index pretty soon.
 	 *
 	 * The move changes the
 	 * {@link topic:c9723f8265f644af91c0ed941e114d46/section_CST context states} of the nodes as
@@ -1649,18 +1699,12 @@ sap.ui.define([
 	 *   </ul>
 	 *
 	 * @private
+	 * @see #getSibling
 	 * @since 1.125.0
 	 * @ui5-restricted sap.fe
 	 */
-	Context.prototype.requestSibling = function (iOffset = +1) {
-		if (iOffset !== -1 && iOffset !== +1) {
-			throw new Error("Unsupported offset: " + iOffset);
-		}
-		if (this.isDeleted() || this.isTransient()) {
-			throw new Error("Unsupported context: " + this);
-		}
-
-		return this.oBinding.requestSibling(this, iOffset);
+	Context.prototype.requestSibling = function (iOffset) {
+		return Promise.resolve(this.oBinding.fetchOrGetSibling(this, iOffset, true));
 	};
 
 	/**
@@ -2238,17 +2282,24 @@ sap.ui.define([
 	};
 
 	/**
-	 * Sets whether this context is currently selected. While a context is currently
-	 * {@link #delete deleted} on the client, it does not appear as {@link #isSelected selected}. If
-	 * the preconditions of {@link #setKeepAlive} hold, a best effort is made to implicitly keep a
-	 * selected context alive in order to preserve the selection state. Once the selection is no
-	 * longer needed, for example because you perform an operation on this context which logically
-	 * removes it from its list, you need to reset the selection.
+	 * Sets whether this context is currently selected. If the selection state changes, a
+	 * {@link sap.ui.model.odata.v4.ODataListBinding#event:selectionChanged 'selectionChanged'}
+	 * event is fired on the list binding which this context belongs to. While a context is
+	 * currently {@link #delete deleted} on the client, it does not appear as
+	 * {@link #isSelected selected}. If the preconditions of {@link #setKeepAlive} hold, a best
+	 * effort is made to implicitly keep a selected context alive in order to preserve the selection
+	 * state. Once the selection is no longer needed, for example because you perform an operation
+	 * on this context which logically removes it from its list, you need to reset the selection.
 	 *
 	 * If this context is a header context of a list binding, the new selection state is propagated
-	 * to all row contexts. This method can be called repeatedly with the same value to again select
-	 * all row contexts. For example, if a row context was deselected explicitly, it is selected
-	 * again by selecting the header context (even if the header context is already selected).
+	 * to all row contexts. If the selection state of this header context changes, a
+	 * {@link sap.ui.model.odata.v4.ODataListBinding#event:selectionChanged 'selectionChanged'}
+	 * event is fired for this header context. This method can be called repeatedly with
+	 * the same value to again select all row contexts. For example, if a row context was deselected
+	 * explicitly, it is selected again by selecting the header context (even if the header context
+	 * is already selected). If the selection state of any row context changes in this way, then a
+	 * {@link sap.ui.model.odata.v4.ODataListBinding#event:selectionChanged 'selectionChanged'}
+	 * event is nevertheless fired for this header context, but not for the row context.
 	 *
 	 * <b>Note:</b> It is unsafe to keep a reference to a context instance which is not
 	 * {@link #isKeepAlive kept alive}.
@@ -2269,23 +2320,21 @@ sap.ui.define([
 		if (bSelected && this.isDeleted()) {
 			throw new Error("Must not select a deleted entity: " + this);
 		}
-		if (this.oBinding.getHeaderContext() === this) {
-			this.oBinding._getAllExistingContexts().forEach(function (oContext) {
-				oContext.setSelected(bSelected);
-			});
-		}
-		if (bSelected !== this.bSelected) {
-			if (this.mChangeListeners) { // header context: "select all"
-				_Helper.fireChange(this.mChangeListeners, "", bSelected);
-			}
-			this.withCache((oCache, sPath) => {
-				if (this.oBinding) {
-					oCache.setProperty("@$ui5.context.isSelected", bSelected, sPath);
-				} // else: context already destroyed
-			}, "");
+
+		const bRowsChanged = this.oBinding.getHeaderContext() === this
+			&& this.oBinding._getAllExistingContexts().reduce((bChanged, oContext) => {
+				return oContext.doSetSelected(bSelected) || bChanged;
+			}, false);
+
+		const bSelectionChanged = this.doSetSelected(bSelected);
+
+		if (bSelectionChanged && this.mChangeListeners) { // header context: "select all"
+			_Helper.fireChange(this.mChangeListeners, "", bSelected);
 		}
 
-		this.doSetSelected(bSelected);
+		if (bSelectionChanged || bRowsChanged) {
+			this.oBinding.fireSelectionChanged(this);
+		}
 	};
 
 	/**

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

@@ -123,26 +123,6 @@ sap.ui.define([
 		this.sReducedPath = this.sReducedPath.replace(sTransientPredicate, sPredicate);
 	};
 
-	/**
-	 * Throws an error that the response is being ignored if the current cache is not the expected
-	 * one. The error has the property <code>canceled : true</code>
-	 *
-	 * @param {sap.ui.model.odata.v4.lib._Cache} oExpectedCache - The expected cache
-	 * @throws {Error} If the current cache is not the expected one
-	 *
-	 * @private
-	 */
-	ODataBinding.prototype.assertSameCache = function (oExpectedCache) {
-		var oError;
-
-		if (this.oCache !== oExpectedCache) {
-			oError = new Error(this + " is ignoring response from inactive cache: "
-				+ oExpectedCache);
-			oError.canceled = true;
-			throw oError;
-		}
-	};
-
 	/**
 	 * Checks binding-specific parameters from the given map. "Binding-specific" parameters are
 	 * those with a key starting with '$$', i.e. OData query options provided as binding parameters
@@ -250,6 +230,26 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * Throws an error that the response is being ignored if the current cache is not the expected
+	 * one. The error has the property <code>canceled : true</code>
+	 *
+	 * @param {sap.ui.model.odata.v4.lib._Cache} oExpectedCache - The expected cache
+	 * @throws {Error} If the current cache is not the expected one
+	 *
+	 * @private
+	 */
+	ODataBinding.prototype.checkSameCache = function (oExpectedCache) {
+		var oError;
+
+		if (this.oCache !== oExpectedCache) {
+			oError = new Error(this + " is ignoring response from inactive cache: "
+				+ oExpectedCache);
+			oError.canceled = true;
+			throw oError;
+		}
+	};
+
 	/**
 	 * Throws an Error if the binding's root binding is suspended.
 	 *