@sapui5/sap.ushell_abap 1.150.1 → 1.152.0

package/src/main/js/sap/ushell_abap/pbServices/ui2/Chip.js

@@ -5,13 +5,15 @@
  */
 sap.ui.define([
     "sap/base/Log",
+    "sap/ushell/base/requireAsync",
     "sap/ushell_abap/pbServices/ui2/Bag",
     "sap/ushell_abap/pbServices/ui2/ChipDefinition",
-    "sap/ushell_abap/pbServices/ui2/Error",
-    "sap/ushell_abap/pbServices/ui2/Utils",
+    "sap/ushell_abap/base/Ui2Error",
+    "sap/ushell_abap/base/Ui2Utils",
     "sap/ushell/utils/DeprecationLog"
 ], (
     Log,
+    requireAsync,
     Bag,
     ChipDefinition,
     SrvcError,
@@ -558,21 +560,13 @@ sap.ui.define([
                 const ComponentContainer = sap.ui.requireSync("sap/ui/core/ComponentContainer"); // LEGACY API (deprecated)
                 const oComponentContainer = new ComponentContainer();
                 // load the content lazily to enable components using async interface
-                this.oComponentPromise = new Promise((resolve, reject) => {
-                    sap.ui.require([
-                        "sap/ui/core/Component"
-                    ], (Component) => {
-                        Component.create({
-                            name: oImplementation.componentName,
-                            componentData: oData,
-                            manifest: false
-                        })
-                            .then((oComponent) => {
-                                oComponentContainer.setComponent(oComponent);
-                            })
-                            .then(resolve)
-                            .catch(reject);
+                this.oComponentPromise = requireAsync(["sap/ui/core/Component"]).then(async ([Component]) => {
+                    const oComponent = await Component.create({
+                        name: oImplementation.componentName,
+                        componentData: oData,
+                        manifest: false
                     });
+                    oComponentContainer.setComponent(oComponent);
                 });
 
                 return oComponentContainer;
@@ -602,59 +596,54 @@ sap.ui.define([
         this.getImplementationAsSapui5Async = async function (oApi) {
             checkStub();
 
-            return new Promise((resolve, reject) => {
-                sap.ui.require([
-                    "sap/ui/core/ComponentContainer",
-                    "sap/ui/core/Component",
-                    "sap/ui/core/mvc/View"
-                ], (ComponentContainer, Component, View) => {
-                    const oData = {
-                        /**
-                         * @namespace
-                         * The namespace for the instance specific CHIP API, which allows you to
-                         * access the various contracts consumed by your CHIP instance.
-                         * @private
-                         */
-                        chip: oApi
-                    };
-                    const oImplementation = oDefinition.implementation.sapui5;
-
-                    // In case the chip is used in FLP wave 2 or later context we load it from the standard path
-                    const sBaseChipId = this.getBaseChipId();
-                    if ((sBaseChipId !== "X-SAP-UI2-CHIP:/UI2/STATIC_APPLAUNCHER") && (sBaseChipId !== "X-SAP-UI2-CHIP:/UI2/DYNAMIC_APPLAUNCHER")) {
-                        if (oImplementation.$VirtualNamespace) {
-                            oImplementation.$absolutePath = this.toAbsoluteUrl(oImplementation.basePath);
-                            sap.ui.loader.config({ paths: JSON.parse(`{"${oImplementation.$Namespace.replace(/\./g, "/")}":"${oImplementation.$absolutePath}"}`) });
-                        } else {
-                            sap.ui.loader.config({ paths: JSON.parse(`{"${oImplementation.$Namespace.replace(/\./g, "/")}":"${oImplementation.$UrlPrefix}"}`) });
-                        }
-                    }
+            const [
+                ComponentContainer,
+                Component,
+                View
+            ] = await requireAsync([
+                "sap/ui/core/ComponentContainer",
+                "sap/ui/core/Component",
+                "sap/ui/core/mvc/View"
+            ]);
+            const oData = {
+                /**
+                 * @namespace
+                 * The namespace for the instance specific CHIP API, which allows you to
+                 * access the various contracts consumed by your CHIP instance.
+                 * @private
+                 */
+                chip: oApi
+            };
+            const oImplementation = oDefinition.implementation.sapui5;
 
-                    if (oImplementation.componentName) {
-                        // SAPUI5 component
-                        return Component.create({
-                            name: oImplementation.componentName,
-                            componentData: oData,
-                            manifest: false
-                        })
-                            .then((oComponent) => {
-                                return new ComponentContainer({
-                                    component: oComponent
-                                });
-                            })
-                            .then(resolve)
-                            .catch(reject);
-                    }
+            // In case the chip is used in FLP wave 2 or later context we load it from the standard path
+            const sBaseChipId = this.getBaseChipId();
+            if ((sBaseChipId !== "X-SAP-UI2-CHIP:/UI2/STATIC_APPLAUNCHER") && (sBaseChipId !== "X-SAP-UI2-CHIP:/UI2/DYNAMIC_APPLAUNCHER")) {
+                if (oImplementation.$VirtualNamespace) {
+                    oImplementation.$absolutePath = this.toAbsoluteUrl(oImplementation.basePath);
+                    sap.ui.loader.config({ paths: JSON.parse(`{"${oImplementation.$Namespace.replace(/\./g, "/")}":"${oImplementation.$absolutePath}"}`) });
+                } else {
+                    sap.ui.loader.config({ paths: JSON.parse(`{"${oImplementation.$Namespace.replace(/\./g, "/")}":"${oImplementation.$UrlPrefix}"}`) });
+                }
+            }
 
-                    // SAPUI5 MVC
-                    return View.create({
-                        type: oImplementation.$ViewType,
-                        viewName: oImplementation.$ViewName,
-                        viewData: oData
-                    })
-                        .then(resolve)
-                        .catch(reject);
+            if (oImplementation.componentName) {
+                // SAPUI5 component
+                const oComponent = await Component.create({
+                    name: oImplementation.componentName,
+                    componentData: oData,
+                    manifest: false
+                });
+                return new ComponentContainer({
+                    component: oComponent
                 });
+            }
+
+            // SAPUI5 MVC
+            return View.create({
+                type: oImplementation.$ViewType,
+                viewName: oImplementation.$ViewName,
+                viewData: oData
             });
         };
 

package/src/main/js/sap/ushell_abap/pbServices/ui2/ChipDefinition.js

@@ -6,7 +6,7 @@
  */
 
 sap.ui.define([
-    "sap/ushell_abap/pbServices/ui2/Error"
+    "sap/ushell_abap/base/Ui2Error"
 ], (
     SrvcError
 ) => {

package/src/main/js/sap/ushell_abap/pbServices/ui2/ChipInstance.js

@@ -9,8 +9,8 @@ this.sap = this.sap || {};
 sap.ui.define([
     "sap/base/Log",
     "sap/ushell_abap/pbServices/ui2/Bag",
-    "sap/ushell_abap/pbServices/ui2/Error",
-    "sap/ushell_abap/pbServices/ui2/Utils",
+    "sap/ushell_abap/base/Ui2Error",
+    "sap/ushell_abap/base/Ui2Utils",
     "sap/ushell/utils/DeprecationLog"
 ], (
     Log,
@@ -966,7 +966,7 @@ sap.ui.define([
 
         /**
          * Returns the map of bags for this CHIP instance
-         * @returns {sap.ushell_abap.pbServices.ui2.Utils.Map} The map of bags
+         * @returns {sap.ushell_abap.base.Ui2Utils.Map} The map of bags
          *
          * @since 1.113.0
          * @private
@@ -977,7 +977,7 @@ sap.ui.define([
 
         /**
          * Overwrites the map of bags for this CHIP instance
-         * @param {sap.ushell_abap.pbServices.ui2.Utils.Map} oNewBags The new map of bags
+         * @param {sap.ushell_abap.base.Ui2Utils.Map} oNewBags The new map of bags
          *
          * @since 1.113.0
          * @private

package/src/main/js/sap/ushell_abap/pbServices/ui2/Error.js

@@ -1,44 +1,12 @@
 // Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 
 /**
- * @fileOverview An error object which logs the error message immediately.
+ * @fileOverview Deprecated re-export shim. Use "sap/ushell_abap/base/Ui2Error" instead.
+ * @deprecated since 1.147.0 - use sap/ushell_abap/base/Ui2Error
  */
-
 sap.ui.define([
-    "sap/base/Log"
-], (
-    Log
-) => {
+    "sap/ushell_abap/base/Ui2Error"
+], (Ui2Error) => {
     "use strict";
-
-    /**
-     * Creates an <code>Error</code> object and logs the error message immediately.
-     *
-     * @param {string} sMessage
-     *   the error message
-     * @param {string} [sComponent]
-     *   the error component to log
-     * @param {boolean} [bLogError=true]
-     *   defines if the error is logged directly in the constructor; In case the error is going to be catched,
-     *   the logging may be misleading
-     *
-     * @class
-     * @since 1.2.0
-     */
-    function SrvcError (sMessage, sComponent, bLogError) {
-        // see also redundant declaration in utils.js which has to be in sync
-        const oError = new Error(sMessage); // reuse Error constructor to benefit from it (e.g. stack)
-
-        // by default the error should be logged (as always in this project)
-        bLogError = bLogError === undefined ? true : bLogError;
-
-        oError.name = "Error";
-        if (bLogError === true) {
-            Log.error(sMessage, null, sComponent);
-        }
-
-        return oError;
-    }
-
-    return SrvcError;
+    return Ui2Error;
 });

package/src/main/js/sap/ushell_abap/pbServices/ui2/Factory.js

@@ -8,14 +8,14 @@
 
 sap.ui.define([
     "sap/ushell_abap/pbServices/ui2/Chip",
-    "sap/ushell_abap/pbServices/ui2/Error",
+    "sap/ushell_abap/base/Ui2Error",
     "sap/ushell_abap/pbServices/ui2/Catalog",
     "sap/ushell_abap/pbServices/ui2/ChipDefinition",
     "sap/ushell_abap/pbServices/ui2/PageBuildingService",
     "sap/ushell_abap/pbServices/ui2/ChipInstance",
     "sap/ushell_abap/pbServices/ui2/Page",
     "sap/ushell_abap/pbServices/ui2/PageSet",
-    "sap/ushell_abap/pbServices/ui2/Utils",
+    "sap/ushell_abap/base/Ui2Utils",
     "sap/base/Log",
     "sap/base/util/LoaderExtensions"
 ], (
@@ -322,7 +322,7 @@ sap.ui.define([
                 // cache hit: either array of load handlers, or CHIP definition, or error message
                 oChipDefinition = aLoadHandlers = mChipDefinitions[sUrl];
 
-                if (Utils.isArray(aLoadHandlers)) {
+                if (Array.isArray(aLoadHandlers)) {
                     // wait until loading has finished (one way or the other)
                     aLoadHandlers.push(fnSuccess, fnFailure);
                 } else if (oChipDefinition instanceof ChipDefinition) {

package/src/main/js/sap/ushell_abap/pbServices/ui2/ODataService.js

@@ -5,8 +5,8 @@
  * error handler.
  */
 sap.ui.define([
-    "sap/ushell_abap/pbServices/ui2/Utils",
-    "sap/ushell_abap/pbServices/ui2/Error"
+    "sap/ushell_abap/base/Ui2Utils",
+    "sap/ushell_abap/base/Ui2Error"
 ], (
     Utils,
     SrvcError

package/src/main/js/sap/ushell_abap/pbServices/ui2/ODataWrapper.js

@@ -8,11 +8,10 @@ sap.ui.define([
     "sap/ui/thirdparty/datajs",
     "sap/base/i18n/Localization",
     "sap/ui/core/Supportability",
-    "sap/ushell_abap/pbServices/ui2/Utils",
+    "sap/ushell_abap/base/Ui2Utils",
     "sap/ushell_abap/pbServices/ui2/ODataService",
-    "sap/ushell_abap/pbServices/ui2/Error",
-    "sap/base/Log",
-    "sap/ui/thirdparty/jquery"
+    "sap/ushell_abap/base/Ui2Error",
+    "sap/base/Log"
 ], (
     datajs,
     Localization,
@@ -20,26 +19,23 @@ sap.ui.define([
     Utils,
     ODataService,
     SrvcError,
-    Log,
-    jQuery
+    Log
 ) => {
     "use strict";
 
-    /* global OData */
-
     function nop () { /* null object pattern */ }
     /**
-     * Reject the given <code>jQuery.Deferred</code> object(s) (array or single one) with the
+     * Reject the given Deferred object(s) (array or single one) with the
      * given error response.
      *
-     * @param {jQuery.Deferred|jQuery.Deferred[]} vDeferred
+     * @param {object|object[]} vDeferred
      *   deferred or array of deferreds to be rejected
      * @param {object} oResponse
      *   parameter of (each) reject call
      */
     function reject (vDeferred, oResponse) {
-        if (Utils.isArray(vDeferred)) {
-            // a failed change set: reject each single jQuery.Deferred in the same way
+        if (Array.isArray(vDeferred)) {
+            // a failed change set: reject each single Deferred in the same way
             vDeferred.forEach((oDeferred) => {
                 oDeferred.reject(oResponse);
             });
@@ -355,7 +351,7 @@ sap.ui.define([
             addGlobalSapHeaders(oHeaders);
             addStickySessionHeader(oHeaders);
 
-            OData.request({
+            datajs.request({
                 requestUri: sRequestUrl,
                 method: sMethod,
                 data: oPayload,
@@ -363,9 +359,7 @@ sap.ui.define([
             },
             (oData, oResponse) => {
                 this.detectStickySession((oResponse || {}).headers);
-                Log.debug(`Received OData response for ${sMethod} "${sRequestUrl}"`,
-                    null,
-                    "ODataWrapper");
+                Log.debug(`Received OData response for ${sMethod} "${sRequestUrl}"`, null, "ODataWrapper");
                 // Note: drop excess parameters; try/catch
                 Utils.callHandler(fnSuccess.bind(null, oData), fnFailure);
             },
@@ -382,9 +376,7 @@ sap.ui.define([
                         && oError.response.statusCode === 403
                         && ODataWrapper.csrfTokenValue(oError.response.headers).toLowerCase() === "required") {
                     // refresh CSRF token and repeat original request
-                    Log.debug(`CSRF token required for ${sMethod} "${sRequestUrl
-                    }", refreshing it`, JSON.stringify(oError.response),
-                    "ODataWrapper");
+                    Log.debug(`CSRF token required for ${sMethod} "${sRequestUrl}", refreshing it`, JSON.stringify(oError.response), "ODataWrapper");
 
                     oODataService.refreshCsrfToken(
                         this.doRequest.bind(that, sRequestUrl, sMethod, oPayload, success, failure, oHandler, /* bIsRepeatedRequest */ true),
@@ -395,8 +387,7 @@ sap.ui.define([
                 }
             },
             oHandler);
-            Log.debug(`Sent OData request for ${sMethod} "${sRequestUrl}"`, null,
-                "ODataWrapper");
+            Log.debug(`Sent OData request for ${sMethod} "${sRequestUrl}"`, null, "ODataWrapper");
         };
 
         /**
@@ -414,8 +405,7 @@ sap.ui.define([
         this.toRelativeUrl = function (sRequestUrl) {
             const i = sRequestUrl.indexOf(sBaseUrl);
             if (i < 0) {
-                throw new SrvcError(`Not relative to base URL "${sBaseUrl}": ${sRequestUrl}`,
-                    "ODataWrapper");
+                throw new SrvcError(`Not relative to base URL "${sBaseUrl}": ${sRequestUrl}`, "ODataWrapper");
             }
             return sRequestUrl.slice(i + sBaseUrl.length);
         };
@@ -432,8 +422,7 @@ sap.ui.define([
          */
         this.toRequestUrl = function (sRelativeUrl) {
             if (/^\//.test(sRelativeUrl)) {
-                throw new SrvcError(`Not a relative URL: ${sRelativeUrl}`,
-                    "ODataWrapper");
+                throw new SrvcError(`Not a relative URL: ${sRelativeUrl}`, "ODataWrapper");
             }
             return sBaseUrl + sRelativeUrl;
         };
@@ -460,20 +449,22 @@ sap.ui.define([
             // if sRelativeUrl is empty, we ask for the service document, which is only used for fetching an XSRF token,
             // so we are not taking already queued requests into account.
             if (aBatchQueue && sRelativeUrl !== "") {
-                Log.debug(`Queued OData request for GET "${sRelativeUrl}"`, null,
-                    "ODataWrapper");
+                Log.debug(`Queued OData request for GET "${sRelativeUrl}"`, null, "ODataWrapper");
                 aBatchQueue.push({
                     method: "GET",
                     requestUri: sRelativeUrl,
                     headers: oHeaders
                 });
-                oDeferred = (new jQuery.Deferred()).done(fnRawSuccess).fail(fnRawFailure);
+                oDeferred = Promise.withResolvers();
+                oDeferred.promise
+                    .then(([oData, oResponse]) => fnRawSuccess(oData, oResponse))
+                    .catch(fnRawFailure);
                 aDeferredQueue.push(oDeferred);
                 bChangeSetOpen = false;
                 return;
             }
 
-            // add specifc headers for read request
+            // add specific headers for read request
             oHeaders.Accept = "application/json";
             oHeaders["Accept-Language"] = Localization.getLanguage() || "";
             // always fetch a new token with GET requests;
@@ -481,12 +472,11 @@ sap.ui.define([
             // see internal BCP incident 1570753380
             oHeaders["X-CSRF-Token"] = "Fetch";
 
-            OData.read({
+            datajs.read({
                 requestUri: sRequestUrl,
                 headers: oHeaders
             }, fnRawSuccess, fnRawFailure);
-            Log.debug(`Sent OData request for GET "${sRequestUrl}"`, null,
-                "ODataWrapper");
+            Log.debug(`Sent OData request for GET "${sRequestUrl}"`, null, "ODataWrapper");
         };
 
         /**
@@ -532,14 +522,15 @@ sap.ui.define([
                     bChangeSetOpen = bSupportsChangeSets;
                 }
                 aBatchQueue[aBatchQueue.length - 1].__changeRequests.push(oChangeRequest);
-                oDeferred = (new jQuery.Deferred())
-                    .done((oData, oResponse) => {
+                oDeferred = Promise.withResolvers();
+                oDeferred.promise
+                    .then(([oData]) => {
                         Log.debug(`Received OData response for ${
                             sMethod} "${sRequestUrl}"`, null, "ODataWrapper");
                         // Note: drop excess parameters; try/catch
                         Utils.callHandler(fnSuccess.bind(null, oData), fnFailure);
                     })
-                    .fail(that.onError.bind(that, sMethod, sRequestUrl, fnFailure, /* oDeferred */null));
+                    .catch(that.onError.bind(that, sMethod, sRequestUrl, fnFailure, /* oDeferred */null));
                 aDeferredQueue[aDeferredQueue.length - 1].push(oDeferred);
                 return;
             }
@@ -628,20 +619,16 @@ sap.ui.define([
          */
         this.check = function (fnSuccess, fnFailure) {
             if (!fnSuccess) {
-                throw new SrvcError("Missing success callback",
-                    "ODataWrapper");
+                throw new SrvcError("Missing success callback", "ODataWrapper");
             }
             if (typeof fnSuccess !== "function") {
-                throw new SrvcError("Success callback is not a function",
-                    "ODataWrapper");
+                throw new SrvcError("Success callback is not a function", "ODataWrapper");
             }
             if (!fnFailure) {
-                throw new SrvcError("Missing error callback",
-                    "ODataWrapper");
+                throw new SrvcError("Missing error callback", "ODataWrapper");
             }
             if (typeof fnFailure !== "function") {
-                throw new SrvcError("Error callback is not a function",
-                    "ODataWrapper");
+                throw new SrvcError("Error callback is not a function", "ODataWrapper");
             }
         };
 
@@ -771,9 +758,7 @@ sap.ui.define([
          *   cannot be parsed or is not returned in the OData error response.<br />
          *
          *   <b>NOTE:</b> the second parameter is returned since version 1.28.6.
-         * @param {jQuery.Deferred} [oDeferred]
-         *   a <code>jQuery.Deferred</code> object that will be rejected with the
-         *   same arguments fnFailure is called
+         * @param {object} [oDeferred] Deferred object from Promise.withResolvers
          * @param {object} oError
          *   error object provided by datajs, should contain the response
          *
@@ -814,8 +799,9 @@ sap.ui.define([
             Log.error(sMessage, JSON.stringify(oError.response), "ODataWrapper");
 
             if (oDeferred) {
-                // reject with string as this is used to call the fnFailure
-                oDeferred.reject(sMessage, oParsedErrorInformation);
+                // reject with a tuple as native promises settle with a single value;
+                // the message is later forwarded to fnFailure (see the cache-hit consumer)
+                oDeferred.reject([sMessage, oParsedErrorInformation]);
             }
             fnFailure(sMessage, oParsedErrorInformation);
         };
@@ -896,19 +882,19 @@ sap.ui.define([
                 oODataService.setCsrfToken(
                     ODataWrapper.csrfTokenValue(oResponse.headers) || oODataService.getCsrfToken() // prefer a new token
                 );
-                Log.debug(`Received OData response for GET "${sRequestUrl}"`, null,
-                    "ODataWrapper");
+                Log.debug(`Received OData response for GET "${sRequestUrl}"`, null, "ODataWrapper");
                 // The sap-message header is a Gateway feature used e.g. by the INTEROP service
                 // It returns structured information (as XML). We don't evaluate it, we only log it.
                 // Severity is also part of the structure, but we simply assume warning.
                 sSapMessage = ODataWrapper.headerValue("sap-message", oResponse.headers);
                 if (sSapMessage) {
-                    Log.warning(`SAP message for GET ${sRequestUrl}`, sSapMessage,
-                        "ODataWrapper");
+                    Log.warning(`SAP message for GET ${sRequestUrl}`, sSapMessage, "ODataWrapper");
                 }
                 if (oDeferred) {
                     // put arguments for fnSuccess into cache; clone oData first
-                    oDeferred.resolve(JSON.parse(JSON.stringify(oData)), oODataService.getCsrfToken());
+                    // Note: native promises settle with a single value, so multiple
+                    // values are forwarded as a tuple (see the cache-hit consumer below)
+                    oDeferred.resolve([JSON.parse(JSON.stringify(oData)), oODataService.getCsrfToken()]);
                 }
                 // Note: drop excess parameters; try/catch
                 Utils.callHandler(fnSuccess.bind(null, oData), fnFailure);
@@ -918,22 +904,23 @@ sap.ui.define([
             this.check(fnSuccess, fnFailure);
 
             if (bCache) {
-                OData.read.$cache = OData.read.$cache || new Utils.Map();
-                oDeferred = OData.read.$cache.get(sRequestUrl); // the promise is cached
+                datajs.read.$cache = datajs.read.$cache || new Utils.Map();
+                oDeferred = datajs.read.$cache.get(sRequestUrl); // the (native) promise is cached
                 if (oDeferred) {
-                    Log.debug(`Using cached response for GET "${sRequestUrl}"`, null,
-                        "ODataWrapper");
-                    oDeferred.done((oData, sCachedCsrfToken) => {
-                        // prefer our own token
-                        oODataService.setCsrfToken(oODataService.getCsrfToken() || sCachedCsrfToken);
-                        // clone cached oData before passing to success handler
-                        // Note: try/catch
-                        Utils.callHandler(fnSuccess.bind(null, JSON.parse(JSON.stringify(oData))), fnFailure);
-                    }).fail(fnFailure);
+                    Log.debug(`Using cached response for GET "${sRequestUrl}"`, null, "ODataWrapper");
+                    oDeferred
+                        .then(([oData, sCachedCsrfToken]) => {
+                            // prefer our own token
+                            oODataService.setCsrfToken(oODataService.getCsrfToken() || sCachedCsrfToken);
+                            // clone cached oData before passing to success handler
+                            // Note: try/catch
+                            Utils.callHandler(fnSuccess.bind(null, JSON.parse(JSON.stringify(oData))), fnFailure);
+                        })
+                        .catch(([sMessage, oError]) => fnFailure(sMessage, oError));
                     return;
                 }
-                oDeferred = new jQuery.Deferred();
-                OData.read.$cache.put(sRequestUrl, oDeferred.promise());
+                oDeferred = Promise.withResolvers();
+                datajs.read.$cache.put(sRequestUrl, oDeferred.promise);
             }
 
             this.readOrBatch(
@@ -963,7 +950,7 @@ sap.ui.define([
         this.batch = function (oPayload, fnSuccess, fnFailure) {
             const sRequestUrl = this.toRequestUrl("$batch");
 
-            this.doRequest(sRequestUrl, "POST", oPayload, fnSuccess, fnFailure, OData.batchHandler);
+            this.doRequest(sRequestUrl, "POST", oPayload, fnSuccess, fnFailure, datajs.batchHandler);
         };
 
         /**
@@ -1006,10 +993,13 @@ sap.ui.define([
                 const iExpected = aMyDeferredQueue.length;
 
                 if (iExpected !== iActual) {
-                    that.onError("POST", this.toRequestUrl("$batch"), fnBatchItselfFailed, /* oDeferred */null, {
-                        message: `Protocol error! Expected ${iExpected
-                        } responses, but received ${iActual}`
-                    });
+                    that.onError(
+                        "POST",
+                        this.toRequestUrl("$batch"),
+                        fnBatchItselfFailed,
+                        /* oDeferred */null,
+                        {message: `Protocol error! Expected ${iExpected} responses, but received ${iActual}`}
+                    );
                     return;
                 }
 
@@ -1022,11 +1012,11 @@ sap.ui.define([
                     } else if (oResponse.__changeResponses) {
                         // successful change set
                         oResponse.__changeResponses.forEach((oChangeResponse, j) => {
-                            oDeferred[j].resolve(oChangeResponse.data, oChangeResponse);
+                            oDeferred[j].resolve([oChangeResponse.data, oChangeResponse]);
                         });
                     } else {
                         // successful GET request
-                        oDeferred.resolve(oResponse.data, oResponse);
+                        oDeferred.resolve([oResponse.data, oResponse]);
                     }
                 });
 
@@ -1040,7 +1030,7 @@ sap.ui.define([
             }
 
             if (aBatchQueue.length > 0) {
-                Log.debug("[000] submit batch queue: batch", "ODataWrpper");
+                Log.debug("[000] submit batch queue: batch", "ODataWrapper");
                 this.batch({ __batchRequests: aBatchQueue }, onBatchSuccess.bind(this), fnBatchItselfFailed);
             } else if (fnBatchAccepted) {
                 // call success handler (if given) directly (async) if batchQueue is empty
@@ -1065,8 +1055,6 @@ sap.ui.define([
          */
         this.toString = function (bVerbose) {
             const aResult = ['ODataWrapper({sBaseUrl:"', sBaseUrl, '"'];
-            //      if (bVerbose) {
-            //      }
             aResult.push("})");
             return aResult.join("");
         };
@@ -1155,9 +1143,7 @@ sap.ui.define([
         bSupportsChangeSets = oSettings.supportsChangeSets;
 
         if (typeof ODataWrapper.oStickySessionConfiguration === "undefined") {
-            Log.error("ODataWrapper.oStickySessionConfiguration is not defined!",
-                "the ODataWrapper constructor was called before the static property was defined",
-                "ODataWrapper");
+            Log.error("ODataWrapper.oStickySessionConfiguration is not defined!", "the ODataWrapper constructor was called before the static property was defined", "ODataWrapper");
         } else if (typeof ODataWrapper.oStickySessionConfiguration[sBaseUrl] === "undefined") {
             // Define the sticky session configuration for the base URL managed by
             // this ODataWrapper instance.
@@ -1220,8 +1206,7 @@ sap.ui.define([
             ODataWrapper["sap-statistics"] = Supportability.isStatisticsEnabled();
         } catch {
             // Read sap-statistics directly form query parameter in scenarios without UI5
-            ODataWrapper["sap-statistics"] =
-                /sap-statistics=(true|x|X)/.test(sWindowLocationSearch);
+            ODataWrapper["sap-statistics"] = /sap-statistics=(true|x|X)/.test(sWindowLocationSearch);
         }
     };
     ODataWrapper.checkSapStatisticsSetting(window.location.search);