@openui5/sap.ui.fl 1.108.0 → 1.109.0

package/THIRDPARTY.txt

@@ -478,7 +478,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.1.40
+Component: SAP Theming Base Content, version: 11.1.44
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.fl",
-  "version": "1.108.0",
+  "version": "1.109.0",
   "description": "OpenUI5 UI Library sap.ui.fl",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,7 +14,7 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.108.0",
-    "@openui5/sap.ui.core": "1.108.0"
+    "@openui5/sap.m": "1.109.0",
+    "@openui5/sap.ui.core": "1.109.0"
   }
 }

package/src/sap/ui/fl/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.108.0</version>
+  <version>1.109.0</version>
 
   <documentation>SAPUI5 library with sap.ui.fl controls.</documentation>
 

package/src/sap/ui/fl/Cache.js

@@ -6,12 +6,12 @@
 
 sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/Utils",
+	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/base/Log"
 ],
 function(
 	FlexState,
-	Utils,
+	ControlVariantApplyAPI,
 	Log
 ) {
 	"use strict";
@@ -24,7 +24,7 @@ function(
 	 * @alias sap.ui.fl.Cache
 	 * @experimental Since 1.25.0
 	 * @author SAP SE
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl
@@ -121,7 +121,7 @@ function(
 			})
 			.then(function(sCacheKey) {
 				// concat current control variant ids to cachekey if available
-				var oVariantModel = oAppComponent.getModel(Utils.VARIANT_MODEL_NAME);
+				var oVariantModel = oAppComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
 				var aCurrentControlVariantIds = oVariantModel ? oVariantModel.getCurrentControlVariantIds() : [];
 				return _concatControlVariantIdWithCacheKey(sCacheKey, aCurrentControlVariantIds.join("-"));
 			});

package/src/sap/ui/fl/ChangePersistence.js

@@ -16,6 +16,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/changes/Utils",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObject",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
+	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
@@ -25,7 +26,6 @@ sap.ui.define([
 	"sap/ui/fl/write/_internal/Storage",
 	"sap/ui/fl/write/api/Version",
 	"sap/ui/fl/Cache",
-	"sap/ui/fl/Change",
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils",
@@ -43,6 +43,7 @@ sap.ui.define([
 	ChangesUtils,
 	FlexObject,
 	FlexObjectFactory,
+	States,
 	DependencyHandler,
 	VariantManagementState,
 	FlexState,
@@ -52,7 +53,6 @@ sap.ui.define([
 	Storage,
 	Version,
 	Cache,
-	Change,
 	LayerUtils,
 	Layer,
 	Utils,
@@ -66,7 +66,7 @@ sap.ui.define([
 	 *
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 * @experimental Since 1.25.0
 	 * @param {object} mComponent - Component data to initiate <code>ChangePersistence</code> instance
 	 * @param {string} mComponent.name - Name of the component this instance is responsible for
@@ -94,19 +94,15 @@ sap.ui.define([
 
 	function getChangeInstance(oFileContent, oChangeOrChangeContent) {
 		var oChange;
-		if (oChangeOrChangeContent instanceof Change || oChangeOrChangeContent instanceof FlexObject) {
+		if (oChangeOrChangeContent instanceof FlexObject) {
 			oChange = oChangeOrChangeContent; // can have other states
 			this._mChangesEntries[oChange.getId()] = oChange;
 		} else {
 			if (!this._mChangesEntries[oChangeOrChangeContent.fileName]) {
-				if (oChangeOrChangeContent.changeType === "codeExt") {
-					this._mChangesEntries[oChangeOrChangeContent.fileName] = FlexObjectFactory.createFromFileContent(oChangeOrChangeContent);
-				} else {
-					this._mChangesEntries[oChangeOrChangeContent.fileName] = new Change(oChangeOrChangeContent);
-				}
+				this._mChangesEntries[oChangeOrChangeContent.fileName] = FlexObjectFactory.createFromFileContent(oChangeOrChangeContent);
 			}
 			oChange = this._mChangesEntries[oChangeOrChangeContent.fileName];
-			oChange.setState(Change.states.PERSISTED);
+			oChange.setState(States.LifecycleState.PERSISTED);
 		}
 		return oChange;
 	}
@@ -150,7 +146,7 @@ sap.ui.define([
 		var sVariantReference;
 		var sSelectorId;
 
-		if (oChangeOrChangeContent instanceof Change) {
+		if (oChangeOrChangeContent instanceof FlexObject) {
 			var oChange = oChangeOrChangeContent;
 			sFileType = oChange.getFileType();
 			sVariantReference = oChange.getVariantReference();
@@ -183,7 +179,6 @@ sap.ui.define([
 	 * @param {string} [mPropertyBag.cacheKey] Key to validate the cache entry stored on client side
 	 * @param {sap.ui.core.Component} [mPropertyBag.component] - Component instance
 	 * @param {boolean} bInvalidateCache - should the cache be invalidated
-	 * @see sap.ui.fl.Change
 	 * @returns {Promise} Promise resolving with an array of changes
 	 * @public
 	 */
@@ -264,7 +259,7 @@ sap.ui.define([
 		var sChangeLayer;
 		if (
 			typeof oChangeOrChangeContent.isA === "function"
-			&& (oChangeOrChangeContent.isA("sap.ui.fl.apply._internal.flexObjects.FlVariant") || oChangeOrChangeContent.isA("sap.ui.fl.Change"))
+			&& (oChangeOrChangeContent.isA("sap.ui.fl.apply._internal.flexObjects.FlVariant") || oChangeOrChangeContent.isA("sap.ui.fl.apply._internal.flexObjects.UIChange"))
 		) {
 			sChangeLayer = oChangeOrChangeContent.getLayer();
 		} else {
@@ -291,7 +286,6 @@ sap.ui.define([
 	 * Calls the back end asynchronously and fetches all changes for the component
 	 * New changes (dirty state) that are not yet saved to the back end won't be returned.
 	 * @param {object} oAppComponent - Component instance used to prepare the IDs (e.g. local)
-	 * @see sap.ui.fl.Change
 	 * @returns {Promise} Promise resolving with a getter for the changes map
 	 * @public
 	 */
@@ -319,7 +313,7 @@ sap.ui.define([
 	 *
 	 * @param {object} oSelector selector of the control
 	 * @param {sap.ui.core.Component} oAppComponent - Application component instance that is currently loading
-	 * @returns {sap.ui.fl.Change[]} Array of all open dependent changes for the control
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Array of all open dependent changes for the control
 	 */
 	ChangePersistence.prototype.getOpenDependentChangesForControl = function(oSelector, oAppComponent) {
 		return DependencyHandler.getOpenDependentChangesForControl(this._mChanges, JsControlTreeModifier.getControlIdBySelector(oSelector, oAppComponent), oAppComponent);
@@ -357,7 +351,7 @@ sap.ui.define([
 	 * Also checks if the dependency is still valid in a callback
 	 * This function is used in the case that controls got destroyed and recreated
 	 *
-	 * @param {sap.ui.fl.Change} oChange The change whose dependencies should be copied
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange The change whose dependencies should be copied
 	 * @param {function} fnDependencyValidation this function is called to check if the dependency is still valid
 	 * @param {sap.ui.core.Component} oAppComponent Application component instance that is currently loading
 	 * @returns {object} Returns the mChanges object with the updated dependencies
@@ -383,7 +377,7 @@ sap.ui.define([
 	 * Also checks if the dependency is still valid in a callback
 	 * This function is used in the case that controls got destroyed and recreated
 	 *
-	 * @param {sap.ui.fl.Change} oChange The change whose dependencies should be copied
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange The change whose dependencies should be copied
 	 * @param {function} fnDependencyValidation this function is called to check if the dependency is still valid
 	 * @param {sap.ui.core.Component} oAppComponent Application component instance that is currently loading
 	 * @returns {Promise} Resolves the mChanges object with the updated dependencies
@@ -415,8 +409,8 @@ sap.ui.define([
 	 * Adds a new change into changes map positioned right after the referenced change and updates the change dependencies
 	 *
 	 * @param {sap.ui.core.Component} oAppComponent - Application component for the view
-	 * @param {sap.ui.fl.changeObject} oChange - Change instance
-	 * @param {sap.ui.fl.changeObject} [oReferenceChange] - Refernce change. New change is positioned right after this one in the changes map
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Change instance
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} [oReferenceChange] - Reference change. New change is positioned right after this one in the changes map
 	 */
 	ChangePersistence.prototype.addChangeAndUpdateDependencies = function(oAppComponent, oChange, oReferenceChange) {
 		// the change status should always be initial when it gets added to the map / dependencies
@@ -433,7 +427,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Getter for the private aggregation containing sap.ui.fl.Change objects mapped by their selector ids.
+	 * Getter for the private aggregation containing sap.ui.fl.apply._internal.flexObjects.FlexObject objects mapped by their selector ids.
 	 * @return {map} mChanges mapping with changes sorted by their selector ids
 	 * @public
 	 */
@@ -446,7 +440,7 @@ sap.ui.define([
 	 * @param {map} mPropertyBag - Contains additional data needed for reading changes
 	 * @param {string} [mPropertyBag.layer] - Specifies a single layer for loading changes
 	 * @param {boolean} [mPropertyBag.includeDirtyChanges] - Whether dirty changes of the current session should be included
-	 * @returns {sap.ui.fl.Change[]} Array of changes
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Array of changes
 	 * @public
 	 */
 	ChangePersistence.prototype.getAllUIChanges = function(mPropertyBag) {
@@ -506,7 +500,7 @@ sap.ui.define([
 	 *
 	 * @param {object} vChange - The complete and finalized JSON object representation the file content of the change or a Change instance
 	 * @param {sap.ui.core.Component} oAppComponent - Application component instance
-	 * @returns {sap.ui.fl.Change} the newly created change
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject} the newly created change
 	 * @public
 	 */
 	ChangePersistence.prototype.addChange = function(vChange, oAppComponent) {
@@ -521,18 +515,15 @@ sap.ui.define([
 	 * Adds a new dirty change.
 	 *
 	 * @param {object} vChange - JSON object of change or change object
-	 * @returns {sap.ui.fl.Change} The prepared change object
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject} The prepared change object
 	 * @public
 	 */
 	ChangePersistence.prototype.addDirtyChange = function(vChange) {
 		var oNewChange;
-		if (
-			typeof vChange.isA === "function"
-			&& (vChange.isA("sap.ui.fl.Change") || vChange.isA("sap.ui.fl.apply._internal.flexObjects.FlexObject"))
-		) {
+		if (typeof vChange.isA === "function" && vChange.isA("sap.ui.fl.apply._internal.flexObjects.FlexObject")) {
 			oNewChange = vChange;
 		} else {
-			oNewChange = new Change(vChange);
+			oNewChange = FlexObjectFactory.createFromFileContent(vChange);
 		}
 
 		// don't add the same change twice
@@ -639,9 +630,9 @@ sap.ui.define([
 		}
 		var aPersistedAndSameLayerChanges = this._mChanges.aChanges.filter(function(oChange) {
 			if (sLayer === Layer.CUSTOMER && aDraftFilenames) {
-				return oChange.getState() === Change.states.PERSISTED && aDraftFilenames.includes(oChange.getId());
+				return oChange.getState() === States.LifecycleState.PERSISTED && aDraftFilenames.includes(oChange.getId());
 			}
-			return oChange.getState() === Change.states.PERSISTED && LayerUtils.compareAgainstCurrentLayer(oChange.getLayer(), sLayer) === 0;
+			return oChange.getState() === States.LifecycleState.PERSISTED && LayerUtils.compareAgainstCurrentLayer(oChange.getLayer(), sLayer) === 0;
 		});
 		return aPersistedAndSameLayerChanges.concat(aDirtyChanges);
 	}
@@ -650,7 +641,7 @@ sap.ui.define([
 		if (aDirtyChanges.length) {
 			var aRequests = getRequests(aDirtyChanges);
 			var aStates = getStates(aDirtyChanges);
-			return aStates.length === 1 && aRequests.length === 1 && aStates[0] === Change.states.NEW;
+			return aStates.length === 1 && aRequests.length === 1 && aStates[0] === States.LifecycleState.NEW;
 		}
 		return true;
 	}
@@ -665,7 +656,7 @@ sap.ui.define([
 	 * @param {sap.ui.core.UIComponent} [oAppComponent] - AppComponent instance
 	 * @param {boolean} [bSkipUpdateCache] - If true, then the dirty change shall be saved for the new created app variant, but not for the current app;
 	 * therefore, the cache update of the current app is skipped because the dirty change is not saved for the running app.
-	 * @param {sap.ui.fl.Change} [aChanges] - If passed only those changes are saved
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} [aChanges] - If passed only those changes are saved
 	 * @param {string} sParentVersion - Parent version
 	 * @param {string[]} [aDraftFilenames] - Filenames from persisted changes draft version
 	 * @param {boolean} [bCondenseAnyLayer] - This will enable condensing regardless of the current layer
@@ -728,7 +719,7 @@ sap.ui.define([
 	 * to ensure the correct order, the methods are called sequentially;
 	 * after a change was saved successfully, it is removed from the dirty changes and the cache is updated.
 	 *
-	 * @param {sap.ui.fl.Change[]} aDirtyChanges - Array of dirty changes to be saved
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aDirtyChanges - Array of dirty changes to be saved
 	 * @param {boolean} [bSkipUpdateCache] If true, then the dirty change shall be saved for the new created app variant, but not for the current app;
 	 * therefore, the cache update of the current app is skipped because the dirty change is not saved for the running app.
 	 * @param {string} [sParentVersion] - Indicates if changes should be written as a draft and on which version the changes should be based on
@@ -740,7 +731,7 @@ sap.ui.define([
 			// in case of changes saved for a draft only the first writing operation must have the parentVersion targeting the basis
 			// followup changes must point the the existing draft created with the first request
 			var aNewChanges = aDirtyChanges.filter(function (oChange) {
-				return oChange.getState() === Change.states.NEW;
+				return oChange.getState() === States.LifecycleState.NEW;
 			});
 			oFirstNewChange = [].concat(aNewChanges).shift();
 		}
@@ -754,7 +745,7 @@ sap.ui.define([
 
 	function performSingleSaveAction(oDirtyChange, oFirstChange, sParentVersion) {
 		switch (oDirtyChange.getState()) {
-			case Change.states.NEW:
+			case States.LifecycleState.NEW:
 				if (sParentVersion !== undefined) {
 					sParentVersion = oDirtyChange === oFirstChange ? sParentVersion : Version.Number.Draft;
 				}
@@ -764,7 +755,7 @@ sap.ui.define([
 					transport: oDirtyChange.getRequest(),
 					parentVersion: sParentVersion
 				});
-			case Change.states.DELETED:
+			case States.LifecycleState.DELETED:
 				return Storage.remove({
 					flexObject: oDirtyChange.convertToFileContent(),
 					layer: oDirtyChange.getLayer(),
@@ -777,7 +768,7 @@ sap.ui.define([
 
 	/**
 	 * Updates the cache with the dirty change passed and removes it from the array of dirty changes if present.
-	 * @param {sap.ui.fl.Change} oDirtyChange Dirty change which was saved
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oDirtyChange Dirty change which was saved
 	 * @param {boolean} [bSkipUpdateCache] If true, then the dirty change shall be saved for the new created app variant, but not for the current app
 	 * therefore, the cache update of the current app is skipped
 	 */
@@ -794,15 +785,15 @@ sap.ui.define([
 				});
 			} else {
 				switch (oDirtyChange.getState()) {
-					case Change.states.NEW:
-						oDirtyChange.setState(Change.states.PERSISTED);
+					case States.LifecycleState.NEW:
+						oDirtyChange.setState(States.LifecycleState.PERSISTED);
 						Cache.addChange(this._mComponent, oDirtyChange.convertToFileContent());
 						break;
-					case Change.states.DELETED:
+					case States.LifecycleState.DELETED:
 						Cache.deleteChange(this._mComponent, oDirtyChange.convertToFileContent());
 						break;
-					case Change.states.DIRTY:
-						oDirtyChange.setState(Change.states.PERSISTED);
+					case States.LifecycleState.DIRTY:
+						oDirtyChange.setState(States.LifecycleState.PERSISTED);
 						Cache.updateChange(this._mComponent, oDirtyChange.convertToFileContent());
 						break;
 				}
@@ -811,7 +802,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * @param {sap.ui.fl.Change[]} aDirtyChanges - Array of dirty changes
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aDirtyChanges - Array of dirty changes
 	 * @param {boolean} [bSkipUpdateCache]-  If <code>true</code>, then the dirty change shall be saved for the newly created app variant, but not for the current app;
 	 * therefore, the cache update of the current app is skipped because the dirty change is not saved for the running app.
 	 */
@@ -871,14 +862,14 @@ sap.ui.define([
 	 *
 	 * Otherwise it will be marked for deletion.
 	 *
-	 * @param {sap.ui.fl.Change} oChange the change to be deleted
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange the change to be deleted
 	 * @param {boolean} [bRunTimeCreatedChange] set if the change was created at runtime
 	 */
 	ChangePersistence.prototype.deleteChange = function(oChange, bRunTimeCreatedChange) {
 		var nIndexInDirtyChanges = this._aDirtyChanges.indexOf(oChange);
 
 		if (nIndexInDirtyChanges > -1) {
-			if (oChange.getState() === Change.states.DELETED) {
+			if (oChange.getState() === States.LifecycleState.DELETED) {
 				return;
 			}
 			this._aDirtyChanges.splice(nIndexInDirtyChanges, 1);
@@ -903,7 +894,7 @@ sap.ui.define([
 	/**
 	 * Deletes a change object from the internal map.
 	 *
-	 * @param {sap.ui.fl.Change} oChange change which has to be removed from the mapping
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange change which has to be removed from the mapping
 	 * @param {boolean} [bRunTimeCreatedChange] set if the change was created at runtime
 	 * @private
 	 */
@@ -918,7 +909,7 @@ sap.ui.define([
 	}
 
 	function isPersistedAndInLayer(sLayer, oObject) {
-		return oObject.getState() === Change.states.PERSISTED && oObject.getLayer() === sLayer;
+		return oObject.getState() === States.LifecycleState.PERSISTED && oObject.getLayer() === sLayer;
 	}
 
 	function getAllCompVariantsEntities() {
@@ -964,7 +955,7 @@ sap.ui.define([
 	 * Collect changes from the internal map by names
 	 *
 	 * @param {string[]} aNames Names of changes
-	 * @returns {sap.ui.fl.Change[]} aChanges Array of changes with corresponding names
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aChanges Array of changes with corresponding names
 	 * @private
 	 */
 	ChangePersistence.prototype._getChangesFromMapByNames = function(aNames) {

package/src/sap/ui/fl/ChangePersistenceFactory.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.ChangePersistenceFactory
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/FakeLrepConnectorLocalStorage.js

@@ -20,7 +20,7 @@ function(
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 *
 	 * @private
 	 * @since 1.48

package/src/sap/ui/fl/FakeLrepConnectorSessionStorage.js

@@ -20,7 +20,7 @@ function(
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 *
 	 * @private
 	 * @since 1.58

package/src/sap/ui/fl/FakeLrepLocalStorage.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 *
 	 * @private
 	 * @since 1.48

package/src/sap/ui/fl/FlexController.js

@@ -8,12 +8,14 @@ sap.ui.define([
 	"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage",
 	"sap/ui/fl/Utils",
 	"sap/ui/fl/Layer",
-	"sap/ui/fl/Change",
 	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/write/_internal/Versions",
 	"sap/ui/fl/apply/_internal/changes/Applier",
 	"sap/ui/fl/apply/_internal/changes/Reverter",
 	"sap/ui/fl/apply/_internal/controlVariants/URLHandler",
+	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
+	"sap/ui/fl/apply/_internal/flexObjects/States",
+	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/core/util/reflection/XmlTreeModifier",
 	"sap/ui/core/Component",
@@ -22,12 +24,14 @@ sap.ui.define([
 	ChangeHandlerStorage,
 	Utils,
 	Layer,
-	Change,
 	ChangePersistenceFactory,
 	Versions,
 	Applier,
 	Reverter,
 	URLHandler,
+	FlexObjectFactory,
+	States,
+	ControlVariantApplyAPI,
 	JsControlTreeModifier,
 	XmlTreeModifier,
 	Component,
@@ -50,7 +54,7 @@ sap.ui.define([
 			}.bind(this))
 			.then(function () {
 				if (oComponent) {
-					var oModel = oComponent.getModel(Utils.VARIANT_MODEL_NAME);
+					var oModel = oComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
 					if (oModel) {
 						aChanges.forEach(function (oChange) {
 							var sVariantReference = oChange.getVariantReference();
@@ -84,7 +88,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexController
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 */
 	var FlexController = function(sComponentName) {
 		this._oChangePersistence = undefined;
@@ -128,16 +132,13 @@ sap.ui.define([
 	/**
 	 * Base function for creation of a change
 	 *
-	 * @param {object} oChangeSpecificData - Property bag (nvp) holding the change information (see sap.ui.fl.Change#createInitialFileContent)
+	 * @param {object} oChangeSpecificData - Property bag holding the change information
 	 * The property "oPropertyBag.packageName" is set to $TMP and internally since flex changes are always local when they are created.
 	 * @param {sap.ui.core.Component} oAppComponent - Application Component of the control at runtime in case a map has been used
-	 * @returns {sap.ui.fl.Change} the created change
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject} the created change
 	 * @public
 	 */
 	FlexController.prototype.createBaseChange = function(oChangeSpecificData, oAppComponent) {
-		var oChangeFileContent;
-		var oChange;
-
 		if (!oAppComponent) {
 			throw new Error("No application component found. To offer flexibility a valid relation to its owning component must be present.");
 		}
@@ -145,8 +146,7 @@ sap.ui.define([
 		oChangeSpecificData.reference = this.getComponentName(); //in this case the component name can also be the value of sap-app-id
 		oChangeSpecificData.packageName = "$TMP"; // first a flex change is always local, until all changes of a component are made transportable
 
-		oChangeFileContent = Change.createInitialFileContent(oChangeSpecificData);
-		oChange = new Change(oChangeFileContent);
+		var oChange = FlexObjectFactory.createUIChange(oChangeSpecificData);
 
 		if (oChangeSpecificData.variantReference) {
 			oChange.setVariantReference(oChangeSpecificData.variantReference);
@@ -174,7 +174,7 @@ sap.ui.define([
 			})
 			.then(function () {
 				// completeChangeContent changes the content and might make it dirty
-				oChange.setState(Change.states.NEW);
+				oChange.setState(States.LifecycleState.NEW);
 				return oChange;
 			})
 			.catch(function(oError) {
@@ -185,12 +185,12 @@ sap.ui.define([
 	/**
 	 * Create a change with an ExtensionPoint as selector.
 	 *
-	 * @param {object} oChangeSpecificData - Property bag (nvp) holding the change information (see sap.ui.fl.Change#createInitialFileContent)
+	 * @param {object} oChangeSpecificData - Property bag (nvp) holding the change information
 	 * The property "oPropertyBag.packageName" is set to $TMP and internally since flex changes are always local when they are created.
 	 * @param {object} mExtensionPointReference - Reference map for extension point
 	 * @param {string} mExtensionPointReference.name - Name of the extension point
 	 * @param {sap.ui.core.Component} mExtensionPointReference.view - View including the extension point
-	 * @returns {Promise.<sap.ui.fl.Change>} Created change wrapped in a promise
+	 * @returns {Promise.<sap.ui.fl.apply._internal.flexObjects.FlexObject>} Created change wrapped in a promise
 	 * @public
 
 	 */
@@ -216,13 +216,13 @@ sap.ui.define([
 	/**
 	 * Create a change
 	 *
-	 * @param {object} oChangeSpecificData - Property bag (nvp) holding the change information (see sap.ui.fl.Change#createInitialFileContent)
+	 * @param {object} oChangeSpecificData - Property bag (nvp) holding the change information
 	 * The property "oPropertyBag.packageName" is set to $TMP and internally since flex changes are always local when they are created.
 	 * @param {sap.ui.core.Control | map} oControl - Control for which the change will be added
 	 * @param {string} oControl.id - ID of the control in case a map has been used to specify the control
 	 * @param {sap.ui.core.Component} [oControl.appComponent] - Application component of the control at runtime in case a map has been used
 	 * @param {string} oControl.controlType - Control type of the control in case a map has been used
-	 * @returns {Promise.<sap.ui.fl.Change>} Created change wrapped in a promise
+	 * @returns {Promise.<sap.ui.fl.apply._internal.flexObjects.FlexObject>} Created change wrapped in a promise
 	 * @public
 	 */
 	FlexController.prototype.createChangeWithControlSelector = function(oChangeSpecificData, oControl) {
@@ -257,10 +257,10 @@ sap.ui.define([
 	/**
 	 * Adds a change to the flex persistence (not yet saved). Will be saved with #saveAll.
 	 *
-	 * @param {object} oChangeSpecificData property bag (nvp) holding the change information (see sap.ui.fl.Change#createInitialFileContent
+	 * @param {object} oChangeSpecificData property bag (nvp) holding the change information
 	 * The property "oPropertyBag.packageName" is set to $TMP internally since flex changes are always local when they are created.
 	 * @param {sap.ui.core.Control} oControl control for which the change will be added
-	 * @returns {Promise.<sap.ui.fl.Change>} the created change
+	 * @returns {Promise.<sap.ui.fl.apply._internal.flexObjects.FlexObject>} the created change
 	 * @public
 	 */
 	FlexController.prototype.addChange = function(oChangeSpecificData, oControl) {
@@ -285,16 +285,16 @@ sap.ui.define([
 	 * createChange again, but expects a fully computed and appliable change.
 	 * Will be saved with #saveAll.
 	 *
-	 * @param {object} oChange property bag (nvp) holding the change information (see sap.ui.fl.Change#createInitialFileContent
+	 * @param {object} oChange property bag (nvp) holding the change information
 	 * The property "oPropertyBag.packageName" is set to $TMP internally since flex changes are always local when they are created.
 	 * @param {sap.ui.core.Component} oAppComponent - Application component
-	 * @returns {sap.ui.fl.Change} the created change
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject} the created change
 	 * @public
 	 */
 	FlexController.prototype.addPreparedChange = function(oChange, oAppComponent) {
 		if (oChange.getVariantReference()) {
 			// variant model is always associated with the app component
-			var oModel = oAppComponent.getModel(Utils.VARIANT_MODEL_NAME);
+			var oModel = oAppComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
 			oModel.addChange(oChange);
 		}
 
@@ -313,13 +313,13 @@ sap.ui.define([
 	 *
 	 * Otherwise it will be marked for deletion.
 	 *
-	 * @param {sap.ui.fl.Change} oChange - the change to be deleted
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - the change to be deleted
 	 * @param {sap.ui.core.Component} oAppComponent - Application component instance
 	 */
 	FlexController.prototype.deleteChange = function(oChange, oAppComponent) {
 		this._oChangePersistence.deleteChange(oChange);
 		if (oChange.getVariantReference()) {
-			oAppComponent.getModel(Utils.VARIANT_MODEL_NAME).removeChange(oChange);
+			oAppComponent.getModel(ControlVariantApplyAPI.getVariantModelName()).removeChange(oChange);
 		}
 	};
 
@@ -533,7 +533,7 @@ sap.ui.define([
 	 * @param {object} [mPropertyBag.appDescriptor] Manifest that belongs to the current running component
 	 * @param {string} [mPropertyBag.siteId] ID of the site belonging to the current running component
 	 * @param {boolean} bInvalidateCache - (optional) should the cache be invalidated
-	 * @returns {Promise} Promise resolves with a map of all {sap.ui.fl.Change} having the changeId as key
+	 * @returns {Promise} Promise resolves with a map of all {sap.ui.fl.apply._internal.flexObjects.FlexObject} having the changeId as key
 	 * @public
 	 */
 	FlexController.prototype.getComponentChanges = function(mPropertyBag, bInvalidateCache) {
@@ -545,7 +545,7 @@ sap.ui.define([
 	 *
 	 * @param {object} oSelector selector of the control
 	 * @param {sap.ui.core.Component} oComponent - component instance that is currently loading
-	 * @returns {sap.ui.fl.Change[]} Array of all open dependent changes for the control
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Array of all open dependent changes for the control
 	 */
 	FlexController.prototype.getOpenDependentChangesForControl = function(oSelector, oComponent) {
 		return this._oChangePersistence.getOpenDependentChangesForControl(oSelector, oComponent);
@@ -616,7 +616,7 @@ sap.ui.define([
 	 * Saves changes sequentially on the associated change persistence instance;
 	 * This API must be only used in scnarios without draft (like personalization).
 	 *
-	 * @param {sap.ui.fl.Change[]} aDirtyChanges Array of dirty changes to be saved
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aDirtyChanges Array of dirty changes to be saved
 	 * @param {sap.ui.core.UIComponent} [oAppComponent] - AppComponent instance
 	 * @returns {Promise} A Promise which resolves when all changes have been saved
 	 * @public