@openui5/sap.ui.fl 1.115.1 → 1.117.0

package/src/sap/ui/fl/apply/_internal/changes/Applier.js

@@ -6,6 +6,7 @@
 
 sap.ui.define([
 	"sap/base/Log",
+	"sap/base/strings/formatMessage",
 	"sap/ui/core/Element",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/apply/_internal/changes/FlexCustomData",
@@ -14,6 +15,7 @@ sap.ui.define([
 	"sap/ui/fl/Utils"
 ], function(
 	Log,
+	formatMessage,
 	Element,
 	JsControlTreeModifier,
 	FlexCustomData,
@@ -23,7 +25,21 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	var oLastPromise = new FlUtils.FakePromise();
+	var oLastPromise = (FlUtils.FakePromise ? new FlUtils.FakePromise() : Promise.resolve());
+
+	/**
+	 * Formats the log message by replacing placeholders with values and logging the message.
+	 *
+	 * @param {string} sLogType - Logging type to be used. Possible values: info | warning | debug | error
+	 * @param {array.<string>} aMessageComponents - Individual parts of the message text
+	 * @param {array.<any>} aValuesToInsert - The values to be used instead of the placeholders in the message
+	 * @param {string} [sCallStack] - Passes the callstack to the logging function
+	 */
+	function formatAndLogMessage(sLogType, aMessageComponents, aValuesToInsert, sCallStack) {
+		var sLogMessage = aMessageComponents.join(" ");
+		sLogMessage = formatMessage(sLogMessage, aValuesToInsert);
+		Log[sLogType](sLogMessage, sCallStack || "");
+	}
 
 	function checkControlAndDependentSelectorControls(oChange, mPropertyBag) {
 		var oSelector = oChange.getSelector && oChange.getSelector();
@@ -38,22 +54,26 @@ sap.ui.define([
 		}
 
 		return mPropertyBag.modifier.bySelectorTypeIndependent(oSelector, mPropertyBag.appComponent, mPropertyBag.view)
-			.then(function (oControl) {
-				if (!oControl) {
-					throw Error("A flexibility change tries to change a nonexistent control.");
+		.then(function(oControl) {
+			if (!oControl) {
+				throw Error("A flexibility change tries to change a nonexistent control.");
+			}
+			checkFailedSelectors(oSelector);
+
+			var aDependentControlSelectorList = oChange.getDependentControlSelectorList();
+			aDependentControlSelectorList.forEach(function(oDependentControlSelector) {
+				var oDependentControl = mPropertyBag.modifier.bySelector(
+					oDependentControlSelector,
+					mPropertyBag.appComponent,
+					mPropertyBag.view
+				);
+				if (!oDependentControl) {
+					throw new Error("A dependent selector control of the flexibility change is not available.");
 				}
-				checkFailedSelectors(oSelector);
-
-				var aDependentControlSelectorList = oChange.getDependentControlSelectorList();
-				aDependentControlSelectorList.forEach(function(oDependentControlSelector) {
-					var oDependentControl = mPropertyBag.modifier.bySelector(oDependentControlSelector, mPropertyBag.appComponent, mPropertyBag.view);
-					if (!oDependentControl) {
-						throw new Error("A dependent selector control of the flexibility change is not available.");
-					}
-					checkFailedSelectors(oDependentControlSelector);
-				});
-				return oControl;
+				checkFailedSelectors(oDependentControlSelector);
 			});
+			return oControl;
+		});
 	}
 
 	function isXmlModifier(mPropertyBag) {
@@ -107,28 +127,28 @@ sap.ui.define([
 
 	function handleAfterApply(oChange, mControl, oInitializedControl, mPropertyBag) {
 		return Promise.resolve()
-			.then(function () {
-				// changeHandler can return a different control, e.g. case where a visible UI control replaces the stashed control placeholder
-				if (oInitializedControl instanceof Element) {
-					// the newly rendered control could have custom data set from the XML modifier
-					mControl.control = oInitializedControl;
-				}
-				if (mControl.control) {
-					return mPropertyBag.modifier.updateAggregation(mControl.originalControl, oChange.getContent().boundAggregation);
-				}
-				return undefined;
-			})
-			.then(function () {
-				// only save the revert data in the custom data when the change is being processed in XML,
-				// as it's only relevant for viewCache at the moment
-				return FlexCustomData.addAppliedCustomData(mControl.control, oChange, mPropertyBag, isXmlModifier(mPropertyBag));
-			})
-			.then(function () {
-				// if a change was reverted previously remove the flag as it is not reverted anymore
-				var oResult = {success: true};
-				oChange.markSuccessful(oResult);
-				return oResult;
-			});
+		.then(function() {
+			// changeHandler can return a different control, e.g. case where a visible UI control replaces the stashed control placeholder
+			if (oInitializedControl instanceof Element) {
+				// the newly rendered control could have custom data set from the XML modifier
+				mControl.control = oInitializedControl;
+			}
+			if (mControl.control) {
+				return mPropertyBag.modifier.updateAggregation(mControl.originalControl, oChange.getContent().boundAggregation);
+			}
+			return undefined;
+		})
+		.then(function() {
+			// only save the revert data in the custom data when the change is being processed in XML,
+			// as it's only relevant for viewCache at the moment
+			return FlexCustomData.addAppliedCustomData(mControl.control, oChange, mPropertyBag, isXmlModifier(mPropertyBag));
+		})
+		.then(function() {
+			// if a change was reverted previously remove the flag as it is not reverted anymore
+			var oResult = {success: true};
+			oChange.markSuccessful(oResult);
+			return oResult;
+		});
 	}
 
 	function handleAfterApplyError(oError, oChange, mControl, mPropertyBag) {
@@ -141,27 +161,42 @@ sap.ui.define([
 		var sCustomDataIdentifier = FlexCustomData.getCustomDataIdentifier(false, bErrorOccurred, bXmlModifier);
 		switch (sCustomDataIdentifier) {
 			case FlexCustomData.notApplicableChangesCustomDataKey:
-				FlUtils.formatAndLogMessage("info", [sLogMessage, oError.message], [sChangeId]);
+				formatAndLogMessage(
+					"info",
+					[sLogMessage, oError.message],
+					[sChangeId]
+				);
 				break;
 			case FlexCustomData.failedChangesCustomDataKeyXml:
-				FlUtils.formatAndLogMessage("warning", [sLogMessage, "Merge error detected while processing the XML tree."], [sChangeId], oError.stack);
+				formatAndLogMessage(
+					"warning",
+					[sLogMessage, "Merge error detected while processing the XML tree."],
+					[sChangeId],
+					oError.stack
+				);
 				break;
 			case FlexCustomData.failedChangesCustomDataKeyJs:
-				FlUtils.formatAndLogMessage("error", [sLogMessage, "Merge error detected while processing the JS control tree."], [sChangeId], oError.stack);
+				formatAndLogMessage(
+					"error",
+					[sLogMessage, "Merge error detected while processing the JS control tree."],
+					[sChangeId],
+					oError.stack
+				);
 				break;
-			/*no default*/
+			default:
+				// no default
 		}
 		return FlexCustomData.addFailedCustomData(mControl.control, oChange, mPropertyBag, sCustomDataIdentifier)
-			.then(function () {
-				// if the change failed during XML processing, the status has to be reset
-				// the change will be applied again in JS
-				if (bXmlModifier) {
-					oChange.setInitialApplyState();
-				} else {
-					oChange.markFailed(oResult);
-				}
-				return oResult;
-			});
+		.then(function() {
+			// if the change failed during XML processing, the status has to be reset
+			// the change will be applied again in JS
+			if (bXmlModifier) {
+				oChange.setInitialApplyState();
+			} else {
+				oChange.markFailed(oResult);
+			}
+			return oResult;
+		});
 	}
 
 	function logApplyChangeError(oError, oChange) {
@@ -210,7 +245,7 @@ sap.ui.define([
 	}
 
 	function registerOnAfterXMLChangeProcessingHandler(aOnAfterXMLChangeProcessingHandlers, oChangeHandler, oControl) {
-		var iChangeHandlerIndex = aOnAfterXMLChangeProcessingHandlers.findIndex(function (mHandler) {
+		var iChangeHandlerIndex = aOnAfterXMLChangeProcessingHandlers.findIndex(function(mHandler) {
 			return mHandler.handler === oChangeHandler;
 		});
 		if (iChangeHandlerIndex < 0) {
@@ -232,7 +267,7 @@ sap.ui.define([
 		 * @param {Promise} oPromise - Promise which is resolved when precondition fulfilled
 		 */
 		addPreConditionForInitialChangeApplying: function(oPromise) {
-			oLastPromise = oLastPromise.then(function () {
+			oLastPromise = oLastPromise.then(function() {
 				return oPromise;
 			});
 		},
@@ -268,7 +303,7 @@ sap.ui.define([
 						return oResult;
 					});
 				} else if (!oChange.isApplyProcessFinished()) {
-					return new FlUtils.FakePromise().then(function() {
+					return (FlUtils.FakePromise ? new FlUtils.FakePromise() : Promise.resolve()).then(function() {
 						oChange.startApplying();
 						return oChangeHandler.applyChange(oChange, mControl.control, mPropertyBag);
 					})
@@ -315,7 +350,7 @@ sap.ui.define([
 				view: FlUtils.getViewForControl(oControl)
 			};
 
-			aChangesForControl.forEach(function (oChange) {
+			aChangesForControl.forEach(function(oChange) {
 				checkAndAdjustChangeStatus(oControl, oChange, mChangesMap, oFlexController, mPropertyBag);
 				if (!oChange.isApplyProcessFinished() && !oChange._ignoreOnce) {
 					oChange.setQueuedForApply();
@@ -334,8 +369,9 @@ sap.ui.define([
 					bControlWithDependencies = true;
 				}
 
-				aChangesForControl.forEach(function (oChange) {
-					// in the ExtensionPoint scenario changes can get cloned, in case of a template change the original selector has to be adjusted
+				aChangesForControl.forEach(function(oChange) {
+					// in the ExtensionPoint scenario changes can get cloned,
+					// in case of a template change the original selector has to be adjusted
 					if (oChange.originalSelectorToBeAdjusted) {
 						adjustOriginalSelector(oChange, oControl, oAppComponent);
 						delete oChange.originalSelectorToBeAdjusted;
@@ -357,7 +393,7 @@ sap.ui.define([
 				});
 
 				if (aChangesForControl.length || bControlWithDependencies) {
-					return FlUtils.execPromiseQueueSequentially(aPromiseStack).then(function () {
+					return FlUtils.execPromiseQueueSequentially(aPromiseStack).then(function() {
 						return DependencyHandler.processDependentQueue(mChangesMap, oAppComponent, sControlId);
 					});
 				}
@@ -391,50 +427,50 @@ sap.ui.define([
 			return aChanges.reduce(function(oPreviousPromise, oChange) {
 				var oControl;
 				return oPreviousPromise
-					.then(checkControlAndDependentSelectorControls.bind(null, oChange, mPropertyBag))
-					.then(function (oReturnedControl) {
-						oControl = oReturnedControl;
-						var mControl = Utils.getControlIfTemplateAffected(oChange, oControl, mPropertyBag);
-						return Utils.getChangeHandler(oChange, mControl, mPropertyBag);
-					})
-					.then(function (oChangeHandler) {
-						mPropertyBag.changeHandler = oChangeHandler;
-						oChange.setQueuedForApply();
-						checkAndAdjustChangeStatus(oControl, oChange, undefined, undefined, mPropertyBag);
-
-						if (!oChange.isApplyProcessFinished()) {
-							if (typeof mPropertyBag.changeHandler.onAfterXMLChangeProcessing === "function") {
-								registerOnAfterXMLChangeProcessingHandler(
-									aOnAfterXMLChangeProcessingHandlers,
-									mPropertyBag.changeHandler,
-									oControl
-								);
-							}
-							return Applier.applyChangeOnControl(oChange, oControl, mPropertyBag);
+				.then(checkControlAndDependentSelectorControls.bind(null, oChange, mPropertyBag))
+				.then(function(oReturnedControl) {
+					oControl = oReturnedControl;
+					var mControl = Utils.getControlIfTemplateAffected(oChange, oControl, mPropertyBag);
+					return Utils.getChangeHandler(oChange, mControl, mPropertyBag);
+				})
+				.then(function(oChangeHandler) {
+					mPropertyBag.changeHandler = oChangeHandler;
+					oChange.setQueuedForApply();
+					checkAndAdjustChangeStatus(oControl, oChange, undefined, undefined, mPropertyBag);
+
+					if (!oChange.isApplyProcessFinished()) {
+						if (typeof mPropertyBag.changeHandler.onAfterXMLChangeProcessing === "function") {
+							registerOnAfterXMLChangeProcessingHandler(
+								aOnAfterXMLChangeProcessingHandlers,
+								mPropertyBag.changeHandler,
+								oControl
+							);
 						}
-						return {success: true};
-					})
-					.then(function(oReturn) {
-						if (!oReturn.success) {
-							throw Error(oReturn.error);
+						return Applier.applyChangeOnControl(oChange, oControl, mPropertyBag);
+					}
+					return {success: true};
+				})
+				.then(function(oReturn) {
+					if (!oReturn.success) {
+						throw Error(oReturn.error);
+					}
+				})
+				.catch(function(oError) {
+					oChange.getDependentSelectorList().forEach(function(oDependentControlSelector) {
+						if (FlUtils.indexOfObject(mPropertyBag.failedSelectors, oDependentControlSelector) === -1) {
+							mPropertyBag.failedSelectors.push(oDependentControlSelector);
 						}
-					})
-					.catch(function(oError) {
-						oChange.getDependentSelectorList().forEach(function(oDependentControlSelector) {
-							if (FlUtils.indexOfObject(mPropertyBag.failedSelectors, oDependentControlSelector) === -1) {
-								mPropertyBag.failedSelectors.push(oDependentControlSelector);
-							}
-						});
-						logApplyChangeError(oError, oChange);
 					});
-			}, new FlUtils.FakePromise())
+					logApplyChangeError(oError, oChange);
+				});
+			}, (FlUtils.FakePromise ? new FlUtils.FakePromise() : Promise.resolve()))
 			.then(function() {
 				delete mPropertyBag.failedSelectors;
 
 				// Once all changes for a control are processed, call the
 				// onAfterXMLChangeProcessing hooks of all involved change handlers
-				aOnAfterXMLChangeProcessingHandlers.forEach(function (mHandler) {
-					mHandler.controls.forEach(function (oControl) {
+				aOnAfterXMLChangeProcessingHandlers.forEach(function(mHandler) {
+					mHandler.controls.forEach(function(oControl) {
 						try {
 							mHandler.handler.onAfterXMLChangeProcessing(oControl, mPropertyBag);
 						} catch (oError) {

package/src/sap/ui/fl/apply/_internal/changes/FlexCustomData.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexCustomData
 	 * @experimental Since 1.61.0
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 */
 	var FlexCustomData = {};
 

package/src/sap/ui/fl/apply/_internal/changes/Reverter.js

@@ -6,11 +6,13 @@
 
 sap.ui.define([
 	"sap/base/Log",
+	"sap/ui/fl/apply/_internal/changes/Applier",
 	"sap/ui/fl/apply/_internal/changes/FlexCustomData",
 	"sap/ui/fl/apply/_internal/changes/Utils",
 	"sap/ui/fl/Utils"
 ], function(
 	Log,
+	Applier,
 	FlexCustomData,
 	Utils,
 	FlUtils
@@ -77,7 +79,7 @@ sap.ui.define([
 			}
 			return undefined;
 		})
-		.then(function () {
+		.then(function() {
 			oChange.markRevertFinished();
 			return mControl.control;
 		})
@@ -109,7 +111,7 @@ sap.ui.define([
 				var oControl = mPropertyBag.modifier.bySelector(oSelector, mPropertyBag.appComponent);
 				if (!oControl) {
 					Log.warning("A flexibility change tries to revert changes on a nonexistent control with id " + oSelector.id);
-					return new FlUtils.FakePromise();
+					return (FlUtils.FakePromise ? new FlUtils.FakePromise() : Promise.resolve());
 				}
 				var mRevertProperties = {
 					modifier: mPropertyBag.modifier,
@@ -119,8 +121,12 @@ sap.ui.define([
 				return revertAndDeleteChangeOnControl(oChange, oControl, mRevertProperties, mPropertyBag);
 			});
 		});
-
-		return FlUtils.execPromiseQueueSequentially(aPromiseStack);
+		const pReturn = FlUtils.execPromiseQueueSequentially(aPromiseStack);
+		// reverting a change might trigger the propagation listener and the applyAllChangesForControl functionality
+		// this needs to wait for the whole revert to be done so that the persistence is cleaned up and
+		// a reverted change is not applied again
+		Applier.addPreConditionForInitialChangeApplying(pReturn);
+		return pReturn;
 	};
 
 	return Reverter;

package/src/sap/ui/fl/apply/_internal/changes/Utils.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.Utils
 	 * @since 1.70
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal, sap.ui.fl.write._internal
 	 */
@@ -49,7 +49,7 @@ sap.ui.define([
 		 * @returns {object} Contains the information about the control
 		 * @private
 		 */
-		getControlIfTemplateAffected: function (oChange, oControl, mPropertyBag) {
+		getControlIfTemplateAffected: function(oChange, oControl, mPropertyBag) {
 			var oModifier = mPropertyBag.modifier;
 			var mControl = {
 				originalControl: oControl
@@ -105,6 +105,11 @@ sap.ui.define([
 				return false;
 			}
 			var oControl = oModifier.bySelector(oChange.getSelector(), oAppComponent);
+			// if the control is currently not available,
+			// the change is also not applied anymore and the dependency is still valid
+			if (!oControl) {
+				return true;
+			}
 			var bHasChangeApplyFinishedCustomData = FlexCustomData.hasChangeApplyFinishedCustomData(oControl, oChange, oModifier);
 			return isDependencyStillValid(oChange, bHasChangeApplyFinishedCustomData);
 		},

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Applier.js

@@ -40,28 +40,28 @@ sap.ui.define([
 		 * @param {function} mStrategy.processTexts - Text postprocessing strategy
 		 * @returns {Promise<object>} - Processed manifest with descriptor changes
 		 */
-		applyChanges: function (oUpdatedManifest, aAppDescriptorChanges, mStrategy) {
+		applyChanges: function(oUpdatedManifest, aAppDescriptorChanges, mStrategy) {
 			return mStrategy.registry()
-				.then(function (Registry) {
-					var aChangeHandlerPromises = aAppDescriptorChanges.map(function (oChange) {
-						return Registry[oChange.getChangeType()] && Registry[oChange.getChangeType()]();
-					});
-					return Promise.all(aChangeHandlerPromises);
-				})
-				.then(function (aChangeHandlers) {
-					aChangeHandlers.forEach(function (oChangeHandler, iIndex) {
-						try {
-							var oChange = aAppDescriptorChanges[iIndex];
-							oUpdatedManifest = oChangeHandler.applyChange(oUpdatedManifest, oChange);
-							if (!oChangeHandler.skipPostprocessing && !isEmptyObject(oChange.getTexts())) {
-								oUpdatedManifest = mStrategy.processTexts(oUpdatedManifest, oChange.getTexts());
-							}
-						} catch (oError) {
-							mStrategy.handleError(oError);
+			.then(function(Registry) {
+				var aChangeHandlerPromises = aAppDescriptorChanges.map(function(oChange) {
+					return Registry[oChange.getChangeType()] && Registry[oChange.getChangeType()]();
+				});
+				return Promise.all(aChangeHandlerPromises);
+			})
+			.then(function(aChangeHandlers) {
+				aChangeHandlers.forEach(function(oChangeHandler, iIndex) {
+					try {
+						var oChange = aAppDescriptorChanges[iIndex];
+						oUpdatedManifest = oChangeHandler.applyChange(oUpdatedManifest, oChange);
+						if (!oChangeHandler.skipPostprocessing && !isEmptyObject(oChange.getTexts())) {
+							oUpdatedManifest = mStrategy.processTexts(oUpdatedManifest, oChange.getTexts());
 						}
-					});
-					return oUpdatedManifest;
+					} catch (oError) {
+						mStrategy.handleError(oError);
+					}
 				});
+				return oUpdatedManifest;
+			});
 		},
 
 		/**

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ApplyStrategyFactory.js

@@ -8,7 +8,7 @@
 sap.ui.define([
 	"sap/ui/fl/requireAsync",
 	"sap/base/Log"
-], function (
+], function(
 	requireAsync,
 	Log
 ) {
@@ -18,11 +18,11 @@ sap.ui.define([
 		registry: function() {
 			return requireAsync("sap/ui/fl/apply/_internal/changes/descriptor/Registration");
 		},
-		handleError: function (oError) {
+		handleError: function(oError) {
 			Log.error(oError);
 		},
-		processTexts: function (oManifest, oChangeTexts) {
-			//TODO: optimize performance by creating map not using JSON.stringify/parse
+		processTexts: function(oManifest, oChangeTexts) {
+			// TODO: optimize performance by creating map not using JSON.stringify/parse
 			var sManifest = JSON.stringify(oManifest);
 			Object.keys(oChangeTexts).forEach(function(sTextKey) {
 				if (oChangeTexts[sTextKey].value[""]) {
@@ -35,7 +35,6 @@ sap.ui.define([
 		}
 	};
 
-
 	var ApplyStrategyFactory = {
 		/**
 		 * Strategy to apply descriptor changes during runtime.

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ApplyUtil.js

@@ -12,7 +12,6 @@ sap.ui.define([
 ) {
 	"use strict";
 
-
 	var ApplyUtil = {
 
 		/**
@@ -24,7 +23,7 @@ sap.ui.define([
 		 * @private
 		 * @ui5-restricted sap.ui.fl.apply._internal
 		 */
-		formatBundleName: function (sId, sBundleUrl) {
+		formatBundleName: function(sId, sBundleUrl) {
 			if (sBundleUrl.startsWith("/")) {
 				throw Error("Absolute paths are not supported");
 			}

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Preprocessor.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Preprocessor
 	 * @since 1.74
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Registration.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Registration
 	 * @since 1.74
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/RegistrationBuild.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild
 	 * @since 1.77
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddAnnotationsToOData.js

@@ -34,7 +34,7 @@ sap.ui.define([
 		return aChangeAnnotations.indexOf(sAnnotation) >= 0;
 	}
 
-	function checkingDataSourceId (oManifestDataSources, sChangeDataSourceId) {
+	function checkingDataSourceId(oManifestDataSources, sChangeDataSourceId) {
 		if (sChangeDataSourceId) {
 			if (Object.keys(oManifestDataSources).length > 0) {
 				if (!isDataSourceIdExistingInManifest(oManifestDataSources, sChangeDataSourceId)) {
@@ -52,7 +52,7 @@ sap.ui.define([
 		}
 	}
 
-	function checkingAnnotationArray (aChangeAnnotations) {
+	function checkingAnnotationArray(aChangeAnnotations) {
 		if (aChangeAnnotations) {
 			if (aChangeAnnotations.length === 0) {
 				throw new Error("Invalid change format: The 'annotations' array property is empty");
@@ -62,7 +62,7 @@ sap.ui.define([
 		}
 	}
 
-	function checkingAnnotationsInsertPosition (sChangeAnnotationsInsertPosition) {
+	function checkingAnnotationsInsertPosition(sChangeAnnotationsInsertPosition) {
 		if (!(SUPPORTED_INSERT_POSITION.indexOf(sChangeAnnotationsInsertPosition) >= 0) && !(sChangeAnnotationsInsertPosition === undefined)) { // default is 'BEGINNING'
 			throw new Error("The defined insert position '" + sChangeAnnotationsInsertPosition + "' is not supported. The supported insert positions are: " + SUPPORTED_INSERT_POSITION.join("|"));
 		}
@@ -96,24 +96,24 @@ sap.ui.define([
 	}
 
 	function mergeAnnotationArray(oManifestDataSourceId, aChangeAnnotations, sChangeAnnotationsInsertPosition) {
-		if (!oManifestDataSourceId["settings"]) {
-			oManifestDataSourceId["settings"] = {};
+		if (!oManifestDataSourceId.settings) {
+			oManifestDataSourceId.settings = {};
 		}
 
-		if (!oManifestDataSourceId["settings"].annotations) {
-			oManifestDataSourceId["settings"].annotations = [];
+		if (!oManifestDataSourceId.settings.annotations) {
+			oManifestDataSourceId.settings.annotations = [];
 		}
 
-		var aNotExistingAnnotationsInChange = oManifestDataSourceId["settings"].annotations.filter(function(annotation) {
+		var aNotExistingAnnotationsInChange = oManifestDataSourceId.settings.annotations.filter(function(annotation) {
 			return (aChangeAnnotations.indexOf(annotation) < 0);
 		});
 
-		oManifestDataSourceId["settings"].annotations = aNotExistingAnnotationsInChange;
+		oManifestDataSourceId.settings.annotations = aNotExistingAnnotationsInChange;
 
 		if (sChangeAnnotationsInsertPosition === "END") {
-			oManifestDataSourceId["settings"].annotations = oManifestDataSourceId["settings"].annotations.concat(aChangeAnnotations);
+			oManifestDataSourceId.settings.annotations = oManifestDataSourceId.settings.annotations.concat(aChangeAnnotations);
 		} else {
-			oManifestDataSourceId["settings"].annotations = aChangeAnnotations.concat(oManifestDataSourceId["settings"].annotations);
+			oManifestDataSourceId.settings.annotations = aChangeAnnotations.concat(oManifestDataSourceId.settings.annotations);
 		}
 	}
 
@@ -121,7 +121,7 @@ sap.ui.define([
 		Object.assign(oManifestDataSources, oChangeDataSource);
 	}
 
-	function postChecks (oManifestDataSources, oChangeDataSource, aChangeAnnotations) {
+	function postChecks(oManifestDataSources, oChangeDataSource, aChangeAnnotations) {
 		// Further checks after main checks
 		aChangeAnnotations.forEach(function(sAnnotation) {
 			if (!isAnnotationExisting(oManifestDataSources, oChangeDataSource, sAnnotation)) {
@@ -136,9 +136,10 @@ sap.ui.define([
 	 *
 	 * Available only for build {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
 	 *
-	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.AddAnnotationsToOData
+	 * @namespace
+	 * @alias sap.ui.fl.apply._internal.changes.descriptor.app.AddAnnotationsToOData
 	 * @since 1.87
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -149,6 +150,7 @@ sap.ui.define([
 		 *
 		 * @param {object} oManifest - Original manifest
 		 * @param {sap.ui.fl.apply._internal.flexObjects.AppDescriptorChange} oChange - Change with type <code>appdescr_app_addAnnotationsToOData</code>
+		 * @param {object} oChange.content - Details of the change
 		 * @param {string} oChange.content.dataSourceId - ID of <code>sap.app/dataSource</code> that is being changed
 		 * @param {Array<string>} oChange.content.annotations - Array of annotations in OData dataSource <code>sap.app/dataSource/settings/annotations</code> that is being changed
 		 * @param {string} oChange.content.annotationsInsertPosition - Insert position operation that is performed under annotations. Allowed values: <code>BEGINNING</code> and <code>END</code> default: (<code>BEGINNING</code)
@@ -168,9 +170,9 @@ sap.ui.define([
 			checkingAnnotationArray(aChangeAnnotations);
 			checkingAnnotationsInsertPosition(sChangeAnnotationsInsertPosition);
 			checkingAnnotationDataSource(oChangeDataSource, aChangeAnnotations, oChange);
-			postChecks(oManifest["sap.app"]["dataSources"], oChangeDataSource, aChangeAnnotations);
+			postChecks(oManifest["sap.app"].dataSources, oChangeDataSource, aChangeAnnotations);
 
-			merge(oManifest["sap.app"]["dataSources"], sChangeDataSourceId, aChangeAnnotations, sChangeAnnotationsInsertPosition, oChangeDataSource);
+			merge(oManifest["sap.app"].dataSources, sChangeDataSourceId, aChangeAnnotations, sChangeAnnotationsInsertPosition, oChangeDataSource);
 
 			return oManifest;
 		}