Remove a linter error.

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

diff --git a/src/utils/Configuration.js b/src/utils/Configuration.js
index 5833d7e2007e43af8acdd988c4e1e85378079a8a..31ab1d6b561e0e61abdd1159518351e62a67995a 100644 (file)
--- a/src/utils/Configuration.js
+++ b/src/utils/Configuration.js
@@ -1,4 +1,5 @@
 const fs = require('fs');
+const Utils = require('./Utils');
 
 class Configuration {
   static configurationFile;
@@ -18,12 +19,12 @@ class Configuration {
 
   static getAutoReconnectTimeout() {
     // Read conf
-    return Configuration.getConfig().hasOwnProperty('autoReconnectTimeout') ? Configuration.getConfig().autoReconnectTimeout : 10;
+    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'autoReconnectTimeout') ? Configuration.getConfig().autoReconnectTimeout : 10;
   }
 
   static getAutoReconnectMaxRetries() {
     // Read conf
-    return Configuration.getConfig().hasOwnProperty('autoReconnectMaxRetries') ? Configuration.getConfig().autoReconnectMaxRetries : -1;
+    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'autoReconnectMaxRetries') ? Configuration.getConfig().autoReconnectMaxRetries : -1;
   }
 
   static getChargingStationTemplateURLs() {
@@ -38,7 +39,7 @@ class Configuration {
 
   static getNumberofChargingStation() {
     // Read conf
-    return (Configuration.getConfig().numberOfStation ? Configuration.getConfig().numberOfStation : 0);
+    return Configuration.getConfig().numberOfStation ? Configuration.getConfig().numberOfStation : 0;
   }
 
   static useWorkerPool() {
@@ -50,20 +51,15 @@ class Configuration {
   }
 
   static getConsoleLog() {
-    return (Configuration.getConfig().hasOwnProperty('consoleLog') ? Configuration.getConfig().consoleLog : false);
+    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'consoleLog') ? Configuration.getConfig().consoleLog : false;
   }
 
   static getLogFile() {
-    return (Configuration.getConfig().hasOwnProperty('logFile') ? Configuration.getConfig().logFile : 'combined.log');
+    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'logFile') ? Configuration.getConfig().logFile : 'combined.log';
   }
 
   static getErrorFile() {
-    return (Configuration.getConfig().hasOwnProperty('errorFile') ? Configuration.getConfig().errorFile : 'error.log');
-  }
-
-  static getMeterValueSampleInterval() {
-    // Read conf
-    return (Configuration.getChargingStationConfiguration().hasOwnProperty('MeterValueSampleInterval') ? Configuration.getChargingStationConfiguration().MeterValueSampleInterval * 1000 : 60000);
+    return Utils.objectHasOwnProperty(Configuration.getConfig(), 'errorFile') ? Configuration.getConfig().errorFile : 'error.log';
   }
 
   static getAutomaticTransactionConfiguration() {
@@ -81,11 +77,11 @@ class Configuration {
   }
 
   static getChargingStationConfiguration() {
-    return (Configuration.getChargingStationTemplate().hasOwnProperty('Configuration') ? Configuration.getChargingStationTemplate().Configuration : {});
+    return Utils.objectHasOwnProperty(Configuration.getChargingStationTemplate(), 'Configuration') ? Configuration.getChargingStationTemplate().Configuration : {};
   }
 
   static getChargingStationAuthorizationFile() {
-    return (Configuration.getChargingStationTemplate().hasOwnProperty('authorizationFile') ? Configuration.getChargingStationTemplate().authorizationFile : '');
+    return Utils.objectHasOwnProperty(Configuration.getChargingStationTemplate(), 'authorizationFile') ? Configuration.getChargingStationTemplate().authorizationFile : '';
   }
 
   static getChargingStationConnectors() {

diff --git a/src/utils/Utils.js b/src/utils/Utils.js
index e85090d49626156d4e2fdb913781762448bdcc8a..b04f06130f30616db1722e3431328dce76d930c3 100644 (file)
--- a/src/utils/Utils.js
+++ b/src/utils/Utils.js
@@ -127,6 +127,10 @@ class Utils {
     const date = new Date();
     return date.toISOString().substr(0, 19) + prefixString;
   }
+
+  static objectHasOwnProperty(object, property) {
+    return Object.prototype.hasOwnProperty.call(object, property);
+  }
 }
 
 module.exports = Utils;