Added Reset feature to core profile.

Author: TVolden

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

@@ -198,6 +198,11 @@ public void hasReceivedRemoteStopTransactionConfirmation(String status) {
         assertThat(getCallResultPayload().getString("status"), equalTo(status));
     }
 
+    public void hasReceivedResetConfirmation(String status) {
+        assertThat(getUniqueId(), equalTo("Reset"));
+        assertThat(getCallResultPayload().getString("status"), equalTo(status));
+    }
+
     public void sendGetConfigurationRequest(String... keys) {
         String payload = "\"key\":%s";
         sendRequest("GetConfiguration", String.format(payload, formatList(keys)));
@@ -234,6 +239,11 @@ public void sendRemoteStopTransactionRequest(int transactionId) {
         sendRequest("RemoteStopTransaction", String.format(payload, transactionId));
     }
 
+    public void sendResetRequest(String type) {
+        String payload = "\"type\": \"%s\"";
+        sendRequest("Reset", String.format(payload, type));
+    }
+
     public enum AvailabilityType {
         Inoperative, Operative
     }

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

@@ -86,6 +86,12 @@ public RemoteStopTransactionConfirmation handleRemoteStopTransactionRequest(Remo
                 receivedRequest = request;
                 return new RemoteStopTransactionConfirmation("Accepted");
             }
+
+            @Override
+            public ResetConfirmation handleResetRequest(ResetRequest request) {
+                receivedRequest = request;
+                return new ResetConfirmation("Accepted");
+            }
         });
         client = new Client(new Session(new JSONCommunicator(new WebSocketTransmitter()), new Queue()));
         client.addFeatureProfile(core);
@@ -201,4 +207,8 @@ public void hasHandledRemoteStartTransactionRequest() {
     public void hasHandledRemoteStopTransactionRequest() {
         confirmRequest(RemoteStopTransactionRequest.class);
     }
+
+    public void hasHandledResetRequest() {
+        confirmRequest(ResetRequest.class);
+    }
 }

ocpp-v1_6/src/it/groovy/core_features/Reset.groovy

@@ -0,0 +1,39 @@
+package core_features
+
+import eu.chargetime.ocpp.test.FakeCentralSystem
+import eu.chargetime.ocpp.test.FakeChargePoint
+import spock.lang.Shared
+import spock.lang.Specification
+import spock.util.concurrent.PollingConditions
+
+class Reset extends Specification {
+    @Shared
+    FakeCentralSystem centralSystem = FakeCentralSystem.getInstance();
+    @Shared
+    FakeChargePoint chargePoint = new FakeChargePoint();
+
+    def setupSpec() {
+        // When a Central System is running
+        centralSystem.started();
+    }
+
+    def setup() {
+        chargePoint.connect();
+    }
+
+    def cleanup() {
+        chargePoint.disconnect();
+    }
+
+    def "Central System sends a Reset request and receives a response"() {
+        def conditions = new PollingConditions(timeout: 1)
+        when:
+        centralSystem.sendResetRequest("Soft");
+
+        then:
+        conditions.eventually {
+            chargePoint.hasHandledResetRequest();
+            centralSystem.hasReceivedResetConfirmation("Accepted");
+        }
+    }
+}

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/ResetFeature.java

@@ -0,0 +1,53 @@
+package eu.chargetime.ocpp.feature;
+
+import eu.chargetime.ocpp.feature.profile.Profile;
+import eu.chargetime.ocpp.model.Confirmation;
+import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.model.ResetConfirmation;
+import eu.chargetime.ocpp.model.ResetRequest;
+
+/**
+ * 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 class ResetFeature extends Feature {
+    public ResetFeature(Profile ownerProfile) {
+        super(ownerProfile);
+    }
+
+    @Override
+    public Class<? extends Request> getRequestType() {
+        return ResetRequest.class;
+    }
+
+    @Override
+    public Class<? extends Confirmation> getConfirmationType() {
+        return ResetConfirmation.class;
+    }
+
+    @Override
+    public String getAction() {
+        return "Reset";
+    }
+}

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

@@ -35,6 +35,7 @@ public interface ClientCoreEventHandler {
     ClearCacheConfirmation handleClearCacheRequest(ClearCacheRequest request);
     DataTransferConfirmation handleDataTransferRequest(DataTransferRequest request);
     RemoteStartTransactionConfirmation handleRemoteStartTransactionRequest(RemoteStartTransactionRequest request);
-
     RemoteStopTransactionConfirmation handleRemoteStopTransactionRequest(RemoteStopTransactionRequest request);
+
+    ResetConfirmation handleResetRequest(ResetRequest request);
 }

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

@@ -53,6 +53,7 @@ public CoreProfile(ClientCoreEventHandler handler) {
         features.add(new MeterValuesFeature(this));
         features.add(new RemoteStartTransactionFeature(this));
         features.add(new RemoteStopTransactionFeature(this));
+        features.add(new ResetFeature(this));
     }
 
     public AuthorizeRequest createAuthorizeRequest(String idToken) throws PropertyConstraintException {
@@ -118,6 +119,8 @@ else if (request instanceof DataTransferRequest) {
             result = eventHandler.handleRemoteStartTransactionRequest((RemoteStartTransactionRequest) request);
         } else if (request instanceof RemoteStopTransactionRequest) {
             result = eventHandler.handleRemoteStopTransactionRequest((RemoteStopTransactionRequest) request);
+        } else if (request instanceof ResetRequest) {
+            result = eventHandler.handleResetRequest((ResetRequest) request);
         }
 
         return result;

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

@@ -0,0 +1,60 @@
+package eu.chargetime.ocpp.model;
+
+import eu.chargetime.ocpp.PropertyConstraintException;
+import eu.chargetime.ocpp.utilities.ModelUtil;
+
+/**
+ * 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 class ResetConfirmation implements Confirmation {
+    private String status;
+
+    public ResetConfirmation() {
+    }
+
+    public ResetConfirmation(String status) {
+        this.status = status;
+    }
+
+    @Override
+    public boolean validate() {
+        return isValidStatus(status);
+    }
+
+    public void setStatus(String status) throws PropertyConstraintException {
+        if (!isValidStatus(status))
+            throw new PropertyConstraintException("status", status);
+
+        this.status = status;
+    }
+
+    private boolean isValidStatus(String status) {
+        return ModelUtil.isAmong(status, "Accepted", "Rejected");
+    }
+
+    public String getStatus() {
+        return status;
+    }
+}

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

@@ -0,0 +1,52 @@
+package eu.chargetime.ocpp.model;
+
+import eu.chargetime.ocpp.PropertyConstraintException;
+import eu.chargetime.ocpp.utilities.ModelUtil;
+
+/**
+ * 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 class ResetRequest implements Request {
+    private String type;
+
+    @Override
+    public boolean validate() {
+        return isValidType(type);
+    }
+
+    public void setType(String type) throws PropertyConstraintException {
+        if (!isValidType(type))
+            throw new PropertyConstraintException("type", type);
+        this.type = type;
+    }
+
+    private boolean isValidType(String type) {
+        return ModelUtil.isAmong(type, "Hard", "Soft");
+    }
+
+    public String getType() {
+        return type;
+    }
+}

ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/CoreProfileTest.java

@@ -151,6 +151,15 @@ public void getFeatureList_containsRemoteStopTransactionFeature() {
         assertThat(findFeature(features, "RemoteStopTransaction"), is(instanceOf(RemoteStopTransactionFeature.class)));
     }
 
+    @Test
+    public void getFeatureList_containsResetFeature() {
+        // When
+        Feature[] features = core.getFeatureList();
+
+        // Then
+        assertThat(findFeature(features, "Reset"), is(instanceOf(ResetFeature.class)));
+    }
+
     @Test
     public void handleRequest_aChangeAvailabilityRequest_callsHandleChangeAvailabilityRequest() {
         // Given
@@ -187,6 +196,19 @@ public void handleRequest_aRemoteStopTransactionRequest_callsHandleRemoteStopTra
         verify(handler, times(1)).handleRemoteStopTransactionRequest(eq(request));
     }
 
+    @Test
+    public void handleRequest_aResetRequest_callsHandleResetRequest() {
+        // Given
+        ResetRequest request = new ResetRequest();
+
+        // When
+        core.handleRequest(request);
+
+        // Then
+        verify(handler, times(1)).handleResetRequest(eq(request));
+    }
+
+
     @Test
     public void handleRequest_aChangeAvailabilityRequest_returnsChangeAvailabilityConfirmation() {
         // Given