Changed enum values to actual enums. There were some enums that couldn't be easily converted.

Author: TVolden

ocpp-v1_6-test/src/it/groovy/eu/chargetime/ocpp/test/core/BootNotification.groovy

@@ -1,5 +1,6 @@
 package eu.chargetime.ocpp.test.core
 
+import eu.chargetime.ocpp.model.RegistrationStatus
 import eu.chargetime.ocpp.test.FakeCentralSystem
 import eu.chargetime.ocpp.test.FakeChargePoint
 import spock.lang.Shared
@@ -35,11 +36,11 @@ class BootNotification extends Specification
         }
 
         when:
-        centralSystem.sendBootConfirmation(FakeCentralSystem.RegistrationStatus.Accepted);
+        centralSystem.sendBootConfirmation(RegistrationStatus.Accepted);
 
         then:
         conditions.eventually {
-            chargePoint.hasReceivedBootConfirmation("Accepted");
+            chargePoint.hasReceivedBootConfirmation(RegistrationStatus.Accepted);
         }
     }
 }

ocpp-v1_6-test/src/it/groovy/eu/chargetime/ocpp/test/core/ChangeAvailability.groovy

@@ -1,5 +1,6 @@
 package eu.chargetime.ocpp.test.core
 
+import eu.chargetime.ocpp.model.AvailabilityType
 import eu.chargetime.ocpp.test.FakeCentralSystem
 import eu.chargetime.ocpp.test.FakeChargePoint
 import spock.lang.Shared
@@ -27,7 +28,7 @@ class ChangeAvailability extends Specification
     def "Central System sends a ChangeAvailability request and receives a response"() {
         def conditions = new PollingConditions(timeout: 1)
         when:
-        centralSystem.sendChangeAvailabilityRequest(0, FakeCentralSystem.AvailabilityType.Inoperative);
+        centralSystem.sendChangeAvailabilityRequest(0, AvailabilityType.Inoperative);
 
         then:
         conditions.eventually {

ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/FakeCentralSystem.java

@@ -1,5 +1,7 @@
 package eu.chargetime.ocpp.test;
 
+import eu.chargetime.ocpp.model.AvailabilityType;
+import eu.chargetime.ocpp.model.RegistrationStatus;
 import org.java_websocket.WebSocket;
 import org.java_websocket.handshake.ClientHandshake;
 import org.java_websocket.server.WebSocketServer;
@@ -266,18 +268,12 @@ public void sendUnlockConnectorRequest(int connectorId) {
         sendRequest("UnlockConnector", String.format(payload, connectorId));
     }
 
-    public enum AvailabilityType {
-        Inoperative, Operative
-    }
     public void sendChangeAvailabilityRequest(int connectorId, AvailabilityType type)
     {
         String payload = "\"connectorId\":%d,\"type\":\"%s\"";
         sendRequest("ChangeAvailability", String.format(payload, connectorId, type));
     }
 
-    public enum RegistrationStatus {
-        Accepted, Pending, Rejected
-    }
     public void sendHeartbeatConfirmation() {
         String payload = "\"currentTime\": \"%s\"";
         sendConfirmation(String.format(payload, now()));

ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/FakeChargePoint.java

@@ -48,7 +48,7 @@ public FakeChargePoint() {
             @Override
             public ChangeAvailabilityConfirmation handleChangeAvailabilityRequest(ChangeAvailabilityRequest request) {
                 receivedRequest = request;
-                return new ChangeAvailabilityConfirmation("Accepted");
+                return new ChangeAvailabilityConfirmation(AvailabilityStatus.Accepted);
             }
 
             @Override
@@ -78,25 +78,25 @@ public DataTransferConfirmation handleDataTransferRequest(DataTransferRequest re
             @Override
             public RemoteStartTransactionConfirmation handleRemoteStartTransactionRequest(RemoteStartTransactionRequest request) {
                 receivedRequest = request;
-                return new RemoteStartTransactionConfirmation("Accepted");
+                return new RemoteStartTransactionConfirmation(RemoteStartStopStatus.Accepted);
             }
 
             @Override
             public RemoteStopTransactionConfirmation handleRemoteStopTransactionRequest(RemoteStopTransactionRequest request) {
                 receivedRequest = request;
-                return new RemoteStopTransactionConfirmation("Accepted");
+                return new RemoteStopTransactionConfirmation(RemoteStartStopStatus.Accepted);
             }
 
             @Override
             public ResetConfirmation handleResetRequest(ResetRequest request) {
                 receivedRequest = request;
-                return new ResetConfirmation("Accepted");
+                return new ResetConfirmation(ResetStatus.Accepted);
             }
 
             @Override
             public UnlockConnectorConfirmation handleUnlockConnectorRequest(UnlockConnectorRequest request) {
                 receivedRequest = request;
-                return new UnlockConnectorConfirmation("Unlocked");
+                return new UnlockConnectorConfirmation(UnlockStatus.Unlocked);
             }
         });
         client = new Client(new Session(new JSONCommunicator(new WebSocketTransmitter()), new Queue()));
@@ -167,7 +167,7 @@ public void sendDataTransferRequest(String vendorId, String messageId, String da
 
     public void sendStatusNotificationRequest() {
         try {
-            StatusNotificationRequest request = core.createStatusNotificationRequest(42, "NoError", "Available");
+            StatusNotificationRequest request = core.createStatusNotificationRequest(42, ChargePointErrorCode.NoError, ChargePointStatus.Available);
             send(request);
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -182,9 +182,9 @@ private void send(Request request) {
         }
     }
 
-    public void hasReceivedBootConfirmation(String status) {
+    public void hasReceivedBootConfirmation(RegistrationStatus status) {
         assertThat(receivedConfirmation, instanceOf(BootNotificationConfirmation.class));
-        assertThat(((BootNotificationConfirmation)receivedConfirmation).getStatus(), is(status));
+        assertThat(((BootNotificationConfirmation) receivedConfirmation).objStatus(), is(status));
     }
 
     public void hasReceivedAuthorizeConfirmation(String status) {

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/JSONCommunicator.java

@@ -145,6 +145,8 @@ else if (type == Double.class || genericType == Double.TYPE) {
         }
         else if (type == Boolean.class || genericType == Boolean.TYPE) {
             output = json.getBoolean(key);
+        } else if (type.isEnum()) {
+            output = Enum.valueOf((Class<Enum>) type, json.getString(key));
         }
         else {
             output = parseJSON(json.optJSONObject(key), type);

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/CoreProfile.java

@@ -107,7 +107,7 @@ public StartTransactionRequest createStartTransactionRequest(Integer connectorId
         return request;
     }
 
-    public StatusNotificationRequest createStatusNotificationRequest(Integer connectorId, String errorCode, String status) throws PropertyConstraintException {
+    public StatusNotificationRequest createStatusNotificationRequest(Integer connectorId, ChargePointErrorCode errorCode, ChargePointStatus status) throws PropertyConstraintException {
         StatusNotificationRequest request = new StatusNotificationRequest();
         request.setConnectorId(connectorId);
         request.setErrorCode(errorCode);

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/AuthorizationStatus.java

@@ -0,0 +1,30 @@
+package eu.chargetime.ocpp.model;
+
+/**
+ * ChargeTime.eu - Java-OCA-OCPP
+ * <p>
+ * MIT License
+ * <p>
+ * Copyright (C) 2016 Thomas Volden <[email protected]>
+ * <p>
+ * 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:
+ * <p>
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * <p>
+ * 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.
+ */
+public enum AuthorizationStatus {
+    Accepted, Blocked, Expired, Invalid, ConcurrentTx
+}

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/AvailabilityStatus.java

@@ -0,0 +1,30 @@
+package eu.chargetime.ocpp.model;
+
+/**
+ * ChargeTime.eu - Java-OCA-OCPP
+ * <p>
+ * MIT License
+ * <p>
+ * Copyright (C) 2016 Thomas Volden <[email protected]>
+ * <p>
+ * 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:
+ * <p>
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * <p>
+ * 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.
+ */
+public enum AvailabilityStatus {
+    Accepted, Rejected, Scheduled
+}

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/AvailabilityType.java

@@ -0,0 +1,30 @@
+package eu.chargetime.ocpp.model;
+
+/**
+ * ChargeTime.eu - Java-OCA-OCPP
+ * <p>
+ * MIT License
+ * <p>
+ * Copyright (C) 2016 Thomas Volden <[email protected]>
+ * <p>
+ * 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:
+ * <p>
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * <p>
+ * 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.
+ */
+public enum AvailabilityType {
+    Inoperative, Operative
+}

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/BootNotificationConfirmation.java

@@ -1,7 +1,6 @@
 package eu.chargetime.ocpp.model;
 
 import eu.chargetime.ocpp.PropertyConstraintException;
-import eu.chargetime.ocpp.utilities.ModelUtil;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -37,7 +36,7 @@ public class BootNotificationConfirmation implements Confirmation
 {
     private Calendar currentTime;
     private int interval;
-    private String status;
+    private RegistrationStatus status;
 
     public String getCurrentTime()
     {
@@ -67,26 +66,24 @@ public void setInterval(int interval) throws PropertyConstraintException {
         this.interval = interval;
     }
 
-    public String getStatus()
+    public RegistrationStatus objStatus()
     {
         return status;
     }
 
-    public void setStatus(String status) throws PropertyConstraintException {
-        if (!isValidStatus(status))
-            throw new PropertyConstraintException("status", status);
-
-        this.status = status;
+    public String getStatus()
+    {
+        return status.toString();
     }
 
-    private boolean isValidStatus(String status) {
-        return ModelUtil.isAmong(status, "Accepted", "Pending", "Rejected");
+    public void setStatus(RegistrationStatus status) throws PropertyConstraintException {
+        this.status = status;
     }
 
     @Override
     public boolean validate() {
         boolean valid = true;
-        valid &= isValidStatus(this.status);
+        valid &= status != null;
         valid &= currentTime != null;
         valid &= interval > 0;
         return valid;