@openui5/sap.ui.core 1.105.1 → 1.107.0

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

@@ -94,7 +94,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.TreeBinding
 	 * @hideconstructor
 	 * @public
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 */
 	var ODataTreeBinding = TreeBinding.extend("sap.ui.model.odata.v2.ODataTreeBinding", /** @lends sap.ui.model.odata.v2.ODataTreeBinding.prototype */ {
 
@@ -2559,7 +2559,7 @@ sap.ui.define([
 	 *
 	 * See the API documentation for the function {@link sap.ui.model.odata.v2.ODataTreeBinding#createEntry createEntry}.
 	 *
-	 * This feature is only available when the underlying OData service exposes the "hierarchy-descendant-count-for" annotation.
+	 * This feature is only available when the underlying OData service exposes the "hierarchy-node-descendant-count-for" annotation.
 	 * See the constructor documentation for more details.
 	 *
 	 * @function
@@ -2575,7 +2575,7 @@ sap.ui.define([
 	 *
 	 * Calling <code>removeContext</code> for a given context implicitly removes the complete subtree underneath it.
 	 *
-	 * This feature is only available when the underlying OData service exposes the "hierarchy-descendant-count-for" annotation.
+	 * This feature is only available when the underlying OData service exposes the "hierarchy-node-descendant-count-for" annotation.
 	 * See the constructor documentation for more details.
 	 *
 	 * @function
@@ -2592,7 +2592,7 @@ sap.ui.define([
 	 * The available API is the same as for the v2.ODataModel.
 	 * See the API documentation here: {@link sap.ui.model.odata.v2.ODataModel#createEntry createEntry}.
 	 *
-	 * This feature is only available when the underlying OData service exposes the "hierarchy-descendant-count-for" annotation.
+	 * This feature is only available when the underlying OData service exposes the "hierarchy-node-descendant-count-for" annotation.
 	 * See the constructor documentation for more details.
 	 *
 	 * @function
@@ -2608,7 +2608,7 @@ sap.ui.define([
 	 * The available API is the same as for the v2.ODataModel.
 	 * See the API documentation here: {@link sap.ui.model.odata.v2.ODataModel#submitChanges submitChanges}.
 	 *
-	 * This feature is only available when the underlying OData service exposes the "hierarchy-descendant-count-for" annotation.
+	 * This feature is only available when the underlying OData service exposes the "hierarchy-node-descendant-count-for" annotation.
 	 * See the Constructor documentation for more details.
 	 *
 	 * @function

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

@@ -17,9 +17,9 @@ sap.ui.define([
 		rUnsupportedPathSegments = /\$(?:Navigation)?PropertyPath/,
 		/**
 		 * @classdesc
-		 * A collection of methods which help to consume
-		 * <a href="http://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part3-csdl.html">
-		 * OData V4 annotations</a> in XML template views. Every context argument must belong to a
+		 * A collection of methods which help to consume <a href=
+		 * "https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part3-csdl.html#_Vocabulary_and_Annotation"
+		 * >OData V4 annotations</a> in XML template views. Every context argument must belong to a
 		 * {@link sap.ui.model.odata.v4.ODataMetaModel} instance.
 		 *
 		 * @alias sap.ui.model.odata.v4.AnnotationHelper

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

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.39.0
-		 * @version 1.105.1
+		 * @version 1.107.0
 		 */
 		Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 				constructor : constructor
@@ -258,7 +258,7 @@ sap.ui.define([
 	 * Once the promise is resolved, {@link #getPath} returns a path including the key predicate
 	 * of the new entity. This requires that all key properties are available.
 	 *
-	 * @returns {Promise}
+	 * @returns {Promise<void>|undefined}
 	 *   A promise that is resolved without data when the entity represented by this context has
 	 *   been created in the back end. It is rejected with an <code>Error</code> instance where
 	 *   <code>oError.canceled === true</code> if the transient entity is deleted before it is
@@ -281,7 +281,8 @@ sap.ui.define([
 	 * immediately, even if {@link sap.ui.model.odata.v4.SubmitMode.API} is used, and the request is
 	 * only sent later when {@link sap.ui.model.odata.v4.ODataModel#submitBatch} is called. As long
 	 * as the context is deleted on the client, but not yet on the server, {@link #isDeleted}
-	 * returns <code>true</code>.
+	 * returns <code>true</code>. The context must not be used, e.g. as a binding context, while
+	 * {@link #isDeleted} returns <code>true</code>.
 	 *
 	 * Since 1.105 such a pending deletion is a pending change. It causes
 	 * <code>hasPendingChanges</code> to return <code>true</code> for the context, the binding
@@ -322,24 +323,24 @@ sap.ui.define([
 	 *   <ul>
 	 *     <li> the given group ID is invalid,
 	 *     <li> this context's root binding is suspended,
-	 *     <li> a <code>null</code> group ID is used with a context which is not kept-alive
-	 *       (see {@link #isKeepAlive}),
+	 *     <li> a <code>null</code> group ID is used with a context which is not
+	 *       {@link #isKeepAlive kept alive},
 	 *     <li> the context is already being deleted,
 	 *     <li> the resulting group ID has {@link sap.ui.model.odata.v4.SubmitMode.API}, and the
-	 *       context is kept alive (see {@link #isKeepAlive}), but not in the current collection,
+	 *       context is {@link #isKeepAlive kept alive}, but not in the current collection,
 	 *     <li> (only before 1.105) the resulting group ID has
 	 *       {@link sap.ui.model.odata.v4.SubmitMode.API}
 	 *   </ul>
 	 *
 	 * @function
 	 * @public
-	 * @see {#hasPendingChanges}
-	 * @see {sap.ui.model.odata.v4.ODataContextBinding#hasPendingChanges}
-	 * @see {sap.ui.model.odata.v4.ODataListBinding#hasPendingChanges}
-	 * @see {sap.ui.model.odata.v4.ODataModel#hasPendingChanges}
-	 * @see {sap.ui.model.odata.v4.ODataContextBinding#resetChanges}
-	 * @see {sap.ui.model.odata.v4.ODataListBinding#resetChanges}
-	 * @see {sap.ui.model.odata.v4.ODataModel#resetChanges}
+	 * @see #hasPendingChanges
+	 * @see sap.ui.model.odata.v4.ODataContextBinding#hasPendingChanges
+	 * @see sap.ui.model.odata.v4.ODataListBinding#hasPendingChanges
+	 * @see sap.ui.model.odata.v4.ODataModel#hasPendingChanges
+	 * @see sap.ui.model.odata.v4.ODataContextBinding#resetChanges
+	 * @see sap.ui.model.odata.v4.ODataListBinding#resetChanges
+	 * @see sap.ui.model.odata.v4.ODataModel#resetChanges
 	 * @since 1.41.0
 	 */
 	Context.prototype.delete = function (sGroupId, bDoNotRequestCount/*, bRejectIfNotFound*/) {
@@ -361,7 +362,7 @@ sap.ui.define([
 		if (sGroupId === null) {
 			bDoNotRequestCount = true;
 		} else {
-			oModel.checkGroupId(sGroupId);
+			_Helper.checkGroupId(sGroupId);
 			oGroupLock = this.oBinding.lockGroup(sGroupId, true, true);
 		}
 
@@ -432,6 +433,8 @@ sap.ui.define([
 	 * @param {boolean} [bSkipRetry]
 	 *   Whether to skip retries of failed PATCH requests and instead fail accordingly, but still
 	 *   fire "patchSent" and "patchCompleted" events
+	 * @param {boolean} [bUpdating]
+	 *   Whether the given property will not be overwritten by a creation POST(+GET) response
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise which is resolved without a result in case of success, or rejected with an
 	 *   instance of <code>Error</code> in case of failure, for example if the annotation belongs to
@@ -440,8 +443,9 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	Context.prototype.doSetProperty = function (sPath, vValue, oGroupLock, bSkipRetry) {
-		var oMetaModel = this.oModel.getMetaModel(),
+	Context.prototype.doSetProperty = function (sPath, vValue, oGroupLock, bSkipRetry, bUpdating) {
+		var oModel = this.oModel,
+			oMetaModel = oModel.getMetaModel(),
 			oPromise,
 			oValue,
 			that = this;
@@ -458,7 +462,7 @@ sap.ui.define([
 			if (oPromise instanceof Promise) {
 				oGroupLock.unlock();
 				oGroupLock = oGroupLock.getUnlockedCopy();
-				this.doSetProperty(sPath, vValue, null, true) // early UI update
+				this.doSetProperty(sPath, vValue, null, true, true) // early UI update
 					.catch(this.oModel.getReporter());
 
 				return oPromise.then(function (bSuccess) {
@@ -493,8 +497,7 @@ sap.ui.define([
 					 * @param {Error} oError
 					 */
 					function errorCallback(oError) {
-						that.oModel.reportError(
-							"Failed to update path " + that.oModel.resolve(sPath, that),
+						oModel.reportError("Failed to update path " + oModel.resolve(sPath, that),
 							sClassName, oError);
 						firePatchCompleted(false);
 					}
@@ -520,7 +523,8 @@ sap.ui.define([
 					}
 
 					if (!oGroupLock) {
-						return oCache.setProperty(oResult.propertyPath, vValue, sEntityPath);
+						return oCache.setProperty(oResult.propertyPath, vValue, sEntityPath,
+							bUpdating);
 					}
 
 					if (that.isInactive()) {
@@ -643,12 +647,13 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns the "canonical path" of the entity for this context.
-	 * According to "4.3.1 Canonical URL" 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.
+	 * Returns the "canonical path" of the entity for this 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.
+	 *
 	 * Note: For a transient context (see {@link #isTransient}) a wrong path is returned unless all
 	 * key properties are available within the initial data.
 	 *
@@ -708,7 +713,7 @@ sap.ui.define([
 	 *   The context's index within the binding's collection. It is <code>undefined</code> if
 	 *   <ul>
 	 *     <li> it does not belong to a list binding,
-	 *     <li> it is kept alive (see {@link #isKeepAlive}), but not in the collection currently.
+	 *     <li> it is {@link #isKeepAlive kept alive}, but not in the collection currently.
 	 *   </ul>
 	 *
 	 * @public
@@ -740,7 +745,7 @@ sap.ui.define([
 	 *   The context's index within the binding's collection. It is <code>undefined</code> if
 	 *   <ul>
 	 *     <li> it does not belong to a list binding,
-	 *     <li> it is kept alive (see {@link #isKeepAlive}), but not in the collection currently.
+	 *     <li> it is {@link #isKeepAlive kept alive}, but not in the collection currently.
 	 *   </ul>
 	 *
 	 * @private
@@ -755,10 +760,9 @@ sap.ui.define([
 	/**
 	 * Returns the value for the given path relative to this context. The function allows access to
 	 * the complete data the context points to (if <code>sPath</code> is "") or any part thereof.
-	 * The data is a JSON structure as described in
-	 * <a
-	 * href="http://docs.oasis-open.org/odata/odata-json-format/v4.0/odata-json-format-v4.0.html">
-	 * "OData JSON Format Version 4.0"</a>.
+	 * The data is a JSON structure as described in <a href=
+	 * "https://docs.oasis-open.org/odata/odata-json-format/v4.0/odata-json-format-v4.0.html"
+	 * >"OData JSON Format Version 4.0"</a>.
 	 * Note that the function clones the result. Modify values via
 	 * {@link sap.ui.model.odata.v4.ODataPropertyBinding#setValue}.
 	 *
@@ -863,10 +867,9 @@ sap.ui.define([
 	/**
 	 * Returns the value for the given path relative to this context. The function allows access to
 	 * the complete data the context points to (if <code>sPath</code> is "") or any part thereof.
-	 * The data is a JSON structure as described in
-	 * <a
-	 * href="http://docs.oasis-open.org/odata/odata-json-format/v4.0/odata-json-format-v4.0.html">
-	 * "OData JSON Format Version 4.0"</a>.
+	 * The data is a JSON structure as described in <a href=
+	 * "https://docs.oasis-open.org/odata/odata-json-format/v4.0/odata-json-format-v4.0.html"
+	 * >"OData JSON Format Version 4.0"</a>.
 	 * Note that the function returns the cache instance. Do not modify the result, use
 	 * {@link sap.ui.model.odata.v4.ODataPropertyBinding#setValue} instead.
 	 *
@@ -902,8 +905,8 @@ sap.ui.define([
 	 * Returns whether there are pending changes for bindings dependent on this context, or for
 	 * unresolved bindings (see {@link sap.ui.model.Binding#isResolved}) which were dependent on
 	 * this context at the time the pending change was created. This includes the context itself
-	 * being {@link #isTransient transient}. Since 1.98.0, {@link #isInactive inactive} contexts are
-	 * ignored.
+	 * being {@link #isTransient transient} or {@link #isDeleted deleted}. Since 1.98.0,
+	 * {@link #isInactive inactive} contexts are ignored.
 	 *
 	 * @returns {boolean}
 	 *   Whether there are pending changes
@@ -914,8 +917,11 @@ sap.ui.define([
 	Context.prototype.hasPendingChanges = function () {
 		return this.isTransient()
 			|| this.isDeleted()
+			|| this.getBinding().hasPendingChangesForPath(this.sPath)
 			|| this.oModel.getDependentBindings(this).some(function (oDependentBinding) {
-				return oDependentBinding.hasPendingChanges();
+				return oDependentBinding.oCache
+					? oDependentBinding.hasPendingChanges()
+					: oDependentBinding.hasPendingChangesInDependents();
 			})
 			|| this.oModel.withUnresolvedBindings("hasPendingChangesInCaches", this.sPath.slice(1));
 	};
@@ -929,7 +935,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @see #delete
-	 * @since 1.105
+	 * @since 1.105.0
 	 */
 	Context.prototype.isDeleted = function () {
 		return this.bDeleted;
@@ -955,9 +961,9 @@ sap.ui.define([
 	 * Returns whether this context is inactive. The result of this function can also be accessed
 	 * via instance annotation "@$ui5.context.isInactive" at the entity.
 	 *
-	 * @returns {boolean} <code>true</code> if this context is inactive, <code>false</code> if it
-	 *   was created in an inactive state and has been activated, and <code>undefined</code>
-	 *   otherwise.
+	 * @returns {boolean|undefined} <code>true</code> if this context is inactive,
+	 *   <code>false</code> if it was created in an inactive state and has been activated, and
+	 *   <code>undefined</code> otherwise.
 	 *
 	 * @public
 	 * @see #isTransient
@@ -970,7 +976,9 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns whether this context is kept alive.
+	 * Returns whether this context is kept alive even when it is removed from its binding's
+	 * collection, for example if a filter is applied and the entity represented by this context
+	 * does not match the filter criteria.
 	 *
 	 * @returns {boolean} <code>true</code> if this context is kept alive
 	 *
@@ -989,7 +997,7 @@ sap.ui.define([
 	 * if the context is not transient. The result of this function can also be accessed via
 	 * instance annotation "@$ui5.context.isTransient" at the entity.
 	 *
-	 * @returns {boolean}
+	 * @returns {boolean|undefined}
 	 *   Whether this context is transient if it is created using
 	 *   {@link sap.ui.model.odata.v4.ODataListBinding#create}; <code>undefined</code> if it is not
 	 *   created using {@link sap.ui.model.odata.v4.ODataListBinding#create}
@@ -1033,9 +1041,9 @@ sap.ui.define([
 	 *   binding, the parameter must not be used.
 	 *   Supported since 1.55.0
 	 *
-	 *   Since 1.84.0, if this context is kept alive (see {@link #isKeepAlive}), it is only
-	 *   destroyed if the corresponding entity does no longer exist in the back end. In this case,
-	 *   the <code>fnOnBeforeDestroy</code> callback passed with {@link #setKeepAlive}) is called.
+	 *   Since 1.84.0, if this context is {@link #isKeepAlive kept alive}, it is only destroyed if
+	 *   the corresponding entity does no longer exist in the back end. In this case, the
+	 *   <code>fnOnBeforeDestroy</code> callback passed with {@link #setKeepAlive}) is called.
 	 * @throws {Error}
 	 *   If the group ID is not valid, if this context has pending changes or does not represent a
 	 *   single entity (see {@link sap.ui.model.odata.v4.ODataListBinding#getHeaderContext}), if the
@@ -1093,8 +1101,9 @@ sap.ui.define([
 	 *   <ul>
 	 *     <li> this context's root binding is suspended,
 	 *     <li> this context is transient (see {@link #isTransient}),
-	 *     <li> the given other context does not belong to the same list binding as this context, or
-	 *       is already in the collection (has an index, see {@link #getIndex}).
+	 *     <li> the given other context does not belong to the same list binding as this context, is
+	 *       already in the collection (has an index, see {@link #getIndex}), or is not
+	 *       {@link #isKeepAlive kept alive}.
 	 *   </ul>
 	 *
 	 * @public
@@ -1107,7 +1116,8 @@ sap.ui.define([
 		if (this.isTransient()) {
 			throw new Error("Cannot replace " + this);
 		}
-		if (oOtherContext.oBinding !== this.oBinding || oOtherContext.iIndex !== undefined) {
+		if (oOtherContext.oBinding !== this.oBinding || oOtherContext.iIndex !== undefined
+				|| !oOtherContext.bKeepAlive) {
 			throw new Error("Cannot replace with " + oOtherContext);
 		}
 		oElement = oOtherContext.getValue();
@@ -1116,12 +1126,14 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns a promise for the "canonical path" of the entity for this context.
-	 * According to "4.3.1 Canonical URL" 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.
+	 * Returns a promise for the "canonical path" of the entity for this 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.
+	 *
 	 * Note: For a transient context (see {@link #isTransient}) a wrong path is returned unless all
 	 * key properties are available within the initial data.
 	 *
@@ -1139,10 +1151,9 @@ sap.ui.define([
 	/**
 	 * Returns a promise on the value for the given path relative to this context. The function
 	 * allows access to the complete data the context points to (if <code>sPath</code> is "") or
-	 * any part thereof. The data is a JSON structure as described in
-	 * <a
-	 * href="http://docs.oasis-open.org/odata/odata-json-format/v4.0/odata-json-format-v4.0.html">
-	 * "OData JSON Format Version 4.0"</a>.
+	 * any part thereof. The data is a JSON structure as described in <a href=
+	 * "https://docs.oasis-open.org/odata/odata-json-format/v4.0/odata-json-format-v4.0.html"
+	 * >"OData JSON Format Version 4.0"</a>.
 	 * Note that the function clones the result. Modify values via
 	 * {@link sap.ui.model.odata.v4.Context#setProperty}.
 	 *
@@ -1233,7 +1244,7 @@ sap.ui.define([
 	Context.prototype.requestRefresh = function (sGroupId, bAllowRemoval) {
 		var oPromise;
 
-		this.oModel.checkGroupId(sGroupId);
+		_Helper.checkGroupId(sGroupId);
 		this.oBinding.checkSuspended();
 		if (this.hasPendingChanges()) {
 			throw new Error("Cannot refresh entity due to pending changes: " + this);
@@ -1322,7 +1333,7 @@ sap.ui.define([
 	 *   specified, make sure that {@link #requestSideEffects} is called after the corresponding
 	 *   updates have been successfully processed by the server and that there are no pending
 	 *   changes for the affected properties.
-	 * @returns {Promise}
+	 * @returns {Promise<undefined>}
 	 *   Promise resolved with <code>undefined</code>, or rejected with an error if loading of side
 	 *   effects fails. Use it to set fields affected by side effects to read-only before
 	 *   {@link #requestSideEffects} and make them editable again when the promise resolves; in the
@@ -1387,7 +1398,7 @@ sap.ui.define([
 		}
 
 		this.oBinding.checkSuspended();
-		this.oModel.checkGroupId(sGroupId);
+		_Helper.checkGroupId(sGroupId);
 		if (this.isTransient()) {
 			throw new Error("Unsupported context: " + this);
 		}
@@ -1606,7 +1617,7 @@ sap.ui.define([
 		if (this.isTransient()) {
 			throw new Error("Unsupported transient context " + this);
 		}
-		this.oModel.getPredicateIndex(this.sPath);
+		_Helper.getPredicateIndex(this.sPath);
 		this.oBinding.checkKeepAlive(this);
 
 		if (bKeepAlive && bRequestMessages) {
@@ -1692,7 +1703,7 @@ sap.ui.define([
 			throw new Error("Not a primitive value");
 		}
 		if (sGroupId !== null) {
-			this.oModel.checkGroupId(sGroupId);
+			_Helper.checkGroupId(sGroupId);
 			oGroupLock = this.oBinding.lockGroup(sGroupId, true, true);
 		}
 
@@ -1708,19 +1719,46 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns a string representation of this object including the binding path.
+	 * Returns a string representation of this object including the {@link #getPath binding path},
+	 * {@link #getIndex index}, and state (see also "Context states" of
+	 * {@link topic:c9723f8265f644af91c0ed941e114d46 Creating an Entity}).
+	 *
+	 * @returns {string} A string description of this binding
 	 *
-	 * @return {string} A string description of this binding
 	 * @public
+	 * @see #destroy
+	 * @see #isDeleted
+	 * @see #isInactive
+	 * @see #isTransient
 	 * @since 1.39.0
 	 */
 	Context.prototype.toString = function () {
-		var sIndex = "";
+		var sSuffix = "";
+
+		if (!this.oModel) {
+			sSuffix = ";destroyed";
+		} else if (this.bDeleted) {
+			sSuffix = ";deleted";
+		}
 
 		if (this.iIndex !== undefined) {
-			sIndex = "[" + this.iIndex + (this.isTransient() ? "|transient" : "") + "]";
+			if (!sSuffix) {
+				switch (this.isTransient()) {
+					case false:
+						sSuffix = ";createdPersisted";
+						break;
+
+					case true:
+						sSuffix = this.bInactive ? ";inactive" : ";transient";
+						break;
+
+					// no default
+				}
+			}
+			sSuffix = "[" + this.iIndex + sSuffix + "]";
 		}
-		return this.sPath + sIndex;
+
+		return this.sPath + sSuffix;
 	};
 
 	/**

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

@@ -136,7 +136,7 @@ sap.ui.define([
 					break;
 				case "$$groupId":
 				case "$$updateGroupId":
-					that.oModel.checkGroupId(vValue, false,
+					_Helper.checkGroupId(vValue, false,
 						"Unsupported value for binding parameter '" + sKey + "': ");
 					break;
 				case "$$ignoreMessages":
@@ -388,6 +388,15 @@ sap.ui.define([
 		this.oCache.deregisterChangeListener(sPath, oListener);
 	};
 
+	/**
+	 * @override
+	 * @see sap.ui.base.EventProvider#getEventingParent
+	 */
+	ODataBinding.prototype.getEventingParent = function () {
+		// this allows that dataRequested/dataReceived events are bubbled up to the model
+		return this.oModel;
+	};
+
 	/**
 	 * Hook method for {@link #fetchQueryOptionsForOwnCache} to determine the query options for this
 	 * binding.
@@ -639,6 +648,40 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * Fires the 'dataReceived' event. It may be bubbled up to the model.
+	 *
+	 * @param {object} oParameters
+	 *   The event parameters
+	 * @param {object} [oParameters.data]
+	 *   An empty data object if a back-end request succeeds
+	 * @param {Error} [oParameters.error]
+	 *   The error object if a back-end request failed.
+	 * @param {boolean} [bPreventBubbling]
+	 *   Whether the dataRequested and dataReceived events must not be bubbled up to the model
+	 *
+	 * @private
+	 */
+	 // @override sap.ui.model.Binding#fireDataReceived
+	ODataBinding.prototype.fireDataReceived = function (oParameters, bPreventBubbling) {
+		this.fireEvent("dataReceived", oParameters, /*bAllowPreventDefault*/false,
+			/*bEnableEventBubbling*/!bPreventBubbling);
+	};
+
+	/**
+	 * Fires the 'dataRequested' event. It may be bubbled up to the model.
+	 *
+	 * @param {boolean} [bPreventBubbling]
+	 *   Whether the dataRequested and dataReceived events must not be bubbled up to the model
+	 *
+	 * @private
+	 */
+	 // @override sap.ui.model.Binding#fireDataRequested
+	ODataBinding.prototype.fireDataRequested = function (bPreventBubbling) {
+		this.fireEvent("dataRequested", undefined, /*bAllowPreventDefault*/false,
+			/*bEnableEventBubbling*/!bPreventBubbling);
+	};
+
 	/**
 	 * Returns all bindings which have this binding as parent binding.
 	 *
@@ -755,8 +798,8 @@ sap.ui.define([
 	 */
 
 	/**
-	 * Returns the root binding of this binding's hierarchy, see binding
-	 * {@link topic:54e0ddf695af4a6c978472cecb01c64d Initialization and Read Requests}.
+	 * Returns the root binding of this binding's hierarchy, see
+	 * {@link topic:fccfb2eb41414f0792c165e69a878717 Initialization and Read Requests}.
 	 *
 	 * @returns {sap.ui.model.odata.v4.ODataContextBinding|sap.ui.model.odata.v4.ODataListBinding|
 	 *      sap.ui.model.odata.v4.ODataPropertyBinding|undefined}
@@ -841,7 +884,7 @@ sap.ui.define([
 	 *   {@link sap.ui.model.odata.v4.ODataListBinding#refresh refresh} (since 1.100.0),
 	 *   {@link sap.ui.model.odata.v4.ODataListBinding#sort sort}, or
 	 *   {@link sap.ui.model.odata.v4.ODataListBinding#suspend suspend} because they relate to a
-	 *   {@link sap.ui.model.odata.v4.Context#setKeepAlive kept-alive} context of this binding
+	 *   {@link sap.ui.model.odata.v4.Context#isKeepAlive kept-alive} context of this binding
 	 *   (since 1.97.0). Since 1.98.0, {@link sap.ui.model.odata.v4.Context#isTransient transient}
 	 *   contexts of a {@link #getRootBinding root binding} are treated as kept-alive by this flag.
 	 *   Since 1.99.0, the same happens for bindings using the <code>$$ownRequest</code> parameter
@@ -983,7 +1026,7 @@ sap.ui.define([
 	 *   The group lock
 	 *
 	 * @private
-	 * @see {sap.ui.model.odata.v4.ODataModel#lockGroup}
+	 * @see sap.ui.model.odata.v4.ODataModel#lockGroup
 	 */
 	ODataBinding.prototype.lockGroup = function (sGroupId, bLocked, bModifying, fnCancel) {
 		sGroupId = sGroupId || (bModifying ? this.getUpdateGroupId() : this.getGroupId());
@@ -1037,7 +1080,7 @@ sap.ui.define([
 	 *       binding,
 	 *     <li> or a value of type boolean is given.
 	 *   </ul> Since 1.100.0, pending changes are ignored if they relate to a
-	 *   {@link sap.ui.model.odata.v4.Context#setKeepAlive kept-alive} context of this binding, and
+	 *   {@link sap.ui.model.odata.v4.Context#isKeepAlive kept-alive} context of this binding, and
 	 *   {@link sap.ui.model.odata.v4.Context#isTransient transient} contexts of a
 	 *   {@link #getRootBinding root binding} do not count as pending changes.
 	 *
@@ -1192,7 +1235,7 @@ sap.ui.define([
 		if (this.hasPendingChanges(true)) {
 			throw new Error("Cannot refresh due to pending changes");
 		}
-		this.oModel.checkGroupId(sGroupId);
+		_Helper.checkGroupId(sGroupId);
 
 		// The actual refresh is specific to the binding and is implemented in each binding class.
 		return Promise.resolve(this.refreshInternal("", sGroupId, true)).then(function () {