Issue #64 - Changed DiagnosticsStatusNotification and FirmwareStatusN…

…otification to be initiated from the CP.
ChargeTimeEU · Jun 19, 2018 · ba983eb · ba983eb
1 parent e3eac89
commit ba983eb
Show file tree

Hide file tree

Showing 15 changed files with 184 additions and 125 deletions.
diff --git a/ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/DummyHandlers.java b/ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/DummyHandlers.java
@@ -27,10 +27,15 @@ of this software and associated documentation files (the "Software"), to deal
 
 import eu.chargetime.ocpp.ServerEvents;
 import eu.chargetime.ocpp.feature.profile.ServerCoreEventHandler;
+import eu.chargetime.ocpp.feature.profile.ServerFirmwareManagementEventHandler;
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
 import eu.chargetime.ocpp.model.SessionInformation;
 import eu.chargetime.ocpp.model.core.*;
+import eu.chargetime.ocpp.model.firmware.DiagnosticsStatusNotificationConfirmation;
+import eu.chargetime.ocpp.model.firmware.DiagnosticsStatusNotificationRequest;
+import eu.chargetime.ocpp.model.firmware.FirmwareStatusNotificationConfirmation;
+import eu.chargetime.ocpp.model.firmware.FirmwareStatusNotificationRequest;
 
 import java.lang.reflect.Type;
 import java.util.Calendar;
@@ -125,6 +130,24 @@ public StopTransactionConfirmation handleStopTransactionRequest(UUID sessionInde
         };
     }
 
+    public ServerFirmwareManagementEventHandler createServerFirmwareManagementEventHandler() {
+        return new ServerFirmwareManagementEventHandler() {
+            @Override
+            public DiagnosticsStatusNotificationConfirmation handleDiagnosticsStatusNotificationRequest(DiagnosticsStatusNotificationRequest request) {
+                receivedRequest = request;
+                DiagnosticsStatusNotificationConfirmation confirmation = new DiagnosticsStatusNotificationConfirmation();
+                return failurePoint(confirmation);
+            }
+
+            @Override
+            public FirmwareStatusNotificationConfirmation handleFirmwareStatusNotificationRequest(FirmwareStatusNotificationRequest request) {
+                receivedRequest = request;
+                FirmwareStatusNotificationConfirmation confirmation = new FirmwareStatusNotificationConfirmation();
+                return failurePoint(confirmation);
+            }
+        };
+    }
+
     public ServerEvents generateServerEventsHandler() {
         return new ServerEvents() {
             @Override

diff --git a/ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/FakeCentralSystem.java b/ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/FakeCentralSystem.java
@@ -81,7 +81,7 @@ private void initializeServer() {
         ServerRemoteTriggerProfile remoteTriggerProfile = new ServerRemoteTriggerProfile();
         server.addFeatureProfile(remoteTriggerProfile);
 
-        ServerFirmwareManagementProfile firmwareManagementProfile = new ServerFirmwareManagementProfile();
+        ServerFirmwareManagementProfile firmwareManagementProfile = new ServerFirmwareManagementProfile(dummyHandlers.createServerFirmwareManagementEventHandler());
         server.addFeatureProfile(firmwareManagementProfile);
 
         ServerLocalAuthListProfile localAuthListProfile = new ServerLocalAuthListProfile();
@@ -122,6 +122,14 @@ public void stopped() {
         isStarted = false;
     }
 
+    public boolean hasHandledDiagnosticsStatusNotificationRequest() {
+        return dummyHandlers.wasLatestRequest(DiagnosticsStatusNotificationRequest.class);
+    }
+
+    public boolean hasHandledFirmwareStatusNotificationRequest() {
+        return dummyHandlers.wasLatestRequest(FirmwareStatusNotificationRequest.class);
+    }
+
     public boolean hasHandledAuthorizeRequest() {
         return dummyHandlers.wasLatestRequest(AuthorizeRequest.class);
     }
@@ -147,14 +155,6 @@ public boolean hasReceivedGetDiagnosticsConfirmation() {
         return dummyHandlers.wasLatestConfirmation(GetDiagnosticsConfirmation.class);
     }
 
-    public boolean hasReceivedDiagnosticsStatusNotificationConfirmation() {
-        return dummyHandlers.wasLatestConfirmation(DiagnosticsStatusNotificationConfirmation.class);
-    }
-
-    public boolean hasReceivedFirmwareStatusNotificationConfirmation() {
-        return dummyHandlers.wasLatestConfirmation(FirmwareStatusNotificationConfirmation.class);
-    }
-
     public boolean hasReceivedReserveNowConfirmation() {
         return dummyHandlers.wasLatestConfirmation(ReserveNowConfirmation.class);
     }
@@ -282,16 +282,6 @@ public void sendGetDiagnosticsRequest(String location) throws Exception {
         send(request);
     }
 
-    public void sendDiagnosticsStatusNotificationRequest(DiagnosticsStatus status) throws Exception {
-        DiagnosticsStatusNotificationRequest request = new DiagnosticsStatusNotificationRequest(status);
-        send(request);
-    }
-
-    public void sendFirmwareStatusNotificationRequest(FirmwareStatus status) throws Exception {
-        FirmwareStatusNotificationRequest request = new FirmwareStatusNotificationRequest(status);
-        send(request);
-    }
-
     public void sendUpdateFirmwareRequest(String location, Calendar retrieveDate) throws Exception {
         UpdateFirmwareRequest request = new UpdateFirmwareRequest(location, retrieveDate);
         send(request);

diff --git a/ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/FakeChargePoint.java b/ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/FakeChargePoint.java
@@ -153,18 +153,6 @@ public GetDiagnosticsConfirmation handleGetDiagnosticsRequest(GetDiagnosticsRequ
                 return new GetDiagnosticsConfirmation();
             }
 
-            @Override
-            public DiagnosticsStatusNotificationConfirmation handleDiagnosticsStatusNotificationRequest(DiagnosticsStatusNotificationRequest request) {
-                receivedRequest = request;
-                return new DiagnosticsStatusNotificationConfirmation();
-            }
-
-            @Override
-            public FirmwareStatusNotificationConfirmation handleFirmwareStatusNotificationRequest(FirmwareStatusNotificationRequest request) {
-                receivedRequest = request;
-                return new FirmwareStatusNotificationConfirmation();
-            }
-
             @Override
             public UpdateFirmwareConfirmation handleUpdateFirmwareRequest(UpdateFirmwareRequest request) {
                 receivedRequest = request;
@@ -300,6 +288,16 @@ public void sendStatusNotificationRequest() {
         }
     }
 
+    public void sendDiagnosticsStatusNotificationRequest(DiagnosticsStatus status) throws Exception {
+        DiagnosticsStatusNotificationRequest request = new DiagnosticsStatusNotificationRequest(status);
+        send(request);
+    }
+
+    public void sendFirmwareStatusNotificationRequest(FirmwareStatus status) throws Exception {
+        FirmwareStatusNotificationRequest request = new FirmwareStatusNotificationRequest(status);
+        send(request);
+    }
+
     public void clearMemory() {
         receivedConfirmation = null;
         receivedException = null;
@@ -329,6 +327,14 @@ public boolean hasReceivedAuthorizeConfirmation(String status) {
         return false;
     }
 
+    public boolean hasReceivedDiagnosticsStatusNotificationConfirmation() {
+        return (receivedConfirmation instanceof DiagnosticsStatusNotificationConfirmation);
+    }
+
+    public boolean hasReceivedFirmwareStatusNotificationConfirmation() {
+        return (receivedConfirmation instanceof FirmwareStatusNotificationConfirmation);
+    }
+
     public boolean hasReceivedDataTransferConfirmation(String status) {
         if (receivedConfirmation instanceof DataTransferConfirmation)
             return ((DataTransferConfirmation) receivedConfirmation).getStatus().toString().equals(status);
@@ -363,14 +369,6 @@ public boolean hasHandledGetDiagnosticsRequest() {
         return receivedRequest instanceof GetDiagnosticsRequest;
     }
 
-    public boolean hasHandledDiagnosticsStatusNotificationRequest() {
-        return receivedRequest instanceof DiagnosticsStatusNotificationRequest;
-    }
-
-    public boolean hasHandledFirmwareStatusNotificationRequest() {
-        return receivedRequest instanceof FirmwareStatusNotificationRequest;
-    }
-
     public boolean hasHandledUpdateFirmwareRequest() {
         return receivedRequest instanceof UpdateFirmwareRequest;
     }

diff --git a/.../chargetime/ocpp/test/profiles/firmware/json/JSONDiagnosticsStatusNotificationSpec.groovy b/.../chargetime/ocpp/test/profiles/firmware/json/JSONDiagnosticsStatusNotificationSpec.groovy
@@ -1,9 +1,4 @@
 package eu.chargetime.ocpp.test.profiles.firmware.json
-
-import eu.chargetime.ocpp.model.firmware.DiagnosticsStatus
-import eu.chargetime.ocpp.test.base.json.JSONBaseSpec
-import spock.util.concurrent.PollingConditions
-
 /*
     ChargeTime.eu - Java-OCA-OCPP
 
@@ -31,6 +26,10 @@ import spock.util.concurrent.PollingConditions
     SOFTWARE.
  */
 
+import eu.chargetime.ocpp.model.firmware.DiagnosticsStatus
+import eu.chargetime.ocpp.test.base.json.JSONBaseSpec
+import spock.util.concurrent.PollingConditions
+
 class JSONDiagnosticsStatusNotificationSpec extends JSONBaseSpec {
 
     def "Central System sends a DiagnosticsStatusNotification request and receives a response"() {
@@ -41,12 +40,12 @@ class JSONDiagnosticsStatusNotificationSpec extends JSONBaseSpec {
         }
 
         when:
-        centralSystem.sendDiagnosticsStatusNotificationRequest(DiagnosticsStatus.Uploading)
+        chargePoint.sendDiagnosticsStatusNotificationRequest(DiagnosticsStatus.Uploading)
 
         then:
         conditions.eventually {
-            assert chargePoint.hasHandledDiagnosticsStatusNotificationRequest()
-            assert centralSystem.hasReceivedDiagnosticsStatusNotificationConfirmation()
+            assert centralSystem.hasHandledDiagnosticsStatusNotificationRequest()
+            assert chargePoint.hasReceivedDiagnosticsStatusNotificationConfirmation()
         }
     }
 }
diff --git a/.../eu/chargetime/ocpp/test/profiles/firmware/json/JSONFirmwareStatusNotificationSpec.groovy b/.../eu/chargetime/ocpp/test/profiles/firmware/json/JSONFirmwareStatusNotificationSpec.groovy
@@ -1,9 +1,4 @@
 package eu.chargetime.ocpp.test.profiles.firmware.json
-
-import eu.chargetime.ocpp.model.firmware.FirmwareStatus
-import eu.chargetime.ocpp.test.base.json.JSONBaseSpec
-import spock.util.concurrent.PollingConditions
-
 /*
     ChargeTime.eu - Java-OCA-OCPP
 
@@ -31,22 +26,26 @@ import spock.util.concurrent.PollingConditions
     SOFTWARE.
  */
 
+import eu.chargetime.ocpp.model.firmware.FirmwareStatus
+import eu.chargetime.ocpp.test.base.json.JSONBaseSpec
+import spock.util.concurrent.PollingConditions
+
 class JSONFirmwareStatusNotificationSpec extends JSONBaseSpec {
 
-    def "Central System sends a FirmwareStatusNotification request and receives a response"() {
+    def "Charge point sends a FirmwareStatusNotification request and receives a response"() {
         def conditions = new PollingConditions(timeout: 1)
         given:
         conditions.eventually {
             assert centralSystem.connected()
         }
 
         when:
-        centralSystem.sendFirmwareStatusNotificationRequest(FirmwareStatus.Downloading)
+        chargePoint.sendFirmwareStatusNotificationRequest(FirmwareStatus.Downloading)
 
         then:
         conditions.eventually {
-            assert chargePoint.hasHandledFirmwareStatusNotificationRequest()
-            assert centralSystem.hasReceivedFirmwareStatusNotificationConfirmation()
+            assert centralSystem.hasHandledFirmwareStatusNotificationRequest()
+            assert chargePoint.hasReceivedFirmwareStatusNotificationConfirmation()
         }
     }
 }
diff --git a/...rc/main/java/eu/chargetime/ocpp/feature/profile/ClientFirmwareManagementEventHandler.java b/...rc/main/java/eu/chargetime/ocpp/feature/profile/ClientFirmwareManagementEventHandler.java
@@ -25,15 +25,15 @@ of this software and associated documentation files (the "Software"), to deal
     SOFTWARE.
  */
 
-import eu.chargetime.ocpp.model.firmware.*;
+
+import eu.chargetime.ocpp.model.firmware.GetDiagnosticsConfirmation;
+import eu.chargetime.ocpp.model.firmware.GetDiagnosticsRequest;
+import eu.chargetime.ocpp.model.firmware.UpdateFirmwareConfirmation;
+import eu.chargetime.ocpp.model.firmware.UpdateFirmwareRequest;
 
 public interface ClientFirmwareManagementEventHandler {
     GetDiagnosticsConfirmation handleGetDiagnosticsRequest(GetDiagnosticsRequest request);
 
-    DiagnosticsStatusNotificationConfirmation handleDiagnosticsStatusNotificationRequest(DiagnosticsStatusNotificationRequest request);
-
-    FirmwareStatusNotificationConfirmation handleFirmwareStatusNotificationRequest(FirmwareStatusNotificationRequest request);
-
     UpdateFirmwareConfirmation handleUpdateFirmwareRequest(UpdateFirmwareRequest request);
 
 }
diff --git a/...1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ClientFirmwareManagementProfile.java b/...1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ClientFirmwareManagementProfile.java
@@ -1,4 +1,5 @@
-package eu.chargetime.ocpp.feature.profile;/*
+package eu.chargetime.ocpp.feature.profile;
+/*
     ChargeTime.eu - Java-OCA-OCPP
     
     MIT License
@@ -27,8 +28,6 @@ of this software and associated documentation files (the "Software"), to deal
 import eu.chargetime.ocpp.feature.*;
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
-import eu.chargetime.ocpp.model.firmware.DiagnosticsStatusNotificationRequest;
-import eu.chargetime.ocpp.model.firmware.FirmwareStatusNotificationRequest;
 import eu.chargetime.ocpp.model.firmware.GetDiagnosticsRequest;
 import eu.chargetime.ocpp.model.firmware.UpdateFirmwareRequest;
 
@@ -60,10 +59,6 @@ public Confirmation handleRequest(UUID sessionIndex, Request request) {
 
         if (request instanceof GetDiagnosticsRequest) {
             result = eventHandler.handleGetDiagnosticsRequest((GetDiagnosticsRequest) request);
-        } else if (request instanceof DiagnosticsStatusNotificationRequest) {
-            result = eventHandler.handleDiagnosticsStatusNotificationRequest((DiagnosticsStatusNotificationRequest) request);
-        } else if (request instanceof FirmwareStatusNotificationRequest) {
-            result = eventHandler.handleFirmwareStatusNotificationRequest((FirmwareStatusNotificationRequest) request);
         } else if (request instanceof UpdateFirmwareRequest) {
             result = eventHandler.handleUpdateFirmwareRequest((UpdateFirmwareRequest) request);
         }

diff --git a/...rc/main/java/eu/chargetime/ocpp/feature/profile/ServerFirmwareManagementEventHandler.java b/...rc/main/java/eu/chargetime/ocpp/feature/profile/ServerFirmwareManagementEventHandler.java
@@ -0,0 +1,37 @@
+package eu.chargetime.ocpp.feature.profile;
+/*
+    ChargeTime.eu - Java-OCA-OCPP
+    
+    MIT License
+
+    Copyright (C) 2018 Thomas Volden <tv@chargetime.eu>
+
+    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.firmware.DiagnosticsStatusNotificationConfirmation;
+import eu.chargetime.ocpp.model.firmware.DiagnosticsStatusNotificationRequest;
+import eu.chargetime.ocpp.model.firmware.FirmwareStatusNotificationConfirmation;
+import eu.chargetime.ocpp.model.firmware.FirmwareStatusNotificationRequest;
+
+public interface ServerFirmwareManagementEventHandler {
+    DiagnosticsStatusNotificationConfirmation handleDiagnosticsStatusNotificationRequest(DiagnosticsStatusNotificationRequest request);
+
+    FirmwareStatusNotificationConfirmation handleFirmwareStatusNotificationRequest(FirmwareStatusNotificationRequest request);
+}
diff --git a/...1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerFirmwareManagementProfile.java b/...1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerFirmwareManagementProfile.java
@@ -28,15 +28,19 @@ of this software and associated documentation files (the "Software"), to deal
 import eu.chargetime.ocpp.feature.*;
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.model.firmware.DiagnosticsStatusNotificationRequest;
+import eu.chargetime.ocpp.model.firmware.FirmwareStatusNotificationRequest;
 
 import java.util.HashSet;
 import java.util.UUID;
 
 public class ServerFirmwareManagementProfile implements Profile {
 
+    private final ServerFirmwareManagementEventHandler eventHandler;
     private HashSet<Feature> features;
 
-    public ServerFirmwareManagementProfile() {
+    public ServerFirmwareManagementProfile(ServerFirmwareManagementEventHandler eventHandler) {
+        this.eventHandler = eventHandler;
         features = new HashSet<>();
         features.add(new GetDiagnosticsFeature(this));
         features.add(new DiagnosticsStatusNotificationFeature(this));
@@ -51,6 +55,15 @@ public Feature[] getFeatureList() {
 
     @Override
     public Confirmation handleRequest(UUID sessionIndex, Request request) {
-        return null;
+        Confirmation result = null;
+
+        if (request instanceof DiagnosticsStatusNotificationRequest) {
+            result = eventHandler.handleDiagnosticsStatusNotificationRequest((DiagnosticsStatusNotificationRequest) request);
+        } else if (request instanceof FirmwareStatusNotificationRequest) {
+            result = eventHandler.handleFirmwareStatusNotificationRequest((FirmwareStatusNotificationRequest) request);
+        }
+
+        return result;
     }
+
 }
diff --git a/...ain/java/eu/chargetime/ocpp/model/firmware/DiagnosticsStatusNotificationConfirmation.java b/...ain/java/eu/chargetime/ocpp/model/firmware/DiagnosticsStatusNotificationConfirmation.java
@@ -1,5 +1,4 @@
 package eu.chargetime.ocpp.model.firmware;
-
 /*
  * ChargeTime.eu - Java-OCA-OCPP
  *
@@ -33,7 +32,7 @@
 import java.util.Objects;
 
 /**
- * Sent by the Charge Point to the Central System in response to an {@link DiagnosticsStatusNotificationRequest}.
+ * Sent by the Central System to the Charge Point in response to an {@link DiagnosticsStatusNotificationRequest}.
  */
 @XmlRootElement(name = "diagnosticsStatusNotificationResponse")
 public class DiagnosticsStatusNotificationConfirmation implements Confirmation {