@openui5/sap.ui.core 1.141.2 → 1.143.0

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";
 
 	/**
@@ -155,7 +151,9 @@ sap.ui.define([
 		 *   "sap-context-token" applies only to the service's root $metadata, but not to
 		 *   "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" and "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
@@ -167,8 +165,8 @@ sap.ui.define([
 		 *   forward slash according to OData V4 specification ABNF, rule "serviceRoot". You may
 		 *   append OData custom query options to the service root URL separated with a "?", for
 		 *   example "/MyService/?custom=foo". See specification <a href=
-		 *   "https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part2-url-conventions.html#_Custom_Query_Options"
-		 *   >"OData Version 4.0 Part 2: URL Conventions", "5.2 Custom Query Options"</a>. OData
+		 *   "https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html#_Toc31361050"
+		 *   >"OData Version 4.01. Part 2: URL Conventions", "5.2 Custom Query Options"</a>. OData
 		 *   system query options and OData parameter aliases lead to an error.
 		 * @param {boolean} [mParameters.sharedRequests]
 		 *   Whether all list bindings for the same resource path share their data, so that it is
@@ -209,9 +207,9 @@ sap.ui.define([
 		 *
 		 *   Every resource path (relative to the service root URL, no query options) according to
 		 *   <a href=
-		 *   "https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part2-url-conventions.html#resource-pathurl4"
-		 *   >"4 Resource Path"</a> in specification "OData Version 4.0 Part 2: URL Conventions" is
-		 *   a valid data binding path within this model if a leading slash is added; for example
+		 *   "https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html#_Toc31360928"
+		 *   >"4 Resource Path"</a> in specification "OData Version 4.01. Part 2: URL Conventions"
+		 *   is a valid data binding path within this model if a leading slash is added; for example
 		 *   "/" + "SalesOrderList('A%2FB%26C')" to access an entity instance with key "A/B&C". Note
 		 *   that appropriate URI encoding is necessary, see the example of
 		 *   {@link sap.ui.model.odata.v4.ODataUtils.formatLiteral}. "4.5.1 Addressing Actions"
@@ -242,7 +240,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.141.2
+		 * @version 1.143.0
 		 */
 		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
@@ -286,7 +284,7 @@ sap.ui.define([
 		}
 		sODataVersion = mParameters.odataVersion || "4.0";
 		this.sODataVersion = sODataVersion;
-		if (sODataVersion !== "4.0" && sODataVersion !== "2.0") {
+		if (sODataVersion !== "4.01" && sODataVersion !== "4.0" && sODataVersion !== "2.0") {
 			throw new Error("Unsupported value for parameter odataVersion: " + sODataVersion);
 		}
 		for (sParameter in mParameters) {
@@ -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";
@@ -748,8 +749,8 @@ sap.ui.define([
 	 *   The context which is required as base for a relative path
 	 * @param {object} [mParameters]
 	 *   Map of binding parameters which can be OData query options as specified in <a href=
-	 *   "https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part2-url-conventions.html"
-	 *   >"OData Version 4.0 Part 2: URL Conventions"</a> or the binding-specific parameters as
+	 *   "https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html"
+	 *   >"OData Version 4.01. Part 2: URL Conventions"</a> or the binding-specific parameters as
 	 *   specified below.
 	 *   Note: The binding creates its own data service request if it is absolute or if it has any
 	 *   parameters or if it is relative and has a context created via
@@ -766,7 +767,7 @@ sap.ui.define([
 	 *   All other query options lead to an error.
 	 *   Query options specified for the binding overwrite model query options.
 	 * @param {string|object} [mParameters.$expand]
-	 *   The value for the "5.1.2 System Query Option $expand" or an object which determines that
+	 *   The value for the "5.1.3 System Query Option $expand" or an object which determines that
 	 *   value. The object is a map from expand path to expand options, where the options are again
 	 *   maps of system query options, typically with string values. $count can also be given as a
 	 *   <code>boolean</code> value, $expand can recursively be given as a map, $levels can also be
@@ -775,9 +776,9 @@ sap.ui.define([
 	 *   <code>true</code>. See also {@link topic:1ab4f62de6ab467096a2a98b363a1373 Parameters}.
 	 * @param {string|string[]} [mParameters.$select]
 	 *   A comma separated list or an array of items which determine the value for the
-	 *   "5.1.3 System Query Option $select". Since 1.75.0, when using the "autoExpandSelect" model
+	 *   "5.1.4 System Query Option $select". Since 1.75.0, when using the "autoExpandSelect" model
 	 *   parameter (see {@link #constructor}), paths with navigation properties can be included and
-	 *   will contribute to the "5.1.2 System Query Option $expand".
+	 *   will contribute to the "5.1.3 System Query Option $expand".
 	 * @param {boolean} [mParameters.$$canonicalPath]
 	 *   Whether a binding relative to an {@link sap.ui.model.odata.v4.Context} uses the canonical
 	 *   path computed from its context's path for data service requests; only the value
@@ -874,8 +875,8 @@ sap.ui.define([
 	 *   Supported since 1.39.0.
 	 * @param {object} [mParameters]
 	 *   Map of binding parameters which can be OData query options as specified in <a href=
-	 *   "https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part2-url-conventions.html"
-	 *   >"OData Version 4.0 Part 2: URL Conventions"</a> or binding-specific parameters as
+	 *   "https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html"
+	 *   >"OData Version 4.01. Part 2: URL Conventions"</a> or binding-specific parameters as
 	 *   specified below.
 	 *   Note: The binding creates its own data service request if it is absolute or if it has any
 	 *   parameters or if it is relative and has a context created via {@link #createBindingContext}
@@ -895,10 +896,10 @@ sap.ui.define([
 	 *   Extension for Data Aggregation Version 4.0</a>) as an alternative to
 	 *   <code>$$aggregation</code>
 	 * @param {string|boolean} [mParameters.$count]
-	 *   The value for the "5.1.6 System Query Option $count", useful for creation at the end and
+	 *   The value for the "5.1.7 System Query Option $count", useful for creation at the end and
 	 *   {@link sap.ui.model.odata.v4.ODataListBinding#getCount}
 	 * @param {string|object} [mParameters.$expand]
-	 *   The value for the "5.1.2 System Query Option $expand" or an object which determines that
+	 *   The value for the "5.1.3 System Query Option $expand" or an object which determines that
 	 *   value. The object is a map from expand path to expand options, where the options are again
 	 *   maps of system query options, typically with string values. $count can also be given as a
 	 *   <code>boolean</code> value, $expand can recursively be given as a map, $levels can also be
@@ -906,20 +907,20 @@ sap.ui.define([
 	 *   without navigation paths). An empty map can also be given as <code>null</code> or
 	 *   <code>true</code>. See also {@link topic:1ab4f62de6ab467096a2a98b363a1373 Parameters}.
 	 * @param {string} [mParameters.$filter]
-	 *   The value for the "5.1.1 System Query Option $filter" used in addition to
+	 *   The value for the "5.1.2 System Query Option $filter" used in addition to
 	 *   <code>vFilters</code>
 	 * @param {string|number} [mParameters.$orderby]
-	 *   The value for the "5.1.4 System Query Option $orderby" used in addition to
+	 *   The value for the "5.1.5 System Query Option $orderby" used in addition to
 	 *   <code>vSorters</code>
 	 * @param {string} [mParameters.$search]
-	 *   The value for the "5.1.7 System Query Option $search"; see also
+	 *   The value for the "5.1.8 System Query Option $search"; see also
 	 *   <code>oAggregation.search</code> at
 	 *   {@link sap.ui.model.odata.v4.ODataListBinding#setAggregation} and the note there!
 	 * @param {string|string[]} [mParameters.$select]
 	 *   A comma separated list or an array of items which determine the value for the
-	 *   "5.1.3 System Query Option $select". Since 1.75.0, when using the "autoExpandSelect" model
+	 *   "5.1.4 System Query Option $select". Since 1.75.0, when using the "autoExpandSelect" model
 	 *   parameter (see {@link #constructor}), paths with navigation properties can be included and
-	 *   will contribute to the "5.1.2 System Query Option $expand".
+	 *   will contribute to the "5.1.3 System Query Option $expand".
 	 * @param {object} [mParameters.$$aggregation]
 	 *   An object holding the information needed for data aggregation, see
 	 *   {@link sap.ui.model.odata.v4.ODataListBinding#setAggregation} for details.
@@ -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.
@@ -1065,8 +1066,8 @@ sap.ui.define([
 	 *   The context which is required as base for a relative path
 	 * @param {object} [mParameters]
 	 *   Map of binding parameters which can be OData query options as specified in <a href=
-	 *   "https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part2-url-conventions.html"
-	 *   >"OData Version 4.0 Part 2: URL Conventions"</a> or the binding-specific parameters as
+	 *   "https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html"
+	 *   >"OData Version 4.01. Part 2: URL Conventions"</a> or the binding-specific parameters as
 	 *   specified below. The following OData query options are allowed:
 	 *   <ul>
 	 *     <li> All "5.2 Custom Query Options" except for those with a name starting with "sap-"
@@ -1085,10 +1086,10 @@ sap.ui.define([
 	 *   <a href="https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/">OData
 	 *   Extension for Data Aggregation Version 4.0</a>), if the path ends with a "$count" segment
 	 * @param {string} [mParameters.$filter]
-	 *   The value for the "5.1.1 System Query Option $filter", if the path ends with a "$count"
+	 *   The value for the "5.1.2 System Query Option $filter", if the path ends with a "$count"
 	 *   segment
 	 * @param {string} [mParameters.$search]
-	 *   The value for the "5.1.7 System Query Option $search", if the path ends with a "$count"
+	 *   The value for the "5.1.8 System Query Option $search", if the path ends with a "$count"
 	 *   segment
 	 * @param {string} [mParameters.$$groupId]
 	 *   The group ID to be used for <b>read</b> requests initiated by this binding; if not
@@ -1243,10 +1244,13 @@ sap.ui.define([
 		if (mParameters) {
 			for (sParameterName in mParameters) {
 				if (a401DenyList.includes(sParameterName.toLowerCase())) {
-					Log.warning("[FUTURE FATAL] Custom query option " + sParameterName
-						+ " will not be supported with OData 4.01, see"
-						+ " https://sdk.openui5.org/topic/cda632b01c1e4a988ccecab759d19380",
-						undefined, sClassName);
+					const sMessage = "Custom query option " + sParameterName
+						+ " not supported with OData 4.01, see"
+						+ " https://sdk.openui5.org/topic/cda632b01c1e4a988ccecab759d19380";
+					if (this.sODataVersion === "4.01") {
+						throw new Error(sMessage);
+					}
+					Log.warning("[FUTURE FATAL] " + sMessage, undefined, sClassName);
 				}
 				if (sParameterName.startsWith("$$")) { // binding-specific parameter
 					delete mTransformedOptions[sParameterName];
@@ -1274,9 +1278,9 @@ sap.ui.define([
 	 * and missing headers remain unchanged. The following headers must not be used:
 	 * <ul>
 	 *   <li> OData V4 requests headers as specified in <a href=
-	 *     "https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part1-protocol.html#_Common_Headers"
-	 *     >"8.1 Common Headers"</a> and "8.2 Request Headers" of the specification "OData Version
-	 *     4.0 Part 1: Protocol"
+	 *     "https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#_Toc31358857"
+	 *     >"8.1 Common Headers"</a> and "8.2 Request Headers" of the specification
+	 *     "OData Version 4.01. Part 1: Protocol"
 	 *   <li> OData V2 request headers as specified in "2.2.5 HTTP Header Fields" of the
 	 *     specification "OData Version 2 v10.1"
 	 *   <li> The headers "Content-Id" and "Content-Transfer-Encoding"
@@ -2695,11 +2699,12 @@ sap.ui.define([
 	/**
 	 * Returns a promise for the "canonical path" of the entity for the given context.
 	 * According to <a href=
-	 * "https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part2-url-conventions.html#canonical-urlurl4.1.1"
-	 * >"4.3.1 Canonical URL"</a> of the specification "OData Version 4.0 Part 2: URL Conventions",
-	 * this is the "name of the entity set associated with the entity followed by the key predicate
-	 * identifying the entity within the collection". Use the canonical path in
-	 * {@link sap.ui.core.Element#bindElement} to create an element binding.
+	 * "https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html#_Toc31360932"
+	 * >"4.3.1 Canonical URL"</a> of the specification
+	 * "OData Version 4.01. Part 2: URL Conventions", this is the "name of the entity set associated
+	 * with the entity followed by the key predicate identifying the entity within the collection".
+	 * Use the canonical path in {@link sap.ui.core.Element#bindElement} to create an element
+	 * binding.
 	 *
 	 * @param {sap.ui.model.odata.v4.Context} oEntityContext
 	 *   A context in this model which must point to a non-contained OData entity

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

@@ -130,8 +130,8 @@ sap.ui.define([
 	 *
 	 * Note: * is an item in <code>$select</code> and <code>$expand</code> just as others, that is
 	 * it must be part of the array of items and one must not ignore the other items if * is
-	 * provided. See "5.1.2 System Query Option $expand" and "5.1.3 System Query Option $select" in
-	 * specification "OData Version 4.0 Part 2: URL Conventions".
+	 * provided. See "5.1.3 System Query Option $expand" and "5.1.4 System Query Option $select" in
+	 * specification "OData Version 4.01. Part 2: URL Conventions".
 	 *
 	 * @param {object} mQueryOptions - The query options to be merged
 	 * @param {string} sBaseMetaPath - This binding's meta path
@@ -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)]) {
@@ -1361,9 +1366,9 @@ sap.ui.define([
 	 * @param {string} sGroupId
 	 *   The group ID to be used for requesting side effects
 	 * @param {string[]} aPaths
-	 *   The "14.5.11 Expression edm:NavigationPropertyPath" or
-	 *   "14.5.13 Expression edm:PropertyPath" strings describing which properties need to be loaded
-	 *   because they may have changed due to side effects of a previous update
+	 *   The "14.4.1.5 Expression edm:NavigationPropertyPath" or
+	 *   "14.4.1.6 Expression edm:PropertyPath" strings describing which properties need to be
+	 *   loaded because they may have changed due to side effects of a previous update
 	 * @param {sap.ui.model.odata.v4.Context} [oContext]
 	 *   The context for which to request side effects; if this parameter is missing or if it is the
 	 *   header context of a list binding, the whole binding is affected

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.141.2
+		 * @version 1.143.0
 		 * @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

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

@@ -14,7 +14,7 @@ sap.ui.define([
 ], function (CalendarType, DateFormat, BaseODataUtils, _Batch, _Helper) {
 	"use strict";
 
-	// see https://docs.oasis-open.org/odata/odata/v4.0/errata03/os/complete/abnf/
+	// see https://docs.oasis-open.org/odata/odata/v4.01/os/abnf/
 	var oDateFormatter,
 		oDateTimeOffsetFormatter,
 		sDateValue = "\\d{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[12]\\d|3[01])",
@@ -140,15 +140,15 @@ sap.ui.define([
 			 *
 			 * @param {any} vValue
 			 *   The value according to <a href=
-			 *   "https://docs.oasis-open.org/odata/odata-json-format/v4.0/odata-json-format-v4.0.html#_Primitive_Value"
-			 *   >"OData JSON Format Version 4.0" section "7.1 Primitive Value"</a>
+			 *   "https://docs.oasis-open.org/odata/odata-json-format/v4.01/odata-json-format-v4.01.html#sec_PrimitiveValue"
+			 *   >"OData JSON Format Version 4.01" section "7.1 Primitive Value"</a>
 			 * @param {string} sType
 			 *   The OData primitive type, for example "Edm.String"
 			 * @returns {string}
 			 *   The literal according to <a href=
-			 *   "https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part2-url-conventions.html"
-			 *   >"OData Version 4.0 Part 2: URL Conventions"</a> section
-			 *   "5.1.1.11.1 Primitive Literals"
+			 *   "https://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part2-url-conventions.html#_Toc31361028"
+			 *   >"OData Version 4.01. Part 2: URL Conventions"</a> section
+			 *   "5.1.1.14.1 Primitive Literals"
 			 * @throws {Error}
 			 *   If the value is undefined or the type is not supported
 			 *

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

@@ -16,7 +16,7 @@ sap.ui.define([
 ], function (Basics, Log, BindingInfo, BindingParser, SyncPromise, Measurement) {
 	"use strict";
 
-	// see https://docs.oasis-open.org/odata/odata/v4.0/errata03/os/complete/abnf/
+	// see https://docs.oasis-open.org/odata/odata/v4.01/os/abnf/
 	var sAnnotationHelper = "sap.ui.model.odata.v4.AnnotationHelper",
 		aPerformanceCategories = [sAnnotationHelper],
 		sPerformanceGetExpression = sAnnotationHelper + "/getExpression",
@@ -165,7 +165,7 @@ sap.ui.define([
 		},
 
 		/**
-		 * Handling of "14.5.3 Expression edm:Apply".
+		 * Handling of "14.4.4 Expression edm:Apply".
 		 *
 		 * @param {object} oPathValue
 		 *   path and value information pointing to the apply (see Expression object)
@@ -178,11 +178,11 @@ sap.ui.define([
 			var oFunction = Basics.descend(oPathValue, "$Function", "string");
 
 			switch (oFunction.value) {
-				case "odata.concat": // 14.5.3.1.1 Function odata.concat
+				case "odata.concat": // 14.4.4.1 Function odata.concat
 					return Expression.concat(oParameters);
-				case "odata.fillUriTemplate": // 14.5.3.1.2 Function odata.fillUriTemplate
+				case "odata.fillUriTemplate": // 14.4.4.2 Function odata.fillUriTemplate
 					return Expression.fillUriTemplate(oParameters);
-				case "odata.uriEncode": // 14.5.3.1.3 Function odata.uriEncode
+				case "odata.uriEncode": // 14.4.4.4 Function odata.uriEncode
 					return Expression.uriEncode(oParameters);
 				default:
 					return asyncError(oFunction, "unknown function: " + oFunction.value);
@@ -190,7 +190,7 @@ sap.ui.define([
 		},
 
 		/**
-		 * Handling of "14.5.5 Expression edm:Collection".
+		 * Handling of "14.4.6 Expression edm:Collection".
 		 *
 		 * @param {object} oPathValue
 		 *   path and value information pointing to the array (see Expression object)
@@ -221,7 +221,7 @@ sap.ui.define([
 		},
 
 		/**
-		 * Handling of "14.5.3.1.1 Function odata.concat".
+		 * Handling of "odata.concat" from "14.4.4.1 Canonical Functions".
 		 *
 		 * @param {object} oPathValue
 		 *   path and value information pointing to the parameter array (see Expression object)
@@ -270,7 +270,7 @@ sap.ui.define([
 		},
 
 		/**
-		 * Handling of "14.5.6 Expression edm:If".
+		 * Handling of "14.4.7 Expression edm:If".
 		 *
 		 * @param {object} oPathValue
 		 *   path and value information pointing to the parameter array (see Expression object).
@@ -278,8 +278,8 @@ sap.ui.define([
 		 *   Edm.Boolean. The second and third child elements are the expressions, which are
 		 *   evaluated conditionally.
 		 * @param {boolean} [bInCollection]
-		 *   Whether "14.5.6 Expression edm:If" appears as a direct child of
-		 *   "14.5.5 Expression edm:Collection" and thus needs no third child element ("else")
+		 *   Whether "14.4.7 Expression edm:If" appears as a direct child of
+		 *   "14.4.6 Expression edm:Collection" and thus needs no third child element ("else")
 		 * @returns {sap.ui.base.SyncPromise<object>}
 		 *   a sync promise which resolves with the result object or is rejected with an error
 		 */
@@ -330,17 +330,17 @@ sap.ui.define([
 		},
 
 		/**
-		 * Handling of "14.4 Constant Expressions", i.e.
+		 * Handling of "14.3 Constant Expressions", i.e.
 		 * <ul>
-		 *   <li> "14.4.2 Expression edm:Bool",
-		 *   <li> "14.4.3 Expression edm:Date",
-		 *   <li> "14.4.4 Expression edm:DateTimeOffset",
-		 *   <li> "14.4.5 Expression edm:Decimal",
-		 *   <li> "14.4.8 Expression edm:Float",
-		 *   <li> "14.4.9 Expression edm:Guid",
-		 *   <li> "14.4.10 Expression edm:Int",
-		 *   <li> "14.4.11 Expression edm:String",
-		 *   <li> "14.4.12 Expression edm:TimeOfDay".
+		 *   <li> "14.3.2 Expression edm:Bool",
+		 *   <li> "14.3.3 Expression edm:Date",
+		 *   <li> "14.3.4 Expression edm:DateTimeOffset",
+		 *   <li> "14.3.5 Expression edm:Decimal",
+		 *   <li> "14.3.8 Expression edm:Float",
+		 *   <li> "14.3.9 Expression edm:Guid",
+		 *   <li> "14.3.10 Expression edm:Int",
+		 *   <li> "14.3.11 Expression edm:String",
+		 *   <li> "14.3.12 Expression edm:TimeOfDay".
 		 * </ul>
 		 *
 		 * @param {object} oPathValue
@@ -378,7 +378,7 @@ sap.ui.define([
 		 *   path and value information pointing to the expression (see Expression object)
 		 * @param {boolean} [bInCollection]
 		 *   Whether the current expression appears as a direct child of
-		 *  "14.5.5 Expression edm:Collection"
+		 *  "14.4.6 Expression edm:Collection"
 		 * @returns {sap.ui.base.SyncPromise<object>}
 		 *   a sync promise which resolves with the result object or is rejected with an error
 		 */
@@ -397,7 +397,7 @@ sap.ui.define([
 					: "Float";
 			} else if (typeof oRawValue === "string") {
 				sType = "String";
-			} else if (Array.isArray(oRawValue)) { // 14.5.5 Expression edm:Collection
+			} else if (Array.isArray(oRawValue)) { // 14.4.6 Expression edm:Collection
 				return Expression.collection(oPathValue);
 			} else {
 				Basics.expectType(oPathValue, "object");
@@ -420,29 +420,29 @@ sap.ui.define([
 			}
 
 			switch (sType) {
-				case "Apply": // 14.5.3 Expression edm:Apply
+				case "Apply": // 14.4.4 Expression edm:Apply
 					return Expression.apply(oPathValue, oSubPathValue);
 
-				case "If": // 14.5.6 Expression edm:If
+				case "If": // 14.4.7 Expression edm:If
 					return Expression.conditional(oSubPathValue, bInCollection);
 
-				case "Name": // 12.4.1 Attribute Name
-				case "Path": // 14.5.12 Expression edm:Path
-				case "PropertyPath": // 14.5.13 Expression edm:PropertyPath
+				case "Name": // 12.9 Attribute Name
+				case "Path": // 14.4.1.7 Expression edm:Path
+				case "PropertyPath": // 14.4.1.6 Expression edm:PropertyPath
 					return Expression.path(oSubPathValue);
 
-				case "Date": // 14.4.3 Expression edm:Date
-				case "DateTimeOffset": // 14.4.4 Expression edm:DateTimeOffset
-				case "Decimal": // 14.4.5 Expression edm:Decimal
-				case "Guid": // 14.4.9 Expression edm:Guid
-				case "Int": // 14.4.10 Expression edm:Int
-				case "String": // 14.4.11 Expression edm:String
-				case "TimeOfDay": // 14.4.12 Expression edm:TimeOfDay
+				case "Date": // 14.3.3 Expression edm:Date
+				case "DateTimeOffset": // 14.3.4 Expression edm:DateTimeOffset
+				case "Decimal": // 14.3.5 Expression edm:Decimal
+				case "Guid": // 14.3.9 Expression edm:Guid
+				case "Int": // 14.3.10 Expression edm:Int
+				case "String": // 14.3.11 Expression edm:String
+				case "TimeOfDay": // 14.3.12 Expression edm:TimeOfDay
 					Basics.expectType(oSubPathValue, "string");
 					// fall through
-				case "Bool": // 14.4.2 Expression edm:Bool
-				case "Float": // 14.4.8 Expression edm:Float
-				case "Int32": // 14.4.10 Expression edm:Int
+				case "Bool": // 14.3.2 Expression edm:Bool
+				case "Float": // 14.3.8 Expression edm:Float
+				case "Int32": // 14.3.10 Expression edm:Int
 					return SyncPromise.resolve(Expression.constant(oSubPathValue, sType));
 
 				case "And":
@@ -453,20 +453,20 @@ sap.ui.define([
 				case "Lt":
 				case "Ne":
 				case "Or":
-					// 14.5.1 Comparison and Logical Operators
+					// 14.4.2 Comparison and Logical Operators
 					return Expression.operator(oSubPathValue, sType);
 
-				case "Not": // 14.5.1 Comparison and Logical Operators
+				case "Not": // 14.4.2 Comparison and Logical Operators
 					return Expression.not(oSubPathValue);
 
-				case "Null": // 14.5.10 Expression edm:Null
+				case "Null": // 14.4.11 Expression edm:Null
 					return SyncPromise.resolve({
 						result : "constant",
 						type : "edm:Null",
 						value : null
 					});
 
-				// case "LabeledElement": 14.5.8 Expression edm:LabeledElement
+				// case "LabeledElement": 14.4.9 Expression edm:LabeledElement
 				default:
 					return asyncError(oPathValue, "Unsupported OData expression");
 			}
@@ -589,7 +589,7 @@ sap.ui.define([
 		},
 
 		/**
-		 * Handling of "14.5.3.1.2 Function odata.fillUriTemplate".
+		 * Handling of "14.4.4.2 Function odata.fillUriTemplate".
 		 *
 		 * @param {object} oPathValue
 		 *   path and value information pointing to the parameter array (see Expression object)
@@ -699,7 +699,7 @@ sap.ui.define([
 		},
 
 		/**
-		 * Handling of "14.5.1 Comparison and Logical Operators": <code>edm:Not</code>.
+		 * Handling of "14.4.2 Comparison and Logical Operators": <code>edm:Not</code>.
 		 *
 		 * @param {object} oPathValue
 		 *   path and value information pointing to the parameter (see Expression object)
@@ -722,7 +722,7 @@ sap.ui.define([
 		},
 
 		/**
-		 * Handling of "14.5.1 Comparison and Logical Operators" except <code>edm:Not</code>.
+		 * Handling of "14.4.2 Comparison and Logical Operators" except <code>edm:Not</code>.
 		 *
 		 * @param {object} oPathValue
 		 *   path and value information pointing to the parameter array (see Expression object)
@@ -811,7 +811,7 @@ sap.ui.define([
 		},
 
 		/**
-		 * Handling of "14.5.12 Expression edm:Path" and "14.5.13 Expression edm:PropertyPath".
+		 * Handling of "14.4.1.7 Expression edm:Path" and "14.4.1.6 Expression edm:PropertyPath".
 		 * If <code>oPathValue.path</code> references a property which has an
 		 * <code>Org.OData.Measures.V1.ISOCurrency</code> annotation, a composite result object for
 		 * a <code>sap.ui.model.odata.type.Currency</code> type with the currency, the currency code
@@ -892,7 +892,7 @@ sap.ui.define([
 		},
 
 		/**
-		 * Handling of "14.5.3.1.3 Function odata.uriEncode".
+		 * Handling of "14.4.4.4 Function odata.uriEncode".
 		 *
 		 * @param {object} oPathValue
 		 *   path and value information pointing to the parameter array (see Expression object)