Add OCPP 2.1 support

build.gradle

@@ -32,6 +32,10 @@ subprojects {
 
     sourceCompatibility = '1.8'
 
+    tasks.withType(JavaCompile).configureEach {
+        options.encoding = 'UTF-8'
+    }
+
     publishing {
         publications {
             maven(MavenPublication) {

ocpp-common/src/main/java/eu/chargetime/ocpp/ProtocolVersion.java

@@ -32,7 +32,8 @@
 /** enum of protocol versions along with their registered WebSocket sub-protocol names */
 public enum ProtocolVersion {
   OCPP1_6("ocpp1.6"),
-  OCPP2_0_1("ocpp2.0.1");
+  OCPP2_0_1("ocpp2.0.1"),
+  OCPP2_1("ocpp2.1");
 
   private static final Map<String, ProtocolVersion> MAP = new HashMap<>();
 

ocpp-v1_6-test/pom.xml

@@ -54,7 +54,7 @@
             <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
-        <dependency>    
+        <dependency>
             <groupId>org.spockframework</groupId>
             <artifactId>spock-core</artifactId>
             <version>2.3-groovy-4.0</version>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy</artifactId>
-            <version>4.0.24</version> 
+            <version>4.0.24</version>
             <scope>test</scope>
         </dependency>
         <dependency>

ocpp-v2/src/main/java/eu/chargetime/ocpp/v21/feature/AFRRSignalFeature.java

@@ -0,0 +1,54 @@
+/*
+   ChargeTime.eu - Java-OCA-OCPP
+
+   MIT License
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in all
+   copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+   SOFTWARE.
+*/
+
+package eu.chargetime.ocpp.v21.feature;
+
+import eu.chargetime.ocpp.feature.FunctionFeature;
+import eu.chargetime.ocpp.feature.function.Function;
+import eu.chargetime.ocpp.model.Confirmation;
+import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.v21.model.messages.AFRRSignalRequest;
+import eu.chargetime.ocpp.v21.model.messages.AFRRSignalResponse;
+
+public class AFRRSignalFeature extends FunctionFeature {
+
+  public AFRRSignalFeature(Function ownerFunction) {
+    super(ownerFunction);
+  }
+
+  @Override
+  public Class<? extends Request> getRequestType() {
+    return AFRRSignalRequest.class;
+  }
+
+  @Override
+  public Class<? extends Confirmation> getConfirmationType() {
+    return AFRRSignalResponse.class;
+  }
+
+  @Override
+  public String getAction() {
+    return "AFRRSignal";
+  }
+}

ocpp-v2/src/main/java/eu/chargetime/ocpp/v21/feature/AdjustPeriodicEventStreamFeature.java

@@ -0,0 +1,54 @@
+/*
+   ChargeTime.eu - Java-OCA-OCPP
+
+   MIT License
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in all
+   copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+   SOFTWARE.
+*/
+
+package eu.chargetime.ocpp.v21.feature;
+
+import eu.chargetime.ocpp.feature.FunctionFeature;
+import eu.chargetime.ocpp.feature.function.Function;
+import eu.chargetime.ocpp.model.Confirmation;
+import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.v21.model.messages.AdjustPeriodicEventStreamRequest;
+import eu.chargetime.ocpp.v21.model.messages.AdjustPeriodicEventStreamResponse;
+
+public class AdjustPeriodicEventStreamFeature extends FunctionFeature {
+
+  public AdjustPeriodicEventStreamFeature(Function ownerFunction) {
+    super(ownerFunction);
+  }
+
+  @Override
+  public Class<? extends Request> getRequestType() {
+    return AdjustPeriodicEventStreamRequest.class;
+  }
+
+  @Override
+  public Class<? extends Confirmation> getConfirmationType() {
+    return AdjustPeriodicEventStreamResponse.class;
+  }
+
+  @Override
+  public String getAction() {
+    return "AdjustPeriodicEventStream";
+  }
+}

ocpp-v2/src/main/java/eu/chargetime/ocpp/v21/feature/AuthorizeFeature.java

@@ -0,0 +1,54 @@
+/*
+   ChargeTime.eu - Java-OCA-OCPP
+
+   MIT License
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in all
+   copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+   SOFTWARE.
+*/
+
+package eu.chargetime.ocpp.v21.feature;
+
+import eu.chargetime.ocpp.feature.FunctionFeature;
+import eu.chargetime.ocpp.feature.function.Function;
+import eu.chargetime.ocpp.model.Confirmation;
+import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.v21.model.messages.AuthorizeRequest;
+import eu.chargetime.ocpp.v21.model.messages.AuthorizeResponse;
+
+public class AuthorizeFeature extends FunctionFeature {
+
+  public AuthorizeFeature(Function ownerFunction) {
+    super(ownerFunction);
+  }
+
+  @Override
+  public Class<? extends Request> getRequestType() {
+    return AuthorizeRequest.class;
+  }
+
+  @Override
+  public Class<? extends Confirmation> getConfirmationType() {
+    return AuthorizeResponse.class;
+  }
+
+  @Override
+  public String getAction() {
+    return "Authorize";
+  }
+}

ocpp-v2/src/main/java/eu/chargetime/ocpp/v21/feature/BatterySwapFeature.java

@@ -0,0 +1,54 @@
+/*
+   ChargeTime.eu - Java-OCA-OCPP
+
+   MIT License
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in all
+   copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+   SOFTWARE.
+*/
+
+package eu.chargetime.ocpp.v21.feature;
+
+import eu.chargetime.ocpp.feature.FunctionFeature;
+import eu.chargetime.ocpp.feature.function.Function;
+import eu.chargetime.ocpp.model.Confirmation;
+import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.v21.model.messages.BatterySwapRequest;
+import eu.chargetime.ocpp.v21.model.messages.BatterySwapResponse;
+
+public class BatterySwapFeature extends FunctionFeature {
+
+  public BatterySwapFeature(Function ownerFunction) {
+    super(ownerFunction);
+  }
+
+  @Override
+  public Class<? extends Request> getRequestType() {
+    return BatterySwapRequest.class;
+  }
+
+  @Override
+  public Class<? extends Confirmation> getConfirmationType() {
+    return BatterySwapResponse.class;
+  }
+
+  @Override
+  public String getAction() {
+    return "BatterySwap";
+  }
+}

ocpp-v2/src/main/java/eu/chargetime/ocpp/v21/feature/BootNotificationFeature.java

@@ -0,0 +1,54 @@
+/*
+   ChargeTime.eu - Java-OCA-OCPP
+
+   MIT License
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in all
+   copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+   SOFTWARE.
+*/
+
+package eu.chargetime.ocpp.v21.feature;
+
+import eu.chargetime.ocpp.feature.FunctionFeature;
+import eu.chargetime.ocpp.feature.function.Function;
+import eu.chargetime.ocpp.model.Confirmation;
+import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.v21.model.messages.BootNotificationRequest;
+import eu.chargetime.ocpp.v21.model.messages.BootNotificationResponse;
+
+public class BootNotificationFeature extends FunctionFeature {
+
+  public BootNotificationFeature(Function ownerFunction) {
+    super(ownerFunction);
+  }
+
+  @Override
+  public Class<? extends Request> getRequestType() {
+    return BootNotificationRequest.class;
+  }
+
+  @Override
+  public Class<? extends Confirmation> getConfirmationType() {
+    return BootNotificationResponse.class;
+  }
+
+  @Override
+  public String getAction() {
+    return "BootNotification";
+  }
+}

ocpp-v2/src/main/java/eu/chargetime/ocpp/v21/feature/CancelReservationFeature.java

@@ -0,0 +1,54 @@
+/*
+   ChargeTime.eu - Java-OCA-OCPP
+
+   MIT License
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in all
+   copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+   SOFTWARE.
+*/
+
+package eu.chargetime.ocpp.v21.feature;
+
+import eu.chargetime.ocpp.feature.FunctionFeature;
+import eu.chargetime.ocpp.feature.function.Function;
+import eu.chargetime.ocpp.model.Confirmation;
+import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.v21.model.messages.CancelReservationRequest;
+import eu.chargetime.ocpp.v21.model.messages.CancelReservationResponse;
+
+public class CancelReservationFeature extends FunctionFeature {
+
+  public CancelReservationFeature(Function ownerFunction) {
+    super(ownerFunction);
+  }
+
+  @Override
+  public Class<? extends Request> getRequestType() {
+    return CancelReservationRequest.class;
+  }
+
+  @Override
+  public Class<? extends Confirmation> getConfirmationType() {
+    return CancelReservationResponse.class;
+  }
+
+  @Override
+  public String getAction() {
+    return "CancelReservation";
+  }
+}