@openui5/sap.ui.core 1.120.10 → 1.121.1

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

@@ -671,7 +671,8 @@ sap.ui.define([
 
 				var oNode = this._aNodes[iIndex] = this._aNodes[iIndex] || {
 					key: sKey,
-					context: this.oModel.getContext("/" + sKey),
+					context: this.oModel.getContext("/" + sKey,
+						this.oModel.resolveDeep(this.sPath, this.oContext) + sKey.slice(sKey.indexOf("("))),
 					magnitude: iMagnitude,
 					level: oEntry[this.oTreeProperties["hierarchy-level-for"]],
 					originalLevel: oEntry[this.oTreeProperties["hierarchy-level-for"]],
@@ -984,7 +985,8 @@ sap.ui.define([
 		}
 		var oNode = oParentNode.children[iPositionInParent] = oParentNode.children[iPositionInParent] || {
 			key: sKey,
-			context: this.oModel.getContext("/" + sKey),
+			context: this.oModel.getContext("/" + sKey,
+				this.oModel.resolveDeep(this.sPath, this.oContext) + sKey.slice(sKey.indexOf("("))),
 			//sub-child nodes have a magnitude of 0 at their first loading time
 			magnitude: 0,
 			//level is either given by the back-end or simply 1 level deeper than the parent

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

@@ -20,20 +20,20 @@ sap.ui.define([
 	"sap/base/util/each",
 	"sap/ui/core/CalendarType",
 	"sap/ui/core/format/DateFormat",
+	"sap/ui/model/_Helper",
 	"sap/ui/model/FilterProcessor",
 	"sap/ui/model/Sorter"
-], function(assert, Log, encodeURL, each, CalendarType, DateFormat, FilterProcessor, Sorter) {
+], function(assert, Log, encodeURL, each, CalendarType, DateFormat, _Helper, FilterProcessor, Sorter) {
 	"use strict";
 
-	var oDateTimeFormat,
-		oDateTimeFormatMs,
-		oDateTimeOffsetFormat,
-		rDecimal = /^([-+]?)0*(\d+)(\.\d+|)$/,
-		// URL might be encoded, "(" becomes %28
-		rSegmentAfterCatalogService = /\/(Annotations|ServiceNames|ServiceCollection)(\(|%28)/,
-		oTimeFormat,
-		rTrailingDecimal = /\.$/,
-		rTrailingZeroes = /0+$/;
+	let oDateTimeFormat, oDateTimeFormatMs, oDateTimeOffsetFormat, oDateTimeOffsetFormatMs, oTimeFormat;
+	const sClassName = "sap.ui.model.odata.ODataUtils";
+	const rDecimal = /^([-+]?)0*(\d+)(\.\d+|)$/;
+	// URL might be encoded, "(" becomes %28
+	const rSegmentAfterCatalogService = /\/(Annotations|ServiceNames|ServiceCollection)(\(|%28)/;
+	const rTrailingDecimal = /\.$/;
+	const rTrailingSingleQuote = /'$/;
+	const rTrailingZeroes = /0+$/;
 
 	function setDateTimeFormatter () {
 		// Lazy creation of format objects
@@ -50,6 +50,10 @@ sap.ui.define([
 				pattern: "'datetimeoffset'''yyyy-MM-dd'T'HH:mm:ss'Z'''",
 				calendarType: CalendarType.Gregorian
 			});
+			oDateTimeOffsetFormatMs = DateFormat.getDateInstance({
+				pattern: "'datetimeoffset'''yyyy-MM-dd'T'HH:mm:ss.SSS'Z'''",
+				calendarType: CalendarType.Gregorian
+			});
 			oTimeFormat = DateFormat.getTimeInstance({
 				pattern: "'time''PT'HH'H'mm'M'ss'S'''",
 				calendarType: CalendarType.Gregorian
@@ -102,16 +106,16 @@ sap.ui.define([
 	}
 
 	/**
-	 * Creates URL parameters strings for filtering.
-	 * The Parameter string is prepended with the "$filter=" system query option to form
-	 * a valid URL part for OData Request.
-	 * In case an array of filters is passed, they will be grouped in a way that filters on the
-	 * same path are ORed and filters on different paths are ANDed with each other
-	 * @see ODataUtils._createFilterParams
-	 * @param {sap.ui.model.Filter|sap.ui.model.Filter[]} vFilter the root filter or filter array
-	 * @param {object} oMetadata the entity metadata object
-	 * @param {object} oEntityType the entity type object
-	 * @return {string} the URL encoded filter parameters
+	 * Creates the URL parameter string for filtering. The parameter string is prepended with the "$filter=" system
+	 * query option to form a valid URL part for an OData request. In case an array of filters is passed, they are
+	 * grouped in a way that filters on the same path are OR-ed and filters on different paths are AND-ed with each
+	 * other.
+	 *
+	 * @param {sap.ui.model.Filter|sap.ui.model.Filter[]} vFilter The filter or filter array
+	 * @param {sap.ui.model.odata.ODataMetadata} oMetadata The model metadata
+	 * @param {sap.ui.model.odata.ODataMetaModel.EntityType} oEntityType The entity type
+	 * @return {string} The URL encoded <code>$filter</code> system query option
+	 *
 	 * @private
 	 */
 	ODataUtils.createFilterParams = function(vFilter, oMetadata, oEntityType) {
@@ -130,62 +134,75 @@ sap.ui.define([
 	};
 
 	/**
-	 * Creates a string of logically (or/and) linked filter options,
-	 * which will be used as URL query parameters for filtering.
-	 * @param {sap.ui.model.Filter|sap.ui.model.Filter[]} vFilter the root filter or filter array
-	 * @param {object} oMetadata the entity metadata object
-	 * @param {object} oEntityType the entity type object
-	 * @return {string} the URL encoded filter parameters
+	 * Creates a string of logically (or/and) linked filter options, which can be used as a value for the
+	 * <code>$filter</code> system query option.
+	 *
+	 * @param {sap.ui.model.Filter|sap.ui.model.Filter[]} vFilter The filter or filter array
+	 * @param {sap.ui.model.odata.ODataMetadata} oMetadata The model metadata
+	 * @param {sap.ui.model.odata.ODataMetaModel.EntityType} oEntityType The entity type
+	 * @return {string} The URL encoded value for <code>$filter</code> system query option
+	 *
 	 * @private
 	 */
 	ODataUtils._createFilterParams = function(vFilter, oMetadata, oEntityType) {
-		var that = this,
-			oFilter = Array.isArray(vFilter) ? FilterProcessor.groupFilters(vFilter) : vFilter;
-
-		function create(oFilter, bOmitBrackets) {
-			oFilter = convertLegacyFilter(oFilter);
-
-			if (oFilter.aFilters) {
-				return createMulti(oFilter, bOmitBrackets);
-			}
-			return that._createFilterSegment(oFilter.sPath, oMetadata, oEntityType, oFilter.sOperator, oFilter.oValue1, oFilter.oValue2, oFilter.bCaseSensitive);
+		const oFilter = Array.isArray(vFilter) ? FilterProcessor.groupFilters(vFilter) : vFilter;
+		if (!oFilter) {
+			return undefined;
 		}
+		return ODataUtils._processSingleFilter(oFilter, oMetadata, oEntityType, true);
+	};
 
-		function createMulti(oMultiFilter, bOmitBrackets) {
-			var aFilters = oMultiFilter.aFilters,
-				bAnd = !!oMultiFilter.bAnd,
-				sFilter = "";
+	/**
+	 * Gets the filter string for a given filter object.
+	 *
+	 * @param {sap.ui.model.Filter} oFilter The filter object to be processed
+	 * @param {sap.ui.model.odata.ODataMetadata} oMetadata The model metadata
+	 * @param {sap.ui.model.odata.ODataMetaModel.EntityType} oEntityType The entity type
+	 * @param {boolean} [bOmitBrackets] Whether to omit brackets around the resulting filter string
+	 * @returns {string} The URL encoded string representation of the given filter object
+	 *
+	 * @private
+	 */
+	ODataUtils._processSingleFilter = function (oFilter, oMetadata, oEntityType, bOmitBrackets) {
+		oFilter = convertLegacyFilter(oFilter);
 
-			if (aFilters.length === 0) {
-				return bAnd ? "true" : "false";
-			}
+		if (oFilter.aFilters) {
+			return ODataUtils._processMultiFilter(oFilter, oMetadata, oEntityType, bOmitBrackets);
+		}
+		return ODataUtils._createFilterSegment(oFilter, oMetadata, oEntityType);
+	};
 
-			if (aFilters.length === 1) {
-				if (aFilters[0]._bMultiFilter) {
-					return create(aFilters[0]);
-				}
-				return create(aFilters[0], true);
-			}
+	/**
+	 * Gets the filter string for a given multi-filter object.
+	 *
+	 * @param {sap.ui.model.Filter} oFilter The multi-filter object to be processed
+	 * @param {sap.ui.model.odata.ODataMetadata} oMetadata The model metadata
+	 * @param {sap.ui.model.odata.ODataMetaModel.EntityType} oEntityType The entity type
+	 * @param {boolean} [bOmitBrackets] Whether to omit brackets around the resulting filter string
+	 * @returns {string} The URL encoded string representation of the given multi-filter object
+	 *
+	 * @private
+	 */
+	ODataUtils._processMultiFilter = function (oFilter, oMetadata, oEntityType, bOmitBrackets) {
+		const aFilters = oFilter.aFilters;
+		const bAnd = !!oFilter.bAnd;
 
-			if (!bOmitBrackets) {
-				sFilter += "(";
-			}
-			sFilter += create(aFilters[0]);
-			for (var i = 1; i < aFilters.length; i++) {
-				sFilter += bAnd ? "%20and%20" : "%20or%20";
-				sFilter += create(aFilters[i]);
-			}
-			if (!bOmitBrackets) {
-				sFilter += ")";
-			}
-			return sFilter;
+		if (aFilters.length === 0) {
+			return bAnd ? "true" : "false";
 		}
 
-		if (!oFilter) {
-			return undefined;
+		if (aFilters.length === 1) {
+			if (aFilters[0]._bMultiFilter) {
+				return ODataUtils._processSingleFilter(aFilters[0], oMetadata, oEntityType);
+			}
+			return ODataUtils._processSingleFilter(aFilters[0], oMetadata, oEntityType, true);
 		}
 
-		return create(oFilter, true);
+		return (!bOmitBrackets ? "(" : "")
+			+ aFilters.map((oFilter) => {
+				return ODataUtils._processSingleFilter(oFilter, oMetadata, oEntityType);
+			}).join(bAnd ? "%20and%20" : "%20or%20")
+			+ (!bOmitBrackets ? ")" : "");
 	};
 
 	/**
@@ -387,88 +404,74 @@ sap.ui.define([
 
 
 	/**
-	 * Convert multi filter to filter string.
+	 * Convert multi-filter to filter string.
 	 *
-	 * @param {object} oMultiFilter A multi filter
-	 * @param {sap.ui.model.odata.ODataMetadata} oMetadata The metadata
-	 * @param {object} oEntityType The entity type to filter
-	 * @returns {string} A filter string
+	 * @param {object} oMultiFilter A multi-filter
+	 * @param {sap.ui.model.odata.ODataMetadata} oMetadata The model metadata
+	 * @param {sap.ui.model.odata.ODataMetaModel.EntityType} oEntityType The entity type
+	 * @returns {string} The URL encoded string representation of the given multi-filter object
 	 *
 	 * @private
 	 */
 	ODataUtils._resolveMultiFilter = function(oMultiFilter, oMetadata, oEntityType){
-		var that = this,
-			aFilters = oMultiFilter.aFilters,
-			sFilterParam = "";
-
+		const aFilters = oMultiFilter.aFilters;
 		if (aFilters) {
-			sFilterParam += "(";
-			each(aFilters, function(i, oFilter) {
-				if (oFilter._bMultiFilter) {
-					sFilterParam += that._resolveMultiFilter(oFilter, oMetadata, oEntityType);
-				} else if (oFilter.sPath) {
-					sFilterParam += that._createFilterSegment(oFilter.sPath, oMetadata, oEntityType, oFilter.sOperator, oFilter.oValue1, oFilter.oValue2, "", oFilter.bCaseSensitive);
-				}
-				if (i < (aFilters.length - 1)) {
-					if (oMultiFilter.bAnd) {
-						sFilterParam += "%20and%20";
-					} else {
-						sFilterParam += "%20or%20";
+			return "("
+				+ aFilters.map((oFilter) => {
+					let sFilterParam = "";
+					if (oFilter._bMultiFilter) {
+						sFilterParam = ODataUtils._resolveMultiFilter(oFilter, oMetadata, oEntityType);
+					} else if (oFilter.sPath) {
+						sFilterParam = ODataUtils._createFilterSegment(oFilter, oMetadata, oEntityType);
 					}
-				}
-			});
-			sFilterParam += ")";
+					return sFilterParam;
+				}).join(oMultiFilter.bAnd ? "%20and%20" : "%20or%20")
+				+ ")";
 		}
 
-		return sFilterParam;
+		return "";
 	};
 
 	/**
-	 * Create a single filter segment of the OData filter parameters.
-	 *
-	 * @param {string} sPath The path to the value
-	 * @param {sap.ui.model.odata.ODataMetadata} oMetadata The metadata
-	 * @param {object} oEntityType The value's entity type
-	 * @param {string} sOperator The filter operator
-	 * @param {object} oValue1 The first value
-	 * @param {object} oValue2 The second value
-	 * @param {boolean} [bCaseSensitive=true] Whether the case should be considered
-	 * @returns {string} The encoded string representation of the given filter
+	 * Create a single filter segment for the given filter.
 	 *
+	 * @param {sap.ui.model.Filter} oFilter The filter object to be processed
+	 * @param {sap.ui.model.odata.ODataMetadata} oMetadata The model metadata
+	 * @param {sap.ui.model.odata.ODataMetaModel.EntityType} oEntityType The entity type object
+	 * @returns {string} The encoded string representation of the given filter
 	 * @private
 	 */
-	ODataUtils._createFilterSegment = function(sPath, oMetadata, oEntityType, sOperator, oValue1, oValue2, bCaseSensitive) {
-
-		var oPropertyMetadata, sType;
-
-		if (bCaseSensitive === undefined) {
-			bCaseSensitive = true;
-		}
-
+	ODataUtils._createFilterSegment = function(oFilter, oMetadata, oEntityType) {
+		let {sPath, oValue1, oValue2} = oFilter;
+		const {sOperator, bCaseSensitive = true, sFractionalSeconds1, sFractionalSeconds2} = oFilter;
+		let sType;
 		if (oEntityType) {
-			oPropertyMetadata = oMetadata._getPropertyMetadata(oEntityType, sPath);
-			sType = oPropertyMetadata && oPropertyMetadata.type;
-			assert(oPropertyMetadata, "PropertyType for property " + sPath + " of EntityType " + oEntityType.name + " not found!");
-		}
-
-		if (sType) {
-			oValue1 = this.formatValue(oValue1, sType, bCaseSensitive);
-			oValue2 = (oValue2 != null) ? this.formatValue(oValue2, sType, bCaseSensitive) : null;
-		} else {
-			assert(null, "Type for filter property could not be found in metadata!");
+			const oPropertyMetadata = oMetadata._getPropertyMetadata(oEntityType, sPath);
+			if (oPropertyMetadata) {
+				sType = oPropertyMetadata.type;
+				if (sType) {
+					oValue1 = ODataUtils._formatValue(oValue1, sType, bCaseSensitive, sFractionalSeconds1);
+					oValue2 = oValue2 === null || oValue2 === undefined
+						? null
+						: ODataUtils._formatValue(oValue2, sType, bCaseSensitive, sFractionalSeconds2);
+				} else {
+					Log.error("Type for property '" + sPath + "' of EntityType '" + oEntityType.name
+						+ "' not found!", undefined, sClassName);
+				}
+			} else {
+				Log.error("Property type for property '" + sPath + "' of EntityType '" + oEntityType.name
+					+ "' not found!", undefined, sClassName);
+			}
 		}
-
 		if (oValue1) {
-			oValue1 = encodeURL(String(oValue1));
+			oValue1 = _Helper.encodeURL(String(oValue1));
 		}
 		if (oValue2) {
-			oValue2 = encodeURL(String(oValue2));
+			oValue2 = _Helper.encodeURL(String(oValue2));
 		}
-
 		if (!bCaseSensitive && sType === "Edm.String") {
-			sPath =  "toupper(" + sPath + ")";
+			sPath = "toupper(" + sPath + ")";
 		}
-
 		switch (sOperator) {
 			case "EQ":
 			case "NE":
@@ -494,7 +497,7 @@ sap.ui.define([
 			case "NotEndsWith":
 				return "not%20endswith(" + sPath + "," + oValue1 + ")";
 			default:
-				Log.error("ODataUtils :: Unknown filter operator " + sOperator);
+				Log.error("Unknown filter operator '" + sOperator + "'", undefined, sClassName);
 				return "true";
 		}
 	};
@@ -511,6 +514,22 @@ sap.ui.define([
 	 * @public
 	 */
 	ODataUtils.formatValue = function(vValue, sType, bCaseSensitive) {
+		return ODataUtils._formatValue(vValue, sType, bCaseSensitive);
+	};
+
+	/**
+	 * Like {@link #formatValue}, but allows for providing fractional seconds for Date values and if the given type
+	 * is "Edm.DateTime" or "Edm.DateTimeOffset".
+	 *
+	 * @param {any} vValue The value to format
+	 * @param {string} sType The EDM type (e.g. Edm.Decimal)
+	 * @param {boolean} bCaseSensitive Whether strings gets compared case sensitive or not
+	 * @param {string} [sFractionalSeconds] The fractional seconds to be appended to the given value in case it is a
+	 *   <code>Date<code>
+	 * @return {string} The formatted value
+	 * @private
+	 */
+	ODataUtils._formatValue = function(vValue, sType, bCaseSensitive, sFractionalSeconds) {
 		var oDate, sValue;
 
 		if (bCaseSensitive === undefined) {
@@ -544,14 +563,30 @@ sap.ui.define([
 				oDate = vValue instanceof Date ? vValue : new Date(vValue);
 				if (oDate.getMilliseconds() > 0) {
 					sValue = oDateTimeFormatMs.format(oDate, true);
+					if (sFractionalSeconds) {
+						sValue = sValue.replace(rTrailingSingleQuote, sFractionalSeconds + "'");
+					}
 				} else {
 					sValue = oDateTimeFormat.format(oDate, true);
+					if (sFractionalSeconds) {
+						sValue = sValue.replace(rTrailingSingleQuote, ".000" + sFractionalSeconds + "'");
+					}
 				}
 				break;
 			case "Edm.DateTimeOffset":
 				// no need to use UI5Date.getInstance as only the UTC timestamp is used
 				oDate = vValue instanceof Date ? vValue : new Date(vValue);
-				sValue = oDateTimeOffsetFormat.format(oDate, true);
+				if (oDate.getMilliseconds() > 0) {
+					sValue = oDateTimeOffsetFormatMs.format(oDate, true);
+					if (sFractionalSeconds) {
+						sValue = sValue.replace("Z'", sFractionalSeconds + "Z'");
+					}
+				} else {
+					sValue = oDateTimeOffsetFormat.format(oDate, true);
+					if (sFractionalSeconds) {
+						sValue = sValue.replace("Z'", ".000" + sFractionalSeconds + "Z'");
+					}
+				}
 				break;
 			case "Edm.Guid":
 				sValue = "guid'" + vValue + "'";
@@ -603,13 +638,13 @@ sap.ui.define([
 				ms : oTimeFormat.parse(sValue, true).getTime()
 			};
 		} else if (sValue.startsWith("datetime'")) { // Edm.DateTime
-			if (sValue.indexOf(".") === -1) {
-				return oDateTimeFormat.parse(sValue, true);
-			} else { // Edm.DateTime with ms
-				return oDateTimeFormatMs.parse(sValue, true);
-			}
+			return sValue.includes(".")
+				? oDateTimeFormatMs.parse(sValue, true)
+				: oDateTimeFormat.parse(sValue, true);
 		} else if (sValue.startsWith("datetimeoffset'")) { // Edm.DateTimeOffset
-			return oDateTimeOffsetFormat.parse(sValue, true);
+			return sValue.includes(".")
+				? oDateTimeOffsetFormatMs.parse(sValue, true)
+				: oDateTimeOffsetFormat.parse(sValue, true);
 		} else if (sValue.startsWith("guid'")) { // Edm.Guid
 			return sValue.slice(5, -1);
 		} else if (sValue === "null") { // null

package/src/sap/ui/model/odata/type/Boolean.js

@@ -6,12 +6,14 @@
 
 sap.ui.define([
 	"sap/base/Log",
+	"sap/ui/core/Lib",
 	"sap/ui/model/FormatException",
 	"sap/ui/model/ParseException",
 	"sap/ui/model/ValidateException",
 	"sap/ui/model/odata/type/ODataType",
-	"sap/ui/core/Core" //  provides sap.ui.getCore()
-], function (Log, FormatException, ParseException, ValidateException, ODataType) {
+	//  provides sap.ui.getCore()
+	"sap/ui/core/Core"
+], function(Log, Library, FormatException, ParseException, ValidateException, ODataType) {
 	"use strict";
 
 	/**
@@ -36,7 +38,7 @@ sap.ui.define([
 	 *   the locale-dependent text for the key
 	 */
 	function getMessage(sKey, aParameters) {
-		return sap.ui.getCore().getLibraryResourceBundle().getText(sKey, aParameters);
+		return Library.getResourceBundleFor("sap.ui.core").getText(sKey, aParameters);
 	}
 
 	/**
@@ -87,7 +89,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 *
 	 * @alias sap.ui.model.odata.type.Boolean
 	 * @param {object} [oFormatOptions]
@@ -118,7 +120,7 @@ sap.ui.define([
 	 *   the target type; may be "any", "boolean", "string", or a type with one of these types as
 	 *   its {@link sap.ui.base.DataType#getPrimitiveType primitive type}.
 	 *   If the target type (or its primitive type) is "string", the result is "Yes" or "No" in the
-	 *   current {@link sap.ui.core.Configuration#getLanguage language}.
+	 *   current language; see {@link module:sap/base/i18n/Localization.getLanguage Localization.getLanguage}.
 	 *   See {@link sap.ui.model.odata.type} for more information.
 	 * @returns {boolean|string}
 	 *   the formatted output value in the target type; <code>undefined</code> or <code>null</code>
@@ -157,8 +159,8 @@ sap.ui.define([
 	 * @returns {boolean}
 	 *   the parsed value
 	 * @throws {sap.ui.model.ParseException}
-	 *   if <code>sSourceType</code> is unsupported or if the given string is neither "Yes" nor
-	 *   "No" in the current {@link sap.ui.core.Configuration#getLanguage language}.
+	 *   if <code>sSourceType</code> is unsupported or if the given string is neither "Yes" nor "No"
+	 *   in the current language; see {@link module:sap/base/i18n/Localization.getLanguage Localization.getLanguage}.
 	 * @public
 	 */
 	EdmBoolean.prototype.parseValue = function (vValue, sSourceType) {

package/src/sap/ui/model/odata/type/Byte.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 *
 	 * @alias sap.ui.model.odata.type.Byte
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Currency.js

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.type.Currency
 	 * @public
 	 * @since 1.63.0
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 */
 	var Currency = BaseCurrency.extend("sap.ui.model.odata.type.Currency", {
 		constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/Date.js

@@ -8,14 +8,15 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/base/util/extend",
 	"sap/ui/core/CalendarType",
+	"sap/ui/core/Lib",
 	"sap/ui/core/date/UI5Date",
 	"sap/ui/core/format/DateFormat",
 	"sap/ui/model/FormatException",
 	"sap/ui/model/ParseException",
 	"sap/ui/model/ValidateException",
 	"sap/ui/model/odata/type/ODataType"
-], function (Log, extend, CalendarType, UI5Date, DateFormat, FormatException, ParseException,
-		ValidateException, ODataType) {
+], function(Log, extend, CalendarType, Library, UI5Date, DateFormat, FormatException, ParseException,
+	ValidateException, ODataType) {
 	"use strict";
 
 	var rDate = /\d{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[12]\d|3[01])/,
@@ -75,7 +76,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 *
 	 * @alias sap.ui.model.odata.type.Date
 	 * @param {object} [oFormatOptions]
@@ -160,7 +161,7 @@ sap.ui.define([
 	EdmDate.prototype._getErrorMessage = function () {
 		var sDemoDate = UI5Date.getInstance().getFullYear() + "-12-31";
 
-		return sap.ui.getCore().getLibraryResourceBundle().getText("EnterDate",
+		return Library.getResourceBundleFor("sap.ui.core").getText("EnterDate",
 			[this.formatValue(sDemoDate, "string")]);
 	};
 

package/src/sap/ui/model/odata/type/DateTime.js

@@ -61,7 +61,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.DateTimeBase
 	 *
 	 * @author SAP SE
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 *
 	 * @alias sap.ui.model.odata.type.DateTime
 	 * @param {object} [oFormatOptions]
@@ -135,7 +135,7 @@ sap.ui.define([
 	 *   If the constraints of this type instance are violated
 	 *
 	 * @public
-	 * @see {@link sap.ui.core.Configuration#getTimezone}
+	 * @see {@link module:sap/base/i18n/Localization.getTimezone Localization.getTimezone}
 	 * @since 1.111.0
 	 */
 	DateTime.prototype.getModelValue = function (oDate) {

package/src/sap/ui/model/odata/type/DateTimeBase.js

@@ -7,14 +7,14 @@
 sap.ui.define([
 	"sap/base/Log",
 	"sap/base/util/extend",
+	"sap/ui/core/Lib",
 	"sap/ui/core/date/UI5Date",
 	"sap/ui/core/format/DateFormat",
 	"sap/ui/model/FormatException",
 	"sap/ui/model/ParseException",
 	"sap/ui/model/ValidateException",
 	"sap/ui/model/odata/type/ODataType"
-], function (Log, extend, UI5Date, DateFormat, FormatException, ParseException, ValidateException,
-		ODataType) {
+], function(Log, extend, Library, UI5Date, DateFormat, FormatException, ParseException, ValidateException, ODataType) {
 	"use strict";
 
 	/*
@@ -92,7 +92,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.27.0
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 */
 	var DateTimeBase = ODataType.extend("sap.ui.model.odata.type.DateTimeBase", {
 			constructor : function (oFormatOptions, oConstraints) {
@@ -216,7 +216,7 @@ sap.ui.define([
 				? new Date(Date.UTC(iFullYear, 11, 31))
 				: UI5Date.getInstance(iFullYear, 11, 31, 23, 59, 58), // configured time zone
 			sText = isDateOnly(this) ? "EnterDate" : "EnterDateTime",
-			oResourceBundle = sap.ui.getCore().getLibraryResourceBundle();
+			oResourceBundle = Library.getResourceBundleFor("sap.ui.core");
 
 		return oResourceBundle.getText(sText, [this.formatValue(oDate, "string")]);
 	};

package/src/sap/ui/model/odata/type/DateTimeOffset.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.DateTimeBase
 	 *
 	 * @author SAP SE
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 *
 	 * @alias sap.ui.model.odata.type.DateTimeOffset
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/DateTimeWithTimezone.js

@@ -5,13 +5,14 @@
  */
 
 sap.ui.define([
+	"sap/ui/core/Lib",
 	"sap/ui/core/date/UI5Date",
 	"sap/ui/core/format/DateFormat",
 	"sap/ui/model/_Helper",
 	"sap/ui/model/CompositeType",
 	"sap/ui/model/FormatException",
 	"sap/ui/model/ParseException"
-], function (UI5Date, DateFormat, _Helper, CompositeType, FormatException, ParseException) {
+], function(Library, UI5Date, DateFormat, _Helper, CompositeType, FormatException, ParseException) {
 	"use strict";
 
 	var sDateOrTimeRequired = "For type 'object', at least one of the format options 'showDate' or"
@@ -45,7 +46,7 @@ sap.ui.define([
 	 * @public
 	 * @see {sap.ui.model.odata.v2.ODataModel#bindProperty}
 	 * @since 1.99.0
-	 * @version 1.120.10
+	 * @version 1.121.1
 	 */
 	var DateTimeWithTimezone = CompositeType.extend("sap.ui.model.odata.type.DateTimeWithTimezone",
 		{
@@ -91,7 +92,7 @@ sap.ui.define([
 				? "EnterDateTimeTimezone"
 				: "EnterDateTime";
 
-		return sap.ui.getCore().getLibraryResourceBundle()
+		return Library.getResourceBundleFor("sap.ui.core")
 			.getText(sMessageKey, [this.formatValue([oDemoDateTime, "America/New_York"],
 				"string")]);
 	};