Added RemoteStopTransaction feature to core profile.

Author: TVolden

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

@@ -193,6 +193,11 @@ public void hasReceivedRemoteStartTransactionConfirmation(String status) {
         assertThat(getCallResultPayload().getString("status"), equalTo(status));
     }
 
+    public void hasReceivedRemoteStopTransactionConfirmation(String status) {
+        assertThat(getUniqueId(), equalTo("RemoteStopTransaction"));
+        assertThat(getCallResultPayload().getString("status"), equalTo(status));
+    }
+
     public void sendGetConfigurationRequest(String... keys) {
         String payload = "\"key\":%s";
         sendRequest("GetConfiguration", String.format(payload, formatList(keys)));
@@ -224,6 +229,11 @@ public void sendRemoteStartTransactionRequest(String idTag) {
         sendRequest("RemoteStartTransaction", String.format(payload, idTag));
     }
 
+    public void sendRemoteStopTransactionRequest(int transactionId) {
+        String payload = "\"transactionId\": %d";
+        sendRequest("RemoteStopTransaction", String.format(payload, transactionId));
+    }
+
     public enum AvailabilityType {
         Inoperative, Operative
     }

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

@@ -80,6 +80,12 @@ public RemoteStartTransactionConfirmation handleRemoteStartTransactionRequest(Re
                 receivedRequest = request;
                 return new RemoteStartTransactionConfirmation("Accepted");
             }
+
+            @Override
+            public RemoteStopTransactionConfirmation handleRemoteStopTransactionRequest(RemoteStopTransactionRequest request) {
+                receivedRequest = request;
+                return new RemoteStopTransactionConfirmation("Accepted");
+            }
         });
         client = new Client(new Session(new JSONCommunicator(new WebSocketTransmitter()), new Queue()));
         client.addFeatureProfile(core);
@@ -191,4 +197,8 @@ public void hasHandledDataTransferRequest() {
     public void hasHandledRemoteStartTransactionRequest() {
         confirmRequest(RemoteStartTransactionRequest.class);
     }
+
+    public void hasHandledRemoteStopTransactionRequest() {
+        confirmRequest(RemoteStopTransactionRequest.class);
+    }
 }

ocpp-v1_6/src/it/groovy/core_features/RemoteStopTransaction.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 RemoteStopTransaction 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 RemoteStopTransaction request and receives a response"() {
+        def conditions = new PollingConditions(timeout: 1)
+        when:
+        centralSystem.sendRemoteStopTransactionRequest(0);
+
+        then:
+        conditions.eventually {
+            chargePoint.hasHandledRemoteStopTransactionRequest();
+            centralSystem.hasReceivedRemoteStopTransactionConfirmation("Accepted");
+        }
+    }
+}

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/RemoteStopTransactionFeature.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.RemoteStopTransactionConfirmation;
+import eu.chargetime.ocpp.model.RemoteStopTransactionRequest;
+import eu.chargetime.ocpp.model.Request;
+
+/**
+ * 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 RemoteStopTransactionFeature extends Feature {
+    public RemoteStopTransactionFeature(Profile ownerProfile) {
+        super(ownerProfile);
+    }
+
+    @Override
+    public Class<? extends Request> getRequestType() {
+        return RemoteStopTransactionRequest.class;
+    }
+
+    @Override
+    public Class<? extends Confirmation> getConfirmationType() {
+        return RemoteStopTransactionConfirmation.class;
+    }
+
+    @Override
+    public String getAction() {
+        return "RemoteStopTransaction";
+    }
+}

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

@@ -34,6 +34,7 @@ public interface ClientCoreEventHandler {
     ChangeConfigurationConfirmation handleChangeConfigurationRequest(ChangeConfigurationRequest request);
     ClearCacheConfirmation handleClearCacheRequest(ClearCacheRequest request);
     DataTransferConfirmation handleDataTransferRequest(DataTransferRequest request);
-
     RemoteStartTransactionConfirmation handleRemoteStartTransactionRequest(RemoteStartTransactionRequest request);
+
+    RemoteStopTransactionConfirmation handleRemoteStopTransactionRequest(RemoteStopTransactionRequest request);
 }

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

@@ -52,6 +52,7 @@ public CoreProfile(ClientCoreEventHandler handler) {
         features.add(new HeartbeatFeature(this));
         features.add(new MeterValuesFeature(this));
         features.add(new RemoteStartTransactionFeature(this));
+        features.add(new RemoteStopTransactionFeature(this));
     }
 
     public AuthorizeRequest createAuthorizeRequest(String idToken) throws PropertyConstraintException {
@@ -115,6 +116,8 @@ else if (request instanceof DataTransferRequest) {
             result = eventHandler.handleDataTransferRequest((DataTransferRequest)request);
         } else if (request instanceof RemoteStartTransactionRequest) {
             result = eventHandler.handleRemoteStartTransactionRequest((RemoteStartTransactionRequest) request);
+        } else if (request instanceof RemoteStopTransactionRequest) {
+            result = eventHandler.handleRemoteStopTransactionRequest((RemoteStopTransactionRequest) request);
         }
 
         return result;

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

@@ -9,21 +9,21 @@
 
 /**
  * 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

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

@@ -5,21 +5,21 @@
 
 /**
  * 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

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/RemoteStopTransactionConfirmation.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 RemoteStopTransactionConfirmation implements Confirmation {
+    private String status;
+
+    public RemoteStopTransactionConfirmation() {
+    }
+
+    public RemoteStopTransactionConfirmation(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/RemoteStopTransactionRequest.java

@@ -0,0 +1,43 @@
+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 class RemoteStopTransactionRequest implements Request {
+    private Integer transactionId;
+
+    @Override
+    public boolean validate() {
+        return transactionId != null;
+    }
+
+    public void setTransactionId(Integer transactionId) {
+        this.transactionId = transactionId;
+    }
+
+    public Integer getTransactionId() {
+        return transactionId;
+    }
+}