@openui5/sap.ui.core 1.97.1 → 1.99.1

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

@@ -201,7 +201,7 @@ sap.ui.define([
 	 * This model is not prepared to be inherited from.
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.99.1
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel
@@ -1887,7 +1887,7 @@ sap.ui.define([
 	 * function lead to a single synchronous call where <code>mChangedEntities</code> is the union
 	 * of all <code>mChangedEntities</Code> from the asynchronous calls.
 	 *
-	 * @param {boolean} bForceUpdate
+	 * @param {boolean} [bForceUpdate]
 	 *   The parameter <code>bForceUpdate</code> for the <code>checkUpdate</code> call on the
 	 *   bindings
 	 * @param {boolean} bAsync
@@ -2922,7 +2922,7 @@ sap.ui.define([
 			oResultValue = {};
 			for (i = 0; i < aOwnPropSelect.length; i++) {
 				sSelect = aOwnPropSelect[i];
-				if (oValue[sSelect] !== undefined) {
+				if (oValue[sSelect] !== undefined || oValue.__metadata.created) {
 					oResultValue[sSelect] = oValue[sSelect];
 				} else {
 					Log.fatal("No data loaded for select property: " + sSelect + " of entry: " + that.getKey(oValue));
@@ -4928,7 +4928,10 @@ sap.ui.define([
 	};
 
 	/**
-	 * Trigger a <code>POST</code> request to the OData service that was specified in the model constructor.
+	 * Trigger a <code>POST</code> request to the OData service that was specified in the model
+	 * constructor; see
+	 * {@link topic:6c47b2b39db9404582994070ec3d57a2#loio4c4cd99af9b14e08bb72470cc7cabff4 Creating
+	 * Entities documentation} for comprehensive information on the topic.
 	 *
 	 * Please note that deep creates are not supported and may not work.
 	 *
@@ -5198,7 +5201,7 @@ sap.ui.define([
 	 * @param {function} [mParameters.success]
 	 *   A callback function which is called when the data has been successfully retrieved; the
 	 *   handler can have the following parameters: <code>oData</code> and <code>response</code>.
-	 * @param {Object<string,string>} [mParameters.urlParameters]
+	 * @param {Object<string,any>} [mParameters.urlParameters]
 	 *   Maps the function import parameter name as specified in the function import's metadata to
 	 *   its value; the value is formatted based on the parameter's type as specified in the metadata
 	 * @param {string} [mParameters.batchGroupId]
@@ -5831,11 +5834,10 @@ sap.ui.define([
 	 * @public
 	 */
 	ODataModel.prototype.submitChanges = function(mParameters) {
-		var oRequest, sGroupId, oGroupInfo, fnSuccess, fnError,
-			oRequestHandle, vRequestHandleInternal,
-			bAborted = false, sMethod, mChangedEntities,
+		var mChangedEntities, fnError, sGroupId, sMethod, oRequestHandle, vRequestHandleInternal,
+			fnSuccess,
+			bAborted = false,
 			bRefreshAfterChange = this.bRefreshAfterChange,
-			mParams,
 			that = this;
 
 		if (mParameters) {
@@ -5855,28 +5857,37 @@ sap.ui.define([
 		mChangedEntities = merge({}, that.mChangedEntities);
 
 		this.oMetadata.loaded().then(function() {
+			var oChange, aChanges, sChangeSetId, i, sRequestGroupId, oRequestGroup;
+
 			each(mChangedEntities, function(sKey, oData) {
-				oGroupInfo = that._resolveGroup(sKey);
+				var oCreatedInfo, oRequest, oRequestHandle0,
+					oGroupInfo = that._resolveGroup(sKey);
+
 				if (oGroupInfo.groupId === sGroupId || !sGroupId) {
 					oRequest = that._processChange(sKey, oData, sMethod || that.sDefaultUpdateMethod);
 					oRequest.key = sKey;
 					//get params for created entries: could contain success/error handler
-					mParams = oData.__metadata && oData.__metadata.created ? oData.__metadata.created : {};
-					var oRequestHandle = {
+					oCreatedInfo = oData.__metadata && oData.__metadata.created
+						? oData.__metadata.created
+						: {};
+					oRequestHandle0 = {
 						abort: function() {
 							oRequest._aborted = true;
 						}
 					};
 					if (oGroupInfo.groupId in that.mDeferredGroups) {
-						that._pushToRequestQueue(that.mDeferredRequests, oGroupInfo.groupId, oGroupInfo.changeSetId,
-							oRequest, mParams.success, mParams.error, oRequestHandle, bRefreshAfterChange);
+						that._pushToRequestQueue(that.mDeferredRequests, oGroupInfo.groupId,
+							oGroupInfo.changeSetId, oRequest, oCreatedInfo.success,
+							oCreatedInfo.error, oRequestHandle0,
+							oCreatedInfo.refreshAfterChange === undefined
+								? bRefreshAfterChange
+								: oCreatedInfo.refreshAfterChange);
 					}
 				}
 			});
 
 			// Set undefined refreshAfterChange flags
 			// If undefined => overwrite with current global refreshAfterChange state
-			var sRequestGroupId, sChangeSetId, oRequestGroup, aChanges, oChange, i;
 			for (sRequestGroupId in that.mDeferredRequests) {
 				oRequestGroup = that.mDeferredRequests[sRequestGroupId];
 				for (sChangeSetId in oRequestGroup.changes) {
@@ -6015,6 +6026,9 @@ sap.ui.define([
 			that.abortInternalRequest(sGroupId, {requestKey : sKey});
 		});
 		if (bDeleteCreatedEntities && oCreated) {
+			// remove context synchronously from the list of created contexts to avoid a temporary
+			// empty table row
+			this.oCreatedContextsCache.findAndRemoveContext(this.mContexts["/" + sKey]);
 			this._removeEntity(sKey);
 			if (oCreated.abort) {
 				oCreated.abort(ODataModel._createAbortedError());
@@ -6044,7 +6058,7 @@ sap.ui.define([
 	 * </ul>
 	 *
 	 * @param {array} [aPath]
-	 *   Paths to be be reset; if no array is passed, all changes are reset
+	 *   Paths to be reset; if no array is passed, all changes are reset
 	 * @param {boolean} [bAll=false]
 	 *   Whether also deferred requests are taken into account
 	 * @param {boolean} [bDeleteCreatedEntities=false]
@@ -6136,11 +6150,14 @@ sap.ui.define([
 	 */
 	ODataModel.prototype.setProperty = function(sPath, oValue, oContext, bAsyncUpdate) {
 
-		var oOriginalValue, sPropertyPath, mRequests, oRequest, oOriginalEntry, oEntry,
-			sResolvedPath, aParts,	sKey, oGroupInfo, oRequestHandle, oEntityMetadata,
-			mChangedEntities = {}, oEntityInfo = {}, mParams, oChangeObject, bRefreshAfterChange,
-			bFunction = false, that = this, bCreated,
-			oEntityType, oNavPropRefInfo, bIsNavPropExpanded, mKeys, oRef, sDeepPath;
+		var oContextToActivate, oChangeObject, bCreated, sDeepPath, oEntityMetadata, oEntityType,
+			oEntry, oGroupInfo, bIsNavPropExpanded, sKey, mKeys, oNavPropRefInfo, oOriginalEntry,
+			oOriginalValue, mParams, aParts, sPropertyPath, oRef, bRefreshAfterChange, oRequest,
+			mRequests, oRequestHandle, sResolvedPath,
+			mChangedEntities = {},
+			oEntityInfo = {},
+			bFunction = false,
+			that = this;
 
 		function updateChangedEntities(oOriginalObject, oChangedObject) {
 			each(oChangedObject,function(sKey) {
@@ -6256,7 +6273,13 @@ sap.ui.define([
 
 		bRefreshAfterChange = this._getRefreshAfterChange(undefined, oGroupInfo.groupId);
 
-		this.oMetadata.loaded().then(function() {
+		if (oEntry.__metadata.created && !oEntry.__metadata.created.functionImport) {
+			oContextToActivate = this.oCreatedContextsCache.findCreatedContext(sResolvedPath);
+			if (oContextToActivate) {
+				oContextToActivate.activate();
+			}
+		}
+		this.oMetadata.loaded().then(function () {
 			oRequestHandle = {
 				abort: function() {
 					oRequest._aborted = true;
@@ -6494,7 +6517,9 @@ sap.ui.define([
 	/**
 	 * Creates a new entry object which is described by the metadata of the entity type of the
 	 * specified <code>sPath</code> Name. A context object is returned which can be used to bind
-	 * against the newly created object.
+	 * against the newly created object. See
+	 * {@link topic:6c47b2b39db9404582994070ec3d57a2#loio4c4cd99af9b14e08bb72470cc7cabff4 Creating
+	 * Entities documentation} for comprehensive information on the topic.
 	 *
 	 * For each created entry a request is created and stored in a request queue.
 	 * The request queue can be submitted by calling {@link #submitChanges}. As long as the context
@@ -6589,6 +6614,10 @@ sap.ui.define([
 	 *   batch request
 	 * @param {Object<string,string>} [mParameters.headers]
 	 *   A map of headers
+	 * @param {boolean} [mParameters.inactive]
+	 *   Whether the created context is inactive. An inactive context will only be sent to the
+	 *   server after the first property update. From then on it behaves like any other created
+	 *   context. Supported since 1.98.0
 	 * @param {array|object} [mParameters.properties]
 	 *   An array that specifies a set of properties or the entry
 	 * @param {boolean} [mParameters.refreshAfterChange]
@@ -6610,9 +6639,9 @@ sap.ui.define([
 	 */
 	ODataModel.prototype.createEntry = function (sPath, mParameters) {
 		var bCanonical, sChangeSetId, oContext, fnCreated, pCreate, fnCreatedPromiseResolve,
-			sDeepPath, fnError, sETag, sExpand, sGroupId, mHeaders, sKey, sNormalizedPath,
-			vProperties, bRefreshAfterChange, oRequest, mRequests, fnSuccess, sUrl, aUrlParams,
-			mUrlParams,
+			sDeepPath, fnError, sETag, sExpand, sGroupId, mHeaders, bInactive, sKey,
+			sNormalizedPath, vProperties, bRefreshAfterChange, oRequest, mRequests, fnSuccess, sUrl,
+			aUrlParams, mUrlParams,
 			oEntity = {},
 			sMethod = "POST",
 			that = this;
@@ -6631,6 +6660,7 @@ sap.ui.define([
 			bRefreshAfterChange = mParameters.refreshAfterChange;
 			bCanonical = mParameters.canonicalRequest;
 			sExpand = mParameters.expand;
+			bInactive = mParameters.inactive;
 		}
 		if (sExpand && !this.bUseBatch) {
 			throw new Error("The 'expand' parameter is only supported if batch mode is used");
@@ -6764,19 +6794,20 @@ sap.ui.define([
 				};
 			}
 			oEntity.__metadata = {
-				type: "" + oEntityMetadata.entityType,
-				uri: that.sServiceUrl + '/' + sKey,
-				created: {
-					key: sNormalizedPath.substring(1), //store path for later POST
-					success: fnSuccess,
-					error: fnError,
-					headers: mHeaders,
-					urlParameters: mUrlParams,
-					groupId: sGroupId,
-					changeSetId: sChangeSetId,
-					eTag: sETag
+				type : "" + oEntityMetadata.entityType,
+				uri : that.sServiceUrl + '/' + sKey,
+				created : {
+					changeSetId : sChangeSetId,
+					error : fnError,
+					eTag : sETag,
+					groupId : sGroupId,
+					headers : mHeaders,
+					key : sNormalizedPath.substring(1), //store path for later POST
+					refreshAfterChange : bRefreshAfterChange,
+					success : fnSuccess,
+					urlParameters : mUrlParams
 				},
-				deepPath: sDeepPath
+				deepPath : sDeepPath
 			};
 			pCreate = new SyncPromise(function (resolve, reject) {
 				fnCreatedPromiseResolve = function () {
@@ -6799,7 +6830,9 @@ sap.ui.define([
 			});
 
 			sKey = that._addEntity(merge({}, oEntity));
-			that.mChangedEntities[sKey] = oEntity;
+			if (!bInactive) {
+				that.mChangedEntities[sKey] = oEntity;
+			}
 
 			sUrl = that._createRequestUrlWithNormalizedPath(sNormalizedPath, aUrlParams, that.bUseBatch);
 			oRequest = that._createRequest(sUrl, sDeepPath, sMethod, mHeaders, oEntity, sETag);
@@ -6816,7 +6849,7 @@ sap.ui.define([
 				oEntity.__metadata.created.contentID = sUID;
 			}
 
-			oCreatedContext = that.getContext("/" + sKey, sDeepPath, pCreate);
+			oCreatedContext = that.getContext("/" + sKey, sDeepPath, pCreate, bInactive);
 
 			oRequest.key = sKey;
 			oRequest.created = true;
@@ -6826,11 +6859,14 @@ sap.ui.define([
 				mRequests = that.mDeferredRequests;
 			}
 
-			that.oMetadata.loaded().then(function() {
-				that._pushToRequestQueue(mRequests, sGroupId,
-					sChangeSetId, oRequest, fnSuccess, fnError, oRequestHandle, bRefreshAfterChange);
-				that._processRequestQueueAsync(that.mRequests);
+			that.oMetadata.loaded().then(function () {
+				oCreatedContext.fetchActivated().then(function () {
+					that._pushToRequestQueue(mRequests, sGroupId, sChangeSetId, oRequest, fnSuccess,
+						fnError, oRequestHandle, bRefreshAfterChange);
+					that._processRequestQueueAsync(that.mRequests);
+				});
 			});
+
 			return oCreatedContext;
 		}
 
@@ -7755,9 +7791,9 @@ sap.ui.define([
 	};
 
 	/**
-	 * Enriches the context with the deep path information.
-	 * Gets the OData V2 context instance for the given path. The returned context is cached by the
-	 * given path.
+	 * Gets or creates the OData V2 context for the given path; the returned context is cached by
+	 * this path. Enriches the context with the given deep path. In case the context is created, the
+	 * parameters <code>oCreatePromise</code> and <code>bInactive</code> are used for the creation.
 	 *
 	 * @param {string} sPath
 	 *   The absolute path
@@ -7765,15 +7801,18 @@ sap.ui.define([
 	 *   The absolute deep path representing the same data as the given <code>sPath</code>
 	 * @param {sap.ui.base.SyncPromise} [oCreatePromise]
 	 *   A created promise as specified in the constructor of {@link sap.ui.model.odata.v2.Context}
+	 * @param {boolean} [bInactive]
+	 *   Whether the created context is inactive
 	 * @returns {sap.ui.model.odata.v2.Context}
 	 *   The ODate V2 context for the given path
 	 * @private
 	 */
-	ODataModel.prototype.getContext = function (sPath, sDeepPath, oCreatePromise) {
+	ODataModel.prototype.getContext = function (sPath, sDeepPath, oCreatePromise, bInactive) {
 		var oContext = this.mContexts[sPath];
 
 		if (!oContext) {
-			oContext = this.mContexts[sPath] = new Context(this, sPath, sDeepPath, oCreatePromise);
+			oContext = this.mContexts[sPath]
+				= new Context(this, sPath, sDeepPath, oCreatePromise, bInactive);
 		} else {
 			oContext.setDeepPath(sDeepPath || oContext.getDeepPath() || sPath);
 		}
@@ -7842,7 +7881,7 @@ sap.ui.define([
 	 * path prefix. Use <code>fullTarget</code> to determine whether a message matches the resolved
 	 * binding path prefix.
 	 *
-	 * @param {string} sMessageTarget
+	 * @param {string} sMessagePath
 	 *   The messages target used as key in <code>this.mMessages</code>
 	 * @param {string} sPathPrefix
 	 *   The resolved binding path prefix

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

@@ -92,7 +92,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.TreeBinding
 	 * @hideconstructor
 	 * @public
-	 * @version 1.97.1
+	 * @version 1.99.1
 	 */
 	var ODataTreeBinding = TreeBinding.extend("sap.ui.model.odata.v2.ODataTreeBinding", /** @lends sap.ui.model.odata.v2.ODataTreeBinding.prototype */ {
 
@@ -906,8 +906,7 @@ sap.ui.define([
 	 * Retrieves parent ids from a given data set
 	 *
 	 * @param {Array} aData Lookup array to search for parent ids
-	 * @param {boolean} bExcludeRootNodes Can be set to exclude root node elements
-	 * @returns {Array} Array of all parent ids
+	 * @returns {Object<string,string>} Map of all parent ids
 	 *
 	 * @private
 	 */
@@ -1379,6 +1378,9 @@ sap.ui.define([
 		}
 		var sAbsolutePath = this.getResolvedPath();
 		if (sAbsolutePath) {
+			if (this.iTotalCollectionCount) {
+				aURLParams.push("$top=" + this.iTotalCollectionCount);
+			}
 			this.mRequestHandles[sRequestKey] = this.oModel.read(sAbsolutePath, {
 				urlParameters: aURLParams,
 				success: fnSuccess,
@@ -1821,7 +1823,7 @@ sap.ui.define([
 	 * Check whether this Binding would provide new values and in case it changed,fire a change
 	 * event.
 	 *
-	 * @param {boolean} bForceUpdate
+	 * @param {boolean} [bForceUpdate]
 	 *   Whether to fire the event regardless of the bindings state
 	 * @param {object} mChangedEntities
 	 *   A map of changed entities

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

@@ -33,10 +33,14 @@ sap.ui.define([
 	 *   The resolved binding path
 	 * @param {string} sListID
 	 *   The identifier for the list showing the data
+	 * @param {boolean} bAtEnd
+	 *   Whether the context is added at the end; if set to <code>false</code>, the context is added
+	 *   at the beginning. The first call determines the overall position of the contexts.
 	 *
 	 * @private
 	 */
-	_CreatedContextsCache.prototype.addContext = function (oCreatedContext, sPath, sListID) {
+	_CreatedContextsCache.prototype.addContext = function (oCreatedContext, sPath, sListID,
+			bAtEnd) {
 		var aContexts, mListIDToContexts;
 
 		mListIDToContexts = this.mCache[sPath];
@@ -46,9 +50,14 @@ sap.ui.define([
 		aContexts = mListIDToContexts[sListID];
 		if (!aContexts) {
 			aContexts = mListIDToContexts[sListID] = [];
+			// store bAtEnd initially because it will determine the overall position of the contexts
+			aContexts.bAtEnd = bAtEnd;
+		}
+		if (bAtEnd) {
+			aContexts.push(oCreatedContext);
+		} else {
+			aContexts.unshift(oCreatedContext);
 		}
-		// currently we support only bAtEnd === false in ODataListBinding#create
-		aContexts.unshift(oCreatedContext);
 	};
 
 	/**
@@ -67,6 +76,36 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Finds the context in the cache whose path is prefix to or equals the given path.
+	 *
+	 * @param {string} sPath
+	 *   The absolute path
+	 * @returns {sap.ui.model.odata.v2.Context|undefined}
+	 *   The matching context or <code>undefined</code> if no context matches
+	 *
+	 * @private
+	 */
+	_CreatedContextsCache.prototype.findCreatedContext = function (sPath) {
+		var oContext;
+
+		Object.values(this.mCache).some(function (mListIDToContexts) {
+			return Object.values(mListIDToContexts).some(function (aContextsByListID) {
+				return aContextsByListID.some(function (oContext0) {
+					if (sPath.startsWith(oContext0.getPath())) {
+						oContext = oContext0;
+
+						return true;
+					}
+
+					return false;
+				});
+			});
+		});
+
+		return oContext;
+	};
+
 	/**
 	 * Checks whether a given context is contained in the the list of contexts for created entities
 	 * and returns the path and list ID.
@@ -104,7 +143,7 @@ sap.ui.define([
 	/**
 	 * Gets the contexts for created entities for the given path and list ID.
 	 *
-	 * @param {string} [sPath]
+	 * @param {string} sPath
 	 *   The resolved binding path
 	 * @param {string} sListID
 	 *   The identifier for the list showing the data
@@ -121,6 +160,27 @@ sap.ui.define([
 		return aContexts ? aContexts.slice() : [];
 	};
 
+	/**
+	 * Returns whether the contexts for created entities for the given path and list ID are added
+	 * at the end.
+	 *
+	 * @param {string} sPath
+	 *   The resolved binding path
+	 * @param {string} sListID
+	 *   The identifier for the list showing the data
+	 * @returns {boolean|undefined}
+	 *   Whether the contexts are added at the end; <code>undefined</code> if there are no contexts
+	 *   for the given path and list ID
+	 *
+	 * @private
+	 */
+	_CreatedContextsCache.prototype.isAtEnd = function (sPath, sListID) {
+		var mListIDToContexts = this.mCache[sPath],
+			aContexts = mListIDToContexts && mListIDToContexts[sListID];
+
+		return aContexts && aContexts.bAtEnd;
+	};
+
 	/**
 	 * Removes a context from the list of contexts for created entities for the given path and list
 	 * ID.
@@ -176,4 +236,4 @@ sap.ui.define([
 	};
 
 	return _CreatedContextsCache;
-}, /* bExport= */ false);
+});

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

@@ -15,7 +15,6 @@ sap.ui.define([
 		rPaths = /\$(?:(?:Annotation)|(?:(?:Navigation)?Property))?Path/,
 		rSplitPathSegment = /^(.+?\/(\$(?:Annotation)?Path))(\/?)(.*)$/,
 		rUnsupportedPathSegments = /\$(?:Navigation)?PropertyPath/,
-
 		/**
 		 * @classdesc
 		 * A collection of methods which help to consume
@@ -113,16 +112,16 @@ sap.ui.define([
 			 * Example for "$AnnotationPath" in the context's path:
 			 * <pre>
 			 * &lt;Annotations Target="com.sap.gateway.default.iwbep.tea_busi.v0001.EQUIPMENT">
-			 *	&lt;Annotation Term="com.sap.vocabularies.UI.v1.Facets">
-			 *		&lt;Collection>
-			 *			&lt;Record Type="com.sap.vocabularies.UI.v1.ReferenceFacet">
-			 *				&lt;PropertyValue Property="Target" AnnotationPath="EQUIPMENT_2_PRODUCT/@com.sap.vocabularies.Common.v1.QuickInfo" />
-			 *			&lt;/Record>
-			 *		&lt;/Collection>
-			 *	&lt;/Annotation>
+			 *   &lt;Annotation Term="com.sap.vocabularies.UI.v1.Facets">
+			 *     &lt;Collection>
+			 *       &lt;Record Type="com.sap.vocabularies.UI.v1.ReferenceFacet">
+			 *         &lt;PropertyValue Property="Target" AnnotationPath="EQUIPMENT_2_PRODUCT/@com.sap.vocabularies.Common.v1.QuickInfo" />
+			 *       &lt;/Record>
+			 *     &lt;/Collection>
+			 *   &lt;/Annotation>
 			 * &lt;/Annotations>
 			 * &lt;Annotations Target="com.sap.gateway.default.iwbep.tea_busi_product.v0001.Product">
-			 *	&lt;Annotation Term="com.sap.vocabularies.Common.v1.QuickInfo" Path="Name" />
+			 *   &lt;Annotation Term="com.sap.vocabularies.Common.v1.QuickInfo" Path="Name" />
 			 * &lt;/Annotations>
 			 * </pre>
 			 * <pre>
@@ -134,16 +133,16 @@ sap.ui.define([
 			 * Example for "$Path" in the context's path:
 			 * <pre>
 			 * &lt;Annotations Target="com.sap.gateway.default.iwbep.tea_busi.v0001.EQUIPMENT">
-			 *	&lt;Annotation Term="com.sap.vocabularies.UI.v1.LineItem">
-			 *		&lt;Collection>
-			 *			&lt;Record Type="com.sap.vocabularies.UI.v1.DataField">
-			 *				&lt;PropertyValue Property="Value" Path="EQUIPMENT_2_PRODUCT/Name" />
-			 *			&lt;/Record>
-			 *		&lt;/Collection>
-			 *	&lt;/Annotation>
+			 *   &lt;Annotation Term="com.sap.vocabularies.UI.v1.LineItem">
+			 *     &lt;Collection>
+			 *       &lt;Record Type="com.sap.vocabularies.UI.v1.DataField">
+			 *         &lt;PropertyValue Property="Value" Path="EQUIPMENT_2_PRODUCT/Name" />
+			 *       &lt;/Record>
+			 *     &lt;/Collection>
+			 *   &lt;/Annotation>
 			 * &lt;/Annotations>
 			 * &lt;Annotations Target="com.sap.gateway.default.iwbep.tea_busi_product.v0001.Product/Name">
-			 *	&lt;Annotation Term="com.sap.vocabularies.Common.v1.QuickInfo" Path="PRODUCT_2_SUPPLIER/Supplier_Name" />
+			 *   &lt;Annotation Term="com.sap.vocabularies.Common.v1.QuickInfo" Path="PRODUCT_2_SUPPLIER/Supplier_Name" />
 			 * &lt;/Annotations>
 			 * </pre>
 			 * <pre>
@@ -296,7 +295,7 @@ sap.ui.define([
 				if (sPath.endsWith("/$Path")) {
 					sPath = sPath.slice(0, -6);
 					vRawValue = {$Path : vRawValue};
-				} else if (sPath.endsWith('/$PropertyPath')) {
+				} else if (sPath.endsWith("/$PropertyPath")) {
 					sPath = sPath.slice(0, -14);
 					vRawValue = {$PropertyPath : vRawValue};
 				}
@@ -327,7 +326,7 @@ sap.ui.define([
 							i;
 
 						if (!bIsAnnotationPath && aMatches[3]) {
-							sPrefix = sPrefix + "/";
+							sPrefix += "/";
 						} else if (!sPrefix.endsWith("/")) {
 							i = sPrefix.lastIndexOf("/");
 							sPrefix = i < 0 ? "" : sPrefix.slice(0, i + 1);
@@ -502,7 +501,7 @@ sap.ui.define([
 				var iIndexOfAt;
 
 				// Whether the given value is exactly <code>true</code>
-				function isTrue (vValue) {
+				function isTrue(vValue) {
 					return vValue === true;
 				}
 
@@ -549,7 +548,7 @@ sap.ui.define([
 			 * @param {sap.ui.model.Context} oDetails.context
 			 *   Points to the given raw value, that is
 			 *   <code>oDetails.context.getProperty("") === vRawValue</code>
-			 * @returns {string|Promise}
+			 * @returns {string|Promise|undefined}
 			 *   A data binding or a fixed text or a sequence thereof or <code>undefined</code>. If
 			 *   <code>oDetails.$$valueAsPromise</code> is <code>true</code> a <code>Promise</code>
 			 *   may be returned resolving with the value for the label.
@@ -802,7 +801,7 @@ sap.ui.define([
 				} else if (sPath.endsWith("/$Path")) {
 					sPath = sPath.slice(0, -6);
 					vRawValue = {$Path : vRawValue};
-				} else if (sPath.endsWith('/$PropertyPath')) {
+				} else if (sPath.endsWith("/$PropertyPath")) {
 					sPath = sPath.slice(0, -14);
 					vRawValue = {$PropertyPath : vRawValue};
 				}