From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Wed, 18 Mar 2026 14:49:05 +0000 (+0100)
Subject: refactor(ocpp): harmonize buildRequestPayload switch structure across versions
X-Git-Tag: ocpp-server@v3.2.0~63
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=db04e1514590d0a79fab7a7e4af34a9b48d86861;p=e-mobility-charging-stations-simulator.git

refactor(ocpp): harmonize buildRequestPayload switch structure across versions

Group passthrough cases into fall-through blocks in both OCPP 1.6 and
2.0 buildRequestPayload, giving both files a symmetric structure:
grouped passthroughs, heartbeat empty object, enrichment cases, default
error.
---

diff --git a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
index 5fe55dc8..d06a817c 100644
--- a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
@@ -179,17 +179,14 @@ export class OCPP16RequestService extends OCPPRequestService {
           ...commandParams,
         } as unknown as Request
       case OCPP16RequestCommand.BOOT_NOTIFICATION:
-        return commandParams as unknown as Request
       case OCPP16RequestCommand.DATA_TRANSFER:
-        return commandParams as unknown as Request
       case OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION:
-        return commandParams as unknown as Request
       case OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION:
+      case OCPP16RequestCommand.METER_VALUES:
+      case OCPP16RequestCommand.STATUS_NOTIFICATION:
         return commandParams as unknown as Request
       case OCPP16RequestCommand.HEARTBEAT:
         return OCPP16Constants.OCPP_REQUEST_EMPTY as unknown as Request
-      case OCPP16RequestCommand.METER_VALUES:
-        return commandParams as unknown as Request
       case OCPP16RequestCommand.START_TRANSACTION:
         return {
           idTag: Constants.DEFAULT_IDTAG,
@@ -213,8 +210,6 @@ export class OCPP16RequestService extends OCPPRequestService {
           }),
           ...commandParams,
         } as unknown as Request
-      case OCPP16RequestCommand.STATUS_NOTIFICATION:
-        return commandParams as unknown as Request
       case OCPP16RequestCommand.STOP_TRANSACTION:
         chargingStation.stationInfo?.transactionDataMeterValues === true &&
           (connectorId = chargingStation.getConnectorIdByTransactionId(
diff --git a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
index 21ff7b6b..bd240189 100644
--- a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
+++ b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
@@ -149,7 +149,6 @@ export class OCPP20RequestService extends OCPPRequestService {
     )
     switch (commandName) {
       case OCPP20RequestCommand.BOOT_NOTIFICATION:
-        return commandParams as unknown as Request
       case OCPP20RequestCommand.FIRMWARE_STATUS_NOTIFICATION:
       case OCPP20RequestCommand.GET_15118_EV_CERTIFICATE:
       case OCPP20RequestCommand.GET_CERTIFICATE_STATUS: