[JS] eslint: prefer template literals

Change-Id: I26d14f896464b9acf286855241155cec13a5a61e
bmwcarit · Jun 6, 2018 · 4a8e97b · 4a8e97b
1 parent 72e8f98
commit 4a8e97b
Show file tree

Hide file tree

Showing 87 changed files with 547 additions and 701 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -72,6 +72,7 @@ module.exports = {
         "prefer-arrow-callback": "error",
         "prefer-const": "error",
         "prefer-destructuring": "off",
+        "prefer-template": "error",
         "prefer-spread": "error",
         "promise/always-return": "off",
         "promise/no-return-wrap": "error",

diff --git a/javascript/libjoynr-js/src/main/js/global/JoynrPersist.js b/javascript/libjoynr-js/src/main/js/global/JoynrPersist.js
@@ -76,8 +76,9 @@ JoynrPersist.prototype = {
                     return fs.lstatSync(filePath).isDirectory();
                 });
                 throw new Error(
-                    "joynr configuration error: Persistency subdirectory must not include other subdirectories. Directories found: " +
+                    `joynr configuration error: Persistency subdirectory must not include other subdirectories. Directories found: ${JSON.stringify(
-                        JSON.stringify(subDirectories)
+                        subDirectories
+                    )}`
                 );
             } else {
                 throw e;

diff --git a/javascript/libjoynr-js/src/main/js/global/LocalStorageNode.js b/javascript/libjoynr-js/src/main/js/global/LocalStorageNode.js
@@ -88,7 +88,7 @@ if (global.window !== undefined) {
         },
         _wrapFunction(cb, ...args) {
             this._promiseChain = this._promiseChain.then(() => cb(...args)).catch(e => {
-                log.error(`failure executing ${cb} with args ${JSON.stringify(args)} error: ` + e);
+                log.error(`failure executing ${cb} with args ${JSON.stringify(args)} error: ${e}`);
             });
         }
     };

diff --git a/javascript/libjoynr-js/src/main/js/global/WebSocket.js b/javascript/libjoynr-js/src/main/js/global/WebSocket.js
@@ -30,7 +30,7 @@ if (typeof TextDecoder !== "function") {
 const log = LoggingManager.getLogger("joynr.messaging.websocket.WebSocket");
 const fileReader = new FileReader();
 fileReader.onError = function(error) {
-    log.error("Decoding of binary message failed: " + error);
+    log.error(`Decoding of binary message failed: ${error}`);
 };
 const textDecoder = new TextDecoder();
 const textEncoder = new TextEncoder();

diff --git a/javascript/libjoynr-js/src/main/js/joynr/capabilities/CapabilitiesRegistrar.js b/javascript/libjoynr-js/src/main/js/joynr/capabilities/CapabilitiesRegistrar.js
@@ -144,7 +144,7 @@ CapabilitiesRegistrar.prototype.registerProvider = function registerProvider(
 
     if (missingImplementations.length > 0) {
         throw new Error(
-            "provider: " + domain + "/" + provider.interfaceName + " is missing: " + missingImplementations.toString()
+            `provider: ${domain}/${provider.interfaceName} is missing: ${missingImplementations.toString()}`
         );
     }
 
@@ -192,12 +192,9 @@ CapabilitiesRegistrar.prototype.registerProvider = function registerProvider(
 
     function registerProviderFinished() {
         log.info(
-            "Provider registered: participantId: " +
+            `Provider registered: participantId: ${participantId}, domain: ${domain}, interfaceName: ${
-                participantId +
-                ", domain: " +
-                domain +
-                ", interfaceName: " +
                 provider.interfaceName
+            }`
         );
         return participantId;
     }
@@ -237,12 +234,9 @@ CapabilitiesRegistrar.prototype.unregisterProvider = function unregisterProvider
 
     return Promise.all([discoveryStubPromise, messageRouterPromise]).then(() => {
         log.info(
-            "Provider unregistered: participantId: " +
+            `Provider unregistered: participantId: ${participantId}, domain: ${domain}, interfaceName: ${
-                participantId +
-                ", domain: " +
-                domain +
-                ", interfaceName: " +
                 provider.interfaceName
+            }`
         );
     });
 };

diff --git a/javascript/libjoynr-js/src/main/js/joynr/capabilities/ParticipantIdStorage.js b/javascript/libjoynr-js/src/main/js/joynr/capabilities/ParticipantIdStorage.js
@@ -43,7 +43,7 @@ function ParticipantIdStorage(persistency, uuid) {
  * @returns {String} the retrieved or generated participantId
  */
 ParticipantIdStorage.prototype.getParticipantId = function getParticipantId(domain, provider) {
-    const key = "joynr.participant." + domain + "." + provider.interfaceName;
+    const key = `joynr.participant.${domain}.${provider.interfaceName}`;
     let participantId = this._persistency.getItem(key);
     if (!participantId) {
         participantId = this._uuid();

diff --git a/javascript/libjoynr-js/src/main/js/joynr/capabilities/arbitration/Arbitrator.js b/javascript/libjoynr-js/src/main/js/joynr/capabilities/arbitration/Arbitrator.js
@@ -66,7 +66,7 @@ function discoverStaticCapabilities(capabilities, domains, interfaceName, discov
         }
     } catch (e) {
         deferred.pending = false;
-        deferred.reject(new Error("Exception while arbitrating: " + e));
+        deferred.reject(new Error(`Exception while arbitrating: ${e}`));
     }
 }
 
@@ -245,14 +245,9 @@ Arbitrator.prototype.startArbitration = function startArbitration(settings) {
         delete that._pendingArbitrations[deferred.id];
 
         if (deferred.incompatibleVersionsFound.length > 0) {
-            const message =
+            const message = `no compatible provider found within discovery timeout for domains "${JSON.stringify(
-                'no compatible provider found within discovery timeout for domains "' +
+                settings.domains
-                JSON.stringify(settings.domains) +
+            )}", interface "${settings.interfaceName}" with discoveryQos "${JSON.stringify(settings.discoveryQos)}"`;
-                '", interface "' +
-                settings.interfaceName +
-                '" with discoveryQos "' +
-                JSON.stringify(settings.discoveryQos) +
-                '"';
             startArbitrationDeferred.reject(
                 new NoCompatibleProviderFoundException({
                     detailMessage: message,
@@ -263,15 +258,11 @@ Arbitrator.prototype.startArbitration = function startArbitration(settings) {
         } else {
             startArbitrationDeferred.reject(
                 new DiscoveryException({
-                    detailMessage:
+                    detailMessage: `no provider found within discovery timeout for domains "${JSON.stringify(
-                        'no provider found within discovery timeout for domains "' +
+                        settings.domains
-                        JSON.stringify(settings.domains) +
+                    )}", interface "${settings.interfaceName}" with discoveryQos "${JSON.stringify(
-                        '", interface "' +
+                        settings.discoveryQos
-                        settings.interfaceName +
+                    )}"${deferred.errorMsg !== undefined ? `. Error: ${deferred.errorMsg}` : ""}`
-                        '" with discoveryQos "' +
-                        JSON.stringify(settings.discoveryQos) +
-                        '"' +
-                        (deferred.errorMsg !== undefined ? ". Error: " + deferred.errorMsg : "")
                 })
             );
         }

diff --git a/javascript/libjoynr-js/src/main/js/joynr/capabilities/discovery/CapabilityDiscovery.js b/javascript/libjoynr-js/src/main/js/joynr/capabilities/discovery/CapabilityDiscovery.js
@@ -121,7 +121,7 @@ function CapabilityDiscovery(
                 })
             })
             .catch(error => {
-                throw new Error("Failed to create global capabilities directory proxy: " + error);
+                throw new Error(`Failed to create global capabilities directory proxy: ${error}`);
             });
     }
 
@@ -149,8 +149,9 @@ function CapabilityDiscovery(
                                 globalAddress = Typing.augmentTypes(JSON.parse(globalDiscoveryEntry.address));
                             } catch (e) {
                                 log.error(
-                                    "unable to use global discoveryEntry with unknown address type: " +
+                                    `unable to use global discoveryEntry with unknown address type: ${
                                         globalDiscoveryEntry.address
+                                    }`
                                 );
                                 continue;
                             }
@@ -221,7 +222,7 @@ function CapabilityDiscovery(
                 });
             })
             .catch(error => {
-                throw new Error('Error calling operation "add" of GlobalCapabilitiesDirectory because: ' + error);
+                throw new Error(`Error calling operation "add" of GlobalCapabilitiesDirectory because: ${error}`);
             });
     }
 
@@ -363,7 +364,7 @@ function CapabilityDiscovery(
                 }
                 return lookupGlobalCapabilities(domains, interfaceName, TTL_30DAYS_IN_MS, globalCapabilities);
             default:
-                log.error("unknown discoveryScope value: " + discoveryQos.discoveryScope.value);
+                log.error(`unknown discoveryScope value: ${discoveryQos.discoveryScope.value}`);
         }
     };
 
@@ -409,9 +410,7 @@ function CapabilityDiscovery(
                 promise = addGlobal(discoveryEntry);
             }
         } else {
-            promise = Promise.reject(
+            promise = Promise.reject(new Error(`Encountered unknown ProviderQos scope "${discoveryEntry.qos.scope}"`));
-                new Error('Encountered unknown ProviderQos scope "' + discoveryEntry.qos.scope + '"')
-            );
         }
         return promise;
     };
@@ -431,7 +430,7 @@ function CapabilityDiscovery(
                 return globalCapabilitiesDirectoryProxy.touch({ clusterControllerId });
             })
             .catch(error => {
-                throw new Error('Error calling operation "touch" of GlobalCapabilitiesDirectory because: ' + error);
+                throw new Error(`Error calling operation "touch" of GlobalCapabilitiesDirectory because: ${error}`);
             });
     };
 
@@ -454,7 +453,7 @@ function CapabilityDiscovery(
                 });
             })
             .catch(error => {
-                throw new Error('Error calling operation "remove" of GlobalCapabilitiesDirectory because: ' + error);
+                throw new Error(`Error calling operation "remove" of GlobalCapabilitiesDirectory because: ${error}`);
             });
     }
 
@@ -481,9 +480,9 @@ function CapabilityDiscovery(
         });
         if (discoveryEntries === undefined || discoveryEntries.length !== 1) {
             log.warn(
-                "remove(): no capability entry found in local capabilities store for participantId " +
+                `remove(): no capability entry found in local capabilities store for participantId ${
-                    participantId +
+                    participantId
-                    ". Trying to remove the capability from global directory"
+                }. Trying to remove the capability from global directory`
             );
             promise = removeParticipantIdFromGlobalCapabilitiesDirectory(participantId);
         } else if (discoveryEntries[0].qos.scope === ProviderScope.LOCAL || discoveryEntries.length < 1) {
@@ -492,7 +491,7 @@ function CapabilityDiscovery(
             promise = removeParticipantIdFromGlobalCapabilitiesDirectory(participantId);
         } else {
             promise = Promise.reject(
-                new Error('Encountered unknown ProviderQos scope "' + discoveryEntries[0].qos.scope + '"')
+                new Error(`Encountered unknown ProviderQos scope "${discoveryEntries[0].qos.scope}"`)
             );
         }
         return promise;