refactor: factor out default error handling params

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

diff --git a/src/charging-station/ocpp/OCPPIncomingRequestService.ts b/src/charging-station/ocpp/OCPPIncomingRequestService.ts
index 1206cede00d0493df941f54e73dc03cffedfc28c..4d2b29e3d0c695f5fbbdac79fdff1782bd6f04b6 100644 (file)
--- a/src/charging-station/ocpp/OCPPIncomingRequestService.ts
+++ b/src/charging-station/ocpp/OCPPIncomingRequestService.ts
@@ -62,7 +62,7 @@ export abstract class OCPPIncomingRequestService extends AsyncResource {
     error: Error,
     params: HandleErrorParams<T> = { throwError: true, consoleOut: false }
   ): T | undefined {
-    ErrorUtils.handleErrorParams(params);
+    ErrorUtils.setDefaultErrorParams(params);
     logger.error(
       `${chargingStation.logPrefix()} ${moduleName}.handleIncomingRequestError: Incoming request command '${commandName}' error:`,
       error

diff --git a/src/performance/storage/Storage.ts b/src/performance/storage/Storage.ts
index 9df2ebca63b5ae35ce3968959c2f6f23e0b5ede5..39345cdf18a851efeed644ab41aeeb121097c3a0 100644 (file)
--- a/src/performance/storage/Storage.ts
+++ b/src/performance/storage/Storage.ts
@@ -27,7 +27,7 @@ export abstract class Storage {
     table?: string,
     params: HandleErrorParams<EmptyObject> = { throwError: false, consoleOut: false }
   ): void {
-    ErrorUtils.handleErrorParams(params, { throwError: false, consoleOut: false });
+    ErrorUtils.setDefaultErrorParams(params, { throwError: false, consoleOut: false });
     const inTableOrCollectionStr =
       (!Utils.isNullOrUndefined(table) || !table) && ` in table or collection '${table}'`;
     logger.error(

diff --git a/src/utils/ErrorUtils.ts b/src/utils/ErrorUtils.ts
index 254bd9ecf4a821da81b0be440bbba16011b18511..7569b8ebe0226ef438e4d54125ed5ce41cf35460 100644 (file)
--- a/src/utils/ErrorUtils.ts
+++ b/src/utils/ErrorUtils.ts
@@ -12,6 +12,11 @@ import type {
   RequestCommand,
 } from '../types';
 
+const defaultErrorParams = {
+  throwError: true,
+  consoleOut: false,
+};
+
 export class ErrorUtils {
   private constructor() {
     // This is intentional
@@ -34,9 +39,9 @@ export class ErrorUtils {
     fileType: FileType,
     error: NodeJS.ErrnoException,
     logPrefix: string,
-    params: HandleErrorParams<EmptyObject> = { throwError: true, consoleOut: false }
+    params: HandleErrorParams<EmptyObject> = defaultErrorParams
   ): void {
-    ErrorUtils.handleErrorParams(params);
+    ErrorUtils.setDefaultErrorParams(params);
     const prefix = Utils.isNotEmptyString(logPrefix) ? `${logPrefix} ` : '';
     let logMsg: string;
     switch (error.code) {
@@ -79,16 +84,16 @@ export class ErrorUtils {
     error: Error,
     params: HandleErrorParams<EmptyObject> = { throwError: false, consoleOut: false }
   ): void {
-    ErrorUtils.handleErrorParams(params, { throwError: false, consoleOut: false });
+    ErrorUtils.setDefaultErrorParams(params, { throwError: false, consoleOut: false });
     logger.error(`${chargingStation.logPrefix()} Request command '${commandName}' error:`, error);
     if (params?.throwError === true) {
       throw error;
     }
   }
 
-  public static handleErrorParams<T extends JsonType>(
+  public static setDefaultErrorParams<T extends JsonType>(
     params: HandleErrorParams<T>,
-    defaultParams: HandleErrorParams<T> = { throwError: true, consoleOut: false }
+    defaultParams: HandleErrorParams<T> = defaultErrorParams
   ): HandleErrorParams<T> {
     return { ...defaultParams, ...params };
   }