@openui5/sap.ui.core 1.109.0 → 1.111.0

package/src/sap/ui/base/ManagedObjectMetadata.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -13,7 +13,8 @@ sap.ui.define([
 	'sap/base/util/ObjectPath',
 	'sap/base/strings/escapeRegExp',
 	'sap/base/util/merge',
-	'sap/base/util/isPlainObject'
+	'sap/base/util/isPlainObject',
+	'sap/ui/core/Lib'
 ],
 function(
 	DataType,
@@ -23,7 +24,8 @@ function(
 	ObjectPath,
 	escapeRegExp,
 	merge,
-	isPlainObject
+	isPlainObject,
+	Library
 ) {
 	"use strict";
 
@@ -73,7 +75,7 @@ function(
 	 *
 	 *
 	 * @author Frank Weigel
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @since 0.8.6
 	 * @alias sap.ui.base.ManagedObjectMetadata
 	 * @extends sap.ui.base.Metadata
@@ -1314,7 +1316,7 @@ function(
 	 * @since 1.54
 	 *
 	 * @private
-	 * @ui5-restricted SAPUI5 Distribution libraries only
+	 * @ui5-restricted SAPUI5 Distribution Layer Libraries
 	 * @experimental As of 1.54, this method is still in an experimental state. Its signature might change or it might be removed
 	 *   completely. Controls should prefer to declare aggregation forwarding in the metadata for the aggregation. See property
 	 *   <code>forwarding</code> in the documentation of {@link sap.ui.base.ManagedObject.extend ManagedObject.extend}.
@@ -1795,7 +1797,7 @@ function(
 		//preload the designtime data for the library
 		var sLibrary = oMetadata.getLibraryName(),
 			sPreload = sap.ui.getCore().getConfiguration().getPreload(),
-			oLibrary = sap.ui.getCore().getLoadedLibraries()[sLibrary];
+			oLibrary = Library.all()[sLibrary];
 		if (oLibrary && oLibrary.designtime) {
 			var oPromise;
 			if (sPreload === "async" || sPreload === "sync") {

package/src/sap/ui/base/ManagedObjectObserver.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/base/ManagedObjectRegistry.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/base/Metadata.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -26,7 +26,7 @@ sap.ui.define([
 	 *
 	 * @class Metadata for a class.
 	 * @author Frank Weigel
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @since 0.8.6
 	 * @public
 	 * @alias sap.ui.base.Metadata

package/src/sap/ui/base/Object.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -26,7 +26,7 @@ sap.ui.define(['./Metadata', "sap/base/Log"],
 	 * @class Base class for all SAPUI5 Objects.
 	 * @abstract
 	 * @author Malte Wedel
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @public
 	 * @alias sap.ui.base.Object
 	 * @throws {Error} When an instance of the class or its subclasses is created without the <code>new</code> operator.
@@ -91,22 +91,31 @@ sap.ui.define(['./Metadata', "sap/base/Log"],
 	 * @public
 	 */
 
+	/**
+	 * The structure of the "metadata" object which is passed when inheriting from sap.ui.base.Object using its static "extend" method.
+	 * See {@link sap.ui.base.Object.extend} for details on its usage.
+	 *
+	 * @typedef {object} sap.ui.base.Object.MetadataOptions
+	 *
+	 * @property {string[]} [interfaces] set of names of implemented interfaces (defaults to no interfaces)
+	 * @property {boolean} [abstract=false] flag that marks the class as abstract (purely informational, defaults to false)
+	 * @property {boolean} [final=false] flag that marks the class as final (defaults to false)
+	 * @property {boolean} [deprecated=false] flag that marks the class as deprecated (defaults to false). May lead to an additional warning
+	 *     log message at runtime when the object is still used. For the documentation, also add a <code>@deprecated</code> tag in the JSDoc,
+	 *     describing since when it is deprecated and what any alternatives are.
+	 *
+	 * @public
+	 */
+
 	/**
 	 * Creates a subclass of class sap.ui.base.Object with name <code>sClassName</code>
 	 * and enriches it with the information contained in <code>oClassInfo</code>.
 	 *
 	 * <code>oClassInfo</code> might contain three kinds of information:
 	 * <ul>
-	 * <li><code>metadata:</code> an (optional) object literal with metadata about the class.
-	 * The information in the object literal will be wrapped by an instance of {@link sap.ui.base.Metadata Metadata}
-	 * and might contain the following information
-	 * <ul>
-	 * <li><code>interfaces:</code> {string[]} (optional) set of names of implemented interfaces (defaults to no interfaces)</li>
-	 * <li><code>publicMethods:</code> {string[]} (optional) list of methods that should be part of the public
-	 * facade of the class</li>
-	 * <li><code>abstract:</code> {boolean} (optional) flag that marks the class as abstract (purely informational, defaults to false)</li>
-	 * <li><code>final:</code> {boolean} (optional) flag that marks the class as final (defaults to false)</li>
-	 * </ul>
+	 * <li><code>metadata:</code> an (optional) object literal with metadata about the class like implemented interfaces,
+	 * see {@link sap.ui.base.Object.MetadataOptions MetadataOptions} for details.
+	 * The information in the object literal will be wrapped by an instance of {@link sap.ui.base.Metadata Metadata}.
 	 * Subclasses of sap.ui.base.Object can enrich the set of supported metadata (e.g. see {@link sap.ui.core.Element.extend}).
 	 * </li>
 	 *

package/src/sap/ui/base/ObjectPool.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -59,7 +59,7 @@ sap.ui.define(['./Object'],
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @alias sap.ui.base.ObjectPool
 	 * @public
 	 */

package/src/sap/ui/base/SyncPromise.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/base/syncXHRFix.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 /*

package/src/sap/ui/core/.library

@@ -4,9 +4,9 @@
   <name>sap.ui.core</name>
   <vendor>SAP SE</vendor>
   <copyright>OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.109.0</version>
+  <version>1.111.0</version>
 
   <documentation>The SAPUI5 Core Runtime.
 
@@ -203,7 +203,7 @@
             <copyright>OpenJS Foundation and other contributors</copyright>
             <pattern>sap/ui/thirdparty/jquery-compat.js</pattern>
         </lib>
-        <lib name="jquery_mobile" displayName="jQuery Mobile" npmName="n/a" version="1.3.1" hash="ce7f0d13341afe624e75cf797f43192f" homepage="http://jquerymobile.com" id="73554900106100002438">
+        <lib name="jquery_mobile" displayName="jQuery Mobile" npmName="n/a" version="1.3.1" hash="9455e32c6b83390085754590a3d71707" homepage="http://jquerymobile.com" id="73554900106100002438">
             <license url="http://jQuery.org/license" type="MIT" />
             <copyright>2010, 2013 jQuery Foundation, Inc. and other contributors</copyright>
             <pattern>sap/ui/thirdparty/jquery-mobile-custom.js</pattern>
@@ -279,7 +279,7 @@
             <copyright>Google Inc.</copyright>
             <pattern>sap/ui/thirdparty/caja-html-sanitizer.js</pattern>
         </lib>
-        <lib name="cldr" displayName="Unicode Common Locale Data Repository" npmName="cldr-core" version="35.1" hash="7a09744bcb85e731762b2a3dafd8d1e5" homepage="http://cldr.unicode.org/" id="73555000106100020909">
+        <lib name="cldr" displayName="Unicode Common Locale Data Repository" npmName="cldr-core" version="41" hash="42c6ef1e814f4b110339ad801d570123" homepage="http://cldr.unicode.org/" id="73555000106100020909">
             <license url="http://www.unicode.org/copyright.html" type="Unicode-DFS-2015" />
             <copyright>1991-2014 Unicode, Inc.</copyright>
             <pattern>sap/ui/core/cldr/*</pattern>

package/src/sap/ui/core/AccessKeysEnablement.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/AppCacheBuster.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/BlockLayerUtils.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -8,8 +8,9 @@
 sap.ui.define([
 	'sap/ui/events/jquery/EventTriggerHook',
 	"sap/base/Log",
+	"sap/ui/core/Lib",
 	"sap/ui/thirdparty/jquery"
-], function(EventTriggerHook, Log, jQuery) {
+], function(EventTriggerHook, Log, Library, jQuery) {
 	"use strict";
 
 	/**
@@ -73,7 +74,8 @@ sap.ui.define([
 
 			oBlockState = {
 				$parent: jQuery(oParentDomRef),
-				$blockLayer: jQuery(oBlockLayerDOM)
+				$blockLayer: jQuery(oBlockLayerDOM),
+				control: oControl
 			};
 
 			//check if the control has static position, if this is the case we need to change it,
@@ -113,6 +115,11 @@ sap.ui.define([
 			// deregister handlers and :before and :after tabbable spans
 			fnHandleInteraction.call(oBlockState, false);
 
+			// restore focus back to control when blocklayer currently has the focus
+			if (oBlockState.control && oBlockState.$blockLayer[0] && oBlockState.$blockLayer[0].contains(document.activeElement)) {
+				oBlockState.control.focus();
+			}
+
 			// remove blocklayer from dom
 			oBlockState.$blockLayer.remove();
 		}
@@ -124,7 +131,7 @@ sap.ui.define([
 	 * @private
 	 */
 	BlockLayerUtils.addAriaAttributes = function(oDOM) {
-		var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.core");
+		var oResourceBundle = Library.get("sap.ui.core").getResourceBundle();
 
 		oDOM.setAttribute("role", "progressbar");
 		oDOM.setAttribute("aria-valuemin", "0");

package/src/sap/ui/core/BusyIndicator.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -11,6 +11,7 @@ sap.ui.define([
 	'./Popup',
 	'./BusyIndicatorUtils',
 	'sap/ui/core/library',
+	'sap/ui/core/Lib',
 	"sap/ui/performance/trace/FESR",
 	"sap/ui/performance/trace/Interaction",
 	"sap/base/Log",
@@ -22,7 +23,8 @@ sap.ui.define([
 		EventProvider,
 		Popup,
 		BusyIndicatorUtils,
-		library,
+		coreLib,
+		Library,
 		FESR,
 		Interaction,
 		Log,
@@ -32,13 +34,13 @@ sap.ui.define([
 	"use strict";
 
 	//shortcut for sap.ui.core.BusyIndicatorSize
-	var BusyIndicatorSize = library.BusyIndicatorSize;
+	var BusyIndicatorSize = coreLib.BusyIndicatorSize;
 
 	/**
 	 * Provides methods to show or hide a waiting animation covering the whole
 	 * page and blocking user interaction.
 	 * @namespace
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @public
 	 * @alias sap.ui.core.BusyIndicator
 	 */
@@ -105,7 +107,7 @@ sap.ui.define([
 		oRootDomRef.id = this.sDOM_ID;
 
 		var oBusyContainer = document.createElement("div");
-		this._oResBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.core");
+		this._oResBundle = Library.get("sap.ui.core").getResourceBundle();
 		var sTitle = this._oResBundle.getText("BUSY_TEXT");
 		delete this._oResBundle;
 

package/src/sap/ui/core/BusyIndicatorUtils.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/CalendarType.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/CommandExecution.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/core/Component.js

@@ -1,6 +1,6 @@
 /*
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -14,6 +14,7 @@ sap.ui.define([
 	'sap/base/util/merge',
 	'sap/ui/base/ManagedObject',
 	'sap/ui/base/ManagedObjectRegistry',
+	'sap/ui/core/Lib',
 	'sap/ui/core/ResizeHandler',
 	'sap/ui/thirdparty/URI',
 	'sap/ui/performance/trace/Interaction',
@@ -36,6 +37,7 @@ sap.ui.define([
 	merge,
 	ManagedObject,
 	ManagedObjectRegistry,
+	Library,
 	ResizeHandler,
 	URI,
 	Interaction,
@@ -198,31 +200,6 @@ sap.ui.define([
 
 	}
 
-
-	/**
-	 * Calls the function <code>fn</code> once and marks all ManagedObjects
-	 * created during that call as "owned" by the given ID.
-	 *
-	 * @param {function} fn Function to execute
-	 * @param {string} sOwnerId Id of the owner
-	 * @param {Object} [oThisArg=undefined] Value to use as <code>this</code> when executing <code>fn</code>
-	 * @return {any} result of function <code>fn</code>
-	 */
-	function runWithOwner(fn, sOwnerId, oThisArg) {
-
-		assert(typeof fn === "function", "fn must be a function");
-
-		var oldOwnerId = ManagedObject._sOwnerId;
-		try {
-			ManagedObject._sOwnerId = sOwnerId;
-			return fn.call(oThisArg);
-		} finally {
-			ManagedObject._sOwnerId = oldOwnerId;
-		}
-
-	}
-
-
 	/**
 	 * Creates and initializes a new Component with the given <code>sId</code> and
 	 * settings.
@@ -248,7 +225,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @alias sap.ui.core.Component
 	 * @since 1.9.2
 	 */
@@ -403,6 +380,43 @@ sap.ui.define([
 		}
 	});
 
+	/**
+	 * Creates a new subclass of class <code>sap.ui.core.Component</code> with name
+	 * <code>sClassName</code> and enriches it with the information contained in <code>oClassInfo</code>.
+	 *
+	 * <code>oClassInfo</code> might contain the same kind of information as described in
+	 * {@link sap.ui.base.ManagedObject.extend}, plus the <code>manifest</code> property in the 'metadata'
+	 * object literal, indicating that the component configuration should be read from a manifest.json file.
+	 *
+	 * @param {string} sClassName
+	 *            Qualified name of the newly created class
+	 * @param {object} [oClassInfo]
+	 *            Object literal with information about the class
+	 * @param {sap.ui.core.Component.MetadataOptions} [oClassInfo.metadata]
+	 *            The metadata object describing the class.
+	 *            See {@link sap.ui.core.Component.MetadataOptions MetadataOptions} for the values allowed in every extend.
+	 * @param {function} [FNMetaImpl=sap.ui.core.ComponentMetadata]
+	 *            Constructor function for the metadata object. If not given, it defaults to an
+	 *            internal subclass of <code>sap.ui.core.ComponentMetadata</code>.
+	 * @returns {function} The created class / constructor function
+	 * @name sap.ui.core.Component.extend
+	 * @function
+	 * @static
+	 * @public
+	 */
+
+	/**
+	 * @typedef {sap.ui.base.ManagedObject.MetadataOptions} sap.ui.core.Component.MetadataOptions
+	 *
+	 * The structure of the "metadata" object which is passed when inheriting from sap.ui.core.Component using its static "extend" method.
+	 * See {@link sap.ui.core.Component.extend} for details on its usage.
+	 *
+	 * @property {"json"} [manifest]  When set to the string literal "json", this property indicates that the component configuration
+	 *            should be read from a manifest.json file which is assumed to exist next to the Component.js file.
+	 *
+	 * @public
+	 */
+
 	/**
 	 * Executes the given callback function for each sap.ui.core.Element whose owner-component
 	 * has the given ID and which has no parent.
@@ -713,7 +727,7 @@ sap.ui.define([
 			throw new Error("Execute 'runAsOwner' on an inactive owner component is not supported. Component: '" +
 				this.getMetadata().getName() + "' with id '" + this.getId() + "'.");
 		}
-		return runWithOwner(fn, this.getId());
+		return ManagedObject.runWithOwner(fn, this.getId());
 	};
 
 	// ---- ----
@@ -1708,68 +1722,76 @@ sap.ui.define([
 						bIsDataSourceUri = true;
 					}
 
-					if (oDataSource.type === 'OData' && oDataSource.settings && typeof oDataSource.settings.maxAge === "number") {
+					if (oDataSource.type === 'OData' && oDataSource.settings) {
 						oModelConfig.settings = oModelConfig.settings || {};
-						oModelConfig.settings.headers = oModelConfig.settings.headers || {};
-						oModelConfig.settings.headers["Cache-Control"] = "max-age=" + oDataSource.settings.maxAge;
-					}
 
-					// read out OData annotations and create ODataModel settings for it
-					if (oDataSource.type === 'OData' && oDataSource.settings && oDataSource.settings.annotations) {
-						var aAnnotations = oDataSource.settings.annotations;
+						if (typeof oDataSource.settings.maxAge === "number") {
+							oModelConfig.settings.headers = oModelConfig.settings.headers || {};
+							oModelConfig.settings.headers["Cache-Control"] = "max-age=" + oDataSource.settings.maxAge;
+						}
 
-						for (var i = 0; i < aAnnotations.length; i++) {
-							var sAnnotation = aAnnotations[i];
-							var oAnnotation = mConfig.dataSources[sAnnotation];
+						// The ODataModel's "ignoreAnnotationsFromMetadata" parameter only accepts <true> (see ODataModel constructor documentation)
+						if (oDataSource.settings.ignoreAnnotationsFromMetadata === true) {
+							oModelConfig.settings.ignoreAnnotationsFromMetadata = oDataSource.settings.ignoreAnnotationsFromMetadata;
+						}
 
-							// dataSource entry should be defined!
-							if (!oAnnotation) {
-								Log.error("Component Manifest: ODataAnnotation \"" + sAnnotation + "\" for dataSource \"" + oModelConfig.dataSource + "\" could not be found in manifest", "[\"sap.app\"][\"dataSources\"][\"" + sAnnotation + "\"]", sLogComponentName);
-								continue;
-							}
+						// read out OData annotations and create ODataModel settings for it
+						if (oDataSource.settings.annotations) {
+							var aAnnotations = oDataSource.settings.annotations;
 
-							// type should be ODataAnnotation!
-							if (oAnnotation.type !== 'ODataAnnotation') {
-								Log.error("Component Manifest: dataSource \"" + sAnnotation + "\" was expected to have type \"ODataAnnotation\" but was \"" + oAnnotation.type + "\"", "[\"sap.app\"][\"dataSources\"][\"" + sAnnotation + "\"]", sLogComponentName);
-								continue;
-							}
+							for (var i = 0; i < aAnnotations.length; i++) {
+								var sAnnotation = aAnnotations[i];
+								var oAnnotation = mConfig.dataSources[sAnnotation];
 
-							// uri is required!
-							if (!oAnnotation.uri) {
-								Log.error("Component Manifest: Missing \"uri\" for ODataAnnotation \"" + sAnnotation + "\"", "[\"sap.app\"][\"dataSources\"][\"" + sAnnotation + "\"]", sLogComponentName);
-								continue;
-							}
+								// dataSource entry should be defined!
+								if (!oAnnotation) {
+									Log.error("Component Manifest: ODataAnnotation \"" + sAnnotation + "\" for dataSource \"" + oModelConfig.dataSource + "\" could not be found in manifest", "[\"sap.app\"][\"dataSources\"][\"" + sAnnotation + "\"]", sLogComponentName);
+									continue;
+								}
 
-							var oAnnotationUri = new URI(oAnnotation.uri);
+								// type should be ODataAnnotation!
+								if (oAnnotation.type !== 'ODataAnnotation') {
+									Log.error("Component Manifest: dataSource \"" + sAnnotation + "\" was expected to have type \"ODataAnnotation\" but was \"" + oAnnotation.type + "\"", "[\"sap.app\"][\"dataSources\"][\"" + sAnnotation + "\"]", sLogComponentName);
+									continue;
+								}
 
-							if (bIsV2Model || bIsV4Model) {
-								/* eslint-disable no-loop-func */
-								["sap-language", "sap-client"].forEach(function(sName) {
-									if (!oAnnotationUri.hasQuery(sName) && oConfig.getSAPParam(sName)) {
-										oAnnotationUri.setQuery(sName, oConfig.getSAPParam(sName));
-									}
-								});
-								/* eslint-enable no-loop-func */
-
-								var sCacheTokenForAnnotation = mCacheTokens.dataSources && mCacheTokens.dataSources[oAnnotation.uri];
-								if (sCacheTokenForAnnotation) {
-									Component._applyCacheToken(oAnnotationUri, {
-										cacheToken: sCacheTokenForAnnotation,
-										componentName: sLogComponentName,
-										dataSource: sAnnotation
+								// uri is required!
+								if (!oAnnotation.uri) {
+									Log.error("Component Manifest: Missing \"uri\" for ODataAnnotation \"" + sAnnotation + "\"", "[\"sap.app\"][\"dataSources\"][\"" + sAnnotation + "\"]", sLogComponentName);
+									continue;
+								}
+
+								var oAnnotationUri = new URI(oAnnotation.uri);
+
+								if (bIsV2Model || bIsV4Model) {
+									/* eslint-disable no-loop-func */
+									["sap-language", "sap-client"].forEach(function(sName) {
+										if (!oAnnotationUri.hasQuery(sName) && oConfig.getSAPParam(sName)) {
+											oAnnotationUri.setQuery(sName, oConfig.getSAPParam(sName));
+										}
 									});
+									/* eslint-enable no-loop-func */
+
+									var sCacheTokenForAnnotation = mCacheTokens.dataSources && mCacheTokens.dataSources[oAnnotation.uri];
+									if (sCacheTokenForAnnotation) {
+										Component._applyCacheToken(oAnnotationUri, {
+											cacheToken: sCacheTokenForAnnotation,
+											componentName: sLogComponentName,
+											dataSource: sAnnotation
+										});
+									}
 								}
-							}
 
-							// resolve relative to component, ui5:// URLs are already resolved upfront
-							var oAnnotationSourceManifest = mConfig.origin.dataSources[aAnnotations[i]] || oManifest;
-							var sAnnotationUri = oAnnotationSourceManifest.resolveUri(oAnnotationUri.toString());
+								// resolve relative to component, ui5:// URLs are already resolved upfront
+								var oAnnotationSourceManifest = mConfig.origin.dataSources[aAnnotations[i]] || oManifest;
+								var sAnnotationUri = oAnnotationSourceManifest.resolveUri(oAnnotationUri.toString());
 
-							// add uri to annotationURI array in settings (this parameter applies for ODataModel v1 & v2)
-							oModelConfig.settings = oModelConfig.settings || {};
-							oModelConfig.settings.annotationURI = oModelConfig.settings.annotationURI || [];
-							oModelConfig.settings.annotationURI.push(sAnnotationUri);
+								// add uri to annotationURI array in settings (this parameter applies for ODataModel v1 & v2)
+								oModelConfig.settings.annotationURI = oModelConfig.settings.annotationURI || [];
+								oModelConfig.settings.annotationURI.push(sAnnotationUri);
+							}
 						}
+
 					}
 
 				} else {
@@ -2589,7 +2611,7 @@ sap.ui.define([
 					});
 				};
 				return loadDependenciesAndIncludes(oClass.getMetadata()).then(function () {
-					return runWithOwner(function() {
+					return ManagedObject.runWithOwner(function() {
 						return createInstance(oClass);
 					}, sCurrentOwnerId);
 				});
@@ -3022,7 +3044,7 @@ sap.ui.define([
 						Array.prototype.push.apply(aLibs, oTransitiveDependencies.dependencies);
 
 						// load library preload for every transitive dependency
-						return sap.ui.getCore().loadLibraries( aLibs, { preloadOnly: true } ).catch(errorLogging(oTransitiveDependencies.library, true));
+						return Library._load( aLibs, { preloadOnly: true } ).catch(errorLogging(oTransitiveDependencies.library, true));
 					} else {
 						sPreloadName = sController.replace(/\./g, "/") + (http2 ? '-h2-preload.js' : '-preload.js'); // URN
 						return sap.ui.loader._.loadJSResourceAsync(sPreloadName).catch(errorLogging(sPreloadName, true));
@@ -3059,8 +3081,8 @@ sap.ui.define([
 				}
 				if (aLibs.length > 0) {
 					Log.info("Component \"" + sComponentName + "\" is loading libraries: \"" + aLibs.join(", ") + "\"");
-					fnCollect(sap.ui.getCore().loadLibraries(aLibs, {
-						async: bAsync
+					fnCollect(Library._load(aLibs, {
+						sync: !bAsync
 					}));
 				}
 			}
@@ -3152,7 +3174,7 @@ sap.ui.define([
 			if ( Array.isArray(hints.libs) ) {
 				libs = hints.libs.map(processOptions).filter(identity);
 				phase1Preloads.push(
-					sap.ui.getCore().loadLibraries( libs, { preloadOnly: true } )
+					Library._load( libs, { preloadOnly: true } )
 				);
 			}
 
@@ -3162,7 +3184,7 @@ sap.ui.define([
 			phase1Preloads = Promise.all( phase1Preloads );
 			if ( libs && !mOptions.preloadOnly ) {
 				phase1Preloads = phase1Preloads.then( function() {
-					return sap.ui.getCore().loadLibraries( libs );
+					return Library._load( libs );
 				});
 			}
 			collect( phase1Preloads );