@openui5/sap.ui.core 1.119.1 → 1.120.1

package/src/ui5loader-autoconfig.js

@@ -89,6 +89,9 @@
 		return oResult || {};
 	}
 
+	/**
+	 * @deprecated As of Version 1.120
+	 */
 	function _createGlobalConfig() {
 		var sCfgFile = "sap-ui-config.json",
 			url = globalThis["sap-ui-config"];
@@ -121,6 +124,7 @@
 					});
 
 					xhr.send(null);
+					globalThis["sap-ui-config"].__loaded = true;
 
 				} catch (error) {
 					ui5loader._.logger.error("Loading externalized bootstrap configuration from \"" + url + "\" failed! Reason: " + error + "!");
@@ -152,6 +156,9 @@
 		}
 	}
 
+	/**
+	 * @deprecated As of Version 1.120
+	 */
 	_createGlobalConfig();
 
 	define("sap/base/config/GlobalConfigurationProvider", [
@@ -166,6 +173,7 @@
 
 		function createConfig() {
 			oConfig = Object.create(null);
+			globalThis["sap-ui-config"] ??= {};
 			var mOriginalGlobalParams = {};
 			var oGlobalConfig = globalThis["sap-ui-config"];
 			if (typeof oGlobalConfig === "object")  {
@@ -229,7 +237,15 @@
 			get: get,
 			set: set,
 			freeze: freeze,
-			setConfiguration: setConfiguration
+			setConfiguration: setConfiguration,
+			/**
+			 * @deprecated As of Version 1.120
+			 */
+			_: {
+				configLoaded() {
+					return !!globalThis["sap-ui-config"].__loaded;
+				}
+			}
 		};
 
 		createConfig();
@@ -290,14 +306,17 @@
 			var sLocation = globalThis.location.search;
 			var urlParams = new URLSearchParams(sLocation);
 			urlParams.forEach(function(value, key) {
+				const bSapParam = /sap\-?([Uu]?i\-?)?/.test(key);
 				var sNormalizedKey = camelize(key);
-				if (!sNormalizedKey) {
+				if (sNormalizedKey) {
+					if (Object.hasOwn(oConfig, sNormalizedKey)) {
+						ui5loader._.logger.error("Configuration option '" + key + "' was already set by '" + mOriginalUrlParams[sNormalizedKey] + "' and will be ignored!");
+					} else {
+						oConfig[sNormalizedKey] = value;
+						mOriginalUrlParams[sNormalizedKey] = key;
+					}
+				} else if (bSapParam) {
 					ui5loader._.logger.error("Invalid configuration option '" + key + "' in url!");
-				} else if (Object.hasOwn(oConfig, sNormalizedKey)) {
-					ui5loader._.logger.error("Configuration option '" + key + "' was already set by '" + mOriginalUrlParams[sNormalizedKey] + "' and will be ignored!");
-				} else {
-					oConfig[sNormalizedKey] = value;
-					mOriginalUrlParams[sNormalizedKey] = key;
 				}
 			});
 			mOriginalUrlParams = undefined;
@@ -326,6 +345,7 @@
 			var allMetaTags = globalThis.document.querySelectorAll("meta");
 			allMetaTags.forEach(function(tag) {
 				var sNormalizedKey = camelize(tag.name);
+				const bSapParam = /sap\-?([Uu]?i\-?)?/.test(tag.name);
 				if (sNormalizedKey) {
 					if (Object.hasOwn(oConfig, sNormalizedKey)) {
 						ui5loader._.logger.error("Configuration option '" + tag.name + "' was already set by '" + mOriginalTagNames[sNormalizedKey] + "' and will be ignored!");
@@ -333,7 +353,7 @@
 						oConfig[sNormalizedKey] = tag.content;
 						mOriginalTagNames[sNormalizedKey] = tag.name;
 					}
-				} else if (tag.name) { // tags without explicit name (tag.name === "") are ignored silently
+				} else if (tag.name && bSapParam) { // tags without explicit name (tag.name === "") are ignored silently
 					ui5loader._.logger.error("Invalid configuration option '" + tag.name + "' in meta tag!");
 				}
 			});
@@ -374,41 +394,61 @@
 		};
 
 		/**
+		 * Enum for available types of configuration entries.
+		 *
 		 * @enum {string}
 		 * @alias module:sap/base/config.Type
 		 * @private
+		 * @ui5-restricted sap.ui.core, sap.fl, sap.ui.intergration, sap.ui.export
 		 */
 		var TypeEnum = {
 			/**
 			 * defaultValue: false
+			 * @private
+			 * @ui5-restricted sap.ui.core, sap.fl, sap.ui.intergration, sap.ui.export
 			 */
 			"Boolean": "boolean",
 			/**
 			 * defaultValue: undefined
+			 * @private
+			 * @ui5-restricted sap.ui.core, sap.fl, sap.ui.intergration, sap.ui.export
+			 * @deprecated As of Version 1.120
 			 */
 			"Code": "code",
 			/**
 			 * defaultValue: 0
+			 * @private
+			 * @ui5-restricted sap.ui.core, sap.fl, sap.ui.intergration, sap.ui.export
 			 */
 			"Integer": "integer",
 			/**
 			 * defaultValue: ""
+			 * @private
+			 * @ui5-restricted sap.ui.core, sap.fl, sap.ui.intergration, sap.ui.export
 			 */
 			"String": "string",
 			/**
 			 * defaultValue: []
+			 * @private
+			 * @ui5-restricted sap.ui.core, sap.fl, sap.ui.intergration, sap.ui.export
 			 */
 			"StringArray": "string[]",
 			/**
 			 * defaultValue: []
+			 * @private
+			 * @ui5-restricted sap.ui.core, sap.fl, sap.ui.intergration, sap.ui.export
 			 */
 			"FunctionArray": "function[]",
 			/**
 			 * defaultValue: undefined
+			 * @private
+			 * @ui5-restricted sap.ui.core, sap.fl, sap.ui.intergration, sap.ui.export
 			 */
 			"Function": "function",
 			/**
 			 * defaultValue: {}
+			 * @private
+			 * @ui5-restricted sap.ui.core, sap.fl, sap.ui.intergration, sap.ui.export
 			 */
 			"Object":  "object"
 		};
@@ -492,6 +532,9 @@
 							vValue = !!vValue;
 						}
 						break;
+					/**
+					 * @deprecated As of Version 1.120
+					 */
 					case TypeEnum.Code:
 						vValue = typeof vValue === "function" ? vValue : String(vValue);
 						break;
@@ -592,7 +635,7 @@
 		 * @returns {any} Value of the configuration parameter
 		 * @throws {TypeError} Throws an error if the given parameter name does not match the definition.
 		 * @private
-		 * @ui5-restricted sap.ui.core.Core, jquery.sap.global
+		 * @ui5-restricted sap.ui.core, sap.fl, sap.ui.intergration, sap.ui.export
 		 */
 		function get(mOptions) {
 			if (typeof mOptions.name !== "string" || !rValidKey.test(mOptions.name)) {
@@ -746,8 +789,7 @@
 	// configuration via window['sap-ui-config'] always overrides an auto detected base URL
 	var mResourceRoots = BaseConfig.get({
 		name: "sapUiResourceRoots",
-		type: BaseConfig.Type.Object,
-		freeze: true
+		type: BaseConfig.Type.Object
 	});
 	if (typeof mResourceRoots[''] === 'string' ) {
 		sBaseUrl = mResourceRoots[''];
@@ -950,6 +992,35 @@
 		freeze: true
 	});
 
+	//calculate syncCallBehavior
+	let syncCallBehavior = 0; // ignore
+	const sNoSync = BaseConfig.get({
+		name: "sapUiXxNoSync",
+		type: BaseConfig.Type.String,
+		external: true,
+		freeze: true
+	});
+	if (sNoSync === 'warn') {
+		syncCallBehavior = 1;
+	} else if (/^(true|x)$/i.test(sNoSync)) {
+		syncCallBehavior = 2;
+	}
+
+	/**
+	 * @deprectaed As of Version 1.120
+	 */
+	(() => {
+		const GlobalConfigurationProvider = sap.ui.require("sap/base/config/GlobalConfigurationProvider");
+		if ( syncCallBehavior && GlobalConfigurationProvider._.configLoaded()) {
+			const sMessage = "[nosync]: configuration loaded via sync XHR";
+			if (syncCallBehavior === 1) {
+				ui5loader._.logger.warning(sMessage);
+			} else {
+				ui5loader._.logger.error(sMessage);
+			}
+		}
+	})();
+
 	ui5loader.config({
 		baseUrl: sBaseUrl,
 
@@ -977,6 +1048,8 @@
 			}
 		},
 
+		reportSyncCalls: syncCallBehavior,
+
 		shim: {
 			'sap/ui/thirdparty/bignumber': {
 				amd: true,

package/test/sap/ui/core/demokit/sample/MessageManager/ODataBackendMessagesComp/manifest.json

@@ -1,17 +1,9 @@
 {
 	"sap.app": {
-		"id": "sap.ui.core.sample.MessageManager.ODataBackendMessagesComp",
-		"applicationVersion": {
-			"version": "1.0.0"
-		}
+		"id": "sap.ui.core.sample.MessageManager.ODataBackendMessagesComp"
 	},
 	"sap.ui5": {
 		"config": {
-			"dependencies": {
-				"libs": [
-					"sap.m"
-				]
-			},
 			"sample": {
 				"iframe": "webapp/index.html",
 				"stretch": true,
@@ -34,7 +26,8 @@
 					"webapp/Component.js",
 					"webapp/index.html",
 					"webapp/manifest.json",
-					"manifest.json"
+					"ui5.yaml",
+					"package.json"
 				]
 			}
 		}

package/test/sap/ui/core/demokit/sample/MessageManager/ODataBackendMessagesComp/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "sap.ui.core.sample.messagemanager.odatabackendmessagescomp",
+  "version": "1.0.0",
+  "private": true,
+  "author": "SAP SE",
+  "scripts": {
+    "start": "ui5 serve",
+    "build": "ui5 build"
+  },
+  "devDependencies": {
+    "@ui5/cli": "^3"
+  }
+}

package/test/sap/ui/core/demokit/sample/MessageManager/ODataBackendMessagesComp/ui5.yaml

@@ -0,0 +1,11 @@
+specVersion: "3.0"
+metadata:
+  name: sap.ui.core.sample.messagemanager.odatabackendmessagescomp
+type: application
+framework:
+  name: OpenUI5
+  version: "1.120.1" #MainVersion#
+  libraries:
+    - name: sap.m
+    - name: sap.ui.core
+    - name: themelib_sap_horizon

package/test/sap/ui/core/demokit/sample/RoutingNestedComponent/localService/mockserver.js

@@ -1,9 +1,8 @@
 sap.ui.define([
 	"sap/ui/core/util/MockServer",
 	"sap/ui/model/json/JSONModel",
-	"sap/base/Log",
-	"sap/base/util/UriParameters"
-], function (MockServer, JSONModel, Log, UriParameters) {
+	"sap/base/Log"
+], function (MockServer, JSONModel, Log) {
 	"use strict";
 
 	var oMockServer,
@@ -28,7 +27,7 @@ sap.ui.define([
 					oManifestModel = new JSONModel(sManifestUrl);
 
 				oManifestModel.attachRequestCompleted(function () {
-					var oUriParameters = UriParameters.fromQuery(window.location.search),
+					var oUriParameters = new URLSearchParams(window.location.search),
 						// parse manifest for local metadata URI
 						sJsonFilesUrl = sap.ui.require.toUrl(_sJsonFilesPath),
 						oMainDataSource = oManifestModel.getProperty("/sap.app/dataSources/mainService"),

package/test/sap/ui/core/demokit/sample/ViewTemplate/scenario/ChartAnnotation.fragment.xml

@@ -4,28 +4,28 @@
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1">
 	<template:with path="entityType>com.sap.vocabularies.UI.v1.Chart#Dimensions" var="chart">
 		<template:if test="{chart>}">
-			<Table headerText="{path: 'chart>Title', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"
+			<Table headerText="{path: 'chart>Title', formatter: 'AH.format'}"
 				items="{:= '{path:\'/' + ${meta>name} + '\', length: 3}' }">
 				<columns>
 					<Column>
-						<template:with path="chart>Dimensions/0" helper="sap.ui.model.odata.AnnotationHelper.resolvePath" var="idcolumn">
-							<Text text="{path: 'idcolumn>com.sap.vocabularies.Common.v1.Label', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"/>
+						<template:with path="chart>Dimensions/0" helper="AH.resolvePath" var="idcolumn">
+							<Text text="{path: 'idcolumn>com.sap.vocabularies.Common.v1.Label', formatter: 'AH.format'}"/>
 						</template:with>
 					</Column>
 					<template:repeat list="{chart>Measures}" var="column">
 						<Column>
 							<template:with path="column>"
-								helper="sap.ui.model.odata.AnnotationHelper.resolvePath"
+								helper="AH.resolvePath"
 								var="property">
-								<Text text="{path: 'property>com.sap.vocabularies.Common.v1.Label', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"/>
+								<Text text="{path: 'property>com.sap.vocabularies.Common.v1.Label', formatter: 'AH.format'}"/>
 							</template:with>
 						</Column>
 					</template:repeat>
 				</columns>
 				<ColumnListItem>
-					<Text text="{path: 'chart>Dimensions/0', formatter: 'sap.ui.model.odata.AnnotationHelper.simplePath'}" />
+					<Text text="{path: 'chart>Dimensions/0', formatter: 'AH.simplePath'}" />
 					<template:repeat list="{chart>Measures}" var="column">
-						<Text text="{path: 'column>', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}" />
+						<Text text="{path: 'column>', formatter: 'AH.format'}" />
 					</template:repeat>
 				</ColumnListItem>
 			</Table>

package/test/sap/ui/core/demokit/sample/ViewTemplate/scenario/Component.js

@@ -8,7 +8,6 @@
  * @version @version@
  */
 sap.ui.define([
-	"sap/base/util/UriParameters",
 	"sap/ui/core/mvc/XMLView",
 	"sap/ui/core/sample/common/Component",
 	"sap/ui/core/util/MockServer",
@@ -16,7 +15,7 @@ sap.ui.define([
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/model/odata/ODataModel",
 	"sap/ui/model/odata/v2/ODataModel"
-], function (UriParameters, XMLView, BaseComponent, MockServer, XMLPreprocessor, JSONModel,
+], function (XMLView, BaseComponent, MockServer, XMLPreprocessor, JSONModel,
 		ODataModel, ODataModel2) {
 	"use strict";
 
@@ -78,7 +77,7 @@ sap.ui.define([
 					= "test-resources/sap/ui/core/demokit/sample/ViewTemplate/scenario/data/",
 				oModel,
 				sServiceUri,
-				oUriParameters = UriParameters.fromQuery(window.location.search),
+				oUriParameters = new URLSearchParams(window.location.search),
 				bRealOData = oUriParameters.get("realOData") === "true",
 				fnModel = oUriParameters.get("oldOData") === "true" ? ODataModel : ODataModel2;
 

package/test/sap/ui/core/demokit/sample/ViewTemplate/scenario/Detail.view.xml

@@ -1,6 +1,7 @@
 <mvc:View
 	controllerName="sap.ui.core.sample.ViewTemplate.scenario.Detail"
-	template:require="sap.ui.core.sample.ViewTemplate.scenario.Helper"
+	template:require="{AH: 'sap/ui/model/odata/AnnotationHelper',
+		Helper: 'sap/ui/core/sample/ViewTemplate/scenario/Helper'}"
 	xmlns="sap.m"
 	xmlns:core="sap.ui.core"
 	xmlns:layout="sap.ui.layout"
@@ -9,11 +10,10 @@
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1">
 	<layout:VerticalLayout class="sapUiSmallMarginBottom">
 		<!-- Note: "meta>" MUST point to an entity set! -->
-		<template:alias name=".AH" value="sap.ui.model.odata.AnnotationHelper">
-		<template:alias name=".formatParts" value="sap.ui.core.sample.ViewTemplate.scenario.Helper.formatParts">
-		<template:alias name=".id" value="sap.ui.core.sample.ViewTemplate.scenario.Helper.id">
+		<template:alias name=".formatParts" value="Helper.formatParts">
+		<template:alias name=".id" value="Helper.id">
 			<template:with path="meta>/" var="fieldGroup"><!-- default value needed for IDs -->
-			<template:with path="meta>entityType" helper=".AH.gotoEntityType" var="entityType">
+			<template:with path="meta>entityType" helper="AH.gotoEntityType" var="entityType">
 
 				<template:if test="{entityType>com.sap.vocabularies.UI.v1.LineItem}">
 					<!-- Note: this limits the data shown to 5 rows! -->
@@ -32,11 +32,11 @@
 					<scenario:Form title="HeaderInfo">
 						<template:with path="entityType>com.sap.vocabularies.UI.v1.HeaderInfo">
 							<!-- Note: composite bindings instead of separate labels for testing only! -->
-							<Text text="[Type Name] {path: 'entityType>TypeName', formatter: '.AH.format'}"/>
-							<!-- Text text="[{path: 'entityType>Title/Label', formatter: '.AH.format'}] {path: 'entityType>Title/Value', formatter: '.AH.format'}" / -->
+							<Text text="[Type Name] {path: 'entityType>TypeName', formatter: 'AH.format'}"/>
+							<!-- Text text="[{path: 'entityType>Title/Label', formatter: 'AH.format'}] {path: 'entityType>Title/Value', formatter: 'AH.format'}" / -->
 							<Text text="{parts: [{path: 'entityType>Title/Label'}, {path: 'entityType>Title/Value'}], formatter: '.formatParts'}"/>
 							<template:if test="{entityType>Description}"> <!-- HeaderInfo Description is Nullable -->
-								<Text text="[{path: 'entityType>Description/Label', formatter: '.AH.format'}] {path: 'entityType>Description/Value', formatter: '.AH.format'}"/>
+								<Text text="[{path: 'entityType>Description/Label', formatter: 'AH.format'}] {path: 'entityType>Description/Value', formatter: 'AH.format'}"/>
 							</template:if>
 						</template:with>
 					</scenario:Form>
@@ -45,7 +45,7 @@
 				<core:Fragment fragmentName="sap.ui.core.sample.ViewTemplate.scenario.Identification" type="XML"/>
 
 				<template:repeat list="{path:'entityType>', filters: {path: '@sapui.name', operator: 'StartsWith', value1: 'com.sap.vocabularies.UI.v1.FieldGroup'}}" var="fieldGroup">
-					<scenario:Form title="{path: 'fieldGroup>Label', formatter: '.AH.format'}">
+					<scenario:Form title="{path: 'fieldGroup>Label', formatter: 'AH.format'}">
 						<template:repeat list="{fieldGroup>Data}" var="field">
 							<core:Fragment fragmentName="sap.ui.core.sample.ViewTemplate.scenario.LabeledField" type="XML"/>
 						</template:repeat>
@@ -61,16 +61,15 @@
 
 			<template:with path="meta>com.sap.vocabularies.UI.v1.DataPoint" var="dataPoint">
 				<template:if test="{dataPoint>}">
-					<scenario:Form title="DataPoint@EntitySet - {path: 'dataPoint>Title', formatter: '.AH.format'}">
+					<scenario:Form title="DataPoint@EntitySet - {path: 'dataPoint>Title', formatter: 'AH.format'}">
 						<Label labelFor="dataPoint"
-							text="{path: 'dataPoint>Description', formatter: '.AH.format'}"/>
-						<Text id="dataPoint" text="{path: 'dataPoint>Value', formatter: '.AH.format'}"/>
+							text="{path: 'dataPoint>Description', formatter: 'AH.format'}"/>
+						<Text id="dataPoint" text="{path: 'dataPoint>Value', formatter: 'AH.format'}"/>
 					</scenario:Form>
 				</template:if>
 			</template:with>
 			</template:with>
 		</template:alias>
 		</template:alias>
-		</template:alias>
 	</layout:VerticalLayout>
 </mvc:View>

package/test/sap/ui/core/demokit/sample/ViewTemplate/scenario/Facets.fragment.xml

@@ -3,22 +3,22 @@
 	xmlns:core="sap.ui.core"
 	xmlns:scenario="sap.ui.core.sample.ViewTemplate.scenario"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1">
-	<template:repeat list="{facets>}" var="facet">
+<template:repeat list="{facets>}" var="facet">
 		<template:if test="{= ${facet>RecordType} === 'com.sap.vocabularies.UI.v1.CollectionFacet'}">
 			<template:then>
-				<Panel expandable="true" expanded="true" headerText="{path: 'facet>Label', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}">
+				<Panel expandable="true" expanded="true" headerText="{path: 'facet>Label', formatter: 'AH.format'}">
 					<template:with path="facet>Facets" var="facets">
 						<core:Fragment fragmentName="sap.ui.core.sample.ViewTemplate.scenario.Facets" type="XML"/>
 					</template:with>
 				</Panel>
 			</template:then>
 			<template:elseif test="{= ${facet>RecordType} === 'com.sap.vocabularies.UI.v1.ReferenceFacet'}">
-				<core:Fragment fragmentName="{= ${path: 'facet>Target', formatter: 'sap.ui.model.odata.AnnotationHelper.isMultiple'} === 'true'
+				<core:Fragment fragmentName="{= ${path: 'facet>Target', formatter: 'AH.isMultiple'} === 'true'
 					? 'sap.ui.core.sample.ViewTemplate.scenario.TableFacet'
 					: 'sap.ui.core.sample.ViewTemplate.scenario.FormFacet' }" type="XML"/>
 			</template:elseif>
 			<template:else>
-				<scenario:Form title="{path: 'facet>Label', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}">
+				<scenario:Form title="{path: 'facet>Label', formatter: 'AH.format'}">
 					<Label labelFor="{path: 'facet>', formatter: '.id'}"
 						text="Unsupported Facet Type"/>
 					<Text id="{path: 'facet>', formatter: '.id'}" text="{facet>RecordType}"/>

package/test/sap/ui/core/demokit/sample/ViewTemplate/scenario/Field.fragment.xml

@@ -8,13 +8,13 @@
 			<template:then>
 				<Link id="{parts: [{path: 'field>'}, {path: 'fieldGroup>'}], formatter: '.id'}"
 					target="_blank"
-					text="{path: 'field>Value', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"
-					href="{path: 'field>Url', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}" />
+					text="{path: 'field>Value', formatter: 'AH.format'}"
+					href="{path: 'field>Url', formatter: 'AH.format'}" />
 			</template:then>
 			<template:else>
 				<template:if test="{field>Value/Path}"><!-- could also be Apply etc. -->
 					<template:then>
-						<template:with path="field>Value" helper="sap.ui.model.odata.AnnotationHelper.resolvePath" var="target">
+						<template:with path="field>Value" helper="AH.resolvePath" var="target">
 							<template:if test="{target>com.sap.vocabularies.Common.v1.Text}">
 								<template:then>
 									<!--  check that IsEmailAddress annotation is available and that it has value true -->
@@ -22,14 +22,14 @@
 										<template:then>
 											<ObjectStatus id="{parts: [{path: 'field>'}, {path: 'fieldGroup>'}], formatter: '.id'}"
 												icon="sap-icon://email"
-												text="{path: 'target>com.sap.vocabularies.Common.v1.Text', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"
+												text="{path: 'target>com.sap.vocabularies.Common.v1.Text', formatter: 'AH.format'}"
 												tooltip="Email" />
 										</template:then>
 										<template:else>
 											<!--  check only the availability of the annotation IsPhoneNumber -->
 											<ObjectStatus id="{parts: [{path: 'field>'}, {path: 'fieldGroup>'}], formatter: '.id'}"
 												icon="{= ${target>com.sap.vocabularies.Communication.v1.IsPhoneNumber} ? 'sap-icon://phone' : ''}"
-												text="{path: 'target>com.sap.vocabularies.Common.v1.Text', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"
+												text="{path: 'target>com.sap.vocabularies.Common.v1.Text', formatter: 'AH.format'}"
 												tooltip="{= ${target>com.sap.vocabularies.Communication.v1.IsPhoneNumber} ? 'Phone' : ''}" />
 										</template:else>
 									</template:if>
@@ -40,14 +40,14 @@
 										<template:then>
 											<ObjectStatus id="{parts: [{path: 'field>'}, {path: 'fieldGroup>'}], formatter: '.id'}"
 												icon="sap-icon://email"
-												text="{path: 'field>Value', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"
+												text="{path: 'field>Value', formatter: 'AH.format'}"
 												tooltip="Email" />
 										</template:then>
 										<template:else>
 											<!--  check only the availability of the annotation IsPhoneNumber -->
 											<ObjectStatus id="{parts: [{path: 'field>'}, {path: 'fieldGroup>'}], formatter: '.id'}"
 												icon="{= ${target>com.sap.vocabularies.Communication.v1.IsPhoneNumber} ? 'sap-icon://phone' : ''}"
-												text="{path: 'field>Value', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"
+												text="{path: 'field>Value', formatter: 'AH.format'}"
 												tooltip="{= ${target>com.sap.vocabularies.Communication.v1.IsPhoneNumber} ? 'Phone' : ''}" />
 										</template:else>
 									</template:if>
@@ -57,7 +57,7 @@
 					</template:then>
 					<template:else>
 						<Text id="{parts: [{path: 'field>'}, {path: 'fieldGroup>'}], formatter: '.id'}"
-							text="{path: 'field>Value', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}" />
+							text="{path: 'field>Value', formatter: 'AH.format'}" />
 					</template:else>
 				</template:if>
 			</template:else>

package/test/sap/ui/core/demokit/sample/ViewTemplate/scenario/FormFacet.fragment.xml

@@ -3,12 +3,10 @@
 	xmlns:core="sap.ui.core"
 	xmlns:scenario="sap.ui.core.sample.ViewTemplate.scenario"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1">
-
-	<scenario:Form binding="{path: 'facet>Target', formatter: 'sap.ui.model.odata.AnnotationHelper.getNavigationPath'}"
-		title="{path: 'facet>Label', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}">
+	<scenario:Form binding="{path: 'facet>Target', formatter: 'AH.getNavigationPath'}"
+		title="{path: 'facet>Label', formatter: 'AH.format'}">
 		<core:ExtensionPoint name="afterTitle"/>
-
-		<template:with path="facet>Target" helper="sap.ui.model.odata.AnnotationHelper.resolvePath" var="target">
+		<template:with path="facet>Target" helper="AH.resolvePath" var="target">
 			<template:if test="{:= Array.isArray(${target>Data}) }">
 				<template:then><!-- e.g. com.sap.vocabularies.UI.v1.FieldGroup -->
 					<!-- ignore target>Label in favor of facet>Label -->

package/test/sap/ui/core/demokit/sample/ViewTemplate/scenario/LabeledField.fragment.xml

@@ -6,16 +6,16 @@
 	<template:if test="{field>Label}"><!--DataFieldAbstract Label is Nullable -->
 		<template:then>
 			<Label labelFor="{parts: [{path: 'field>'}, {path: 'fieldGroup>'}], formatter: '.id'}"
-				text="{path: 'field>Label', formatter: '.AH.format'}"/>
+				text="{path: 'field>Label', formatter: 'AH.format'}"/>
 			<template:if test="{:= !${field>Value} }">
 				<Text/><!-- needed in case label is shown, but no field -->
 			</template:if>
 		</template:then>
 		<template:elseif test="{field>Value}">
-			<template:with path="field>Value" helper="sap.ui.model.odata.AnnotationHelper.resolvePath" var="target">
+			<template:with path="field>Value" helper="AH.resolvePath" var="target">
 				<!-- Note: ID is derived from 'field>', not 'target>'! -->
 				<Label labelFor="{parts: [{path: 'field>'}, {path: 'fieldGroup>'}], formatter: '.id'}"
-					text="{path: 'target>com.sap.vocabularies.Common.v1.Label', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"/>
+					text="{path: 'target>com.sap.vocabularies.Common.v1.Label', formatter: 'AH.format'}"/>
 			</template:with>
 		</template:elseif>
 	</template:if>

package/test/sap/ui/core/demokit/sample/ViewTemplate/scenario/Table.fragment.xml

@@ -9,12 +9,12 @@
 		<template:repeat list="{target>}" var="field">
 			<template:if test="{field>Value}"><!-- duck typing for com.sap.vocabularies.UI.v1.DataField -->
 				<Column>
-					<Text text="{path: 'field>Label', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"/>
+					<Text text="{path: 'field>Label', formatter: 'AH.format'}"/>
 				</Column>
 			</template:if>
 			<template:if test="{field>Action}"><!-- duck typing for com.sap.vocabularies.UI.v1.DataFieldForAction -->
 				<Column demandPopin="true" minScreenWidth="1800px" popinDisplay="WithoutHeader">
-					<Text text="{path: 'field>Label', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"/>
+					<Text text="{path: 'field>Label', formatter: 'AH.format'}"/>
 				</Column>
 			</template:if>
 		</template:repeat>
@@ -24,12 +24,12 @@
 			<template:if test="{field>Value}"><!-- duck typing for com.sap.vocabularies.UI.v1.DataField -->
 				<template:if test="{field>Target}"><!-- duck typing for com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath -->
 					<template:then>
-						<template:with path="field>Target" helper="sap.ui.model.odata.AnnotationHelper.resolvePath" var="entityType">
-							<Link text="{path: 'field>Value', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}" press="onDetailsPressed">
+						<template:with path="field>Target" helper="AH.resolvePath" var="entityType">
+							<Link text="{path: 'field>Value', formatter: 'AH.format'}" press="onDetailsPressed">
 								<dependents>
 									<template:with path="entityType>com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
-										<Popover binding="{path: 'field>Target', formatter: 'sap.ui.model.odata.AnnotationHelper.getNavigationPath'}"
-												title="{path: 'headerInfo>Title/Value', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}">
+										<Popover binding="{path: 'field>Target', formatter: 'AH.getNavigationPath'}"
+												title="{path: 'headerInfo>Title/Value', formatter: 'AH.format'}">
 											<core:Fragment fragmentName="sap.ui.core.sample.ViewTemplate.scenario.Identification" type="XML"/>
 										</Popover>
 									</template:with>
@@ -38,20 +38,20 @@
 						</template:with>
 					</template:then>
 					<template:else>
-						<Text text="{path: 'field>Value', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}" />
+						<Text text="{path: 'field>Value', formatter: 'AH.format'}" />
 					</template:else>
 				</template:if>
 			</template:if>
 			<template:if test="{field>Action}"><!-- duck typing for com.sap.vocabularies.UI.v1.DataFieldForAction -->
-				<template:with path="field>Action" helper="sap.ui.model.odata.AnnotationHelper.gotoFunctionImport" var="function">
+				<template:with path="field>Action" helper="AH.gotoFunctionImport" var="function">
 					<template:if test="{function>com.sap.vocabularies.Common.v1.IsActionCritical}">
 						<template:then>
 							<!-- IsActionCritical defaults to true -->
-							<Button text="{path: 'field>Label', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"
+							<Button text="{path: 'field>Label', formatter: 'AH.format'}"
 								icon="{= ${function>com.sap.vocabularies.Common.v1.IsActionCritical/Bool} !== 'false' ? 'sap-icon://notification' : ''}" />
 						</template:then>
 						<template:else>
-							<Button text="{path: 'field>Label', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}" />
+							<Button text="{path: 'field>Label', formatter: 'AH.format'}" />
 						</template:else>
 					</template:if>
 				</template:with>

package/test/sap/ui/core/demokit/sample/ViewTemplate/scenario/TableFacet.fragment.xml

@@ -3,10 +3,10 @@
 	xmlns:core="sap.ui.core"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1">
 
-	<template:with path="facet>Target" helper="sap.ui.model.odata.AnnotationHelper.resolvePath" var="target">
+	<template:with path="facet>Target" helper="AH.resolvePath" var="target">
 		<Table class="sapUiSmallMarginBottom"
-			headerText="{path: 'facet>Label', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"
-			items="{path: 'facet>Target', formatter: 'sap.ui.model.odata.AnnotationHelper.getNavigationPath'}">
+			headerText="{path: 'facet>Label', formatter: 'AH.format'}"
+			items="{path: 'facet>Target', formatter: 'AH.getNavigationPath'}">
 			<core:Fragment fragmentName="sap.ui.core.sample.ViewTemplate.scenario.Table" type="XML"/>
 		</Table>
 	</template:with>

package/test/sap/ui/core/demokit/sample/ViewTemplate/scenario/extension/HeaderInfo.fragment.xml

@@ -10,7 +10,7 @@
 			<Label labelFor="{path: 'entityType>TypeName', formatter: '.id'}"
 				text="Type Name"/>
 			<Text id="{path: 'entityType>TypeName', formatter: '.id'}"
-				text="{path: 'entityType>TypeName', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}" />
+				text="{path: 'entityType>TypeName', formatter: 'AH.format'}" />
 
 			<template:with path="entityType>Title" var="field">
 				<core:Fragment fragmentName="sap.ui.core.sample.ViewTemplate.scenario.LabeledField" type="XML"/>