@openui5/sap.ui.core 1.120.10 → 1.121.1

package/src/sap/ui/events/jquery/EventTriggerHook.js

@@ -7,7 +7,6 @@
  * IMPORTANT: This is a private module, its API must not be used and is subject to change.
  * Code other than the OpenUI5 libraries must not introduce dependencies to this module.
  */
-/*global window */
 sap.ui.define([
 	'sap/base/Log',
 	'sap/ui/dom/containsOrEquals',
@@ -26,7 +25,7 @@ sap.ui.define([
 		var bIsLoggable = Log.isLoggable(Log.Level.DEBUG),
 			mEventInfo = mTriggerEventInfo[oEvent.type],
 			fnOriginalTriggerHook = mEventInfo.originalTriggerHook,
-			t0 = window.performance.now(),
+			t0 = performance.now(),
 			t1, sId, oDomInfo;
 
 		if (!oEvent.isPropagationStopped() && !oEvent.isSimulated) {
@@ -36,7 +35,7 @@ sap.ui.define([
 					oEvent.preventDefault();
 					oEvent.stopImmediatePropagation();
 					if (bIsLoggable) {
-						t1 = window.performance.now();
+						t1 = performance.now();
 						Log.debug("Perf: jQuery trigger suppression event handler " + oEvent.type + " took " + (t1 - t0) + " milliseconds.");
 					}
 					return false; //prevent further jQuery processing.

package/src/sap/ui/model/Binding.js

@@ -768,7 +768,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Removes all control messages for this binding from {@link sap.ui.core.Messaging} in addition
+	 * Removes all control messages for this binding from {@link module:sap/ui/core/Messaging} in addition
 	 * to the standard clean-up tasks.
 	 * @see sap.ui.base.EventProvider#destroy
 	 *

package/src/sap/ui/model/ClientListBinding.js

@@ -288,6 +288,7 @@ sap.ui.define([
 		this.bIgnoreSuspend = true;
 
 		this._fireChange({reason: ChangeReason.Sort});
+		/** @deprecated As of version 1.11.0 */
 		this._fireSort({sorter: aSorters});
 		this.bIgnoreSuspend = false;
 
@@ -362,6 +363,7 @@ sap.ui.define([
 		this.bIgnoreSuspend = true;
 
 		this._fireChange({reason: ChangeReason.Filter});
+		/** @deprecated As of version 1.11.0 */
 		if (sFilterType == FilterType.Application) {
 			this._fireFilter({filters: this.aApplicationFilters});
 		} else {

package/src/sap/ui/model/ClientModel.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.Model
 	 *
 	 * @author SAP SE
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 *
 	 * @param {string} [oData] URL where to load the data from
 	 * @public

package/src/sap/ui/model/ClientTreeBinding.js

@@ -303,6 +303,7 @@ sap.ui.define([
 		}
 		this._mLengthsCache = {};
 		this._fireChange({reason: "filter"});
+		/** @deprecated As of version 1.11.0 */
 		this._fireFilter({filters: aFilters});
 
 		return this;

package/src/sap/ui/model/CompositeDataState.js

@@ -14,7 +14,7 @@ sap.ui.define(['./DataState', "sap/base/util/deepEqual", "sap/base/util/each"],
 	 * @extends sap.ui.model.DataState
 	 *
 	 * @author SAP SE
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 *
 	 * @public
 	 * @alias sap.ui.model.CompositeDataState

package/src/sap/ui/model/CompositeType.js

@@ -39,7 +39,7 @@ sap.ui.define(['./SimpleType'],
 	 *   <code>true</code>.
 	 * @extends sap.ui.model.SimpleType
 	 * @public
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 */
 	var CompositeType = SimpleType.extend("sap.ui.model.CompositeType", /** @lends sap.ui.model.CompositeType.prototype */ {
 

package/src/sap/ui/model/DataState.js

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 *
 	 * @public
 	 * @alias sap.ui.model.DataState

package/src/sap/ui/model/Filter.js

@@ -8,9 +8,9 @@
 sap.ui.define([
 	"./FilterOperator",
 	"sap/base/Log",
-	"sap/ui/base/Object",
-	"sap/ui/core/Configuration"
-], function(FilterOperator, Log, BaseObject, Configuration) {
+	"sap/base/i18n/Localization",
+	"sap/ui/base/Object"
+], function(FilterOperator, Log, Localization, BaseObject) {
 	"use strict";
 
 	/**
@@ -257,6 +257,8 @@ sap.ui.define([
 			} else {
 				Log.error("Wrong parameters defined for filter.");
 			}
+			this.sFractionalSeconds1 = undefined;
+			this.sFractionalSeconds2 = undefined;
 		}
 	});
 
@@ -305,6 +307,34 @@ sap.ui.define([
 		return v instanceof Filter;
 	}
 
+	/**
+	 * Set fractional seconds to be appended to the filter's first value in case it is a JavaScript <code>Date</code>
+	 * instance. Note that the model resp. list binding where the filter is used need to support filtering with the
+	 * resulting precision.
+	 *
+	 * @param {string} [sFractionalSeconds] The additional fractional seconds
+	 *
+	 * @ui5-restricted sap.ui.comp.smartfilterbar
+	 * @private
+	 */
+	Filter.prototype.appendFractionalSeconds1 = function (sFractionalSeconds) {
+		this.sFractionalSeconds1 = sFractionalSeconds;
+	};
+
+	/**
+	 * Set fractional seconds to be appended to the filter's second value in case it is a <code>Date</code>
+	 * instance. Note that the model resp. list binding where the filter is used need to support filtering with the
+	 * resulting precision.
+	 *
+	 * @param {string} [sFractionalSeconds] The additional fractional seconds
+	 *
+	 * @ui5-restricted sap.ui.comp.smartfilterbar
+	 * @private
+	 */
+	Filter.prototype.appendFractionalSeconds2 = function (sFractionalSeconds) {
+		this.sFractionalSeconds2 = sFractionalSeconds;
+	};
+
 	var Type = {
 		Logical: "Logical",
 		Binary: "Binary",
@@ -646,7 +676,7 @@ sap.ui.define([
 			return NaN;
 		}
 		if (typeof a == "string" && typeof b == "string") {
-			return a.localeCompare(b, Configuration.getLanguageTag());
+			return a.localeCompare(b, Localization.getLanguageTag().toString());
 		}
 		if (a < b) {
 			return -1;

package/src/sap/ui/model/ManagedObjectBindingSupport.js

@@ -14,6 +14,7 @@ sap.ui.define([
 	"./ParseException",
 	"./ValidateException",
 	"./Context",
+	"sap/base/future",
 	"sap/base/Log",
 	"sap/base/assert",
 	"sap/ui/base/Object",
@@ -28,12 +29,14 @@ sap.ui.define([
 	ParseException,
 	ValidateException,
 	Context,
+	future,
 	Log,
 	assert,
 	BaseObject,
 	ObjectPath,
 	SyncPromise,
-	ManagedObjectMetadata) {
+	ManagedObjectMetadata
+) {
 	"use strict";
 
 	/**
@@ -440,7 +443,7 @@ sap.ui.define([
 							oClone.destroy("KeepDom");
 							break;
 						default:
-							Log.error("[FUTURE FATAL] Unknown diff type \"" + oDiff.type + "\"");
+							future.errorThrows("Unknown diff type \"" + oDiff.type + "\"");
 					}
 				}
 
@@ -667,7 +670,7 @@ sap.ui.define([
 						// 2. Global lookup
 						TypeClass = ObjectPath.get(sTypeName);
 						if (typeof TypeClass === "function" && !TypeClass._sapUiLazyLoader) {
-							Log.error("[FUTURE FATAL] The type class '" + sTypeName + "' is exported to the global namespace without being set as an export value of a UI5 module. " +
+							future.errorThrows("The type class '" + sTypeName + "' is exported to the global namespace without being set as an export value of a UI5 module. " +
 							"This scenario will not be supported in the future and a separate UI5 module needs to be created which exports this type class.");
 						} else {
 							// 3. requireSync fallback

package/src/sap/ui/model/MetaModel.js

@@ -16,7 +16,7 @@ sap.ui.define(['./Model'],
 	 * @extends sap.ui.model.Model
 	 *
 	 * @author SAP SE
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 *
 	 * @public
 	 * @alias sap.ui.model.MetaModel

package/src/sap/ui/model/Model.js

@@ -51,7 +51,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.message.MessageProcessor
 	 *
 	 * @author SAP SE
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 *
 	 * @public
 	 * @alias sap.ui.model.Model
@@ -785,7 +785,11 @@ sap.ui.define([
 				sContextPath = oContext.getPath();
 				sResolvedPath = sContextPath + (sContextPath.endsWith("/") ? "" : "/") + sPath;
 			} else {
-				sResolvedPath = this.isLegacySyntax() ? "/" + sPath : undefined;
+				sResolvedPath = undefined;
+				/** @deprecated As of version 1.88.0 */
+				if (this.isLegacySyntax()) {
+					sResolvedPath = "/" + sPath;
+				}
 			}
 		}
 		if (!sPath && oContext) {

package/src/sap/ui/model/SelectionModel.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/base/EventProvider', "sap/base/assert"],
 	 * @extends sap.ui.base.EventProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 *
 	 * @param {int} iSelectionMode <code>sap.ui.model.SelectionModel.SINGLE_SELECTION</code> or <code>sap.ui.model.SelectionModel.MULTI_SELECTION</code>
 	 *

package/src/sap/ui/model/SimpleType.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Type
 	 * @public
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 */
 	var SimpleType = Type.extend("sap.ui.model.SimpleType", /** @lends sap.ui.model.SimpleType.prototype */ {
 

package/src/sap/ui/model/Sorter.js

@@ -7,9 +7,9 @@
 // Provides the concept of a sorter for list bindings
 sap.ui.define([
 	"sap/base/Log",
-	"sap/ui/base/Object",
-	"sap/ui/core/Configuration"
-], function(Log, BaseObject, Configuration) {
+	"sap/base/i18n/Localization",
+	"sap/ui/base/Object"
+], function(Log, Localization, BaseObject) {
 	"use strict";
 
 	/**
@@ -143,7 +143,7 @@ sap.ui.define([
 			return 1;
 		}
 		if (typeof a == "string" && typeof b == "string") {
-			return a.localeCompare(b, Configuration.getLanguageTag());
+			return a.localeCompare(b, Localization.getLanguageTag().toString());
 		}
 		if (a < b) {
 			return -1;

package/src/sap/ui/model/TreeAutoExpandMode.js

@@ -12,7 +12,7 @@ sap.ui.define([],
 	/**
 	 * Different modes for setting the auto expand mode on tree or analytical bindings.
 	 *
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 * @enum {string}
 	 * @alias sap.ui.model.TreeAutoExpandMode
 	 * @protected

package/src/sap/ui/model/Type.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/base/Object'],
 	 *
 	 * @extends sap.ui.base.Object
 	 * @public
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 */
 	var Type = BaseObject.extend("sap.ui.model.Type", /** @lends sap.ui.model.Type.prototype */ {
 

package/src/sap/ui/model/_Helper.js

@@ -4,11 +4,12 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
+	"sap/base/security/encodeURL",
 	"sap/base/util/deepEqual",
 	"sap/base/util/extend",
 	"sap/base/util/isPlainObject",
 	"sap/base/util/merge"
-], function (deepEqual, extend, isPlainObject, merge) {
+], function (encodeURL, deepEqual, extend, isPlainObject, merge) {
 	"use strict";
 
 	/**
@@ -17,8 +18,9 @@ sap.ui.define([
 	 */
 	var _Helper = {
 		// Trampoline properties to allow for mocking in unit tests.
-		// @see sap.base.util.*
+		// @see sap.base.(security|util).*
 		deepEqual : deepEqual,
+		encodeURL : encodeURL,
 		extend : extend,
 		isPlainObject : isPlainObject,
 		merge : merge

package/src/sap/ui/model/analytics/AnalyticalBinding.js

@@ -2635,6 +2635,15 @@ sap.ui.define([
 		if (bAddAdditionalSelects && this.aAdditionalSelects.length > 0) {
 			sSelect = (sSelect ? sSelect.split(",") : [])
 				.concat(this.aAdditionalSelects).join(",");
+			const oAdditionalProperties = {};
+			this.aAdditionalSelects.forEach((sAdditionalSelect) => {
+				oAdditionalProperties[sAdditionalSelect] = true;
+			});
+			const sAdditionalOrderBy = oAnalyticalQueryRequest.getSortExpression()
+				.getURIOrderByOptionValue(oAdditionalProperties);
+			if (sAdditionalOrderBy) {
+				sOrderBy = sOrderBy ? sOrderBy + "," + sAdditionalOrderBy : sAdditionalOrderBy;
+			}
 		}
 
 		if (this.mParameters && this.mParameters["filter"]) {

package/src/sap/ui/model/json/JSONModel.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 * @public
 	 * @alias sap.ui.model.json.JSONModel
 	 */
@@ -419,7 +419,11 @@ sap.ui.define([
 	 * @private
 	 */
 	JSONModel.prototype._getObject = function (sPath, oContext) {
-		var oNode = this.isLegacySyntax() ? this.oData : null;
+		let oNode = null;
+		/** @deprecated As of version 1.88.0 */
+		if (this.isLegacySyntax()) {
+			oNode = this.oData;
+		}
 		if (oContext instanceof Context) {
 			oNode = this._getObject(oContext.getPath());
 		} else if (oContext != null) {

package/src/sap/ui/model/message/MessageModel.js

@@ -29,7 +29,7 @@ sap.ui.define(['sap/ui/model/BindingMode', 'sap/ui/model/ClientModel', 'sap/ui/m
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 *
 	 * @public
 	 * @alias sap.ui.model.message.MessageModel

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

@@ -96,13 +96,13 @@ sap.ui.define([
 			 * oSupplierContext = oMetaModel.getMetaContext("/ProductSet('HT-1021')/ToSupplier");
 			 * oValueContext = oMetaModel.createBindingContext("com.sap.vocabularies.UI.v1.DataPoint/Value", oSupplierContext);
 			 *
-			 * vPropertySetting =  sap.ui.model.odata.AnnotationHelper.createPropertySetting([
-			 *     sap.ui.model.odata.AnnotationHelper.format(oValueContext),
-			 *     "{path : 'meta>Value', formatter : 'sap.ui.model.odata.AnnotationHelper.simplePath'}",
+			 * vPropertySetting = AnnotationHelper.createPropertySetting([
+			 *     AnnotationHelper.format(oValueContext),
+			 *     "{path : 'meta>Value', formatter : 'AH.simplePath'}",
 			 *     "{:= 'Mr. ' + ${/FirstName} + ' ' + ${/LastName}}",
 			 *     "hello, world!",
 			 *     42
-			 * ], myRootFormatter);
+			 * ], myRootFormatter, {AH : AnnotationHelper});
 			 *
 			 * oControl.applySettings({"someProperty" : vPropertySetting});
 			 * </pre>
@@ -113,6 +113,10 @@ sap.ui.define([
 			 *   root formatter function; default: <code>Array.prototype.join(., " ")</code>
 			 *   in case of multiple parts, just like
 			 *   {@link sap.ui.model.CompositeBinding#getExternalValue getExternalValue}
+	 		 * @param {Object<object|function>} [oScope]
+	 		 *   Maps an alias to a module (like <code>{AH : AnnotationHelper}</code>) or a function (like
+			 *   <code>{format : AnnotationHelper.format}</code>); the alias must not contain a dot.
+			 *   Since 1.121.0 global names are deprecated; always use this scope instead.
 			 * @returns {any|object}
 			 *   constant value or binding info object for a property as expected by
 			 *   {@link sap.ui.base.ManagedObject#applySettings applySettings}
@@ -121,8 +125,9 @@ sap.ui.define([
 			 *   found
 			 * @public
 			 * @since 1.31.0
+			 * @deprecated As of version 1.121.0
 			 */
-			createPropertySetting : function (aParts, fnRootFormatter) {
+			createPropertySetting : function (aParts, fnRootFormatter, oScope) {
 				var bMergeNeeded = false,
 					vPropertySetting;
 
@@ -136,12 +141,12 @@ sap.ui.define([
 							break;
 
 						case "string":
-							vPropertySetting = BindingParser.complexParser(vPart, null, true, true);
+							vPropertySetting = BindingParser.complexParser(vPart, oScope, true, true, false, true);
 							if (vPropertySetting !== undefined) {
 								if (vPropertySetting.functionsNotFound) {
 									throw new Error("Function name(s) "
 										+ vPropertySetting.functionsNotFound.join(", ")
-										+  " not found");
+										+ " not found");
 								}
 								aParts[i] = vPart = vPropertySetting;
 							}

package/src/sap/ui/model/odata/ODataAnnotations.js

@@ -9,12 +9,12 @@ sap.ui.define([
 	"./AnnotationParser",
 	"sap/base/assert",
 	"sap/base/Log",
+	"sap/base/i18n/Localization",
 	"sap/base/util/extend",
 	"sap/base/util/isEmptyObject",
 	"sap/ui/base/EventProvider",
-	"sap/ui/core/Configuration",
 	"sap/ui/thirdparty/jquery"
-], function (AnnotationParser, assert, Log, extend, isEmptyObject, EventProvider, Configuration,
+], function (AnnotationParser, assert, Log, Localization, extend, isEmptyObject, EventProvider,
 		jQuery) {
 	"use strict";
 
@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @author SAP SE
 	 * @version
-	 * 1.120.10
+	 * 1.121.1
 	 *
 	 * @public
 	 * @deprecated As of version 1.66, please use {@link sap.ui.model.odata.v2.ODataAnnotations} instead.
@@ -503,7 +503,7 @@ sap.ui.define([
 				url: sUrl,
 				async: that.bAsync,
 				headers: extend({}, that.mCustomHeaders, {
-					"Accept-Language": Configuration.getLanguageTag() // Always overwrite
+					"Accept-Language": Localization.getLanguageTag().toString() // Always overwrite
 				})
 			};
 

package/src/sap/ui/model/odata/ODataMessageParser.js

@@ -5,6 +5,7 @@
  */
 /*eslint-disable max-len */
 sap.ui.define([
+	"sap/ui/core/Lib",
 	"sap/ui/model/odata/ODataMetadata",
 	"sap/ui/model/odata/ODataUtils",
 	"sap/ui/core/library",
@@ -14,7 +15,7 @@ sap.ui.define([
 	"sap/ui/core/message/Message",
 	"sap/base/Log"
 ],
-	function(ODataMetadata, ODataUtils, coreLibrary, URI, Messaging, MessageParser, Message, Log) {
+	function(Library, ODataMetadata, ODataUtils, coreLibrary, URI, Messaging, MessageParser, Message, Log) {
 	"use strict";
 
 var sClassName = "sap.ui.model.odata.ODataMessageParser",
@@ -85,7 +86,7 @@ var sClassName = "sap.ui.model.odata.ODataMessageParser",
  * @extends sap.ui.core.message.MessageParser
  *
  * @author SAP SE
- * @version 1.120.10
+ * @version 1.121.1
  * @public
  * @alias sap.ui.model.odata.ODataMessageParser
  */
@@ -660,7 +661,7 @@ ODataMessageParser.prototype._parseBody = function (oResponse, mRequestInfo) {
 ODataMessageParser.prototype._createGenericError = function (mRequestInfo) {
 	return [this._createMessage({
 			description : mRequestInfo.response.body,
-			message : sap.ui.getCore().getLibraryResourceBundle().getText("CommunicationError"),
+			message : Library.getResourceBundleFor("sap.ui.core").getText("CommunicationError"),
 			severity : MessageType.Error,
 			transition : true
 		}, mRequestInfo, true)];

package/src/sap/ui/model/odata/ODataMetaModel.js

@@ -881,7 +881,7 @@ sap.ui.define([
 	 * {@link #loaded loaded} has been resolved!
 	 *
 	 * @author SAP SE
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 * @alias sap.ui.model.odata.ODataMetaModel
 	 * @extends sap.ui.model.MetaModel
 	 * @public
@@ -1123,6 +1123,7 @@ sap.ui.define([
 
 		Utils.visitChildren(oEntityContainer.entitySet, mChildAnnotations, "EntitySet", aSchemas,
 			/*fnCallback*/null, iFirstNewEntitySet);
+		Utils.addUnitAnnotations(aSchemas, this);
 	};
 
 

package/src/sap/ui/model/odata/ODataMetadata.js

@@ -12,16 +12,16 @@ sap.ui.define([
 	"./AnnotationParser",
 	"sap/base/assert",
 	"sap/base/Log",
+	"sap/base/i18n/Localization",
 	"sap/base/util/each",
 	"sap/base/util/extend",
 	"sap/base/util/isEmptyObject",
 	"sap/base/util/uid",
 	"sap/ui/base/EventProvider",
-	"sap/ui/core/Configuration",
 	"sap/ui/core/cache/CacheManager",
 	"sap/ui/thirdparty/datajs"
 ],
-	function(Utils, AnnotationParser, assert, Log, each, extend, isEmptyObject, uid, EventProvider, Configuration,
+	function(Utils, AnnotationParser, assert, Log, Localization, each, extend, isEmptyObject, uid, EventProvider,
 		CacheManager, OData) {
 	"use strict";
 	/*eslint max-nested-callbacks: 0*/
@@ -49,7 +49,7 @@ sap.ui.define([
 	 * Implementation to access OData metadata
 	 *
 	 * @author SAP SE
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.ODataMetadata
@@ -1239,6 +1239,36 @@ sap.ui.define([
 		return oPropertyMetadata;
 	};
 
+	/**
+	 * Gets a map of property names defined by referential constraints. Maps a key property name of the given entity to
+	 * the corresponding property name of the entity referenced by the given navigation property.
+	 *
+	 * @param {object} oSourceEntityType
+	 *   The entity type, for example the metadata object for "GWSAMPLE_BASIC.BusinessPartner"
+	 * @param {string} sNavigationProperty
+	 *   The navigation property name, for example "ToProducts"
+	 * @returns {Object<string, string>}
+	 *   Maps a key property name of the given entity to the foreign key property name of the entity referenced by the
+	 *   given navigation property based on the association's referential constraints; returns an empty object if no
+	 *   mapping is defined; for example <code>{"BusinessPartnerID" : "SupplierID"}</code>
+	 * @private
+	 */
+	ODataMetadata.prototype._getReferentialConstraintsMapping = function (oSourceEntityType, sNavigationProperty) {
+		const oNavigationPropertyInfo = oSourceEntityType.navigationProperty
+			.find((oNavigationProperty) => oNavigationProperty.name === sNavigationProperty);
+		const oAssociationInfo = this._splitName(oNavigationPropertyInfo.relationship);
+		const oAssociation = this._getObjectMetadata("association", oAssociationInfo.name, oAssociationInfo.namespace);
+		if (oNavigationPropertyInfo.fromRole === oAssociation.referentialConstraint?.principal.role) {
+			const aSourceProperties = oAssociation.referentialConstraint.principal.propertyRef;
+			const aTargetProperties = oAssociation.referentialConstraint.dependent.propertyRef;
+			return aSourceProperties.reduce((mSource2TargetProperty, oSourceProperty, iSourceIndex) => {
+				mSource2TargetProperty[oSourceProperty.name] = aTargetProperties[iSourceIndex].name;
+				return mSource2TargetProperty;
+			}, {});
+		}
+		return {};
+	};
+
 	ODataMetadata.prototype.destroy = function() {
 		delete this.oMetadata;
 		var that = this;
@@ -1309,7 +1339,7 @@ sap.ui.define([
 				"sap-cancel-on-close": true
 			},
 			oLangHeader = {
-				"Accept-Language": Configuration.getLanguageTag()
+				"Accept-Language": Localization.getLanguageTag().toString()
 			};
 
 		extend(oDefaultHeaders, this.mHeaders, oLangHeader);

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

@@ -23,6 +23,7 @@ sap.ui.define([
 	"./ODataUtils",
 	"sap/base/assert",
 	"sap/base/Log",
+	"sap/base/i18n/Localization",
 	"sap/base/security/encodeURL",
 	"sap/base/util/each",
 	"sap/base/util/extend",
@@ -30,7 +31,6 @@ sap.ui.define([
 	"sap/base/util/isPlainObject",
 	"sap/base/util/merge",
 	"sap/base/util/uid",
-	"sap/ui/core/Configuration",
 	"sap/ui/core/Supportability",
 	"sap/ui/model/BindingMode",
 	"sap/ui/model/Context",
@@ -41,8 +41,8 @@ sap.ui.define([
 	"sap/ui/thirdparty/datajs",
 	"sap/ui/thirdparty/URI"
 ], function(CountMode, ODataContextBinding, ODataListBinding, ODataMetadata, ODataPropertyBinding,
-		ODataTreeBinding, ODataUtils, assert, Log, encodeURL, each, extend, isEmptyObject,
-		isPlainObject, merge, uid, Configuration, Supportability, BindingMode, Context,
+		ODataTreeBinding, ODataUtils, assert, Log, Localization, encodeURL, each, extend,
+		isEmptyObject, isPlainObject, merge, uid, Supportability, BindingMode, Context,
 		FilterProcessor, Model, ODataAnnotations, ODataMetaModel, OData, URI) {
 	"use strict";
 
@@ -78,7 +78,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 *
 	 * @public
 	 * @deprecated As of version 1.48, please use {@link sap.ui.model.odata.v2.ODataModel} instead.
@@ -195,7 +195,7 @@ sap.ui.define([
 			this.sUser = sUser;
 			this.sPassword = sPassword;
 
-			this.oHeaders["Accept-Language"] = Configuration.getLanguageTag();
+			this.oHeaders["Accept-Language"] = Localization.getLanguageTag().toString();
 
 			if (!this.oServiceData.oMetadata) {
 				//create Metadata object

package/src/sap/ui/model/odata/ODataPropertyBinding.js

@@ -10,8 +10,7 @@ sap.ui.define([
 	'sap/ui/model/Context',
 	'sap/ui/model/ChangeReason',
 	'sap/ui/model/PropertyBinding',
-	"sap/base/util/deepEqual",
-	'sap/ui/model/ChangeReason'
+	"sap/base/util/deepEqual"
 ],
 	function(ODataMetaModel, Context, ChangeReason, PropertyBinding, deepEqual) {
 	"use strict";

package/src/sap/ui/model/odata/ODataTreeBindingAdapter.js

@@ -265,6 +265,7 @@ sap.ui.define(['sap/ui/model/TreeBinding', './v2/ODataTreeBinding', 'sap/ui/mode
 			}
 
 			sKey = this.oModel._getKey(oEntry);
+			// deep path not needed here, it gets updated in ODataTreeBinding#_getContextsForNodeId
 			oContext = this.oModel.getContext("/" + sKey);
 
 			sParentGroupID = mParentGroupIDs[sParentNodeID];