@openui5/sap.ui.core 1.92.0 → 1.95.0

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

@@ -103,6 +103,9 @@ sap.ui.define(['sap/ui/base/Object', "sap/base/util/isPlainObject"],
 	/**
 	 * Sets the force refresh flag of the context. If this is set, the context will force a refresh of dependent
 	 * bindings, when the context is propagated.
+	 *
+	 * @deprecated since 1.93.0; only supported by the OData V2 Model; use V2 specific Context
+	 *   instead
 	 * @private
 	 * @param {boolean} bForceRefresh the force refresh flag
 	 */
@@ -112,6 +115,9 @@ sap.ui.define(['sap/ui/base/Object', "sap/base/util/isPlainObject"],
 
 	/**
 	 * This method returns, whether dependent bindings need to be refreshed.
+	 *
+	 * @deprecated since 1.93.0; only supported by the OData V2 Model; use V2 specific Context
+	 *   instead
 	 * @private
 	 * @return {boolean} the force refresh flag
 	 */
@@ -123,6 +129,9 @@ sap.ui.define(['sap/ui/base/Object', "sap/base/util/isPlainObject"],
 	 * Sets the preliminary flag of the context. If this is set, the context is not yet linked to actual model
 	 * data, but does just contain path information. This can be used by dependent bindings to send their request
 	 * in parallel to the request of the context binding.
+	 *
+	 * @deprecated since 1.93.0; only supported by the OData V2 Model; use V2 specific Context
+	 *   instead
 	 * @private
 	 * @param {boolean} bPreliminary the preliminary flag
 	 */
@@ -132,6 +141,9 @@ sap.ui.define(['sap/ui/base/Object', "sap/base/util/isPlainObject"],
 
 	/**
 	 * This method returns, whether the context is preliminary.
+	 *
+	 * @deprecated since 1.93.0; only supported by the OData V2 Model; use V2 specific Context
+	 *   instead
 	 * @private
 	 * @ui5-restricted sap.suite.ui.generic
 	 * @return {boolean} the preliminary flag
@@ -143,6 +155,9 @@ sap.ui.define(['sap/ui/base/Object', "sap/base/util/isPlainObject"],
 	/**
 	 * Sets the updated flag of the context. If this is set, the context was updated. E.g. the path changed from
 	 * a preliminary path to the canonical one.
+	 *
+	 * @deprecated since 1.93.0; only supported by the OData V2 Model; use V2 specific Context
+	 *   instead
 	 * @private
 	 * @param {boolean} bUpdated the preliminary flag
 	 */
@@ -152,6 +167,9 @@ sap.ui.define(['sap/ui/base/Object', "sap/base/util/isPlainObject"],
 
 	/**
 	 * This method returns, whether the context is updated.
+	 *
+	 * @deprecated since 1.93.0; only supported by the OData V2 Model; use V2 specific Context
+	 *   instead
 	 * @private
 	 * @return {boolean} the updated flag
 	 */
@@ -159,6 +177,17 @@ sap.ui.define(['sap/ui/base/Object', "sap/base/util/isPlainObject"],
 		return this.bUpdated;
 	};
 
+	/**
+	 * Whether this context has changed. By default this context cannot be changed but subclasses
+	 * can override this behaviour.
+	 *
+	 * @return {boolean} Whether this context has changed
+	 * @private
+	 */
+	 Context.prototype.hasChanged = function() {
+		return this.isUpdated() || this.isRefreshForced();
+	};
+
 	/**
 	 * Compares the two given Contexts. Returns true if the context instances are not equal,
 	 * if the new context is updated or if the new context is refreshed.
@@ -169,17 +198,8 @@ sap.ui.define(['sap/ui/base/Object', "sap/base/util/isPlainObject"],
 	 * @private
 	 */
 	Context.hasChanged = function(oOldContext, oNewContext) {
-		var bChanged = false;
-
-		if (oOldContext !== oNewContext) {
-			bChanged = true;
-		} else if (oNewContext && oNewContext.isUpdated()) {
-			bChanged = true;
-		} else if (oNewContext && oNewContext.isRefreshForced()) {
-			bChanged = true;
-		}
-
-		return bChanged;
+		return oOldContext !== oNewContext
+			|| !!oNewContext && !!oNewContext.hasChanged();
 	};
 
 	/**

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

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @public
 	 * @alias sap.ui.model.DataState

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

@@ -168,6 +168,25 @@ sap.ui.define(['./Binding', './Filter', './Sorter', 'sap/base/util/array/diff'],
 		return this.getContexts();
 	};
 
+	/**
+	 * Returns the count of entries in the list, or <code>undefined</code> if it is unknown.
+	 * The count is by default identical to the list length if it is final. Concrete subclasses may,
+	 * however, override the method, for example:
+	 * <ul>
+	 *   <li> for server-side models where lists are not completely read by the client,
+	 *   <li> for lists representing hierarchical data.
+	 * </ul>
+	 *
+	 * @returns {number|undefined} The count of entries
+	 * @public
+	 * @see #getLength
+	 * @see #isLengthFinal
+	 * @since 1.93.0
+	 */
+	ListBinding.prototype.getCount = function() {
+		return this.isLengthFinal() ? this.getLength() : undefined;
+	};
+
 	/**
 	 * Returns the number of entries in the list.
 	 *

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.92.0
+	 * @version 1.95.0
 	 *
 	 * @public
 	 * @alias sap.ui.model.MetaModel

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.message.MessageProcessor
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @public
 	 * @alias sap.ui.model.Model
@@ -739,7 +739,7 @@ sap.ui.define([
 	 * is automatically converted into an absolute path.
 	 *
 	 * @param {string} sPath path to resolve
-	 * @param {sap.ui.core.Context} [oContext] context to resolve a relative path against
+	 * @param {sap.ui.model.Context} [oContext] context to resolve a relative path against
 	 * @return {string} resolved path or undefined
 	 */
 	Model.prototype.resolve = function(sPath, oContext) {
@@ -1104,7 +1104,7 @@ sap.ui.define([
 	 * data was accepted or rejected
 	 *
 	 * @param {string} sPath Path to resolve
-	 * @param {sap.ui.core.Context} [oContext] Context to resolve a relative path against
+	 * @param {sap.ui.model.Context} [oContext] Context to resolve a relative path against
 	 * @returns {boolean} true if the data in this path is laundering
 	 */
 	Model.prototype.isLaundering = function(sPath, oContext) {

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.92.0
+	 * @version 1.95.0
 	 *
 	 * @param {int} iSelectionMode <code>sap.ui.model.SelectionModel.SINGLE_SELECTION</code> or <code>sap.ui.model.SelectionModel.MULTI_SELECTION</code>
 	 *
@@ -51,12 +51,16 @@ sap.ui.define(['sap/ui/base/EventProvider', "sap/base/assert"],
 	/**
 	 * SelectionMode: Single Selection
 	 * @public
+	 * @readonly
+	 * @type {int}
 	 */
 	SelectionModel.SINGLE_SELECTION = 0;
 
 	/**
 	 * SelectionMode: Multi Selection
 	 * @public
+	 * @readonly
+	 * @type {int}
 	 */
 	SelectionModel.MULTI_SELECTION = 1;
 

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Type
 	 * @public
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 */
 	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.92.0
+	 * @version 1.95.0
 	 * @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.92.0
+	 * @version 1.95.0
 	 */
 	var Type = BaseObject.extend("sap.ui.model.Type", /** @lends sap.ui.model.Type.prototype */ {
 

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

@@ -335,13 +335,16 @@ sap.ui.define([
 
 			// considering different count mode settings
 			if (mParameters && mParameters.countMode == CountMode.None) {
-				oLogger.fatal("requested count mode is ignored; OData requests will include $inlinecout options");
+				oLogger.fatal("requested count mode is ignored; OData requests will include"
+					+ " $inlinecount options");
 			} else if (mParameters
 					&& (mParameters.countMode == CountMode.Request
 						|| mParameters.countMode == CountMode.Both)) {
-				oLogger.warning("default count mode is ignored; OData requests will include $inlinecout options");
+				oLogger.warning("default count mode is ignored; OData requests will include"
+					+ " $inlinecount options");
 			} else if (this.oModel.sDefaultCountMode == CountMode.Request) {
-				oLogger.warning("default count mode is ignored; OData requests will include $inlinecout options");
+				oLogger.warning("default count mode is ignored; OData requests will include"
+					+ " $inlinecount options");
 			}
 
 			// detect ODataModel version
@@ -3494,17 +3497,19 @@ sap.ui.define([
 	AnalyticalBinding.prototype._calculateRequiredGroupSection = function (sGroupId, iStartIndex,
 			iLength, iThreshold) {
 		var aElements = this.mKeyIndex[sGroupId] || [],
-			iLimit = this.mFinalLength[sGroupId] && this.mLength[sGroupId],
+			iLimit = this.mFinalLength[sGroupId] ? this.mLength[sGroupId] : undefined,
 			aIntervals = ODataUtils._getReadIntervals(aElements, iStartIndex, iLength, iThreshold,
-				iLimit);
+				iLimit),
+			oInterval = ODataUtils._mergeIntervals(aIntervals);
 
-		if (aIntervals.length) {
+		if (oInterval) {
 			return {
-				startIndex : aIntervals[0].start,
-				length : aIntervals[aIntervals.length - 1].end - aIntervals[0].start
+				startIndex : oInterval.start,
+				length : oInterval.end - oInterval.start
 			};
 		}
-		return {startIndex : 0, length : iLength > 0 ? 0 : iLength};
+
+		return {startIndex : 0, length : Math.min(0, iLength)};
 	};
 
 	/**

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

@@ -146,18 +146,20 @@ sap.ui.define([
 	/**
 	 * Create a representation of the analytical semantics of OData service metadata
 	 *
-	 * @param {object}
-	 *            oModelReference An instance of ReferenceByURI, ReferenceByModel or
-	 *            ReferenceWithWorkaround for locating the OData service.
-	 * @param {object}
-	 * 	          [mParameter] Additional parameters for controlling the model construction. Currently supported are:
-	 *            <li> sAnnotationJSONDoc - A JSON document providing extra annotations to the elements of the
-	 *                 structure of the given service
-	 *            </li>
-	 *            <li> modelVersion - Parameter to define which ODataModel version should be used, in you use
-	 *                 'odata4analytics.Model.ReferenceByURI': 1 (default), 2
-	 *                 see also: AnalyticalVersionInfo constants
-	 *            </li>
+	 * @param {object} oModelReference
+	 *   An instance of {@link sap.ui.model.analytics.odata4analytics.Model.ReferenceByModel} or
+	 *   {@link sap.ui.model.analytics.odata4analytics.Model.ReferenceWithWorkaround} for locating
+	 *   the OData service. {@link sap.ui.model.analytics.odata4analytics.Model.ReferenceByURI} is
+	 *   deprecated.
+	 * @param {object} [mParameter]
+	 *   Additional parameters for controlling the model construction. Currently supported are:
+	 *   <li> sAnnotationJSONDoc - A JSON document providing extra annotations to the elements of
+	 *        the structure of the given service
+	 *   </li>
+	 *   <li> modelVersion (deprecated) - Parameter to define which ODataModel version should be
+	 *        used if you use {@link sap.ui.model.analytics.odata4analytics.Model.ReferenceByURI};
+	 *        supported values are: 1 (default), 2
+	 *   </li>
 	 *
 	 * @class Representation of an OData model with analytical annotations defined
 	 *        by OData4SAP.
@@ -177,6 +179,8 @@ sap.ui.define([
 	 *
 	 * @class Handle to an OData model by the URI pointing to it.
 	 * @name sap.ui.model.analytics.odata4analytics.Model.ReferenceByURI
+	 * @deprecated Since 1.94 use
+	 *   {@link sap.ui.model.analytics.odata4analytics.Model.ReferenceByModel} instead
 	 * @public
 	 */
 	odata4analytics.Model.ReferenceByURI = function(sURI) {
@@ -219,12 +223,12 @@ sap.ui.define([
 	 * exists, they are linked via annotation.</li>
 	 *
 	 *
-	 * @param {object}
-	 *            oModel holding a reference to the OData model, obtained
-	 *            by odata4analytics.Model.ReferenceByModel or by
-	 *            sap.odata4analytics.Model.ReferenceByURI.
-	 * @param {string[]}
-	 *            aWorkaroundID listing all workarounds to be applied.
+	 * @param {object} oModel
+	 *   Holds a reference to the OData model, obtained by
+	 *   {@link sap.ui.model.analytics.odata4analytics.Model.ReferenceByModel}, or by
+	 *   {@link sap.ui.model.analytics.odata4analytics.Model.ReferenceByURI} which is deprecated.
+	 * @param {string[]} aWorkaroundID
+	 *   All workarounds to be applied.
 	 *
 	 * @class Handle to an already instantiated SAPUI5 OData model.
 	 * @name sap.ui.model.analytics.odata4analytics.Model.ReferenceWithWorkaround
@@ -245,12 +249,14 @@ sap.ui.define([
 		 * @private
 		 */
 		_init : function(oModelReference, mParameter) {
+			var ODataModelClass,
+				that = this;
+
 			if (typeof mParameter == "string") {
 				throw "Deprecated second argument: Adjust your invocation by passing an object with a property sAnnotationJSONDoc as a second argument instead";
 			}
 			this._mParameter = mParameter;
 
-			var that = this;
 			/*
 			 * get access to OData model
 			 */
@@ -277,14 +283,16 @@ sap.ui.define([
 				checkForMetadata();
 			} else if (mParameter && mParameter.modelVersion === AnalyticalVersionInfo.V2) {
 				// Check if the user wants a V2 model
-				var V2ODataModel = sap.ui.requireSync("sap/ui/model/odata/v2/ODataModel");
-				this._oModel = new V2ODataModel(oModelReference.sServiceURI);
+				ODataModelClass = sap.ui.require("sap/ui/model/odata/v2/ODataModel") ||
+					sap.ui.requireSync("sap/ui/model/odata/v2/ODataModel");
+				this._oModel = new ODataModelClass(oModelReference.sServiceURI);
 				this._iVersion = AnalyticalVersionInfo.V2;
 				checkForMetadata();
 			} else {
 				//default is V1 Model
-				var ODataModel = sap.ui.requireSync("sap/ui/model/odata/ODataModel");
-				this._oModel = new ODataModel(oModelReference.sServiceURI);
+				ODataModelClass = sap.ui.require("sap/ui/model/odata/ODataModel") ||
+					sap.ui.requireSync("sap/ui/model/odata/ODataModel");
+				this._oModel = new ODataModelClass(oModelReference.sServiceURI);
 				this._iVersion = AnalyticalVersionInfo.V1;
 				checkForMetadata();
 			}

package/src/sap/ui/model/base/ManagedObjectModel.js

@@ -23,6 +23,10 @@ sap.ui.define([
 	function _adaptDeepChildObservation(caller, oControl, oAggregation, bObserve) {
 		var aChildren = oAggregation.get(oControl) || [], oChild, bRecord;
 
+		if (aChildren && !Array.isArray(aChildren) && !oAggregation.multiple) {
+			aChildren = [aChildren];
+		}
+
 		for (var i = 0; i < aChildren.length; i++) {
 			oChild = aChildren[i];
 			if (!(oChild instanceof ManagedObject)) {
@@ -990,17 +994,25 @@ sap.ui.define([
 	 */
 	ManagedObjectModel.prototype.checkUpdate = function (bForceUpdate, bAsync, fnFilter) {
 		if (bAsync) {
+			this.bForceUpdate = this.bForceUpdate || bForceUpdate;
 			if (!this.sUpdateTimer) {
+				this.fnFilter = this.fnFilter || fnFilter;
 				this.sUpdateTimer = setTimeout(function () {
-					this.checkUpdate(bForceUpdate, false, fnFilter);
+					this.checkUpdate(this.bForceUpdate, false, this.fnFilter);
 				}.bind(this), 0);
+			} else if (this.fnFilter && this.fnFilter !== fnFilter) {
+				this.fnFilter = undefined; // if different filter set use no filter
 			}
 			return;
 		}
+		bForceUpdate = this.bForceUpdate || bForceUpdate;
+		fnFilter = !this.fnFilter || this.fnFilter === fnFilter ? fnFilter : undefined; // if different filter set use no filter
 
 		if (this.sUpdateTimer) {
 			clearTimeout(this.sUpdateTimer);
 			this.sUpdateTimer = null;
+			this.bForceUpdate = undefined;
+			this.fnFilter = undefined;
 		}
 		var aBindings = this.aBindings.slice(0);
 		aBindings.forEach(function (oBinding) {

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

@@ -37,12 +37,14 @@ sap.ui.define([
 	 * @param {boolean} [bObserve] Whether to observe the JSON data for property changes (experimental)
 	 *
 	 * @class
-	 * Model implementation for JSON format
+	 * Model implementation for the JSON format.
+	 *
+	 * This model is not prepared to be inherited from.
 	 *
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @public
 	 * @alias sap.ui.model.json.JSONModel
 	 */

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

@@ -22,12 +22,14 @@ sap.ui.define(['sap/ui/model/BindingMode', 'sap/ui/model/ClientModel', 'sap/ui/m
 	 * Constructor for a new JSONModel.
 	 *
 	 * @class
-	 * Model implementation for Messages
+	 * Model implementation for Messages.
+	 *
+	 * This model is not prepared to be inherited from.
 	 *
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @param {sap.ui.core.message.MessageManager} oMessageManager The MessageManager instance
 	 * @public

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @author SAP SE
 	 * @version
-	 * 1.92.0
+	 * 1.95.0
 	 *
 	 * @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

@@ -336,6 +336,7 @@ sap.ui.define([
 					// TODO: what if nested list is not complete, because it was too large?
 					var oRef = this.oModel._getObject(this.sPath, this.oContext);
 					this.aExpandRefs = oRef;
+					// eslint-disable-next-line no-unsafe-negation
 					if (Array.isArray(oRef) && !this.aSorters.length > 0 && !this.aFilters.length > 0) {
 						this.aKeys = oRef;
 						this.iLength = oRef.length;

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

@@ -84,7 +84,7 @@ var sClassName = "sap.ui.model.odata.ODataMessageParser",
  * @extends sap.ui.core.message.MessageParser
  *
  * @author SAP SE
- * @version 1.92.0
+ * @version 1.95.0
  * @public
  * @alias sap.ui.model.odata.ODataMessageParser
  */

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

@@ -89,6 +89,8 @@ sap.ui.define([
 	 * as a foundation and merges V4 annotations from the existing
 	 * {@link sap.ui.model.odata.ODataAnnotations} directly into the corresponding model element.
 	 *
+	 * This model is not prepared to be inherited from.
+	 *
 	 * Also, annotations from the "http://www.sap.com/Protocols/SAPData" namespace are lifted up
 	 * from the <code>extensions</code> array and transformed from objects into simple properties
 	 * with an "sap:" prefix for their name. Note that this happens in addition, thus the
@@ -206,7 +208,7 @@ sap.ui.define([
 	 * {@link #loaded loaded} has been resolved!
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @alias sap.ui.model.odata.ODataMetaModel
 	 * @extends sap.ui.model.MetaModel
 	 * @public
@@ -588,7 +590,8 @@ sap.ui.define([
 			oReadPromise = new SyncPromise(function (fnResolve, fnReject) {
 				oCodeListModel.read("/" + sCollectionPath, {
 					error : fnReject,
-					success : fnResolve
+					success : fnResolve,
+					urlParameters : {$skip : 0, $top : 5000} // avoid server-driven paging
 				});
 			});
 			oMappingPromise = new SyncPromise(function (fnResolve, fnReject) {

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

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

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

@@ -34,13 +34,14 @@ sap.ui.define([
 	"sap/ui/model/Context",
 	"sap/ui/model/FilterProcessor",
 	"sap/ui/model/Model",
+	"sap/ui/model/odata/ODataAnnotations",
 	"sap/ui/model/odata/ODataMetaModel",
 	"sap/ui/thirdparty/datajs",
 	"sap/ui/thirdparty/URI"
 ], function(CountMode, ODataContextBinding, ODataListBinding, ODataMetadata, ODataPropertyBinding,
 		ODataTreeBinding, ODataUtils, assert, Log, encodeURL, each, extend, isEmptyObject,
-		isPlainObject, merge, uid, BindingMode, Context, FilterProcessor, Model, ODataMetaModel,
-		OData, URI) {
+		isPlainObject, merge, uid, BindingMode, Context, FilterProcessor, Model, ODataAnnotations,
+		ODataMetaModel, OData, URI) {
 	"use strict";
 
 	/**
@@ -75,7 +76,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @public
 	 * @deprecated As of version 1.48, please use {@link sap.ui.model.odata.v2.ODataModel} instead.
@@ -3441,13 +3442,13 @@ sap.ui.define([
 	};
 
 	/**
-	 * Singleton Lazy loading of the annotation parser on demand
+	 * Get or create the annotation parser instance.
+	 * @param {object} mAnnotationData The annotation data
 	 *
-	 * @return {sap.ui.model.odata.Annotations} The annotation parser instance
+	 * @return {sap.ui.model.odata.ODataAnnotations} The annotation parser instance
 	 */
 	ODataModel.prototype._getAnnotationParser = function(mAnnotationData) {
 		if (!this.oAnnotations) {
-			var ODataAnnotations = sap.ui.requireSync("sap/ui/model/odata/ODataAnnotations");
 			this.oAnnotations = new ODataAnnotations({
 				annotationData: mAnnotationData,
 				url: null,

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

@@ -107,7 +107,8 @@ sap.ui.define([
 	 * same path are ORed and filters on different paths are ANDed with each other
 	 * @see ODataUtils._createFilterParams
 	 * @param {sap.ui.model.Filter|sap.ui.model.Filter[]} vFilter the root filter or filter array
-	 * @param {object} oEntityType the entity metadata object
+	 * @param {object} oMetadata the entity metadata object
+	 * @param {object} oEntityType the entity type object
 	 * @return {string} the URL encoded filter parameters
 	 * @private
 	 */
@@ -130,7 +131,8 @@ sap.ui.define([
 	 * Creates a string of logically (or/and) linked filter options,
 	 * which will be used as URL query parameters for filtering.
 	 * @param {sap.ui.model.Filter|sap.ui.model.Filter[]} vFilter the root filter or filter array
-	 * @param {object} oEntityType the entity metadata object
+	 * @param {object} oMetadata the entity metadata object
+	 * @param {object} oEntityType the entity type object
 	 * @return {string} the URL encoded filter parameters
 	 * @private
 	 */
@@ -189,7 +191,7 @@ sap.ui.define([
 	 * If vParams is an object map, it will be also encoded properly.
 	 *
 	 * @private
-	 * @param {string|object|array} vParams
+	 * @param {string|object|array} vParams parameters
 	 */
 	ODataUtils._createUrlParamsArray = function(vParams) {
 		var aUrlParams, sType = typeof vParams, sParams;
@@ -369,9 +371,9 @@ sap.ui.define([
 				sFinalAnnotationURL = sAnnotationWithOrigin + sAnnotationUrlRest;
 			}
 		} else if (iHanaXsSegmentIndex >= 0) {
-			// Hana XS case: the Hana XS engine can provide static Annotation files for its services.
-			// The services can be identifed by their URL segment ".xsodata"; if such a service uses the origin feature
-			// the Annotation URLs need also adaption.
+			// Hana XS case: the Hana XS engine can provide static Annotation files for its
+			// services. The services can be identified by their URL segment ".xsodata"; if such a
+			// service uses the origin feature the Annotation URLs need also adaption.
 			sFinalAnnotationURL = ODataUtils.setOrigin(sAnnotationURL, vParameters);
 
 		} else {
@@ -489,10 +491,10 @@ sap.ui.define([
 	 * <a href="http://www.odata.org/documentation/odata-version-2-0/overview#AbstractTypeSystem">
 	 * EDM type</a>.
 	 *
-	 * @param {any} vValue the value to format
-	 * @param {string} sType the EDM type (e.g. Edm.Decimal)
-	 * @param {boolean} bCaseSensitive Wether strings gets compared case sensitive or not
-	 * @return {string} the formatted value
+	 * @param {any} vValue The value to format
+	 * @param {string} sType The EDM type (e.g. Edm.Decimal)
+	 * @param {boolean} bCaseSensitive Whether strings gets compared case sensitive or not
+	 * @return {string} The formatted value
 	 * @public
 	 */
 	ODataUtils.formatValue = function(vValue, sType, bCaseSensitive) {
@@ -800,6 +802,25 @@ sap.ui.define([
 		return sKey.replace(rNormalizeString, fnNormalizeString).replace(rNormalizeCase, fnNormalizeCase).replace(rNormalizeBinary, fnNormalizeBinary);
 	};
 
+	/**
+	 * Merges the given intervals into a single interval. The start and end of the resulting
+	 * interval are the start of the first interval and the end of the last interval.
+	 *
+	 * @param {object[]} aIntervals
+	 *   The array of available intervals
+	 * @returns {object|undefined}
+	 *   The merged interval with a member <code>start</code> and <code>end</code>, or
+	 *   <code>undefined</code> if no intervals are given.
+	 *
+	 * @private
+	 */
+	ODataUtils._mergeIntervals = function (aIntervals) {
+		if (aIntervals.length) {
+			return {start : aIntervals[0].start, end : aIntervals[aIntervals.length - 1].end};
+		}
+		return undefined;
+	};
+
 	/**
 	 * Returns the array of gaps in the given array of elements, taking the given start index,
 	 * length, and prefetch length into consideration.