refactor

Author: goekay

src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java

@@ -27,6 +27,7 @@
 import org.springframework.core.type.filter.RegexPatternTypeFilter;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 
@@ -42,8 +43,13 @@ public abstract class AbstractTypeStore implements TypeStore {
     private final Map<String, Class<? extends RequestType>> requestClassMap = new HashMap<>();
     private final Map<Class<? extends RequestType>, ActionResponsePair> actionResponseMap = new HashMap<>();
 
-    public AbstractTypeStore(String[] packagesForRequestClassMap,
-                             String[] packagesForActionResponseMap) {
+    public AbstractTypeStore(String packageForRequestClassMap,
+                             String packageForActionResponseMap) {
+        this(List.of(packageForRequestClassMap), List.of(packageForActionResponseMap));
+    }
+
+    public AbstractTypeStore(List<String> packagesForRequestClassMap,
+                             List<String> packagesForActionResponseMap) {
         for (var pkg : packagesForRequestClassMap) {
             populateRequestClassMap(pkg.trim());
         }

src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java

@@ -30,8 +30,8 @@ public final class Ocpp12TypeStore extends AbstractTypeStore {
 
     private Ocpp12TypeStore() {
         super(
-                new String[]{ocpp.cs._2010._08.ObjectFactory.class.getPackage().getName()},
-                new String[]{ocpp.cp._2010._08.ObjectFactory.class.getPackage().getName()}
+                ocpp.cs._2010._08.ObjectFactory.class.getPackage().getName(),
+                ocpp.cp._2010._08.ObjectFactory.class.getPackage().getName()
         );
     }
 }

src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java

@@ -30,8 +30,8 @@ public final class Ocpp15TypeStore extends AbstractTypeStore {
 
     private Ocpp15TypeStore() {
         super(
-                new String[]{ocpp.cs._2012._06.ObjectFactory.class.getPackage().getName()},
-                new String[]{ocpp.cp._2012._06.ObjectFactory.class.getPackage().getName()}
+                ocpp.cs._2012._06.ObjectFactory.class.getPackage().getName(),
+                ocpp.cp._2012._06.ObjectFactory.class.getPackage().getName()
         );
     }
 

src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java

@@ -20,6 +20,8 @@
 
 import de.rwth.idsg.steve.ocpp.ws.AbstractTypeStore;
 
+import java.util.List;
+
 /**
  * @author Sevket Goekay <[email protected]>
  * @since 13.03.2018
@@ -30,14 +32,14 @@ public final class Ocpp16TypeStore extends AbstractTypeStore {
 
     private Ocpp16TypeStore() {
         super(
-                new String[]{
-                    ocpp.cs._2015._10.ObjectFactory.class.getPackage().getName(),
-                    ocpp._2022._02.security.GetLog.class.getPackage().getName(),
-                },
-                new String[]{
-                    ocpp.cp._2015._10.ObjectFactory.class.getPackage().getName(),
-                    ocpp._2022._02.security.GetLog.class.getPackage().getName(),
-                }
+            List.of(
+                ocpp.cs._2015._10.ObjectFactory.class.getPackage().getName(),
+                ocpp._2022._02.security.GetLog.class.getPackage().getName()
+            ),
+            List.of(
+                ocpp.cp._2015._10.ObjectFactory.class.getPackage().getName(),
+                ocpp._2022._02.security.GetLog.class.getPackage().getName()
+            )
         );
     }
 }