@openui5/sap.ui.core 1.101.0 → 1.102.0

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

@@ -36,6 +36,7 @@ sap.ui.define([
 	"sap/ui/core/library",
 	"sap/ui/core/message/Message",
 	"sap/ui/core/message/MessageParser",
+	"sap/ui/model/_Helper",
 	"sap/ui/model/BindingMode",
 	"sap/ui/model/Context",
 	"sap/ui/model/FilterProcessor",
@@ -55,9 +56,9 @@ sap.ui.define([
 ], function(_CreatedContextsCache, Context, ODataAnnotations, ODataContextBinding, ODataListBinding,
 		ODataTreeBinding, assert, Log, encodeURL, deepEqual, deepExtend, each, extend,
 		isEmptyObject, isPlainObject, merge, uid, UriParameters, SyncPromise, coreLibrary, Message,
-		MessageParser, BindingMode, BaseContext, FilterProcessor, Model, CountMode, MessageScope,
-		ODataMetadata, ODataMetaModel, ODataMessageParser, ODataPropertyBinding, ODataUtils,
-		OperationMode, UpdateMethod, OData, URI, isCrossOriginURL
+		MessageParser, _Helper, BindingMode, BaseContext, FilterProcessor, Model, CountMode,
+		MessageScope, ODataMetadata, ODataMetaModel, ODataMessageParser, ODataPropertyBinding,
+		ODataUtils, OperationMode, UpdateMethod, OData, URI, isCrossOriginURL
 ) {
 
 	"use strict";
@@ -202,7 +203,7 @@ sap.ui.define([
 	 * This model is not prepared to be inherited from.
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel
@@ -356,9 +357,8 @@ sap.ui.define([
 			this.oMessageParser = oMessageParser;
 
 			//collect internal changes in a deferred group as default
-			this.sDefaultChangeGroup = "changes";
-			this.setDeferredGroups([this.sDefaultChangeGroup]);
-			this.setChangeGroups({"*":{groupId: this.sDefaultChangeGroup}});
+			this.setDeferredGroups(["changes"]);
+			this.setChangeGroups({"*":{groupId: "changes"}});
 
 			this.oData = {};
 			this.oMetadata = null;
@@ -2015,9 +2015,10 @@ sap.ui.define([
 	 *           if not specified, the default operation mode of this model is used
 	 * @param {boolean} [mParameters.faultTolerant] Turns on the fault tolerance mode, data is not reset if a backend request returns an error
 	 * @param {string} [mParameters.batchGroupId] Sets the batch group ID to be used for requests originating from this binding
-	 * @param {int} [mParameters.threshold] Threshold that defines how many entries should be fetched at least
-	 *                                      by the binding if <code>operationMode</code> is set to <code>Auto</code>
-	 *                                      (See documentation for {@link sap.ui.model.odata.OperationMode.Auto})
+	 * @param {int} [mParameters.threshold]
+	 *   Deprecated since 1.102.0, as {@link sap.ui.model.odata.OperationMode.Auto} is deprecated;
+	 *   the threshold that defines how many entries should be fetched at least by the binding if
+	 *   <code>operationMode</code> is set to <code>Auto</code>
 	 * @returns {sap.ui.model.ListBinding} The new list binding
 	 * @see sap.ui.model.Model.prototype.bindList
 	 * @public
@@ -2069,6 +2070,7 @@ sap.ui.define([
 	 * <code>hierarchy-node-descendant-count-for</code> annotation. Services with hierarchy
 	 * annotations including the <code>hierarchy-node-descendant-count-for</code> annotation, do
 	 * <b>not</b> support the operation modes <code>Client</code> and <code>Auto</code>.
+	 * <b>Note:</b> {@link sap.ui.model.odata.OperationMode.Auto} is deprecated since 1.102.0.
 	 *
 	 * @param {string} sPath
 	 *   The binding path, either absolute or relative to a given <code>oContext</code>
@@ -2109,12 +2111,14 @@ sap.ui.define([
 	 *   specified. {@link sap.ui.model.odata.OperationMode.Auto OperationMode.Auto} is only
 	 *   supported for services which expose the hierarchy annotations, yet do <b>NOT</b> expose the
 	 *   <code>hierarchy-node-descendant-count-for</code> annotation.
+	 *   <b>Note:</b> {@link sap.ui.model.odata.OperationMode.Auto} is deprecated since 1.102.0.
 	 * @param {number} [mParameters.threshold]
-	 *   The threshold used if the operation mode is set to
-	 *   {@link sap.ui.model.odata.OperationMode.Auto OperationMode.Auto}. The binding tries to
-	 *   fetch (at least) as many entries as specified by the threshold value.
+	 *   Deprecated since 1.102.0, as {@link sap.ui.model.odata.OperationMode.Auto} is deprecated;
+	 *   the threshold that defines how many entries should be fetched at least by the binding if
+	 *   <code>operationMode</code> is set to <code>Auto</code>
 	 * @param {boolean} [mParameters.useServersideApplicationFilters]
-	 *   Whether <code>$filter</code> statements should be used for the <code>$count</code> /
+	 *   Deprecated since 1.102.0, as {@link sap.ui.model.odata.OperationMode.Auto} is deprecated;
+	 *   whether <code>$filter</code> statements should be used for the <code>$count</code> /
 	 *   <code>$inlinecount</code> requests and for the data request if the operation mode is
 	 *   {@link sap.ui.model.odata.OperationMode.Auto OperationMode.Auto}. Use this feature only
 	 *   if your back end supports pre-filtering the tree and is capable of responding with
@@ -4311,10 +4315,10 @@ sap.ui.define([
 				if (oEntityType) {
 					mEntityTypes[oEntityType.entityType] = true;
 				}
-				if (oRequest.key) { // e.g. /myEntity
+				if (oRequest.key) {
 					// for createEntry entities change context path to new one
 					if (oRequest.created) {
-						var sKey = this._getKey(oResultData); // e.g. /myEntity-4711
+						var sKey = this._getKey(oResultData);
 						// rewrite context for new path
 						var oContext = this.getContext("/" + oRequest.key);
 						sDeepPath = oRequest.deepPath;
@@ -4332,6 +4336,8 @@ sap.ui.define([
 						oEntity = this._getEntity(sKey);
 						if (oEntity) {
 							delete oEntity.__metadata.created;
+							// before deleting the old entity copy and update the changes
+							this._keepChangesAfterCreate(oRequest, oEntity, sKey);
 						}
 						this._removeEntity(oRequest.key);
 					} else {
@@ -4368,6 +4374,46 @@ sap.ui.define([
 		return true;
 	};
 
+	/**
+	 * Creates a new <code>mChangedEntities</code> entry for the <code>sKey</code> for the just
+	 * created entity and takes all changes which have been made after this create has been
+	 * submitted.
+	 *
+	 * @param {object} oRequest
+	 *   The request object for a created entity
+	 * @param {object} oEntity
+	 *   The persisted and retrieved entity object
+	 * @param {string} sKey
+	 *   The key of the created entity
+	 *
+	 * @private
+	 */
+	ODataModel.prototype._keepChangesAfterCreate = function (oRequest, oEntity, sKey) {
+		var oKey2Entity, aNavProps, sProperty,
+			oChangedEntity = this.mChangedEntities[oRequest.key];
+
+		if (oChangedEntity) {
+			aNavProps = this.oMetadata._getNavigationPropertyNames(
+				this.oMetadata._getEntityTypeByPath(sKey));
+			oChangedEntity = _Helper.merge({}, oChangedEntity);
+			oChangedEntity.__metadata = _Helper.merge({}, oEntity.__metadata);
+			oChangedEntity.__metadata.deepPath = oRequest.deepPath;
+			for (sProperty in oRequest.data) {
+				if (_Helper.deepEqual(oRequest.data[sProperty], oChangedEntity[sProperty])
+						|| aNavProps.includes(sProperty)) {
+					delete oChangedEntity[sProperty];
+				}
+			}
+			this.mChangedEntities[sKey] = oChangedEntity;
+			oKey2Entity = {};
+			oKey2Entity[sKey] = oEntity;
+			this._updateChangedEntities(oKey2Entity);
+			// cleanup also further POST request for the just created entity
+			this.abortInternalRequest(this._resolveGroup(oRequest.key).groupId,
+				{requestKey: oRequest.key});
+		}
+	};
+
 	/**
 	 * Process request response for failed requests.
 	 *
@@ -6847,12 +6893,7 @@ sap.ui.define([
 			throw new Error("The 'expand' parameter is only supported if batch mode is used");
 		}
 		bCanonical = this._isCanonicalRequestNeeded(bCanonical);
-
 		mHeaders = mHeaders || {};
-
-		bRefreshAfterChange = this._getRefreshAfterChange(bRefreshAfterChange, sGroupId);
-
-		sGroupId = sGroupId ? sGroupId : this.sDefaultChangeGroup;
 		aUrlParams = ODataUtils._createUrlParamsArray(mUrlParams);
 
 		var oRequestHandle = {
@@ -6875,11 +6916,18 @@ sap.ui.define([
 
 		function create() {
 			var oCreateData, oCreatedContext, oCreateResponse, oEntitySetMetadata, oExpandRequest,
-				sUID,
+				oGroupInfo, sUID,
 				bCreateFailed = false,
 				fnErrorFromParameters = fnError,
 				fnSuccessFromParameters = fnSuccess;
 
+			// fallback to groups as defined in mChangeGroups; using path is OK as we don't have an
+			// entity yet and the entity type can be derived from the path to determine the group ID
+			oGroupInfo = that._resolveGroup(sNormalizedPath);
+			sGroupId = sGroupId || oGroupInfo.groupId;
+			sChangeSetId = sChangeSetId || oGroupInfo.changeSetId;
+			bRefreshAfterChange = that._getRefreshAfterChange(bRefreshAfterChange, sGroupId);
+
 			var oEntityMetadata = that.oMetadata._getEntityTypeByPath(sNormalizedPath);
 			if (!oEntityMetadata) {
 

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

@@ -65,10 +65,12 @@ sap.ui.define([
 	 * @param {sap.ui.model.odata.OperationMode} [mParameters.operationMode]
 	 *   The operation mode for this binding
 	 * @param {number} [mParameters.threshold]
-	 *   The threshold used if the operation mode is set to
-	 *   {@link sap.ui.model.odata.OperationMode.Auto OperationMode.Auto}
+	 *   Deprecated since 1.102.0, as {@link sap.ui.model.odata.OperationMode.Auto} is deprecated;
+	 *   the threshold that defines how many entries should be fetched at least by the binding if
+	 *   <code>operationMode</code> is set to <code>Auto</code>
 	 * @param {boolean} [mParameters.useServersideApplicationFilters]
-	 *   Whether <code>$filter</code> statements should be used for the <code>$count</code> /
+	 *   Deprecated since 1.102.0, as {@link sap.ui.model.odata.OperationMode.Auto} is deprecated;
+	 *   whether <code>$filter</code> statements should be used for the <code>$count</code> /
 	 *   <code>$inlinecount</code> requests and for the data request if the operation mode is
 	 *   {@link sap.ui.model.odata.OperationMode.Auto OperationMode.Auto}
 	 * @param {any} [mParameters.treeState]
@@ -92,7 +94,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.TreeBinding
 	 * @hideconstructor
 	 * @public
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 */
 	var ODataTreeBinding = TreeBinding.extend("sap.ui.model.odata.v2.ODataTreeBinding", /** @lends sap.ui.model.odata.v2.ODataTreeBinding.prototype */ {
 
@@ -1558,6 +1560,7 @@ sap.ui.define([
 	 * instance. If it is set, the filters of type <code>Application</code> will always be applied
 	 * on the back end and trigger an OData request.
 	 * For more information, see {@link sap.ui.model.odata.v2.ODataModel#bindTree}.
+	 * <b>Note:</b> {@link sap.ui.model.odata.OperationMode.Auto} is deprecated since 1.102.0.
 	 *
 	 * @param {sap.ui.model.Filter[]|sap.ui.model.Filter} aFilters
 	 *   Filter or array of filters to apply
@@ -1724,6 +1727,7 @@ sap.ui.define([
 	 * Sorts the Tree according to the given Sorter(s). In <code>OperationMode.Client</code> or
 	 * <code>OperationMode.Auto</code> (if the given threshold is satisfied), the sorters are
 	 * applied locally on the client.
+	 * <b>Note:</b> {@link sap.ui.model.odata.OperationMode.Auto} is deprecated since 1.102.0.
 	 *
 	 * @param {sap.ui.model.Sorter[]|sap.ui.model.Sorter} aSorters
 	 *   The Sorter or an Array of sap.ui.model.Sorter instances

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

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.39.0
-		 * @version 1.101.0
+		 * @version 1.102.0
 		 */
 		Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 				constructor : constructor
@@ -379,6 +379,10 @@ sap.ui.define([
 			oDependentBinding.setContext(undefined);
 		});
 		this.oBinding = undefined;
+		this.oCreatedPromise = undefined;
+		this.oSyncCreatePromise = undefined;
+		this.bInactive = undefined;
+		this.bKeepAlive = undefined;
 		// When removing oModel, ManagedObject#getBindingContext does not return the destroyed
 		// context although the control still refers to it
 		this.oModel = undefined;
@@ -406,8 +410,28 @@ sap.ui.define([
 	 */
 	Context.prototype.doSetProperty = function (sPath, vValue, oGroupLock, bSkipRetry) {
 		var oMetaModel = this.oModel.getMetaModel(),
+			oPromise,
+			oValue,
 			that = this;
 
+		if (oGroupLock && this.isTransient() && !this.isInactive()) {
+			oValue = this.getValue();
+			oPromise = oValue && _Helper.getPrivateAnnotation(oValue, "transient");
+			if (oPromise instanceof Promise) {
+				oGroupLock.unlock();
+				oGroupLock = oGroupLock.getUnlockedCopy();
+				this.doSetProperty(sPath, vValue, null, true) // early UI update
+					.catch(this.oModel.getReporter());
+
+				return oPromise.then(function (bSuccess) {
+					// in case of success, wait until creation is completed because context path's
+					// key predicate is adjusted
+					return bSuccess && that.created();
+				}).then(function () {
+					return that.doSetProperty(sPath, vValue, oGroupLock, bSkipRetry);
+				});
+			}
+		}
 		if (this.oModel.bAutoExpandSelect) {
 			sPath = oMetaModel.getReducedPath(
 				this.oModel.resolve(sPath, this),

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.101.0
+		 * @version 1.102.0
 		 *
 		 * @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

@@ -58,7 +58,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.101.0
+		 * @version 1.102.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
@@ -143,6 +143,7 @@ sap.ui.define([
 		// A kept-alive context may be parked here for a longer time, with undefined index.
 		this.mPreviousContextsByPath = {};
 		this.aPreviousData = [];
+		this.bRefreshKeptElements = false; // refresh kept elements when resuming?
 		this.bSharedRequest = mParameters.$$sharedRequest || oModel.bSharedRequests;
 		this.aSorters = _Helper.toArray(vSorters);
 		this.sUpdateGroupId = mParameters.$$updateGroupId;
@@ -795,8 +796,7 @@ sap.ui.define([
 	 *   contexts within this list.
 	 * @param {boolean} [bInactive]
 	 *   Create an inactive context. Such a context will only be sent to the server after the first
-	 *   property update. From then on it behaves like any other created context. This parameter is
-	 *   experimental and its implementation may still change. Do not use it in productive code yet.
+	 *   property update. From then on it behaves like any other created context.
 	 *   Supported since 1.97.0
 	 *   <p>
 	 *   Since 1.98.0, when the first property updates happens, the context is no longer
@@ -916,11 +916,11 @@ sap.ui.define([
 		this.iCreatedContexts += 1;
 		oContext = Context.create(this.oModel, this, sTransientPath, -this.iCreatedContexts,
 			oCreatePromise, bInactive);
-		oContext.fetchValue("", null, true).then(function (oElement) {
+		// to make sure that #fetchValue does not overtake #createInCache, avoid bCached flag!
+		oContext.fetchValue().then(function (oElement) {
 			if (oElement) {
 				_Helper.setPrivateAnnotation(oElement, "context", oContext);
-				_Helper.setPrivateAnnotation(oElement, "firstCreateAtEnd",
-					that.bFirstCreateAtEnd);
+				_Helper.setPrivateAnnotation(oElement, "firstCreateAtEnd", that.bFirstCreateAtEnd);
 			} // else: context already destroyed
 		});
 
@@ -997,8 +997,9 @@ sap.ui.define([
 				sPredicate = _Helper.getPrivateAnnotation(aResults[i], "predicate");
 				sContextPath = sPath + (sPredicate || "/" + i$skipIndex);
 				oContext = this.mPreviousContextsByPath[sContextPath];
-				if (oContext && !oContext.created()) {
-					// reuse the previous context, unless it is created (and persisted)
+				if (oContext && (!oContext.created() || oContext.isKeepAlive())) {
+					// reuse the previous context, unless it is created (and persisted), but not
+					// kept alive
 					delete this.mPreviousContextsByPath[sContextPath];
 					oContext.iIndex = i$skipIndex;
 					oContext.checkUpdate();
@@ -1830,7 +1831,9 @@ sap.ui.define([
 
 		return this.aContexts.filter(function (oContext) {
 			return oContext;
-		}).concat(Object.values(this.mPreviousContextsByPath));
+		}).concat(Object.values(this.mPreviousContextsByPath).filter(function (oContext) {
+			return oContext.isKeepAlive();
+		}));
 	};
 
 	/**
@@ -2159,6 +2162,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @see sap.ui.model.ListBinding#getCurrentContexts
+	 * @see #getAllCurrentContexts
 	 * @since 1.39.0
 	 */
 	// @override sap.ui.model.ListBinding#getCurrentContexts
@@ -2694,7 +2698,9 @@ sap.ui.define([
 		}
 
 		if (this.isRootBindingSuspended()) {
+			// Note: side-effects (incl. refresh) are forbidden while suspended
 			this.refreshSuspended(sGroupId);
+			this.bRefreshKeptElements = true;
 			return SyncPromise.all(refreshAll(that.getDependentBindings()));
 		}
 
@@ -2711,21 +2717,7 @@ sap.ui.define([
 				that.removeCachesAndMessages(sResourcePathPrefix);
 				that.fetchCache(that.oContext, false, /*bKeepQueryOptions*/true,
 					bKeepCacheOnError ? sGroupId : undefined);
-				oKeptElementsPromise = that.oCachePromise.then(function (oNewCache) {
-					return oNewCache.refreshKeptElements(that.lockGroup(sGroupId),
-						function onRemove(sPredicate, iIndex) {
-							if (iIndex === undefined) {
-								that.mPreviousContextsByPath[that.getResolvedPath() + sPredicate]
-									.resetKeepAlive();
-							} else { // Note: implies oContext.created()
-								that.destroyCreated(that.aContexts[iIndex]);
-							}
-						});
-				}).catch(function (oError) {
-					that.oModel.reportError("Failed to refresh kept-alive elements", sClassName,
-						oError);
-					throw oError;
-				});
+				oKeptElementsPromise = that.refreshKeptElements(sGroupId);
 				if (that.iCurrentEnd > 0) {
 					oPromise = that.createRefreshPromise().catch(function (oError) {
 						if (!bKeepCacheOnError || oError.canceled) {
@@ -2762,7 +2754,7 @@ sap.ui.define([
 			}
 			// Note: after reset the dependent bindings cannot be found any more
 			aDependentBindings = that.getDependentBindings();
-			 // this may reset that.oRefreshPromise
+			// this may reset that.oRefreshPromise
 			that.reset(ChangeReason.Refresh, bKeepCacheOnError ? false : undefined, sGroupId);
 			return SyncPromise.all(
 				refreshAll(aDependentBindings).concat(oPromise, oKeptElementsPromise)
@@ -2774,6 +2766,37 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * Refreshes the kept-alive elements. This needs to be called before the cache has filled the
+	 * collection.
+	 *
+	 * @param {string} sGroupId
+	 *   The effective group ID
+	 * @returns {sap.ui.base.SyncPromise}
+	 *   A promise resolving without a defined result, or rejecting with an error if the refresh
+	 *   fails.
+	 *
+	 * @private
+	 */
+	ODataListBinding.prototype.refreshKeptElements = function (sGroupId) {
+		var that = this;
+
+		return this.oCachePromise.then(function (oCache) {
+			return oCache.refreshKeptElements(that.lockGroup(sGroupId),
+				function onRemove(sPredicate, iIndex) {
+					if (iIndex === undefined) {
+						that.mPreviousContextsByPath[that.getResolvedPath() + sPredicate]
+							.resetKeepAlive();
+					} else { // Note: implies oContext.created()
+						that.destroyCreated(that.aContexts[iIndex]);
+					}
+				});
+		}).catch(function (oError) {
+			that.oModel.reportError("Failed to refresh kept-alive elements", sClassName, oError);
+			throw oError;
+		});
+	};
+
 	/**
 	 * Refreshes the single entity the given <code>oContext</code> is pointing to, refreshes also
 	 * dependent bindings and checks for updates once the data is received.
@@ -3273,7 +3296,8 @@ sap.ui.define([
 	ODataListBinding.prototype.resumeInternal = function (_bCheckUpdate, bParentHasChanges) {
 		var aBindings = this.getDependentBindings(),
 			sResumeChangeReason = this.sResumeChangeReason,
-			bRefresh = bParentHasChanges || sResumeChangeReason;
+			bRefresh = bParentHasChanges || sResumeChangeReason,
+			that = this;
 
 		this.sResumeChangeReason = undefined;
 
@@ -3283,6 +3307,11 @@ sap.ui.define([
 			// if the parent binding resumes but there are no changes in the parent binding
 			// ignore the parent cache and create an own cache
 			this.fetchCache(this.oContext, !bParentHasChanges);
+
+			if (this.bRefreshKeptElements) {
+				this.bRefreshKeptElements = false;
+				that.refreshKeptElements(that.getGroupId());
+			}
 		}
 		aBindings.forEach(function (oDependentBinding) {
 			// do not call checkUpdate in dependent property bindings if the cache of this

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

@@ -157,7 +157,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.101.0
+		 * @version 1.102.0
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor
@@ -1405,10 +1405,17 @@ sap.ui.define([
 								sTarget = sName = sSchemaChildName
 									= sSchemaChildName || mScope.$EntityContainer;
 								vResult = oSchemaChild = oSchemaChild || mScope[sSchemaChildName];
-								if (Array.isArray(vResult) && isParameter(sSegment, vResult[0])) {
-									// path evaluation relative to an operation overload
-									// @see [OData-CSDL-JSON-v4.01] "14.4.1.2 Path Evaluation"
-									return true;
+								if (Array.isArray(vResult)) {
+									if (vBindingParameterType) {
+										vResult = vResult.filter(isRightOverload);
+									}
+									if (isParameter(sSegment, vResult[0])) {
+										// path evaluation relative to an operation overload
+										// @see [OData-CSDL-JSON-v4.01] "14.4.1.2 Path Evaluation"
+										// or ".../@$ui5.overload/0/$Parameter/<i>/$Name/$" to refer
+										// back to (overloaded) operation's parameter
+										return true;
+									}
 								}
 								if (sSegment && sSegment[0] !== "@"
 									&& !(sSegment in oSchemaChild)) {
@@ -1828,7 +1835,7 @@ sap.ui.define([
 					if (!oEntity) {
 						error("No instance to calculate key predicate at " + vSegment.path);
 					}
-					if (_Helper.hasPrivateAnnotation(oEntity, "transient")) {
+					if (oEntity["@$ui5.context.isTransient"]) {
 						bNoEditUrl = true;
 						return undefined;
 					}

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

@@ -35,6 +35,7 @@ sap.ui.define([
 	"sap/base/assert",
 	"sap/base/Log",
 	"sap/ui/base/SyncPromise",
+	"sap/ui/core/cache/CacheManager",
 	"sap/ui/core/library",
 	"sap/ui/core/message/Message",
 	"sap/ui/model/BindingMode",
@@ -44,7 +45,8 @@ sap.ui.define([
 	"sap/ui/thirdparty/URI"
 ], function (ODataContextBinding, ODataListBinding, ODataMetaModel, ODataPropertyBinding,
 		SubmitMode, _GroupLock, _Helper, _MetadataRequestor, _Parser, _Requestor, assert, Log,
-		SyncPromise, coreLibrary, Message, BindingMode, BaseContext, Model, OperationMode, URI) {
+		SyncPromise, CacheManager, coreLibrary, Message, BindingMode, BaseContext, Model,
+		OperationMode, URI) {
 	"use strict";
 
 	var rApplicationGroupID = /^\w+$/,
@@ -212,7 +214,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.101.0
+		 * @version 1.102.0
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -1216,12 +1218,13 @@ sap.ui.define([
 	ODataModel.prototype.createUI5Message = function (oRawMessage, sResourcePath, sCachePath) {
 		var bIsBound = typeof oRawMessage.target === "string",
 			sMessageLongtextUrl = oRawMessage.longtextUrl,
-			aTargets;
+			aTargets,
+			that = this;
 
 		function resolveTarget(sTarget) {
-			return sTarget[0] === "/"
+			return that.normalizeMessageTarget(sTarget[0] === "/"
 				? sTarget
-				: _Helper.buildPath("/" + sResourcePath, sCachePath, sTarget);
+				: _Helper.buildPath("/" + sResourcePath, sCachePath, sTarget));
 		}
 
 		if (bIsBound) {
@@ -1973,6 +1976,84 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Normalizes the key predicates of a message's target using the sort order from the metadata,
+	 * including proper URI encoding, e.g. "(Sector='A%2FB%26C',ID='42')" or "('42')".
+	 *
+	 * @param {string} sTarget
+	 *   The message target
+	 * @returns {string}
+	 *   The normalized message target
+	 *
+	 * @private
+	 */
+	ODataModel.prototype.normalizeMessageTarget = function (sTarget) {
+		var sCandidate,
+			bFailed,
+			sMetaPath = "",
+			that = this;
+
+		if (sTarget.includes("$uid=")) {
+			// target containing a transient path is ignored
+			return sTarget;
+		}
+		sCandidate = sTarget.split("/").map(function (sSegment) {
+			var sCollectionName,
+				iBracketIndex = sSegment.indexOf("("),
+				aParts,
+				mProperties,
+				oType;
+
+			/*
+			 * Normalizes the value for the given alias.
+			 * @param {string} sAlias
+			 *   The property name/alias
+			 * @returns {string|undefined}
+			 *   The normalized value
+			 */
+			function getNormalizedValue(sAlias) {
+				if (sAlias in mProperties) {
+					return encodeURIComponent(decodeURIComponent(mProperties[sAlias]));
+				}
+				bFailed = true;
+			}
+
+			if (iBracketIndex < 0) {
+				sMetaPath = _Helper.buildPath(sMetaPath, sSegment);
+				return sSegment;
+			}
+
+			sCollectionName = sSegment.slice(0, iBracketIndex);
+			sMetaPath = _Helper.buildPath(sMetaPath, sCollectionName);
+			mProperties = _Parser.parseKeyPredicate(sSegment.slice(iBracketIndex));
+
+			if ("" in mProperties) {
+				return sCollectionName + "(" + getNormalizedValue("") + ")";
+			}
+
+			// could be async, but normally in this state we should already have
+			// loaded the needed metadata
+			oType = that.oRequestor.fetchTypeForPath("/" + sMetaPath).getResult();
+
+			if (!(oType && oType.$Key)) {
+				bFailed = true;
+				return sSegment;
+			}
+
+			aParts = oType.$Key.map(function (sAlias) {
+				var sValue = getNormalizedValue(sAlias);
+
+				return oType.$Key.length > 1
+					? sAlias + "=" + sValue
+					: sValue;
+			});
+
+			return sCollectionName + "(" + aParts.join(",") + ")";
+		}).join("/");
+
+		return bFailed ? sTarget : sCandidate;
+	};
+
 	/**
 	 * Returns a promise for the "canonical path" of the entity for the given context.
 	 * According to "4.3.1 Canonical URL" of the specification "OData Version 4.0 Part 2: URL
@@ -2174,6 +2255,7 @@ sap.ui.define([
 	 *
 	 * @experimental As of version 1.100.0
 	 * @private
+	 * @see cleanUpOptimisticBatch
 	 * @ui5-restricted sap.fe
 	 */
 	ODataModel.prototype.setOptimisticBatchEnabler = function (fnOptimisticBatchEnabler) {
@@ -2265,5 +2347,29 @@ sap.ui.define([
 		});
 	};
 
+	//*********************************************************************************************
+	// "static" functions
+	//*********************************************************************************************
+
+	/**
+	 * Cleans up the optimistic batch cache to a given point in time.
+	 *
+	 * @param {Date} [dOlderThan] The point in time from which on older cache entries are deleted.
+	 *   If not supplied, all optimistic batch entries are deleted.
+	 * @returns {Promise} A promise resolving without a defined result, or rejecting with an error
+	 *   if deletion fails.
+	 *
+	 * @experimental As of version 1.102.0
+	 * @private
+	 * @see #setOptimisticBatchEnabler
+	 * @ui5-restricted sap.fe
+	 */
+	ODataModel.cleanUpOptimisticBatch = function (dOlderThan) {
+		return CacheManager.delWithFilters({
+			olderThan : dOlderThan,
+			prefix : "sap.ui.model.odata.v4.optimisticBatch:"
+		});
+	};
+
 	return ODataModel;
 });

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.101.0
+		 * @version 1.102.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