Merge pull request #12 from emilm/RemoteTrigger

Added RemoteTrigger profile

Author: TVolden

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

@@ -1,16 +1,12 @@
 package eu.chargetime.ocpp.test;
 
-import eu.chargetime.ocpp.JSONServer;
-import eu.chargetime.ocpp.SOAPServer;
-import eu.chargetime.ocpp.Server;
-import eu.chargetime.ocpp.ServerEvents;
-import eu.chargetime.ocpp.feature.profile.ServerCoreEventHandler;
-import eu.chargetime.ocpp.feature.profile.ServerCoreProfile;
-import eu.chargetime.ocpp.feature.profile.ServerSmartChargingHandler;
-import eu.chargetime.ocpp.feature.profile.ServerSmartChargingProfile;
+import eu.chargetime.ocpp.*;
+import eu.chargetime.ocpp.feature.profile.*;
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
 import eu.chargetime.ocpp.model.core.*;
+import eu.chargetime.ocpp.model.remotetrigger.TriggerMessageRequest;
+import eu.chargetime.ocpp.model.remotetrigger.TriggerMessageRequestType;
 
 import java.util.Calendar;
 import java.util.UUID;
@@ -184,6 +180,10 @@ public StopTransactionConfirmation handleStopTransactionRequest(UUID sessionInde
 
         });
 
+        ServerRemoteTriggerProfile remoteTriggerProfile = new ServerRemoteTriggerProfile(new ServerRemoteTriggerHandler() {
+
+        });
+
         int port = 0;
         switch (type) {
             case JSON:
@@ -197,6 +197,7 @@ public StopTransactionConfirmation handleStopTransactionRequest(UUID sessionInde
         }
 
         server.addFeatureProfile(smartChargingProfile);
+        server.addFeatureProfile(remoteTriggerProfile);
 
         server.open("localhost", port, new ServerEvents() {
             @Override
@@ -373,4 +374,15 @@ public boolean hasReceivedUnlockConnectorConfirmation(String status) {
     public void isRiggedToFailOnNextRequest() {
         isRigged = true;
     }
+
+    public void sendTriggerMessage(TriggerMessageRequestType type, Integer connectorId) throws Exception {
+        TriggerMessageRequest request = new TriggerMessageRequest(type);
+        try {
+            request.setConnectorId(connectorId);
+        } catch (PropertyConstraintException e) {
+            e.printStackTrace();
+        }
+
+        server.send(currentSessionIndex, request).whenComplete((confirmation, throwable) -> receivedConfirmation = confirmation);
+    }
 }

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

@@ -1,13 +1,13 @@
 package eu.chargetime.ocpp.test;
 
 import eu.chargetime.ocpp.*;
-import eu.chargetime.ocpp.feature.profile.ClientCoreEventHandler;
-import eu.chargetime.ocpp.feature.profile.ClientCoreProfile;
-import eu.chargetime.ocpp.feature.profile.ClientSmartChargingEventHandler;
-import eu.chargetime.ocpp.feature.profile.ClientSmartChargingProfile;
+import eu.chargetime.ocpp.feature.profile.*;
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
 import eu.chargetime.ocpp.model.core.*;
+import eu.chargetime.ocpp.model.remotetrigger.TriggerMessageConfirmation;
+import eu.chargetime.ocpp.model.remotetrigger.TriggerMessageRequest;
+import eu.chargetime.ocpp.model.remotetrigger.TriggerMessageStatus;
 import eu.chargetime.ocpp.model.smartcharging.ChargingProfileStatus;
 import eu.chargetime.ocpp.model.smartcharging.SetChargingProfileConfirmation;
 import eu.chargetime.ocpp.model.smartcharging.SetChargingProfileRequest;
@@ -47,8 +47,9 @@ public class FakeChargePoint
     private Client client;
     private Confirmation receivedConfirmation;
     private Request receivedRequest;
-    private ClientCoreProfile core;
-    private ClientSmartChargingProfile smartCharging;
+    private final ClientCoreProfile core;
+    private final ClientSmartChargingProfile smartCharging;
+    private final ClientRemoteTriggerProfile remoteTrigger;
     private Throwable receivedException;
     private String url;
 
@@ -131,6 +132,14 @@ public SetChargingProfileConfirmation handleSetChargingProfileRequest(SetChargin
             }
         });
 
+        remoteTrigger = new ClientRemoteTriggerProfile(new ClientRemoteTriggerHandler() {
+            @Override
+            public TriggerMessageConfirmation handleTriggerMessageRequest(TriggerMessageRequest request) {
+                receivedRequest = request;
+                return new TriggerMessageConfirmation(TriggerMessageStatus.Accepted);
+            }
+        });
+
         switch (type) {
             case JSON:
                 client = new JSONClient(core, "test");
@@ -143,6 +152,7 @@ public SetChargingProfileConfirmation handleSetChargingProfileRequest(SetChargin
         }
 
         client.addFeatureProfile(smartCharging);
+        client.addFeatureProfile(remoteTrigger);
     }
 
     public void connect() {

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

@@ -0,0 +1,55 @@
+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.remotetrigger.TriggerMessageConfirmation;
+import eu.chargetime.ocpp.model.remotetrigger.TriggerMessageRequest;
+
+/*
+ ChargeTime.eu - Java-OCA-OCPP
+ Copyright (C) 2017 Emil Christopher Solli Melar <[email protected]>
+
+ MIT License
+
+ Copyright (C) 2017 Emil Christopher Solli Melar
+
+ 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.
+ */
+
+public class TriggerMessageFeature extends Feature {
+    public TriggerMessageFeature(Profile ownerProfile) {
+        super(ownerProfile);
+    }
+
+    @Override
+    public Class<? extends Request> getRequestType() {
+        return TriggerMessageRequest.class;
+    }
+
+    @Override
+    public Class<? extends Confirmation> getConfirmationType() {
+        return TriggerMessageConfirmation.class;
+    }
+
+    @Override
+    public String getAction() {
+        return "TriggerMessage";
+    }
+}

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

@@ -0,0 +1,41 @@
+package eu.chargetime.ocpp.feature.profile;
+
+/*
+ ChargeTime.eu - Java-OCA-OCPP
+ Copyright (C) 2017 Emil Christopher Solli Melar <[email protected]>
+
+ MIT License
+
+ Copyright (C) 2017 Emil Christopher Solli Melar
+
+ 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.
+ */
+
+import eu.chargetime.ocpp.model.remotetrigger.TriggerMessageConfirmation;
+import eu.chargetime.ocpp.model.remotetrigger.TriggerMessageRequest;
+
+public interface ClientRemoteTriggerHandler {
+    /**
+     * Handle a {@link TriggerMessageRequest} and return a {@link TriggerMessageConfirmation}.
+     *
+     * @param request   incoming {@link TriggerMessageRequest} to handle.
+     * @return outgoing {@link TriggerMessageConfirmation} to reply with.
+     */
+    TriggerMessageConfirmation handleTriggerMessageRequest(TriggerMessageRequest request);
+}

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

@@ -0,0 +1,68 @@
+package eu.chargetime.ocpp.feature.profile;
+
+import eu.chargetime.ocpp.feature.Feature;
+import eu.chargetime.ocpp.feature.TriggerMessageFeature;
+import eu.chargetime.ocpp.model.Confirmation;
+import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.model.remotetrigger.TriggerMessageRequest;
+
+import java.util.ArrayList;
+import java.util.UUID;
+
+/*
+ ChargeTime.eu - Java-OCA-OCPP
+ Copyright (C) 2017 Emil Christopher Solli Melar <[email protected]>
+
+ MIT License
+
+ Copyright (C) 2017 Emil Christopher Solli Melar
+
+ 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.
+ */
+
+/**
+ * Callback handler for client events of the Remote Trigger feature profile.
+ */
+public class ClientRemoteTriggerProfile implements Profile {
+    ClientRemoteTriggerHandler eventHandler;
+    ArrayList<Feature> features;
+
+    public ClientRemoteTriggerProfile(ClientRemoteTriggerHandler handler) {
+        features = new ArrayList<>();
+        eventHandler = handler;
+
+        features.add(new TriggerMessageFeature(this));
+    }
+
+    @Override
+    public Feature[] getFeatureList() {
+        return features.toArray(new Feature[0]);
+    }
+
+    @Override
+    public Confirmation handleRequest(UUID sessionIndex, Request request) {
+        Confirmation result = null;
+
+        if (request instanceof TriggerMessageRequest) {
+            result = eventHandler.handleTriggerMessageRequest((TriggerMessageRequest) request);
+        }
+
+        return  result;
+    }
+}

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

@@ -0,0 +1,33 @@
+package eu.chargetime.ocpp.feature.profile;
+
+/*
+ ChargeTime.eu - Java-OCA-OCPP
+ Copyright (C) 2017 Emil Christopher Solli Melar <[email protected]>
+
+ MIT License
+
+ Copyright (C) 2017 Emil Christopher Solli Melar
+
+ 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.
+ */
+
+public interface ServerRemoteTriggerHandler {
+
+}
+

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

@@ -0,0 +1,72 @@
+package eu.chargetime.ocpp.feature.profile;
+
+import eu.chargetime.ocpp.PropertyConstraintException;
+import eu.chargetime.ocpp.feature.Feature;
+import eu.chargetime.ocpp.feature.TriggerMessageFeature;
+import eu.chargetime.ocpp.model.Confirmation;
+import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.model.remotetrigger.TriggerMessageRequest;
+import eu.chargetime.ocpp.model.remotetrigger.TriggerMessageRequestType;
+
+import java.util.HashSet;
+import java.util.UUID;
+
+/*
+ ChargeTime.eu - Java-OCA-OCPP
+ Copyright (C) 2017 Emil Christopher Solli Melar <[email protected]>
+
+ MIT License
+
+ Copyright (C) 2017 Emil Christopher Solli Melar
+
+ 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.
+ */
+
+public class ServerRemoteTriggerProfile implements Profile {
+
+    private final ServerRemoteTriggerHandler handler;
+    private HashSet<Feature> features;
+
+    public ServerRemoteTriggerProfile(ServerRemoteTriggerHandler handler) {
+        this.handler = handler;
+
+        features = new HashSet<>();
+        features.add(new TriggerMessageFeature(this));
+    }
+
+    @Override
+    public Feature[] getFeatureList() {
+        return features.toArray(new Feature[0]);
+    }
+
+    @Override
+    public Confirmation handleRequest(UUID sessionIndex, Request request) {
+        return null;
+    }
+
+    public TriggerMessageRequest createTriggerMessageRequest(TriggerMessageRequestType type) throws PropertyConstraintException {
+        return createTriggerMessageRequest(type, null);
+    }
+
+    public TriggerMessageRequest createTriggerMessageRequest(TriggerMessageRequestType type, Integer connectorId) throws PropertyConstraintException {
+        TriggerMessageRequest request = new TriggerMessageRequest(type);
+        request.setConnectorId(connectorId);
+        return request;
+    }
+}