JavaIsJavaScript
diff --git a/‎src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java‎
Lines changed: 10 additions & 8 deletions b/‎src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java‎
Lines changed: 10 additions & 8 deletions
@@ -229,10 +229,11 @@ public DataTransferResponse convertResponse(ocpp.cs._2015._10.DataTransferRespon
      * but something else might make more sense at this place
      */
     private static ChargePointStatus customMapStatus(ocpp.cs._2012._06.ChargePointStatus status) {
-        if (status.equals(ocpp.cs._2012._06.ChargePointStatus.OCCUPIED)) {
-            return ChargePointStatus.CHARGING;
-        } else {
-            return ChargePointStatus.fromValue(status.value());
+        switch (status) {
+            case OCCUPIED:
+                return ChargePointStatus.CHARGING;
+            default:
+                return ChargePointStatus.fromValue(status.value());
         }
     }
 
@@ -241,10 +242,11 @@ private static ChargePointStatus customMapStatus(ocpp.cs._2012._06.ChargePointSt
      * Update: According to the 1.6 specification, MODE_3_ERROR was simply renamed to EV_COMMUNICATION_ERROR
      */
     private static ChargePointErrorCode customMapErrorCode(ocpp.cs._2012._06.ChargePointErrorCode errorCode15) {
-        if (errorCode15.equals(ocpp.cs._2012._06.ChargePointErrorCode.MODE_3_ERROR)) {
-            return ChargePointErrorCode.EV_COMMUNICATION_ERROR;
-        } else {
-            return ChargePointErrorCode.fromValue(errorCode15.value());
+        switch (errorCode15) {
+            case MODE_3_ERROR:
+                return ChargePointErrorCode.EV_COMMUNICATION_ERROR;
+            default:
+                return ChargePointErrorCode.fromValue(errorCode15.value());
         }
     }