Cleanups: renaming.

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts
index 48188134d88fcb3c8959e8144734d9da95a75699..13fb957fc9a307523a1fa62c5e9356b7eb7d1ada 100644 (file)
--- a/src/charging-station/Bootstrap.ts
+++ b/src/charging-station/Bootstrap.ts
@@ -9,7 +9,7 @@ export default class Bootstrap {
   private static instance: Bootstrap;
   private isStarted: boolean;
   private workerScript: string;
-  private workerImplementation: Wrk;
+  private workerImplementationInstance: Wrk;
 
   private constructor() {
     this.isStarted = false;
@@ -27,7 +27,7 @@ export default class Bootstrap {
     if (isMainThread && !this.isStarted) {
       try {
         let numStationsTotal = 0;
-        await this.getWorkerImplementation().start();
+        await this.getWorkerImplementationInstance().start();
         // Start ChargingStation object in worker thread
         if (Configuration.getStationTemplateURLs()) {
           for (const stationURL of Configuration.getStationTemplateURLs()) {
@@ -38,7 +38,7 @@ export default class Bootstrap {
                   index,
                   templateFile: stationURL.file
                 };
-                await this.getWorkerImplementation().addElement(workerData);
+                await this.getWorkerImplementationInstance().addElement(workerData);
                 numStationsTotal++;
               }
             } catch (error) {
@@ -52,7 +52,7 @@ export default class Bootstrap {
         if (numStationsTotal === 0) {
           console.log('No charging station template enabled in configuration, exiting');
         } else {
-          console.log(`Charging station simulator started with ${numStationsTotal.toString()} charging station(s) and ${Utils.workerDynamicPoolInUse() ? `${Configuration.getWorkerPoolMinSize().toString()}/` : ''}${this.getWorkerImplementation().size}${Utils.workerPoolInUse() ? `/${Configuration.getWorkerPoolMaxSize().toString()}` : ''} worker(s) concurrently running in '${Configuration.getWorkerProcess()}' mode (${this.getWorkerImplementation().maxElementsPerWorker} charging station(s) per worker)`);
+          console.log(`Charging station simulator started with ${numStationsTotal.toString()} charging station(s) and ${Utils.workerDynamicPoolInUse() ? `${Configuration.getWorkerPoolMinSize().toString()}/` : ''}${this.getWorkerImplementationInstance().size}${Utils.workerPoolInUse() ? `/${Configuration.getWorkerPoolMaxSize().toString()}` : ''} worker(s) concurrently running in '${Configuration.getWorkerProcess()}' mode (${this.getWorkerImplementationInstance().maxElementsPerWorker} charging station(s) per worker)`);
         }
         this.isStarted = true;
       } catch (error) {
@@ -64,10 +64,10 @@ export default class Bootstrap {
 
   public async stop(): Promise<void> {
     if (isMainThread && this.isStarted) {
-      await this.getWorkerImplementation().stop();
-      if (this.getWorkerImplementation()) {
+      await this.getWorkerImplementationInstance().stop();
+      if (this.getWorkerImplementationInstance()) {
         // Nullify to force worker implementation instance creation
-        this.workerImplementation = null;
+        this.workerImplementationInstance = null;
       }
     }
     this.isStarted = false;
@@ -78,14 +78,14 @@ export default class Bootstrap {
     await this.start();
   }
 
-  private getWorkerImplementation(): Wrk {
-    if (!this.workerImplementation) {
-      this.workerImplementation = WorkerFactory.getWorkerImpl<StationWorkerData>(this.workerScript, Configuration.getWorkerProcess(), {
+  private getWorkerImplementationInstance(): Wrk {
+    if (!this.workerImplementationInstance) {
+      this.workerImplementationInstance = WorkerFactory.getWorkerImplementation<StationWorkerData>(this.workerScript, Configuration.getWorkerProcess(), {
         poolMaxSize: Configuration.getWorkerPoolMaxSize(),
         poolMinSize: Configuration.getWorkerPoolMinSize(),
         elementsPerWorker: Configuration.getChargingStationsPerWorker()
       });
     }
-    return this.workerImplementation;
+    return this.workerImplementationInstance;
   }
 }

diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts
index d6996ee4ab380e8abc3dc971035ba9510f9ee39c..b6eb1f9a683fc7616a2cf27f3b5e0e7c1b50c8c9 100644 (file)
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -521,7 +521,7 @@ export default class ChargingStation {
     fs.watch(this._getAuthorizationFile()).on('change', (e) => {
       try {
         logger.debug(this._logPrefix() + ' Authorization file ' + this._getAuthorizationFile() + ' have changed, reload');
-        // Initialize _authorizedTags
+        // Initialize authorizedTags
         this.authorizedTags = this._getAuthorizedTags();
       } catch (error) {
         logger.error(this._logPrefix() + ' Authorization file monitoring error: %j', error);

diff --git a/src/worker/WorkerFactory.ts b/src/worker/WorkerFactory.ts
index 1bc6786d0cc991993e7809f52022a4a5a212dedd..dba59173510a3e63e33c7dafa191d444eb406385 100644 (file)
--- a/src/worker/WorkerFactory.ts
+++ b/src/worker/WorkerFactory.ts
@@ -8,7 +8,7 @@ import Wrk from './Wrk';
 import { isMainThread } from 'worker_threads';
 
 export default class WorkerFactory {
-  public static getWorkerImpl<T>(workerScript: string, workerProcessType: WorkerProcessType, options?: WorkerOptions): Wrk {
+  public static getWorkerImplementation<T>(workerScript: string, workerProcessType: WorkerProcessType, options?: WorkerOptions): Wrk {
     if (!isMainThread) {
       throw new Error('Trying to get a worker implementation outside the main thread');
     }