Make Configuration class self-contained.

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

diff --git a/src/utils/Configuration.ts b/src/utils/Configuration.ts
index e22d8a8e506cc8bb239055c0e6d37ad681ab2114..760695253531f6c64863315287eb36063895b5a7 100644 (file)
--- a/src/utils/Configuration.ts
+++ b/src/utils/Configuration.ts
@@ -1,6 +1,5 @@
 import ConfigurationData, { StationTemplateURL } from '../types/ConfigurationData';
 
-import Utils from './Utils';
 import fs from 'fs';
 
 export default class Configuration {
@@ -8,14 +7,14 @@ export default class Configuration {
 
   static getStatisticsDisplayInterval(): number {
     // Read conf
-    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'statisticsDisplayInterval') ? Configuration.getConfig().statisticsDisplayInterval : 60;
+    return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'statisticsDisplayInterval') ? Configuration.getConfig().statisticsDisplayInterval : 60;
   }
 
   static getConnectionTimeout(): number {
     Configuration.deprecateConfigurationKey('autoReconnectTimeout', 'Use \'connectionTimeout\' in charging station instead');
     Configuration.deprecateConfigurationKey('connectionTimeout', 'Use it in charging station template instead');
     // Read conf
-    if (Utils.objectHasOwnProperty(Configuration.getConfig(), 'connectionTimeout')) {
+    if (Configuration.objectHasOwnProperty(Configuration.getConfig(), 'connectionTimeout')) {
       return Configuration.getConfig().connectionTimeout;
     }
   }
@@ -23,14 +22,14 @@ export default class Configuration {
   static getAutoReconnectMaxRetries(): number {
     Configuration.deprecateConfigurationKey('autoReconnectMaxRetries', 'Use it in charging station template instead');
     // Read conf
-    if (Utils.objectHasOwnProperty(Configuration.getConfig(), 'autoReconnectMaxRetries')) {
+    if (Configuration.objectHasOwnProperty(Configuration.getConfig(), 'autoReconnectMaxRetries')) {
       return Configuration.getConfig().autoReconnectMaxRetries;
     }
   }
 
   static getStationTemplateURLs(): StationTemplateURL[] {
     Configuration.getConfig().stationTemplateURLs.forEach((stationURL: StationTemplateURL) => {
-      if (!Utils.isUndefined(stationURL['numberOfStation'])) {
+      if (!Configuration.isUndefined(stationURL['numberOfStation'])) {
         console.error(`Deprecated configuration key 'numberOfStation' usage for template file '${stationURL.file}' in 'stationTemplateURLs'. Use 'numberOfStations' instead`);
       }
     });
@@ -48,32 +47,32 @@ export default class Configuration {
 
   static getLogConsole(): boolean {
     Configuration.deprecateConfigurationKey('consoleLog', 'Use \'logConsole\' instead');
-    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'logConsole') ? Configuration.getConfig().logConsole : false;
+    return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'logConsole') ? Configuration.getConfig().logConsole : false;
   }
 
   static getLogFormat(): string {
-    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'logFormat') ? Configuration.getConfig().logFormat : 'simple';
+    return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'logFormat') ? Configuration.getConfig().logFormat : 'simple';
   }
 
   static getLogRotate(): boolean {
-    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'logRotate') ? Configuration.getConfig().logRotate : true;
+    return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'logRotate') ? Configuration.getConfig().logRotate : true;
   }
 
   static getLogMaxFiles(): number {
-    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'logMaxFiles') ? Configuration.getConfig().logMaxFiles : 7;
+    return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'logMaxFiles') ? Configuration.getConfig().logMaxFiles : 7;
   }
 
   static getLogLevel(): string {
-    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'logLevel') ? Configuration.getConfig().logLevel : 'info';
+    return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'logLevel') ? Configuration.getConfig().logLevel : 'info';
   }
 
   static getLogFile(): string {
-    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'logFile') ? Configuration.getConfig().logFile : 'combined.log';
+    return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'logFile') ? Configuration.getConfig().logFile : 'combined.log';
   }
 
   static getLogErrorFile(): string {
     Configuration.deprecateConfigurationKey('errorFile', 'Use \'logErrorFile\' instead');
-    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'logErrorFile') ? Configuration.getConfig().logErrorFile : 'error.log';
+    return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'logErrorFile') ? Configuration.getConfig().logErrorFile : 'error.log';
   }
 
   static getSupervisionURLs(): string[] {
@@ -83,11 +82,11 @@ export default class Configuration {
 
   static getDistributeStationsToTenantsEqually(): boolean {
     Configuration.deprecateConfigurationKey('distributeStationToTenantEqually', 'Use \'distributeStationsToTenantsEqually\' instead');
-    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'distributeStationsToTenantsEqually') ? Configuration.getConfig().distributeStationsToTenantsEqually : true;
+    return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'distributeStationsToTenantsEqually') ? Configuration.getConfig().distributeStationsToTenantsEqually : true;
   }
 
   private static deprecateConfigurationKey(key: string, logMsgToAppend = '') {
-    if (!Utils.isUndefined(Configuration.getConfig()[key])) {
+    if (!Configuration.isUndefined(Configuration.getConfig()[key])) {
       console.error(`Deprecated configuration key '${key}' usage${logMsgToAppend && '. ' + logMsgToAppend}`);
     }
   }
@@ -99,4 +98,12 @@ export default class Configuration {
     }
     return Configuration.configuration;
   }
+
+  private static objectHasOwnProperty(object: any, property: string): boolean {
+    return Object.prototype.hasOwnProperty.call(object, property);
+  }
+
+  private static isUndefined(obj: any): boolean {
+    return typeof obj === 'undefined';
+  }
 }

diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts
index a1f28155f26b21460cf43beb141be2b34ba513d4..4876f46db8c0483b72e0d81e6affd76941673e46 100644 (file)
--- a/src/utils/Utils.ts
+++ b/src/utils/Utils.ts
@@ -117,10 +117,6 @@ export default class Utils {
     return date.toLocaleString() + prefixString;
   }
 
-  static objectHasOwnProperty(object, property): boolean {
-    return Object.prototype.hasOwnProperty.call(object, property);
-  }
-
   static cloneObject(object) {
     return JSON.parse(JSON.stringify(object));
   }