@openui5/sap.ui.integration 1.93.3 → 1.96.2

package/src/sap/ui/integration/util/BaseFactory.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/util/BindingHelper.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * Helper class for working with bindings.
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.BindingHelper

package/src/sap/ui/integration/util/BindingResolver.js

@@ -32,7 +32,7 @@ sap.ui.define([
 		 * Resolves a binding syntax based on a provided model and path.
 		 *
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.2
 		 *
 		 * @private
 		 * @alias sap.ui.integration.util.BindingResolver

package/src/sap/ui/integration/util/CacheAndRequestDataProvider.js

@@ -5,8 +5,10 @@
  */
 sap.ui.define([
 	"sap/ui/integration/util/RequestDataProvider",
-	"sap/base/Log"
-], function (RequestDataProvider, Log) {
+	"sap/base/Log",
+	"sap/ui/core/Core",
+	"sap/base/util/merge"
+], function (RequestDataProvider, Log, Core, merge) {
 	"use strict";
 	/*global URL*/
 
@@ -34,9 +36,32 @@ sap.ui.define([
 	}
 
 	/**
+	 * Executes data requests with enabled caching based on the given settings.
 	 * @private
+	 * @ui5-restricted sap.ui.integration, shell-toolkit
+	 * @alias sap.ui.integration.util.CacheAndRequestDataProvider
 	 */
-	var CacheAndRequestDataProvider = RequestDataProvider.extend("sap.ui.integration.util.CacheAndRequestDataProvider");
+	var CacheAndRequestDataProvider = RequestDataProvider.extend("sap.ui.integration.util.CacheAndRequestDataProvider", {
+		metadata: {
+			associations : {
+				/**
+				 * The host which is used for communication with the caching service worker.
+				 */
+				host: {
+					type : "sap.ui.integration.Host",
+					multiple: false
+				},
+
+				/**
+				 * Optionally the card which will be used as reference for the requests and for visual representation of cache timestamp and refresh.
+				 */
+				card: {
+					type : "sap.ui.integration.widgets.Card",
+					multiple: false
+				}
+			}
+		}
+	});
 
 	/**
 	 * @override
@@ -56,6 +81,24 @@ sap.ui.define([
 		RequestDataProvider.prototype.destroy.apply(this, arguments);
 	};
 
+	CacheAndRequestDataProvider.prototype.getHostInstance = function () {
+		return Core.byId(this.getHost());
+	};
+
+	CacheAndRequestDataProvider.prototype.getCardInstance = function () {
+		return Core.byId(this.getCard());
+	};
+
+	CacheAndRequestDataProvider.prototype.getCardInstanceHeader = function () {
+		var oCard = this.getCardInstance();
+
+		if (!oCard) {
+			return null;
+		}
+
+		return oCard.getCardHeader();
+	};
+
 	CacheAndRequestDataProvider.prototype.onDataRequestComplete = function () {
 		var iInterval;
 
@@ -84,8 +127,7 @@ sap.ui.define([
 	 */
 	CacheAndRequestDataProvider.prototype._request = function (oRequest) {
 		var pRequestPromise,
-			oCard = this.getCardInstance(),
-			oCardHeader = oCard.getCardHeader();
+			oCardHeader = this.getCardInstanceHeader();
 
 		this._sCurrentRequestFullUrl = getFullUrl(oRequest);
 
@@ -110,9 +152,11 @@ sap.ui.define([
 	 * Refresh the data without using cache.
 	 */
 	CacheAndRequestDataProvider.prototype.refreshWithoutCache = function () {
-		var oCardHeader = this.getCardInstance().getCardHeader();
+		var oCardHeader = this.getCardInstanceHeader();
 
-		oCardHeader.setDataTimestampUpdating(true);
+		if (oCardHeader) {
+			oCardHeader.setDataTimestampUpdating(true);
+		}
 
 		setTimeout(function () {
 			this._bCacheOnly = false;
@@ -125,9 +169,11 @@ sap.ui.define([
 	 * Refresh the data preferring any cache if available.
 	 */
 	CacheAndRequestDataProvider.prototype.refreshFromCache = function () {
-		var oCardHeader = this.getCardInstance().getCardHeader();
+		var oCardHeader = this.getCardInstanceHeader();
 
-		oCardHeader.setDataTimestampUpdating(true);
+		if (oCardHeader) {
+			oCardHeader.setDataTimestampUpdating(true);
+		}
 
 		setTimeout(function () {
 			this._bCacheOnly = true;
@@ -144,18 +190,21 @@ sap.ui.define([
 	 */
 	CacheAndRequestDataProvider.prototype._prepareHeaders = function (mHeaders, oSettings) {
 		var oCard = this.getCardInstance(),
-			oHost = oCard.getHostInstance(),
-			oNewSettings = Object.assign({}, oSettings),
-			oCache = oNewSettings.request.cache;
-
-		if (!oCache) {
-			oCache = {
+			oHost = this.getHostInstance(),
+			oDefault = {
+				enabled: true,
 				maxAge: 0,
 				staleWhileRevalidate: true
-			};
+			},
+			oNewSettings = merge({request: { cache: oDefault }}, oSettings),
+			oCache = oNewSettings.request.cache;
+
+		if (oCache.noStore) {
+			// temporary needed for backward compatibility
+			oCache.enabled = false;
 		}
 
-		if (!oCache.noStore) {
+		if (oCache.enabled) {
 			if (this._bCacheOnly) {
 				oCache.maxAge = SECONDS_IN_YEAR;
 				oCache.staleWhileRevalidate = false;
@@ -178,8 +227,7 @@ sap.ui.define([
 	 * Starts to listen for messages from the host.
 	 */
 	CacheAndRequestDataProvider.prototype._subscribeToHostMessages = function () {
-		var oCard = this.getCardInstance(),
-			oHost = oCard.getHostInstance();
+		var oHost = this.getHostInstance();
 
 		if (this._bIsSubscribed) {
 			return;
@@ -198,8 +246,7 @@ sap.ui.define([
 	 * Stops to listen for messages from the host.
 	 */
 	CacheAndRequestDataProvider.prototype._unsubscribeFromHostMessages = function () {
-		var oCard = this.getCardInstance(),
-			oHost = oCard.getHostInstance();
+		var oHost = this.getHostInstance();
 
 		if (!oHost) {
 			return;
@@ -232,7 +279,7 @@ sap.ui.define([
 
 	CacheAndRequestDataProvider.prototype._attachTimestampPress = function (oEvent) {
 		var oCard = this.getCardInstance(),
-			oHeader = oCard.getCardHeader();
+			oHeader = this.getCardInstanceHeader();
 
 		if (this._oHeaderDelegate) {
 			return;
@@ -258,8 +305,12 @@ sap.ui.define([
 
 	CacheAndRequestDataProvider.prototype._detachTimestampPress = function (oEvent) {
 		var oCard = this.getCardInstance(),
-			oHeader = oCard.getCardHeader(),
-			$timestamp = this.getCardInstance().$().find(".sapFCardDataTimestamp");
+			oHeader = this.getCardInstanceHeader(),
+			$timestamp = oCard && oCard.$().find(".sapFCardDataTimestamp");
+
+		if (!oHeader) {
+			return;
+		}
 
 		$timestamp.off("click", this._oRefreshWithoutCacheBound);
 

package/src/sap/ui/integration/util/CardActions.js

@@ -43,7 +43,7 @@ sap.ui.define([
 		 * @extends sap.ui.base.ManagedObject
 		 *
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.2
 		 *
 		 * @constructor
 		 * @private

package/src/sap/ui/integration/util/CardMerger.js

@@ -20,7 +20,7 @@ sap.ui.define([
 		layers: { "admin": 0, "content": 5, "translation": 10, "all": 20 },
 		mergeManifestPathChanges: function (oModel, oChange) {
 			/* hide multi language function since there has a translation issue in Portal
-			var sLanguage =  Core.getConfiguration().getLanguage().replaceAll('-', '_');
+			var sLanguage =  Core.getConfiguration().getLanguage().replaceAll('_', '-');
 			*/
 			Object.keys(oChange).forEach(function (s) {
 				if (s.charAt(0) === "/") {
@@ -44,9 +44,11 @@ sap.ui.define([
 				}
 			});
 		},
-		mergeCardDelta: function (oManifest, aChanges) {
-			var oInitialManifest = merge({}, oManifest),
+		mergeCardDelta: function (oManifest, aChanges, sSection) {
+			var oInitialManifest = merge({}, oManifest);
+			if (typeof sSection === "undefined") {
 				sSection = "sap.card";
+			}
 			if (Array.isArray(aChanges) && aChanges.length > 0) {
 				var oModel;
 				aChanges.forEach(function (oChange) {

package/src/sap/ui/integration/util/CardObserver.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/util/ContentFactory.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.BaseFactory
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/util/DataProvider.js

@@ -3,8 +3,8 @@
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-sap.ui.define(["sap/ui/base/ManagedObject", "sap/ui/core/Core"],
-	function (ManagedObject, Core) {
+sap.ui.define(["sap/ui/base/ManagedObject"],
+	function (ManagedObject) {
 	"use strict";
 
 	/**
@@ -24,10 +24,11 @@ sap.ui.define(["sap/ui/base/ManagedObject", "sap/ui/core/Core"],
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private
+	 * @ui5-restricted sap.ui.integration, shell-toolkit
 	 * @since 1.65
 	 * @alias sap.ui.integration.util.DataProvider
 	 * @ui5-metamodel This control/element will also be described in the UI5 (legacy) designtime metamodel
@@ -41,15 +42,13 @@ sap.ui.define(["sap/ui/base/ManagedObject", "sap/ui/core/Core"],
 				 */
 				settingsJson: {
 					type: "string"
-				}
-			},
-			associations : {
+				},
+
 				/**
-				 * The card.
+				 * The base url where resources for card or editor are located.
 				 */
-				card: {
-					type : "sap.ui.integration.widgets.Card",
-					multiple: false
+				baseRuntimeUrl: {
+					type : "string"
 				}
 			},
 			events: {
@@ -124,6 +123,20 @@ sap.ui.define(["sap/ui/base/ManagedObject", "sap/ui/core/Core"],
 		}
 	};
 
+	/**
+	 * @private
+	 * @param {string} sUrl
+	 */
+	DataProvider.prototype._getRuntimeUrl = function(sUrl) {
+		if (sUrl.startsWith("http://") ||
+			sUrl.startsWith("https://") ||
+			sUrl.startsWith("//")) {
+			return sUrl;
+		}
+		var sSanitizedUrl = sUrl && sUrl.trim().replace(/^\//, "");
+		return this.getBaseRuntimeUrl() + sSanitizedUrl;
+	};
+
 	/**
 	 * Sets the data settings for the <code>DataProvider</code>
 	 *
@@ -145,6 +158,8 @@ sap.ui.define(["sap/ui/base/ManagedObject", "sap/ui/core/Core"],
 	/**
 	 * Triggers a data update which results in either "dataChanged" event or an "error" event.
 	 *
+	 * @private
+	 * @ui5-restricted sap.ui.integration, shell-toolkit
 	 * @returns {Promise} A promise resolved when the update has finished.
 	 */
 	DataProvider.prototype.triggerDataUpdate = function () {
@@ -165,10 +180,6 @@ sap.ui.define(["sap/ui/base/ManagedObject", "sap/ui/core/Core"],
 		return pDataUpdate;
 	};
 
-	DataProvider.prototype.getCardInstance = function () {
-		return Core.byId(this.getCard());
-	};
-
 	DataProvider.prototype._triggerDataUpdate = function () {
 		this._bActive = true;
 
@@ -188,6 +199,9 @@ sap.ui.define(["sap/ui/base/ManagedObject", "sap/ui/core/Core"],
 	};
 
 	/**
+	 * Triggers a data update and returns the result data.
+	 * @private
+	 * @ui5-restricted sap.ui.integration, shell-toolkit
 	 * @returns {Promise} A promise resolved when the data is available and rejected in case of an error.
 	 */
 	DataProvider.prototype.getData = function () {

package/src/sap/ui/integration/util/DataProviderFactory.js

@@ -22,24 +22,31 @@ function (BaseObject, ServiceDataProvider, RequestDataProvider, CacheAndRequestD
 	 * When destroyed, all data providers created by this class are also destroyed.
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @private
+	 * @ui5-restricted sap.ui.integration, shell-toolkit
 	 * @since 1.65
 	 * @alias sap.ui.integration.util.DataProviderFactory
 	 */
 	var DataProviderFactory = BaseObject.extend("sap.ui.integration.util.DataProviderFactory", {
-		constructor: function (oDestinations, oExtension, oCard) {
+		constructor: function (oDestinations, oExtension, oCard, oEditor, oHost) {
 			BaseObject.call(this);
 			this._oDestinations = oDestinations;
 			this._oExtension = oExtension;
 			this._oCard = oCard;
+			this._oEditor = oEditor;
+			this._oHost = oHost;
 
 			this._aDataProviders = [];
 			this._aFiltersProviders = [];
 		}
 	});
 
+	/**
+	 * @private
+	 * @ui5-restricted sap.ui.integration, shell-toolkit
+	 */
 	DataProviderFactory.prototype.destroy = function () {
 		BaseObject.prototype.destroy.apply(this, arguments);
 
@@ -62,6 +69,8 @@ function (BaseObject, ServiceDataProvider, RequestDataProvider, CacheAndRequestD
 	/**
 	 * Returns if this factory is destroyed.
 	 *
+	 * @private
+	 * @ui5-restricted sap.ui.integration, shell-toolkit
 	 * @returns {boolean} if this manifest is destroyed
 	 */
 	DataProviderFactory.prototype.isDestroyed = function () {
@@ -73,11 +82,14 @@ function (BaseObject, ServiceDataProvider, RequestDataProvider, CacheAndRequestD
 	 *
 	 * @param {Object} oDataSettings The data settings.
 	 * @param {sap.ui.integration.util.ServiceManager} oServiceManager A reference to the service manager.
+	 * @private
+	 * @ui5-restricted sap.ui.integration, shell-toolkit
 	 * @returns {sap.ui.integration.util.DataProvider|null} A data provider instance used for data retrieval.
 	 */
 	DataProviderFactory.prototype.create = function (oDataSettings, oServiceManager, bIsFilter) {
 		var oCard = this._oCard,
-			oHost = oCard.getHostInstance(),
+			oEditor = this._oEditor,
+			oHost = this._oHost || (oCard && oCard.getHostInstance()) || (oEditor && oEditor.getHostInstance()),
 			bUseExperimentalCaching = oHost && oHost.bUseExperimentalCaching,
 			oConfig,
 			oDataProvider;
@@ -86,13 +98,26 @@ function (BaseObject, ServiceDataProvider, RequestDataProvider, CacheAndRequestD
 			return null;
 		}
 
-		oConfig = {
-			"card": oCard,
-			"settingsJson": JSONBindingHelper.createJsonWithBindingInfos(oDataSettings, oCard.getBindingNamespaces())
-		};
+		if (oCard) {
+			oConfig = {
+				"baseRuntimeUrl": oCard.getRuntimeUrl("/"),
+				"settingsJson": JSONBindingHelper.createJsonWithBindingInfos(oDataSettings, oCard.getBindingNamespaces())
+			};
+		} else if (oEditor) {
+			oConfig = {
+				"baseRuntimeUrl": oEditor.getRuntimeUrl("/"),
+				"settingsJson": JSONBindingHelper.createJsonWithBindingInfos(oDataSettings, oEditor.getBindingNamespaces())
+			};
+		} else {
+			oConfig = {
+				"settingsJson": JSONBindingHelper.createJsonWithBindingInfos(oDataSettings, {})
+			};
+		}
 
 		if (oDataSettings.request && bUseExperimentalCaching) {
 			oDataProvider = new CacheAndRequestDataProvider(oConfig);
+			oDataProvider.setCard(oCard);
+			oDataProvider.setHost(oHost);
 		} else if (oDataSettings.request) {
 			oDataProvider = new RequestDataProvider(oConfig);
 		} else if (oDataSettings.service) {
@@ -105,7 +130,11 @@ function (BaseObject, ServiceDataProvider, RequestDataProvider, CacheAndRequestD
 			return null;
 		}
 
-		BindingHelper.propagateModels(oCard, oDataProvider);
+		if (oCard) {
+			BindingHelper.propagateModels(oCard, oDataProvider);
+		} else if (oEditor) {
+			BindingHelper.propagateModels(oEditor, oDataProvider);
+		}
 		oDataProvider.bindObject("/");
 
 		oDataProvider.setDestinations(this._oDestinations);
@@ -129,6 +158,8 @@ function (BaseObject, ServiceDataProvider, RequestDataProvider, CacheAndRequestD
 	 * Removes a DataProvider from Factory's registry.
 	 *
 	 * @param oDataProvider {sap.ui.integration.util.DataProvider}
+	 * @private
+	 * @ui5-restricted sap.ui.integration, shell-toolkit
 	 * @experimental
 	 */
 	DataProviderFactory.prototype.remove = function (oDataProvider) {

package/src/sap/ui/integration/util/Destinations.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @param {sap.ui.integration.Host} oHost The Host which will be used for resolving destinations.

package/src/sap/ui/integration/util/ExtensionDataProvider.js

@@ -17,7 +17,7 @@ sap.ui.define(["sap/ui/integration/util/DataProvider"], function (DataProvider)
 	 * @extends sap.ui.integration.util.DataProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/util/HeaderFactory.js

@@ -68,7 +68,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.BaseFactory
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private
@@ -77,11 +77,8 @@ sap.ui.define([
 	var HeaderFactory = BaseFactory.extend("sap.ui.integration.util.HeaderFactory");
 
 	HeaderFactory.prototype.create = function (mConfiguration, oToolbar) {
-		var oHeader,
-			oCard = this._oCard,
-			oActions = new CardActions({
-				card: oCard
-			});
+		var oCard = this._oCard,
+			oHeader;
 
 		mConfiguration = this.createBindingInfos(mConfiguration, oCard.getBindingNamespaces());
 
@@ -110,6 +107,10 @@ sap.ui.define([
 		oHeader.setDataProviderFactory(oCard._oDataProviderFactory);
 		oHeader._setDataConfiguration(mConfiguration.data);
 
+		var oActions = new CardActions({
+			card: oCard
+		});
+
 		oActions.attach({
 			area: ActionArea.Header,
 			actions: mConfiguration.actions,
@@ -125,4 +126,4 @@ sap.ui.define([
 	};
 
 	return HeaderFactory;
-});
+});

package/src/sap/ui/integration/util/JSONBindingHelper.js

@@ -27,9 +27,10 @@ sap.ui.define([
 	 * Helper class for working with bindings for json objects.
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @private
+	 * @ui5-restricted sap.ui.integration, shell-toolkit
 	 * @alias sap.ui.integration.util.JSONBindingHelper
 	 */
 	var JSONBindingHelper = {};
@@ -40,6 +41,8 @@ sap.ui.define([
 	 *
 	 * @param {object} oValue The object for which we want to create binding infos.
 	 * @param {object} mLocalBindingNamespaces Local binding functions
+	 * @private
+	 * @ui5-restricted sap.ui.integration, shell-toolkit
 	 * @return {string} The json stringified object with the binding infos.
 	 */
 	JSONBindingHelper.createJsonWithBindingInfos = function (oValue, mLocalBindingNamespaces) {

package/src/sap/ui/integration/util/LoadingProvider.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/util/Manifest.js

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private
@@ -72,6 +72,7 @@ sap.ui.define([
 			BaseObject.call(this);
 
 			this._aChanges = aChanges;
+			this._sSection = sSection;
 
 			this.PARAMETERS = MANIFEST_PARAMETERS.replace("{SECTION}", sSection);
 			this.FILTERS = MANIFEST_FILTERS.replace("{SECTION}", sSection);
@@ -92,7 +93,7 @@ sap.ui.define([
 				}
 
 				if (this._aChanges) {
-					oMergedManifest = CardMerger.mergeCardDelta(oManifestJson, this._aChanges);
+					oMergedManifest = this.mergeDeltaChanges(oManifestJson);
 				} else {
 					oMergedManifest = oManifestJson;
 				}
@@ -103,6 +104,16 @@ sap.ui.define([
 		}
 	});
 
+	/**
+	 * Merge the manifest json with changes
+	 *
+	 * @param {Object} oManifestJson The manifest json
+	 * @returns {Object} The merged manifest json
+	 */
+	Manifest.prototype.mergeDeltaChanges = function (oManifestJson) {
+		return CardMerger.mergeCardDelta(oManifestJson, this._aChanges, this._sSection);
+	};
+
 	/**
 	 * @returns {Object} A copy of the Manifest JSON.
 	 */
@@ -210,7 +221,7 @@ sap.ui.define([
 				this._oInitialJson = deepClone(oManifestJson, 500);
 
 				if (this._aChanges) {
-					return CardMerger.mergeCardDelta(oManifestJson, this._aChanges);
+					return this.mergeDeltaChanges(oManifestJson);
 				}
 
 				return oManifestJson;

package/src/sap/ui/integration/util/RequestDataProvider.js

@@ -31,10 +31,11 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.DataProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private
+	 * @ui5-restricted sap.ui.integration, shell-toolkit
 	 * @since 1.65
 	 * @alias sap.ui.integration.util.RequestDataProvider
 	 */
@@ -64,6 +65,8 @@ sap.ui.define([
 
 	/**
 	 * @override
+	 * @private
+	 * @ui5-restricted sap.ui.integration, shell-toolkit
 	 * @returns {Promise} A promise resolved when the data is available and rejected in case of an error.
 	 */
 	RequestDataProvider.prototype.getData = function () {
@@ -112,7 +115,6 @@ sap.ui.define([
 		}
 
 		var vData = oRequestConfig.parameters,
-			oCard = this.getCardInstance(),
 			sUrl = oRequestConfig.url,
 			sDataType = (this.getAllowCustomDataType() && oRequestConfig.dataType) || "json",
 			mHeaders = oRequestConfig.headers || {},
@@ -120,8 +122,8 @@ sap.ui.define([
 			oBatchSerialized,
 			oRequest;
 
-		if (oCard && !sUrl.startsWith("/")) {
-			sUrl = oCard.getRuntimeUrl(oRequestConfig.url);
+		if ( !sUrl.startsWith("/")) {
+			sUrl = this._getRuntimeUrl(oRequestConfig.url);
 		}
 
 		// if not 'application/x-www-form-urlencoded', data has to be serialized manually

package/src/sap/ui/integration/util/ServiceDataProvider.js

@@ -17,7 +17,7 @@ sap.ui.define(["sap/ui/integration/util/DataProvider"], function (DataProvider)
 	 * @extends sap.ui.integration.util.DataProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/util/ServiceManager.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.EventProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @param {Object} mServiceFactoryReferences A map with service descriptions.

package/src/sap/ui/integration/util/Utils.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * Utility class helping with JSON strings and formatters.
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.Utils