@sapui5/sap.ushell_abap 1.139.0 → 1.141.0

package/src/main/js/sap/ushell_abap/library.js

@@ -11,6 +11,13 @@ sap.ui.define([
 ) => {
     "use strict";
 
+    /**
+     * @namespace sap.ushell_abap.components
+     * @since 1.121.0
+     * @private
+     * @ui5-restricted
+     */
+
     /**
      * SAP library: sap.ushell_abap
      * provides base functions for Fiori launchpad running on SAP NetWeaver ABAP
@@ -23,7 +30,7 @@ sap.ui.define([
     const ushellAbapLib = Library.init({
         name: "sap.ushell_abap",
         apiVersion: 2,
-        version: "1.139.0",
+        version: "1.141.0",
         dependencies: ["sap.ui.core", "sap.m"],
         noLibraryCSS: true,
         extensions: {

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

@@ -38,7 +38,7 @@ sap.ui.define([
      * @class
      * @since 1.7.0
      */
-    const AllCatalogs = function (oFactory, sPageId) {
+    function AllCatalogs (oFactory, sPageId) {
         let aCatalogs = [];
         let bIsStub = true;
         const that = this;
@@ -180,7 +180,7 @@ sap.ui.define([
             throw new SrvcError("Missing page ID", "AllCatalogs");
         }
         Log.debug(`Created: ${this}`, null, "AllCatalogs");
-    };
+    }
 
     return AllCatalogs;
 });

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

@@ -39,7 +39,7 @@ sap.ui.define([
      * @class
      * @since 1.3.0
      */
-    const Bag = function (oFactory, oAlterEgo, oParentBag, fnChangeListener) {
+    function Bag (oFactory, oAlterEgo, oParentBag, fnChangeListener) {
         let oPropertiesByName;
         let bResetting = false;
         let bSaving = false;
@@ -121,8 +121,6 @@ sap.ui.define([
          * @private
          */
         function getNames (aNames, bTranslatable) {
-            let oNameSet;
-
             if (aNames.length === 0) { // no parent names --> no duplicates expected, run faster code
                 oPropertiesByName.keys().forEach((sKey) => {
                     if (bTranslatable === (oPropertiesByName.get(sKey).translatable === "X")) {
@@ -133,7 +131,7 @@ sap.ui.define([
             }
 
             // parent names present --> expect duplicates and avoid them with slower code
-            oNameSet = new Utils.Map();
+            const oNameSet = new Utils.Map();
             aNames.forEach((sKey) => {
                 oNameSet.put(sKey);
             });
@@ -372,18 +370,18 @@ sap.ui.define([
          *
          * @param {function} fnSuccess
          *   no-args success handler
-         * @param {function(string, object=)} [fnError]
+         * @param {function(string, object=)} [fnFailure]
          *   error handler taking an error message and, since version 1.28.6, an
          *   optional object containing the complete error information as delivered
          *   by the ODataService. See fnFailure parameter of {@link sap.ushell_abap.pbServices.ui2.ODataWrapper#onError}
          *   for more details.
-         *   If fnError is not given, the default error handler from the factory's
+         *   If fnFailure is not given, the default error handler from the factory's
          *   page building service is called.
          * @throws Error when called while {@link #save()} or a previous <code>reset()</code> is
          *   running.
          * @since 1.3.0
          */
-        this.reset = function (fnSuccess, fnError) {
+        this.reset = function (fnSuccess, fnFailure) {
             const oParent = getParentMock();
             const oPbs = oFactory.getPageBuildingService();
 
@@ -406,11 +404,11 @@ sap.ui.define([
             errorIfSaveRunning();
             errorIfResetRunning();
             bResetting = true;
-            fnError = fnError || oPbs.getDefaultErrorHandler();
+            fnFailure = fnFailure || oPbs.getDefaultErrorHandler();
 
             if (oAlterEgo.$tmp) {
                 // if bag is not yet persisted do not call delete and read
-                Utils.callHandler(onReadSuccess.bind(null, oAlterEgo), fnError, true);
+                Utils.callHandler(onReadSuccess.bind(null, oAlterEgo), fnFailure, true);
                 return;
             }
 
@@ -427,7 +425,7 @@ sap.ui.define([
                 bResetting = false;
 
                 // NOTE: call error handler with any arguments passed in this wrapper
-                fnError.apply(null, arguments);
+                fnFailure.apply(null, arguments);
             });
         };
 
@@ -462,9 +460,7 @@ sap.ui.define([
          * @since 1.17.1
          */
         this.resetProperty = function (sPropertyName) {
-            let oProperty;
-
-            oProperty = oPropertiesByName.get(sPropertyName);
+            const oProperty = oPropertiesByName.get(sPropertyName);
             if (oProperty) {
                 oProperty.$currentValue = undefined; // undefined value is marker to delete property on save
                 if (!Object.prototype.hasOwnProperty.call(oProperty, "value")) { // no persisted value
@@ -487,9 +483,9 @@ sap.ui.define([
          *
          * @param {function} fnSuccess
          *   no-args success handler. Errors thrown in this function will be reported to the page
-         *   building service's default error handler (not to <code>fnError</code> since the signature
+         *   building service's default error handler (not to <code>fnFailure</code> since the signature
          *   does not fit)
-         * @param {function(Object<string, string>, Object<string, object>)} fnError
+         * @param {function(Object<string, string>, Object<string, object>)} fnFailure
          *   error handler taking two maps, each mapping individual property names
          *   to error message and complete error information respectively. Since
          *   version 1.28.6, the second parameter is always returned,
@@ -502,7 +498,7 @@ sap.ui.define([
          *   running.
          * @since 1.3.0
          */
-        this.save = function (fnSuccess, fnError) {
+        this.save = function (fnSuccess, fnFailure) {
             let iNumberOfRequests = 0;
             const oResetPropertyNames = new Utils.Map(); // used as a "hash set"
             const mMessagesByName = {};
@@ -513,7 +509,7 @@ sap.ui.define([
             if (typeof fnSuccess !== "function") {
                 throw new SrvcError("Missing success handler", "sap.ushell_abap.pbServices.ui2.Bag");
             }
-            if (typeof fnError !== "function") {
+            if (typeof fnFailure !== "function") {
                 throw new SrvcError("Missing error handler", "sap.ushell_abap.pbServices.ui2.Bag");
             }
             errorIfSaveRunning();
@@ -581,7 +577,7 @@ sap.ui.define([
                     fnChangeListener(that);
                 }
                 if (Object.keys(mMessagesByName).length > 0) {
-                    fnError(mMessagesByName, mErrorResponseByName);
+                    fnFailure(mMessagesByName, mErrorResponseByName);
                 } else {
                     oAlterEgo.$tmp = false;
                     fnSuccess(); // Note: try/catch done by submitBatchQueue()!
@@ -708,7 +704,7 @@ sap.ui.define([
 
         fillPropertyMap(oAlterEgo);
         Log.debug(`Created: ${this}`, null, "sap.ushell_abap.pbServices.ui2.Bag");
-    };
+    }
 
     return Bag;
 });

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

@@ -49,7 +49,7 @@ sap.ui.define([
      * @since 1.2.0
      * @private
      */
-    const Catalog = function (oFactory, vCatalogData) {
+    function Catalog (oFactory, vCatalogData) {
         let oAlterEgo; // catalog's representation with all relations removed
         let oCatalogPage;
         let aChips = [];
@@ -123,7 +123,7 @@ sap.ui.define([
 
         /**
          * Gets this catalog's remote base URL.
-         * @returns {string}
+         * @returns {string} url to the remote catalog service
          * @private
          */
         this.getRemoteBaseUrl = function () {
@@ -135,7 +135,7 @@ sap.ui.define([
         /**
          * Gets the remote catalog service.
          *
-         * @returns {sap.ushell_abap.pbServices.ui2.RemoteCatalogService}
+         * @returns {sap.ushell_abap.pbServices.ui2.RemoteCatalogService} remote catalog service
          * @private
          */
         this.getRemoteCatalogService = function () {
@@ -186,7 +186,7 @@ sap.ui.define([
          * If the catalog is a remote catalog, an attempt to load its chips is made.
          * In this case, if the loading fails, the catalog is fully initialized ( with an empty chips collection ) and
          * returned as 2nd argument of the reject handler (note that it is no longer a stub!)
-         * @param {boolean} bRefresh
+         * @param {boolean} bRefresh boolean indicating whether the catalog should be refreshed
          * @param {function} fnSuccess
          *   no-args success handler
          * @param {function(string, object=)} [fnFailure]
@@ -262,8 +262,8 @@ sap.ui.define([
                     oAlterEgo = oResult;
                     try {
                         sRemoteBaseUrl = that.getRemoteBaseUrl();
-                    } catch (e) {
-                        couldNotLoadRemoteChips(e.toString());
+                    } catch (oError) {
+                        couldNotLoadRemoteChips(oError.toString());
                         return;
                     }
                     that.getRemoteCatalogService().readChips(sRemoteBaseUrl, oAlterEgo.remoteId, undefined,
@@ -387,13 +387,18 @@ sap.ui.define([
         this.clone = function (sNewDomainId, sNewTitle, fnSuccess, fnFailure) {
             let oCatalogData;
             /**
-                 * keeps calls to failure handler consistent with failure handler calls
-                 * in sap.ushell_abap.pbServices.ui2.Factory#createNewCatalog
-                 */
-            const fnFailureWrapper = function (sErrorMessage, oMaybeErrorInformation) {
+             * keeps calls to failure handler consistent with failure handler calls
+             * in sap.ushell_abap.pbServices.ui2.Factory#createNewCatalog
+             *
+             * @param {string} sErrorMessage the error message
+             * @param {Error|object|undefined} oMaybeErrorInformation an optional object containing the complete error information as
+             *
+             * @returns {function} failure handler
+             */
+            function fnFailureWrapper (sErrorMessage, oMaybeErrorInformation) {
                 return fnFailure(sErrorMessage, undefined,
                     oMaybeErrorInformation);
-            };
+            }
 
             if (oAlterEgo && oAlterEgo.type === "REMOTE") {
                 oCatalogData = this.getCatalogData();
@@ -435,13 +440,12 @@ sap.ui.define([
          */
         this.getCatalogData = function () {
             /* jslint nomen:true */
-            let oCatalogData;
 
             if (!oAlterEgo) {
                 return undefined; // only ID is known!
             }
 
-            oCatalogData = JSON.parse(JSON.stringify(oAlterEgo));
+            const oCatalogData = JSON.parse(JSON.stringify(oAlterEgo));
             delete oCatalogData.__metadata;
             return oCatalogData;
         };
@@ -890,14 +894,12 @@ sap.ui.define([
          * @see #getCatalogData
          */
         this.update = function (oCatalogData, fnSuccess, fnFailure) {
-            let oNewAlterEgo;
-
             checkAlterEgo();
             if (Object.hasOwnProperty.call(oCatalogData, "__metadata")) {
                 // ODataWrapper#update() relies on __metadata!
                 throw new SrvcError("Unsupported __metadata update", "Catalog");
             }
-            oNewAlterEgo = JSON.parse(JSON.stringify(oAlterEgo));
+            const oNewAlterEgo = JSON.parse(JSON.stringify(oAlterEgo));
             Object.keys(oCatalogData).forEach((sName) => {
                 oNewAlterEgo[sName] = oCatalogData[sName];
             });
@@ -932,7 +934,7 @@ sap.ui.define([
             throw new SrvcError("Missing ID", "Catalog");
         }
         Log.debug(`Created: ${this}`, null, "Catalog");
-    };
+    }
 
     return Catalog;
 });

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

@@ -65,7 +65,7 @@ sap.ui.define([
      * @class
      * @since 1.2.0
      */
-    const Chip = function (oAlterEgo, oFactory) {
+    function Chip (oAlterEgo, oFactory) {
         const that = this;
         let oBags;
         /**
@@ -307,10 +307,9 @@ sap.ui.define([
             let oContract;
             let fnInitializer;
             let sName;
-            let mRequestedContracts;
 
             checkStub();
-            mRequestedContracts = oDefinition.contracts;
+            const mRequestedContracts = oDefinition.contracts;
             if (mRequestedContracts) {
                 for (sName in mRequestedContracts) {
                     if (Object.prototype.hasOwnProperty.call(mRequestedContracts, sName)) {
@@ -530,17 +529,13 @@ sap.ui.define([
          * @see #isStub()
          */
         this.getImplementationAsSapui5 = function (oApi) {
-            let oData;
-            let oImplementation;
-            let sBaseChipId;
-
             Log.error("Deprecated API call of 'Chip.getImplementationAsSapui5'. Please use 'getImplementationAsSapui5Async' instead",
                 null,
                 "sap.ushell_abap.pbServices.ui2.Chip"
             );
 
             checkStub();
-            oData = {
+            const oData = {
                 /**
                  * @namespace
                  * The namespace for the instance specific CHIP API, which allows you to
@@ -548,10 +543,10 @@ sap.ui.define([
                  */
                 chip: oApi
             };
-            oImplementation = oDefinition.implementation.sapui5;
+            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
-            sBaseChipId = this.getBaseChipId();
+            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);
@@ -611,12 +606,8 @@ sap.ui.define([
          *
          * @see #isStub()
          */
-        this.getImplementationAsSapui5Async = function (oApi) {
-            try {
-                checkStub();
-            } catch (oError) {
-                return Promise.reject(oError);
-            }
+        this.getImplementationAsSapui5Async = async function (oApi) {
+            checkStub();
 
             return new Promise((resolve, reject) => {
                 sap.ui.require([
@@ -748,8 +739,8 @@ sap.ui.define([
                 }:${oChipInstance.getId()}`;
 
             /**
-             * @param {string} sActualId
-             * @returns {boolean}
+             * @param {string} sActualId the actual CHIP ID to compare with the expected one
+             * @returns {boolean} the result of the comparison
              * @private
              */
             function matchesExpectation (sActualId) {
@@ -1002,9 +993,9 @@ sap.ui.define([
          * Updates the given parameter map from the given JSON string. All parameters that actually were
          * defined in the CHIP definition XML are accepted. All others will raise a warning to the log.
          *
-         * @param {object<string,string>} mParameters
+         * @param {Object<string,string>} mParameters
          *   the parameter map to fill
-         * @param {object<string,string>|string} vConfigurationUpdates
+         * @param {Object<string,string>|string} vConfigurationUpdates
          *   the configuration updates as parameter map or as JSON string
          *   <p>If one parameter value is <code>undefined</code> (which can only happen by supplying a
          *   map) then this property is removed from <code>mParameters</code>.
@@ -1021,10 +1012,10 @@ sap.ui.define([
             if (typeof vConfigurationUpdates === "string") {
                 try {
                     mConfigurationUpdates = JSON.parse(vConfigurationUpdates);
-                } catch (e) {
+                } catch (oError) {
                     // configuration as a whole is incorrect and will be ignored
                     // Note: toString(true) will also output configuration, thus it is no secret
-                    Log.warning(`${this}: ignoring invalid configuration "${vConfigurationUpdates}"`, null, "Chip");
+                    Log.warning(`${this}: ignoring invalid configuration "${vConfigurationUpdates}"`, oError, "Chip");
                     return;
                 }
             } else {
@@ -1123,7 +1114,7 @@ sap.ui.define([
         }
         initBags(oAlterEgo.ChipBags && oAlterEgo.ChipBags.results);
         Log.debug(`Created: ${this}`, null, "Chip");
-    };
+    }
 
     // "public" methods (static) ------------------------------------------------
 

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

@@ -43,7 +43,6 @@ sap.ui.define([
      */
     function getAttribute (oDomElement, sName) {
         let oAttribute;
-        let aAttributes;
         let i;
         let n;
         if (typeof oDomElement.getAttributeNS === "function") {
@@ -51,7 +50,7 @@ sap.ui.define([
         }
         // ugly workaround for IE's XMLHttpRequest which doesn't know getAttributeNS, but knows the
         // attribute's namespace
-        aAttributes = oDomElement.attributes;
+        const aAttributes = oDomElement.attributes;
         for (i = 0, n = aAttributes.length; i < n; i += 1) {
             oAttribute = aAttributes[i];
             if (!oAttribute.namespaceURI && getLocalName(oAttribute) === sName) {
@@ -83,7 +82,7 @@ sap.ui.define([
      *  this used for calling the handlers from <code>mChildHandlers</code>
      * @param {object} oDomNode
      *   the DOM node
-     * @param {object<string,function(object)>} mChildHandlers
+     * @param {Object<string,function(object)>} mChildHandlers
      *   maps the child name to a handler function. The handler function's parameter is the DOM node.
      */
     function visit (oThat, oDomNode, mChildHandlers) {
@@ -117,7 +116,7 @@ sap.ui.define([
      * @see sap.ushell_abap.pbServices.ui2.Chip
      * @since 1.2.0
      */
-    const ChipDefinition = function (oXml) {
+    function ChipDefinition (oXml) {
         const that = this;
 
         if (oXml instanceof ChipDefinition) {
@@ -211,7 +210,7 @@ sap.ui.define([
 
         // paranoid mode to avoid memory leaks
         oXml = null;
-    };
+    }
 
     return ChipDefinition;
 });

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

@@ -46,7 +46,7 @@ sap.ui.define([
      * @see sap.ushell_abap.pbServices.ui2.PageBuildingService
      * @since 1.2.0
      */
-    const ChipInstance = function (oFactory, oAlterEgo, oChip, oPage) {
+    function ChipInstance (oFactory, oAlterEgo, oChip, oPage) {
         let oApi;
         let oBags;
         let oConfiguration;
@@ -485,12 +485,8 @@ sap.ui.define([
          *
          * @see #isStub()
          */
-        this.getImplementationAsSapui5Async = function () {
-            try {
-                checkStub();
-            } catch (oError) {
-                return Promise.reject(oError);
-            }
+        this.getImplementationAsSapui5Async = async function () {
+            checkStub();
 
             return oChip.getImplementationAsSapui5Async(oApi);
         };
@@ -697,10 +693,9 @@ sap.ui.define([
          */
         this.load = function (fnSuccess, fnFailure) {
             // TODO disallow multiple calls?
-            let fnLoad;
 
             fnFailure = fnFailure || oFactory.getPageBuildingService().getDefaultErrorHandler();
-            fnLoad = initialize.bind(null, fnSuccess, fnFailure);
+            const fnLoad = initialize.bind(null, fnSuccess, fnFailure);
 
             if (oChip.isStub()) {
                 oChip.load(fnLoad, fnFailure);
@@ -760,8 +755,8 @@ sap.ui.define([
                 try {
                     fnRefreshHandler(); // Note: "this" is undefined
                     return true;
-                } catch (ex) {
-                    Log.error(`${that}: call to refresh handler failed: ${ex.message || ex.toString()}`, null, "ChipInstance");
+                } catch (oError) {
+                    Log.error(`${that.getId()}: call to refresh handler failed:`, oError, "ChipInstance");
                     return false;
                 }
             }
@@ -929,7 +924,7 @@ sap.ui.define([
          * <code>a</code> back to "foo", but our user will never see this again, because the system
          * persisted both <code>a</code> and <code>b</code> in PERS.
          *
-         * @param {object<string,string>} mConfigurationUpdates
+         * @param {Object<string,string>} mConfigurationUpdates
          *   The configuration updates. The values must be strings. You can however set a value to
          *   <code>undefined</code>. This removes it from the list of updated property and effectively
          *   resets it to the default value.
@@ -995,7 +990,7 @@ sap.ui.define([
 
         delete oAlterEgo.Chip;
         Log.debug(`Created: ${this}`, null, "ChipInstance");
-    };
+    }
 
     /**
      * Clones and loads the new CHIP instance.

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

@@ -25,7 +25,7 @@ sap.ui.define([
      * @class
      * @since 1.2.0
      */
-    const SrvcError = function (sMessage, sComponent, bLogError) {
+    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)
 
@@ -38,7 +38,7 @@ sap.ui.define([
         }
 
         return oError;
-    };
+    }
 
     return SrvcError;
 });

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

@@ -56,14 +56,18 @@ sap.ui.define([
      * @class
      * @since 1.2.0
      */
-    const Factory = function (oPbs) {
+    function Factory (oPbs) {
         const mChips = {}; // cache for CHIPs
         const mCatalogs = {}; // cache for catalogs
         const mChipDefinitions = {}; // cache for CHIP definitions
-        let oRemoteCatalogServicesByBaseUrl; // mapping from base URL to remote catalog service
         const that = this;
 
-        // BEWARE: constructor code below!
+        // constructor code -------------------------------------------------------
+        const oRemoteCatalogServicesByBaseUrl = new Utils.Map();
+        if (!oPbs) {
+            throw new SrvcError("Missing page building service", "Factory");
+        }
+        Log.debug(`Created: ${this}`, null, "Factory");
 
         // "private" methods ---------------------------------------------------------
 
@@ -373,9 +377,6 @@ sap.ui.define([
          * @since 1.2.0
          */
         this.createChipInstance = function (oRawChipInstance, fnSuccess, fnFailure, oPage) {
-            let oChip;
-            let oChipInstance;
-
             // ensure at least a "null object" CHIP that knows its IDs
             oRawChipInstance.Chip = oRawChipInstance.Chip || { $proxy: true };
             oRawChipInstance.Chip.id = oRawChipInstance.Chip.id || oRawChipInstance.chipId;
@@ -387,8 +388,8 @@ sap.ui.define([
                 this.createCatalog(oRawChipInstance.RemoteCatalog);
             }
 
-            oChip = this.createChip(oRawChipInstance.Chip);
-            oChipInstance = new ChipInstance(this, oRawChipInstance, oChip, oPage);
+            const oChip = this.createChip(oRawChipInstance.Chip);
+            const oChipInstance = new ChipInstance(this, oRawChipInstance, oChip, oPage);
             if (fnSuccess) {
                 oChipInstance.load(fnSuccess.bind(null, oChipInstance), fnFailure);
             }
@@ -499,8 +500,7 @@ sap.ui.define([
          * @since 1.2.0
          */
         this.createPage = function (sPageId, fnSuccess, fnFailure, bPartially) {
-            let oPage;
-            oPage = new Page(this, sPageId);
+            const oPage = new Page(this, sPageId);
             if (fnSuccess) {
                 oPage.load(fnSuccess.bind(null, oPage), fnFailure, bPartially);
             }
@@ -529,8 +529,7 @@ sap.ui.define([
          * @since 1.11.0
          */
         this.createPageSet = function (sPageSetId, fnSuccess, fnFailure) {
-            let oPageSet;
-            oPageSet = new PageSet(this, sPageSetId);
+            const oPageSet = new PageSet(this, sPageSetId);
             if (fnSuccess) {
                 oPageSet.load(fnSuccess.bind(null, oPageSet), fnFailure);
             }
@@ -601,14 +600,7 @@ sap.ui.define([
             aResult.push("})");
             return aResult.join("");
         };
-
-        // constructor code -------------------------------------------------------
-        oRemoteCatalogServicesByBaseUrl = new Utils.Map();
-        if (!oPbs) {
-            throw new SrvcError("Missing page building service", "Factory");
-        }
-        Log.debug(`Created: ${this}`, null, "Factory");
-    };
+    }
 
     // public factory function ***************************************************
 

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

@@ -34,8 +34,12 @@ sap.ui.define([
      * @public
      * @since 1.19.0
      */
-    const ODataService = function (oODataWrapper, fnDefaultFailure) {
-        let sBaseUrl;
+    function ODataService (oODataWrapper, fnDefaultFailure) {
+        if (!oODataWrapper) {
+            throw new SrvcError("Missing OData wrapper", "ODataService");
+        }
+
+        const sBaseUrl = oODataWrapper.getBaseUrl();
 
         // BEWARE: constructor code below!
 
@@ -104,15 +108,13 @@ sap.ui.define([
          * @see sap.ushell_abap.pbServices.ui2.ODataWrapper#read
          */
         this.refreshCsrfToken = function (fnSuccess, fnFailure) {
-            let oTokenData;
-
             if (typeof fnSuccess !== "function") {
                 throw new SrvcError("Success callback is not a function",
                     "ODataService");
             }
             fnFailure = fnFailure || fnDefaultFailure;
 
-            oTokenData = mCsrfTokens.get(sBaseUrl);
+            const oTokenData = mCsrfTokens.get(sBaseUrl);
 
             if (!oTokenData.fetchingInProgress) {
                 // fetch token
@@ -169,13 +171,12 @@ sap.ui.define([
          * @see #refreshCsrfToken
          */
         this.setCsrfToken = function (sNewCsrfToken) {
-            let oTokenData;
             // sNewCsrfToken must be a string OR undefined
             if (sNewCsrfToken && typeof sNewCsrfToken !== "string") {
                 throw new SrvcError(`Invalid CSRF token: ${sNewCsrfToken}`,
                     "ODataService");
             }
-            oTokenData = mCsrfTokens.get(sBaseUrl);
+            const oTokenData = mCsrfTokens.get(sBaseUrl);
             oTokenData.token = sNewCsrfToken;
         };
 
@@ -223,11 +224,7 @@ sap.ui.define([
         };
 
         // constructor code -------------------------------------------------------
-        if (!oODataWrapper) {
-            throw new SrvcError("Missing OData wrapper", "ODataService");
-        }
 
-        sBaseUrl = oODataWrapper.getBaseUrl();
         if (!mCsrfTokens.get(sBaseUrl)) {
             mCsrfTokens.put(sBaseUrl, {
                 // token: undefined,
@@ -238,7 +235,7 @@ sap.ui.define([
         }
 
         this.setDefaultErrorHandler(fnDefaultFailure);
-    };
+    }
 
     /**
      * for test purposes only