improve exception handling during calls

* bugfix: ChargePointServiceJsonInvoker should call failed(..) instead of defaultCallback().failed(..) because failed(..) iterates over all registered callbacks, whereas defaultCallback only the default one. this was letting other callbacks hang. * ChargePointServiceSoapInvoker should not throw Exception if one mismatched "station X operation" combination is not fitting. instead, we create the dedicated failure msg and trigger the callbacks for this combination and continue with other stations.
steve-community · Jan 8, 2025 · fb3caa8 · fb3caa8
1 parent 67d9be3
commit fb3caa8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java
@@ -125,7 +125,7 @@ public void addNewError(String chargeBoxId, String errorMessage) {
         }
     }
 
-    protected void success(String chargeBoxId, RESPONSE response) {
+    public void success(String chargeBoxId, RESPONSE response) {
         for (OcppCallback<RESPONSE> c : callbackList) {
             try {
                 c.success(chargeBoxId, response);
@@ -135,7 +135,7 @@ protected void success(String chargeBoxId, RESPONSE response) {
         }
     }
 
-    protected void failed(String chargeBoxId, Exception exception) {
+    public void failed(String chargeBoxId, Exception exception) {
         for (OcppCallback<RESPONSE> c : callbackList) {
             try {
                 c.failed(chargeBoxId, exception);

diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ChargePointServiceSoapInvoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ChargePointServiceSoapInvoker.java
@@ -50,6 +50,9 @@
 @Service
 public class ChargePointServiceSoapInvoker implements ChargePointServiceInvoker {
 
+    public static final Exception EXCEPTION_V12 = new IllegalArgumentException("This operation is not supported by this OCPP 1.2 station");
+    public static final Exception EXCEPTION_V15 = new IllegalArgumentException("This operation is not supported by this OCPP 1.5 station");
+
     private final ClientProviderWithCache<ocpp.cp._2010._08.ChargePointService> soapV12Helper;
     private final ClientProviderWithCache<ocpp.cp._2012._06.ChargePointService> soapV15Helper;
     private final ClientProviderWithCache<ocpp.cp._2015._10.ChargePointService> soapV16Helper;
@@ -150,7 +153,7 @@ public void remoteStopTransaction(ChargePointSelect cp, RemoteStopTransactionTas
     @Override
     public void dataTransfer(ChargePointSelect cp, DataTransferTask task) {
         switch (cp.getOcppProtocol().getVersion()) {
-            case V_12 -> throw new IllegalArgumentException("Not supported");
+            case V_12 -> task.failed(cp.getChargeBoxId(), EXCEPTION_V12);
             case V_15 -> createV15(cp).dataTransferAsync(task.getOcpp15Request(), cp.getChargeBoxId(), task.getOcpp15Handler(cp.getChargeBoxId()));
             case V_16 -> createV16(cp).dataTransferAsync(task.getOcpp16Request(), cp.getChargeBoxId(), task.getOcpp16Handler(cp.getChargeBoxId()));
         }
@@ -159,7 +162,7 @@ public void dataTransfer(ChargePointSelect cp, DataTransferTask task) {
     @Override
     public void getConfiguration(ChargePointSelect cp, GetConfigurationTask task) {
         switch (cp.getOcppProtocol().getVersion()) {
-            case V_12 -> throw new IllegalArgumentException("Not supported");
+            case V_12 -> task.failed(cp.getChargeBoxId(), EXCEPTION_V12);
             case V_15 -> createV15(cp).getConfigurationAsync(task.getOcpp15Request(), cp.getChargeBoxId(), task.getOcpp15Handler(cp.getChargeBoxId()));
             case V_16 -> createV16(cp).getConfigurationAsync(task.getOcpp16Request(), cp.getChargeBoxId(), task.getOcpp16Handler(cp.getChargeBoxId()));
         }
@@ -168,7 +171,7 @@ public void getConfiguration(ChargePointSelect cp, GetConfigurationTask task) {
     @Override
     public void getLocalListVersion(ChargePointSelect cp, GetLocalListVersionTask task) {
         switch (cp.getOcppProtocol().getVersion()) {
-            case V_12 -> throw new IllegalArgumentException("Not supported");
+            case V_12 -> task.failed(cp.getChargeBoxId(), EXCEPTION_V12);
             case V_15 -> createV15(cp).getLocalListVersionAsync(task.getOcpp15Request(), cp.getChargeBoxId(), task.getOcpp15Handler(cp.getChargeBoxId()));
             case V_16 -> createV16(cp).getLocalListVersionAsync(task.getOcpp16Request(), cp.getChargeBoxId(), task.getOcpp16Handler(cp.getChargeBoxId()));
         }
@@ -177,7 +180,7 @@ public void getLocalListVersion(ChargePointSelect cp, GetLocalListVersionTask ta
     @Override
     public void sendLocalList(ChargePointSelect cp, SendLocalListTask task) {
         switch (cp.getOcppProtocol().getVersion()) {
-            case V_12 -> throw new IllegalArgumentException("Not supported");
+            case V_12 -> task.failed(cp.getChargeBoxId(), EXCEPTION_V12);
             case V_15 -> createV15(cp).sendLocalListAsync(task.getOcpp15Request(), cp.getChargeBoxId(), task.getOcpp15Handler(cp.getChargeBoxId()));
             case V_16 -> createV16(cp).sendLocalListAsync(task.getOcpp16Request(), cp.getChargeBoxId(), task.getOcpp16Handler(cp.getChargeBoxId()));
         }
@@ -186,7 +189,7 @@ public void sendLocalList(ChargePointSelect cp, SendLocalListTask task) {
     @Override
     public void reserveNow(ChargePointSelect cp, ReserveNowTask task) {
         switch (cp.getOcppProtocol().getVersion()) {
-            case V_12 -> throw new IllegalArgumentException("Not supported");
+            case V_12 -> task.failed(cp.getChargeBoxId(), EXCEPTION_V12);
             case V_15 -> createV15(cp).reserveNowAsync(task.getOcpp15Request(), cp.getChargeBoxId(), task.getOcpp15Handler(cp.getChargeBoxId()));
             case V_16 -> createV16(cp).reserveNowAsync(task.getOcpp16Request(), cp.getChargeBoxId(), task.getOcpp16Handler(cp.getChargeBoxId()));
         }
@@ -195,7 +198,7 @@ public void reserveNow(ChargePointSelect cp, ReserveNowTask task) {
     @Override
     public void cancelReservation(ChargePointSelect cp, CancelReservationTask task) {
         switch (cp.getOcppProtocol().getVersion()) {
-            case V_12 -> throw new IllegalArgumentException("Not supported");
+            case V_12 -> task.failed(cp.getChargeBoxId(), EXCEPTION_V12);
             case V_15 -> createV15(cp).cancelReservationAsync(task.getOcpp15Request(), cp.getChargeBoxId(), task.getOcpp15Handler(cp.getChargeBoxId()));
             case V_16 -> createV16(cp).cancelReservationAsync(task.getOcpp16Request(), cp.getChargeBoxId(), task.getOcpp16Handler(cp.getChargeBoxId()));
         }
@@ -208,31 +211,35 @@ public void cancelReservation(ChargePointSelect cp, CancelReservationTask task)
     @Override
     public void clearChargingProfile(ChargePointSelect cp, ClearChargingProfileTask task) {
         switch (cp.getOcppProtocol().getVersion()) {
-            case V_12, V_15 -> throw new IllegalArgumentException("Not supported");
+            case V_12 -> task.failed(cp.getChargeBoxId(), EXCEPTION_V12);
+            case V_15 -> task.failed(cp.getChargeBoxId(), EXCEPTION_V15);
             case V_16 -> createV16(cp).clearChargingProfileAsync(task.getOcpp16Request(), cp.getChargeBoxId(), task.getOcpp16Handler(cp.getChargeBoxId()));
         }
     }
 
     @Override
     public void setChargingProfile(ChargePointSelect cp, SetChargingProfileTask task) {
         switch (cp.getOcppProtocol().getVersion()) {
-            case V_12, V_15 -> throw new IllegalArgumentException("Not supported");
+            case V_12 -> task.failed(cp.getChargeBoxId(), EXCEPTION_V12);
+            case V_15 -> task.failed(cp.getChargeBoxId(), EXCEPTION_V15);
             case V_16 -> createV16(cp).setChargingProfileAsync(task.getOcpp16Request(), cp.getChargeBoxId(), task.getOcpp16Handler(cp.getChargeBoxId()));
         }
     }
 
     @Override
     public void getCompositeSchedule(ChargePointSelect cp, GetCompositeScheduleTask task) {
         switch (cp.getOcppProtocol().getVersion()) {
-            case V_12, V_15 -> throw new IllegalArgumentException("Not supported");
+            case V_12 -> task.failed(cp.getChargeBoxId(), EXCEPTION_V12);
+            case V_15 -> task.failed(cp.getChargeBoxId(), EXCEPTION_V15);
             case V_16 -> createV16(cp).getCompositeScheduleAsync(task.getOcpp16Request(), cp.getChargeBoxId(), task.getOcpp16Handler(cp.getChargeBoxId()));
         }
     }
 
     @Override
     public void triggerMessage(ChargePointSelect cp, TriggerMessageTask task) {
         switch (cp.getOcppProtocol().getVersion()) {
-            case V_12, V_15 -> throw new IllegalArgumentException("Not supported");
+            case V_12 -> task.failed(cp.getChargeBoxId(), EXCEPTION_V12);
+            case V_15 -> task.failed(cp.getChargeBoxId(), EXCEPTION_V15);
             case V_16 -> createV16(cp).triggerMessageAsync(task.getOcpp16Request(), cp.getChargeBoxId(), task.getOcpp16Handler(cp.getChargeBoxId()));
         }
     }

diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceJsonInvoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceJsonInvoker.java
@@ -63,7 +63,7 @@ public void runPipeline(ChargePointSelect cps, CommunicationTask task) {
         } catch (Exception e) {
             log.error("Exception occurred", e);
             // Outgoing call failed due to technical problems. Pass the exception to handler to inform the user
-            task.defaultCallback().failed(cps.getChargeBoxId(), e);
+            task.failed(cps.getChargeBoxId(), e);
         }
     }