@openui5/sap.ui.core 1.142.1 → 1.143.1

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

@@ -7,10 +7,9 @@
 /**
  * The types in this namespace are {@link sap.ui.model.SimpleType simple types} corresponding
  * to OData primitive types for both
- * {@link http://www.odata.org/documentation/odata-version-2-0/overview#AbstractTypeSystem OData V2}
+ * {@link https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html#_Toc38530338 OData V4.01}
  * and
- * {@link http://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part3-csdl.html OData V4} (see
- * "4.4 Primitive Types").
+ * {@link https://www.odata.org/documentation/odata-version-2-0/overview#AbstractTypeSystem OData V2}.
  *
  * They can be used in any place where simple types are allowed (and the model representation
  * matches), but they are of course most valuable when used in bindings to a
@@ -92,9 +91,9 @@ sap.ui.define([
 	 * Constructor for a new <code>ODataType</code>.
 	 *
 	 * @class This class is an abstract base class for all OData primitive types (see {@link
-	 * http://docs.oasis-open.org/odata/odata/v4.0/errata02/os/complete/part3-csdl/odata-v4.0-errata02-os-part3-csdl-complete.html#_The_edm:Documentation_Element
-	 * OData V4 Edm Types} and
-	 * {@link http://www.odata.org/documentation/odata-version-2-0/overview#AbstractTypeSystem
+	 * https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html#_Toc38530338
+	 * OData V4.01 Edm Types} and
+	 * {@link https://www.odata.org/documentation/odata-version-2-0/overview#AbstractTypeSystem
 	 * OData V2 Edm Types}). All subtypes implement the interface of
 	 * {@link sap.ui.model.SimpleType}. That means they implement next to the constructor:
 	 * <ul>
@@ -116,7 +115,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.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.142.1
+	 * @version 1.143.1
 	 */
 	var Raw = ODataType.extend("sap.ui.model.odata.type.Raw", {
 			constructor : function (oFormatOptions, oConstraints) {

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

@@ -14,9 +14,13 @@ sap.ui.define([
 	/**
 	 * Constructor for a primitive type <code>Edm.SByte</code>.
 	 *
-	 * @class This class represents the OData primitive type <a
-	 * href="http://www.odata.org/documentation/odata-version-2-0/overview#AbstractTypeSystem">
-	 * <code>Edm.SByte</code></a>.
+	 * @class This class represents the OData primitive type <code>Edm.SByte</code>, see
+	 * <a
+	 * href="https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html#_Toc38530338">
+	 * type definition for OData V4.01</a> or
+	 * <a
+	 * href="https://www.odata.org/documentation/odata-version-2-0/overview#AbstractTypeSystem">
+	 * type definition for OData V2</a>.
 	 *
 	 * In both {@link sap.ui.model.odata.v2.ODataModel} and {@link sap.ui.model.odata.v4.ODataModel}
 	 * this type is represented as a <code>number</code>.
@@ -24,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @alias sap.ui.model.odata.type.SByte
 	 * @param {object} [oFormatOptions]

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

@@ -64,9 +64,13 @@ sap.ui.define([
 	/**
 	 * Constructor for a primitive type <code>Edm.Single</code>.
 	 *
-	 * @class This class represents the OData primitive type <a
-	 * href="http://www.odata.org/documentation/odata-version-2-0/overview#AbstractTypeSystem">
-	 * <code>Edm.Single</code></a>.
+	 * @class This class represents the OData primitive type <code>Edm.Single</code>, see
+	 * <a
+	 * href="https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html#_Toc38530338">
+	 * type definition for OData V4.01</a> or
+	 * <a
+	 * href="https://www.odata.org/documentation/odata-version-2-0/overview#AbstractTypeSystem">
+	 * type definition for OData V2</a>.
 	 *
 	 * In both {@link sap.ui.model.odata.v2.ODataModel} and {@link sap.ui.model.odata.v4.ODataModel}
 	 * this type is represented as a <code>number</code>.
@@ -74,7 +78,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @alias sap.ui.model.odata.type.Single
 	 * @param {object} [oFormatOptions]

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

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * @alias sap.ui.model.odata.type.Stream
 	 * @author SAP SE
 	 * @class This class represents the OData V4 primitive type {@link
-	 *   http://docs.oasis-open.org/odata/odata/v4.0/errata02/os/complete/part3-csdl/odata-v4.0-errata02-os-part3-csdl-complete.html#_The_edm:Documentation_Element
+	 *   https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html#_Toc38530338
 	 *   <code>Edm.Stream</code>}. The values for stream properties do not appear in the entity
 	 *   payload. Instead, the values are read or written through URLs.
 	 *
@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.51.0
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 */
 	var Stream = ODataType.extend("sap.ui.model.odata.type.Stream", {
 			constructor : function (oFormatOptions, oConstraints) {

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

@@ -75,9 +75,13 @@ sap.ui.define([
 	/**
 	 * Constructor for an OData primitive type <code>Edm.String</code>.
 	 *
-	 * @class This class represents the OData primitive type <a
-	 * href="http://www.odata.org/documentation/odata-version-2-0/overview#AbstractTypeSystem">
-	 * <code>Edm.String</code></a>.
+	 * @class This class represents the OData primitive type <code>Edm.String</code>, see
+	 * <a
+	 * href="https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html#_Toc38530338">
+	 * type definition for OData V4.01</a> or
+	 * <a
+	 * href="https://www.odata.org/documentation/odata-version-2-0/overview#AbstractTypeSystem">
+	 * type definition for OData V2</a>.
 	 *
 	 * In both {@link sap.ui.model.odata.v2.ODataModel} and {@link sap.ui.model.odata.v4.ODataModel}
 	 * this type is represented as a <code>string</code>.
@@ -85,7 +89,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @alias sap.ui.model.odata.type.String
 	 * @param {object} [oFormatOptions]

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

@@ -125,7 +125,7 @@ sap.ui.define([
 	 * Constructor for an OData primitive type <code>Edm.Time</code>.
 	 *
 	 * @class This class represents the OData V2 primitive type <a
-	 * href="http://www.odata.org/documentation/odata-version-2-0/overview#AbstractTypeSystem">
+	 * href="https://www.odata.org/documentation/odata-version-2-0/overview#AbstractTypeSystem">
 	 * <code>Edm.Time</code></a>.
 	 *
 	 * In {@link sap.ui.model.odata.v2.ODataModel ODataModel} this type is represented as an
@@ -138,7 +138,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @alias sap.ui.model.odata.type.Time
 	 * @param {object} [oFormatOptions]

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

@@ -86,14 +86,14 @@ sap.ui.define([
 	 * @alias sap.ui.model.odata.type.TimeOfDay
 	 * @author SAP SE
 	 * @class This class represents the OData V4 primitive type {@link
-	 *   http://docs.oasis-open.org/odata/odata/v4.0/errata02/os/complete/part3-csdl/odata-v4.0-errata02-os-part3-csdl-complete.html#_The_edm:Documentation_Element
+	 *   https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html#_Toc38530338
 	 *   <code>Edm.TimeOfDay</code>}.
 	 *   In {@link sap.ui.model.odata.v4.ODataModel} this type is represented as a
 	 *   <code>string</code>.
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 */
 	var TimeOfDay = ODataType.extend("sap.ui.model.odata.type.TimeOfDay", {
 			constructor : function (oFormatOptions, oConstraints) {

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

@@ -72,7 +72,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.type.Unit
 	 * @public
 	 * @since 1.63.0
-	 * @version 1.142.1
+	 * @version 1.143.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.142.1
+	 * @version 1.143.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

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

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

@@ -53,13 +53,12 @@ sap.ui.define([
 	"sap/ui/model/odata/OperationMode",
 	"sap/ui/model/odata/UpdateMethod",
 	"sap/ui/thirdparty/datajs",
-	"sap/ui/thirdparty/URI",
 	"sap/ui/util/isCrossOriginURL"
 ], function(_CreatedContextsCache, Context, ODataAnnotations, ODataContextBinding, ODataListBinding, ODataTreeBinding,
 		assert, Log, Localization, encodeURL, deepEqual, deepExtend, each, extend, isEmptyObject, isPlainObject, merge,
 		uid, SyncPromise, Messaging, Message, MessageParser, MessageType, Supportability, _Helper, BindingMode,
 		BaseContext, FilterProcessor, Model, CountMode, MessageScope, ODataMetadata, ODataMetaModel, ODataMessageParser,
-		ODataPropertyBinding, ODataUtils, OperationMode, UpdateMethod, OData, URI, isCrossOriginURL
+		ODataPropertyBinding, ODataUtils, OperationMode, UpdateMethod, OData, isCrossOriginURL
 ) {
 
 	"use strict";
@@ -219,7 +218,7 @@ sap.ui.define([
 	 * This model is not prepared to be inherited from.
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel
@@ -1407,15 +1406,13 @@ sap.ui.define([
 	};
 
 	/**
-	 * Extracts the server base URL from the service URL
+	 * Computes and returns the server base URL from the service URL.
+	 *
 	 * @returns {string} The server base URL
 	 * @private
 	 */
-	ODataModel.prototype._getServerUrl = function() {
-		var oServiceURI, sURI;
-		oServiceURI = new URI(this.sServiceUrl).absoluteTo(document.baseURI);
-		sURI = new URI("/").absoluteTo(oServiceURI).toString();
-		return sURI;
+	ODataModel.prototype._getServerUrl = function () {
+		return new URL("/", new URL(this.sServiceUrl, document.baseURI)).href;
 	};
 
 	/**
@@ -2236,8 +2233,6 @@ sap.ui.define([
 	 *   {@link sap.ui.model.odata.OperationMode.Server OperationMode.Server} or
 	 *   {@link sap.ui.model.odata.OperationMode.Auto OperationMode.Auto} is used.
 	 * @param {boolean} [mParameters.restoreTreeStateAfterChange]
-	 *   This parameter is experimental as of version 1.141.0.
-	 *
 	 *   Whether the tree state is restored on hierarchy maintenance, such as adding, removing, or deleting a node.
 	 *   This is only supported if the following conditions are met: <ul>
 	 *   <li>The binding has to use {@link sap.ui.model.odata.OperationMode.Server OperationMode.Server}</li>

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

@@ -105,7 +105,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.TreeBinding
 	 * @hideconstructor
 	 * @public
-	 * @version 1.142.1
+	 * @version 1.143.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.142.1
+		 * @version 1.143.1
 		 */
 		Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 				constructor : constructor
@@ -1269,6 +1269,7 @@ sap.ui.define([
 	 */
 	Context.prototype.isAggregated = function () {
 		this.oBinding.checkSuspended();
+		// see _AggregationCache#isAggregated
 		const bAggregated = this.oBinding.mParameters.$$aggregation?.$leafLevelAggregated;
 		if (bAggregated === undefined) {
 			return false;

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

@@ -548,6 +548,9 @@ sap.ui.define([
 		this.oCachePromise = SyncPromise.all(aPromises).then(function (aResult) {
 			var mQueryOptions = aResult[0].mQueryOptions;
 
+			if (oCallToken.initiallySuspended) {
+				return null;
+			}
 			if (aResult[0].sReducedPath) {
 				that.sReducedPath = aResult[0].sReducedPath;
 			}

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.142.1
+		 * @version 1.143.1
 		 *
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding

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

@@ -60,7 +60,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.142.1
+		 * @version 1.143.1
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId
@@ -143,6 +143,10 @@ sap.ui.define([
 		this.oHeaderContext = this.bRelative
 			? null
 			: Context.createNewContext(oModel, this, sPath);
+		this.bInitial = true;
+		Promise.resolve().then(() => {
+			this.bInitial = false; // ensure to reset the initial flag after the synchronous part
+		});
 		this.sOperationMode = mParameters.$$operationMode || oModel.sOperationMode;
 		// map<string,sap.ui.model.odata.v4.Context>
 		// Maps a string path to a v4.Context with that path. A context may either be
@@ -774,7 +778,7 @@ sap.ui.define([
 
 		iCount ??= this.oCache.collapse(
 			_Helper.getRelativePath(oContext.getPath(), this.oHeaderContext.getPath()),
-			bAll ? this.lockGroup() : undefined, bSilent, false, this.getKeepAlivePredicates());
+			bAll ? this.lockGroup() : undefined, bSilent);
 
 		if (iCount > 0) {
 			const aContexts = this.aContexts;
@@ -1728,6 +1732,18 @@ sap.ui.define([
 	 */
 	ODataListBinding.prototype.doSetProperty = function () {};
 
+	/**
+	 * @override
+	 * @see sap.ui.model.odata.v4.ODataParentBinding#doSuspend
+	 */
+	ODataListBinding.prototype.doSuspend = function () {
+		// if auto-$expand/$select is not used, this.oFetchCacheCallToken may be reset already
+		if (this.bInitial && this.oFetchCacheCallToken) {
+			this.oFetchCacheCallToken.initiallySuspended = true;
+			this.oCache = null;
+		}
+	};
+
 	/**
 	 * Expands the group node that the given context points to by the given number of levels.
 	 *
@@ -3476,6 +3492,7 @@ sap.ui.define([
 	 */
 	// @override sap.ui.model.Binding#initialize
 	ODataListBinding.prototype.initialize = function () {
+		this.bInitial = false;
 		if (this.isResolved()) {
 			this.checkDataState();
 			if (this.isRootBindingSuspended()) {

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

@@ -40,13 +40,12 @@ sap.ui.define([
 	"sap/ui/model/odata/type/Single",
 	"sap/ui/model/odata/type/Stream",
 	"sap/ui/model/odata/type/String",
-	"sap/ui/model/odata/type/TimeOfDay",
-	"sap/ui/thirdparty/URI"
+	"sap/ui/model/odata/type/TimeOfDay"
 ], function (AnnotationHelper, ValueListType, _Helper, assert, Log, JSTokenizer, ObjectPath,
 		ManagedObject, SyncPromise, BindingMode, ChangeReason, ClientListBinding, BaseContext,
 		ContextBinding, MetaModel, PropertyBinding, OperationMode, Boolean, Byte, EdmDate,
 		DateTimeOffset, Decimal, Double, Guid, Int16, Int32, Int64, Raw, SByte, Single, Stream,
-		String, TimeOfDay, URI) {
+		String, TimeOfDay) {
 	"use strict";
 	/*eslint max-nested-callbacks: 0 */
 
@@ -204,7 +203,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.142.1
+		 * @version 1.143.1
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor
@@ -2294,27 +2293,6 @@ sap.ui.define([
 			});
 	};
 
-	/**
-	 * Returns the absolute service URL corresponding to the given relative $metadata URL.
-	 *
-	 * @param {string} sUrl
-	 *   A $metadata URL, for example "../ValueListService/$metadata?sap-client=123", interpreted
-	 *   relative to this meta model's URL
-	 * @returns {string}
-	 *   The corresponding absolute service URL
-	 *
-	 * @private
-	 */
-	ODataMetaModel.prototype.getAbsoluteServiceUrl = function (sUrl) {
-		// Note: make our $metadata URL absolute because URI#absoluteTo requires an absolute base
-		// URL (and it fails if the base URL starts with "..")
-		var sAbsoluteUrl = new URI(this.sUrl).absoluteTo(document.baseURI).pathname().toString();
-
-		// sUrl references the metadata document, make it absolute based on our $metadata URL to get
-		// rid of ".." segments and remove the filename part
-		return new URI(sUrl).absoluteTo(sAbsoluteUrl).filename("").toString();
-	};
-
 	/**
 	 * Builds the completely reduced path or a list of all reductions of the given path based on
 	 * metadata. Removes adjacent partner navigation properties and reduces binding paths to
@@ -2612,7 +2590,7 @@ sap.ui.define([
 	 */
 	ODataMetaModel.prototype.getOrCreateSharedModel = function (sUrl, bCopyAnnotations,
 			bAutoExpandSelect, sQualifiedParentName) {
-		sUrl = this.getAbsoluteServiceUrl(sUrl);
+		sUrl = _Helper.makeAbsolute(sUrl, this.sUrl, /*bServiceUrl*/true);
 		const sMapKey = !!bAutoExpandSelect + sUrl; // no separator needed as sUrl.startsWith("/")
 		let mSharedModelByUrl = this.mSharedModelByUrl;
 		if (!bCopyAnnotations) {
@@ -2868,8 +2846,8 @@ sap.ui.define([
 					return null;
 				}
 
-				sUrl = that.getAbsoluteServiceUrl(
-					_Helper.setLanguage(oCodeList.Url, that.sLanguage));
+				sUrl = _Helper.makeAbsolute(_Helper.setLanguage(oCodeList.Url, that.sLanguage),
+					that.sUrl, /*bServiceUrl*/true);
 				// separator needed (Note: path must not include hash)
 				sCacheKey = oCodeList.CollectionPath + "#" + sUrl;
 				oPromise = mCodeListUrl2Promise[sCacheKey];
@@ -3781,7 +3759,7 @@ sap.ui.define([
 		for (sReferenceUri in mScope.$Reference) {
 			oReference = mScope.$Reference[sReferenceUri];
 			// interpret reference URI relative to metadata URL
-			sReferenceUri = new URI(sReferenceUri).absoluteTo(this.sUrl).toString();
+			sReferenceUri = _Helper.makeAbsolute(sReferenceUri, this.sUrl);
 
 			if ("$IncludeAnnotations" in oReference) {
 				this._reportAndThrowError("Unsupported IncludeAnnotations", sUrl);

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

@@ -7,9 +7,6 @@
 /**
  * Model and related classes like bindings for OData V4.
  *
- * <b>Note:</b> Smart controls (<code>sap.ui.comp</code> library) do not support the SAPUI5 OData V4
- * model. Also controls such as {@link sap.ui.table.TreeTable} and
- * {@link sap.ui.table.AnalyticalTable} are not supported together with the SAPUI5 OData V4 model.
  * The interface for applications has been changed for easier and more efficient use of the model.
  * For a summary of these changes, see
  * {@link topic:abd4d7c7548d4c29ab8364d3904a6d74 Changes Compared to OData V2 Model}.
@@ -45,12 +42,11 @@ sap.ui.define([
 	"sap/ui/model/BindingMode",
 	"sap/ui/model/Context",
 	"sap/ui/model/Model",
-	"sap/ui/model/odata/OperationMode",
-	"sap/ui/thirdparty/URI"
+	"sap/ui/model/odata/OperationMode"
 ], function (ODataContextBinding, ODataListBinding, ODataMetaModel, ODataPropertyBinding,
 		SubmitMode, _GroupLock, _Helper, _MetadataRequestor, _Parser, _Requestor, assert, Log,
 		Localization, SyncPromise, Messaging, Rendering, Supportability, CacheManager,
-		Message, MessageType, BindingMode, BaseContext, Model, OperationMode, URI) {
+		Message, MessageType, BindingMode, BaseContext, Model, OperationMode) {
 	"use strict";
 
 	/**
@@ -156,6 +152,8 @@ sap.ui.define([
 		 *   "cross-service references". Supported since 1.81.0
 		 * @param {string} [mParameters.odataVersion="4.0"]
 		 *   The version of the OData service. Supported values are "2.0", "4.0", and "4.01".
+		 *   <b>Note:</b> "2.0" is deprecated since 1.143.0. We recommend migrating your service to
+		 *   OData V4.
 		 * @param {sap.ui.model.odata.OperationMode} [mParameters.operationMode]
 		 *   The operation mode for filtering and sorting. Since 1.39.0, the operation mode
 		 *   {@link sap.ui.model.odata.OperationMode.Server} is supported. All other operation modes
@@ -242,7 +240,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.142.1
+		 * @version 1.143.1
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -273,8 +271,8 @@ sap.ui.define([
 			sParameter,
 			mQueryParams,
 			sServiceUrl,
-			oUri,
 			mUriParameters,
+			sUrlParameters,
 			that = this;
 
 		// do not pass any parameters to Model
@@ -298,8 +296,10 @@ sap.ui.define([
 		if (!sServiceUrl) {
 			throw new Error("Missing service root URL");
 		}
-		oUri = new URI(sServiceUrl);
-		if (oUri.path()[oUri.path().length - 1] !== "/") {
+		// we don't expect the sServiceUrl to contain a "#" hash part, because it is not relevant
+		// for OData requests
+		[sServiceUrl, sUrlParameters] = sServiceUrl.split("?");
+		if (sServiceUrl.at(-1) !== "/") {
 			throw new Error("Service root URL must end with '/'");
 		}
 		if (mParameters.operationMode && mParameters.operationMode !== OperationMode.Server) {
@@ -307,15 +307,16 @@ sap.ui.define([
 				+ mParameters.operationMode);
 		}
 		this.sOperationMode = mParameters.operationMode;
+		mUriParameters = _Helper.getUrlParameters(sUrlParameters);
 		// Note: strict checking for model's URI parameters, but "sap-*" is allowed
-		mUriParameters = this.buildQueryOptions(oUri.query(true), false, true);
+		mUriParameters = this.buildQueryOptions(mUriParameters, false, true);
 		// BEWARE: these are shared across all bindings!
 		this.mUriParameters = mUriParameters;
 		if (Supportability.isStatisticsEnabled()) {
 			// Note: this way, "sap-statistics" is not sent within $batch
 			mUriParameters = Object.assign({"sap-statistics" : true}, mUriParameters);
 		}
-		this.sServiceUrl = oUri.query("").toString();
+		this.sServiceUrl = sServiceUrl;
 		this.sGroupId = mParameters.groupId;
 		if (this.sGroupId === undefined) {
 			this.sGroupId = "$auto";
@@ -967,10 +968,10 @@ sap.ui.define([
 	 *   An array of navigation property names which are omitted from the main list request (since
 	 *   1.137.0). Instead, each of them is loaded in a separate request. This results in the main
 	 *   list becoming available faster, while the separate properties are merged as soon as the
-	 *   data is received. Note that the separate properties must be single valued and part of the
-	 *   '$expand' system query option, either automatically via the "autoExpandSelect" model
-	 *   parameter (see {@link #constructor}) or manually. The <code>$$separate</code> parameter
-	 *   must not be combined with <code>$$aggregation</code>.
+	 *   data is received. Note that the separate properties must be single valued. If they are not
+	 *   part of the '$expand' system query option, either automatically via the "autoExpandSelect"
+	 *   model parameter (see {@link #constructor}) or manually, they are ignored. The
+	 *   <code>$$separate</code> parameter must not be combined with <code>$$aggregation</code>.
 	 * @param {boolean} [mParameters.$$sharedRequest]
 	 *   Whether multiple bindings for the same resource path share the data, so that it is
 	 *   requested only once.

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

@@ -731,11 +731,11 @@ sap.ui.define([
 	/**
 	 * Binding specific code for suspend.
 	 *
+	 * @abstract
+	 * @function
+	 * @name sap.ui.model.odata.v4.ODataParentBinding#doSuspend
 	 * @private
 	 */
-	ODataParentBinding.prototype.doSuspend = function () {
-		// nothing to do here
-	};
 
 	/**
 	 * Determines whether a child binding with the given context and path can use
@@ -823,9 +823,15 @@ sap.ui.define([
 
 		if (bDependsOnOperation && !sResolvedChildPath.includes("/$Parameter/")
 				|| this.isRootBindingSuspended()
-				|| _Helper.isDataAggregation(this.mParameters)) {
-			// With data aggregation, no auto-$expand/$select is needed, but the child may still use
-			// the parent's cache
+				|| _Helper.isDataAggregation(this.mParameters)
+					&& (oContext === this.getHeaderContext?.() || oContext.isAggregated()
+						|| this.mParameters.$$aggregation.aggregate[sChildPath]?.name)) {
+			// In general there is no need for auto-$expand/$select, if the given context is a
+			// header context. But exiting here always, if a header context is used, changes the
+			// timing.
+			// With data aggregation, no auto-$expand/$select is needed for a header context, a
+			// context referencing aggregated data, or a dynamic property, but the child may still
+			// use the parent's cache; in case of a single record auto-$expand/$select is used.
 			// Note: Operation bindings do not support auto-$expand/$select yet
 			return SyncPromise.resolve(sResolvedChildPath);
 		}
@@ -891,8 +897,7 @@ sap.ui.define([
 					mChildQueryOptions, bIsProperty);
 			}
 
-			if (oProperty?.["@$ui5.$count"]
-					&& oContext !== oContext.getBinding().getHeaderContext?.()
+			if (oProperty?.["@$ui5.$count"] && oContext !== that.getHeaderContext?.()
 					// avoid new $count handling in case of "manual" $expand
 					// Note: sChildPath.slice(0, -7) is the navigation property name
 					&& !mLocalQueryOptions.$expand?.[sChildPath.slice(0, -7)]) {

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

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.142.1
+		 * @version 1.143.1
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId