refactor

Author: JavaIsJavaScript

src/main/java/de/rwth/idsg/steve/utils/CspUtils.java

@@ -54,7 +54,7 @@ public static List<Integer> setNumberPhases(Integer[] startPeriod, BigDecimal[]
                 numberPhases.add(3);
             }
         } else if ((numberPhases.size() == startPeriod.length) && (startPeriod.length == limit.length)) {
-            numberPhases = numberPhases;
+            return numberPhases;
         } else if ((numberPhases.size() < startPeriod.length) && (startPeriod.length == limit.length)) {
             // If numberPhases has less values than startPeriod, fill numberPhases with the default value,
             // "3" as this is the default value according to OCPP 1.6 Specifications

src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java

@@ -75,11 +75,9 @@ public void setUseChargingProfile(Boolean useChargingProfile) {
                 this.useChargingProfile = null;
             } else {
                 startPeriod[0] = 0;
-                this.useChargingProfile = useChargingProfile = CspUtils.checkStartPeriod(startPeriod) ? useChargingProfile : null;
-
-                this.useChargingProfile = (numberPhases = CspUtils.setNumberPhases(startPeriod, limit, numberPhases)).size() ==
-                        startPeriod.length ? useChargingProfile : null;
-
+                this.useChargingProfile = CspUtils.checkStartPeriod(startPeriod) ?
+                        (numberPhases = CspUtils.setNumberPhases(startPeriod, limit, numberPhases)).size() ==
+                        startPeriod.length ? useChargingProfile : null : null;
             }
         }
     }

src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java

@@ -68,14 +68,9 @@ public void setConnectorId(Integer connectorId) {
     public void setStartPeriod(Integer[] startPeriod) {
         startPeriod[0] = 0;
 
-        this.startPeriod = startPeriod = CspUtils.checkStartPeriod(startPeriod) ? startPeriod : null;
-
-        if (startPeriod != null) {
-            this.startPeriod = (numberPhases = CspUtils.setNumberPhases(startPeriod, limit, numberPhases)).size() ==
-                    startPeriod.length ? startPeriod : null;
-        } else {
-            this.startPeriod = null;
-        }
+        this.startPeriod = CspUtils.checkStartPeriod(startPeriod) ?
+                (numberPhases = CspUtils.setNumberPhases(startPeriod, limit, numberPhases)).size() ==
+                startPeriod.length ? startPeriod : null : null;
     }
 
     public void setTransactionId(Integer transactionId) {