Merge pull request #10 from emilm/smartcharging-setchargingprofile

Added Smart Charging Profile and SetChargingProfile.req / conf

Author: TVolden

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

@@ -6,9 +6,13 @@
 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.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
 import eu.chargetime.ocpp.model.core.*;
+import eu.chargetime.ocpp.model.smartcharging.SetChargingProfileConfirmation;
+import eu.chargetime.ocpp.model.smartcharging.SetChargingProfileRequest;
 
 import java.util.Calendar;
 import java.util.UUID;
@@ -174,6 +178,10 @@ public StopTransactionConfirmation handleStopTransactionRequest(UUID sessionInde
             }
         });
 
+        ServerSmartChargingProfile smartChargingProfile = new ServerSmartChargingProfile(new ServerSmartChargingHandler() {
+
+        });
+
         int port = 0;
         switch (type) {
             case JSON:
@@ -186,6 +194,8 @@ public StopTransactionConfirmation handleStopTransactionRequest(UUID sessionInde
                 break;
         }
 
+        server.addFeatureProfile(smartChargingProfile);
+
         server.open("localhost", port, new ServerEvents() {
             @Override
             public void newSession(UUID sessionIndex, String identifier) {

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

@@ -3,9 +3,14 @@
 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.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
 import eu.chargetime.ocpp.model.core.*;
+import eu.chargetime.ocpp.model.smartcharging.ChargingProfileStatus;
+import eu.chargetime.ocpp.model.smartcharging.SetChargingProfileConfirmation;
+import eu.chargetime.ocpp.model.smartcharging.SetChargingProfileRequest;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -43,6 +48,7 @@ public class FakeChargePoint
     private Confirmation receivedConfirmation;
     private Request receivedRequest;
     private ClientCoreProfile core;
+    private ClientSmartChargingProfile smartCharging;
     private Throwable receivedException;
     private String url;
 
@@ -117,6 +123,14 @@ public UnlockConnectorConfirmation handleUnlockConnectorRequest(UnlockConnectorR
             }
         });
 
+        smartCharging = new ClientSmartChargingProfile(new ClientSmartChargingEventHandler() {
+            @Override
+            public SetChargingProfileConfirmation handleSetChargingProfileRequest(SetChargingProfileRequest request) {
+                receivedRequest = request;
+                return new SetChargingProfileConfirmation(ChargingProfileStatus.Accepted);
+            }
+        });
+
         switch (type) {
             case JSON:
                 client = new JSONClient(core, "test");
@@ -127,6 +141,8 @@ public UnlockConnectorConfirmation handleUnlockConnectorRequest(UnlockConnectorR
                 url = "http://localhost:8890";
                 break;
         }
+
+        client.addFeatureProfile(smartCharging);
     }
 
     public void connect() {

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

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

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

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

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

@@ -0,0 +1,67 @@
+package eu.chargetime.ocpp.feature.profile;
+
+import eu.chargetime.ocpp.feature.Feature;
+import eu.chargetime.ocpp.feature.SetChargingProfileFeature;
+import eu.chargetime.ocpp.model.Confirmation;
+import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.model.smartcharging.SetChargingProfileRequest;
+
+import java.util.ArrayList;
+import java.util.UUID;
+
+/*
+ * ChargeTime.eu - Java-OCA-OCPP
+ *
+ * MIT License
+ *
+ * Copyright (C) 2017 Emil Christopher Solli Melar <[email protected]>
+ *
+ * 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 Smart Charging feature profile.
+ */
+public class ClientSmartChargingProfile implements Profile {
+    ClientSmartChargingEventHandler eventHandler;
+    ArrayList<Feature> features;
+
+    public ClientSmartChargingProfile(ClientSmartChargingEventHandler handler) {
+        features = new ArrayList<>();
+        eventHandler = handler;
+
+        features.add(new SetChargingProfileFeature(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 SetChargingProfileRequest) {
+            result = eventHandler.handleSetChargingProfileRequest((SetChargingProfileRequest) request);
+        }
+
+        return  result;
+    }
+}

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

@@ -0,0 +1,40 @@
+package eu.chargetime.ocpp.feature.profile;
+
+import eu.chargetime.ocpp.model.smartcharging.SetChargingProfileConfirmation;
+import eu.chargetime.ocpp.model.smartcharging.SetChargingProfileRequest;
+
+
+import java.util.UUID;
+
+/*
+ * ChargeTime.eu - Java-OCA-OCPP
+ *
+ * MIT License
+ *
+ * Copyright (C) 2017 Emil Christopher Solli Melar <[email protected]>
+ *
+ * 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.
+ */
+
+/**
+ * Created by emil on 17.02.2017.
+ */
+public interface ServerSmartChargingHandler {
+
+}

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

@@ -0,0 +1,67 @@
+package eu.chargetime.ocpp.feature.profile;
+
+import eu.chargetime.ocpp.PropertyConstraintException;
+import eu.chargetime.ocpp.feature.*;
+import eu.chargetime.ocpp.model.Confirmation;
+import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.model.core.ChargingProfile;
+import eu.chargetime.ocpp.model.smartcharging.SetChargingProfileRequest;
+
+import java.util.HashSet;
+import java.util.UUID;
+
+/*
+ * ChargeTime.eu - Java-OCA-OCPP
+ *
+ * MIT License
+ *
+ * Copyright (C) 2017 Emil Christopher Solli Melar <[email protected]>
+ *
+ * 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 ServerSmartChargingProfile implements Profile {
+
+    private final ServerSmartChargingHandler handler;
+    private HashSet<Feature> features;
+
+    public ServerSmartChargingProfile(ServerSmartChargingHandler handler) {
+        this.handler = handler;
+
+        features = new HashSet<>();
+        features.add(new SetChargingProfileFeature(this));
+    }
+
+    @Override
+    public Feature[] getFeatureList() {
+        return features.toArray(new Feature[0]);
+    }
+
+    @Override
+    public Confirmation handleRequest(UUID sessionIndex, Request request) {
+       return null;
+    }
+
+    public SetChargingProfileRequest createSetChargingProfileRequest(int connectorId, ChargingProfile profile) throws PropertyConstraintException {
+        SetChargingProfileRequest request = new SetChargingProfileRequest();
+        request.setConnectorId(connectorId);
+        request.setChargingProfile(profile);
+        return request;
+    }
+}

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/smartcharging/ChargingProfileStatus.java

@@ -0,0 +1,34 @@
+package eu.chargetime.ocpp.model.smartcharging;
+
+/*
+ * ChargeTime.eu - Java-OCA-OCPP
+ *
+ * MIT License
+ *
+ * Copyright (C) 2017 Emil Christopher Solli Melar <[email protected]>
+ *
+ * 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.
+ */
+
+/**
+ * Accepted values used with {@link SetChargingProfileConfirmation}.
+ */
+public enum ChargingProfileStatus {
+    Accepted, Rejected, NotSupported
+}