Implemented Server features: BootNotification, ChangeAvailability, ChangeConfiguration.

TVolden · TVolden · commit 6c896e054b25 · 2016-08-30T22:06:46.000+02:00
diff --git a/ocpp-common/src/main/java/eu/chargetime/ocpp/ServerEvents.java b/ocpp-common/src/main/java/eu/chargetime/ocpp/ServerEvents.java
@@ -26,4 +26,6 @@ of this software and associated documentation files (the "Software"), to deal
 
 public interface ServerEvents {
     void newSession(int identity);
+
+    void lostSession(int identity);
 }
diff --git a/ocpp-v1_6-test/pom.xml b/ocpp-v1_6-test/pom.xml
@@ -62,12 +62,12 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <version>2.4.4</version>
             <scope>test</scope>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.spockframework</groupId>
             <artifactId>spock-core</artifactId>
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
@@ -1,13 +1,14 @@
 package eu.chargetime.ocpp.test;
 
 import eu.chargetime.ocpp.JSONServer;
+import eu.chargetime.ocpp.ServerEvents;
 import eu.chargetime.ocpp.feature.profile.ServerCoreEventHandler;
 import eu.chargetime.ocpp.feature.profile.ServerCoreProfile;
+import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
-import eu.chargetime.ocpp.model.core.AuthorizationStatus;
-import eu.chargetime.ocpp.model.core.AuthorizeConfirmation;
-import eu.chargetime.ocpp.model.core.AuthorizeRequest;
-import eu.chargetime.ocpp.model.core.IdTagInfo;
+import eu.chargetime.ocpp.model.core.*;
+
+import java.util.Calendar;
 
 /*
  ChargeTime.eu - Java-OCA-OCPP
@@ -38,8 +39,11 @@ of this software and associated documentation files (the "Software"), to deal
 public class FakeCentralSystem
 {
     private Request receivedRequest;
+    private Confirmation receivedConfirmation;
     private JSONServer server;
 
+    private int sessionIndex;
+
     private static FakeCentralSystem instance;
     public static FakeCentralSystem getInstance () {
         if (instance == null)
@@ -51,6 +55,9 @@ private FakeCentralSystem() { }
 
     public void started() throws Exception
     {
+        if (server != null)
+            return;
+
         server = new JSONServer(new ServerCoreProfile(new ServerCoreEventHandler() {
             @Override
             public AuthorizeConfirmation handleAuthorizeRequest(int sessionIndex, AuthorizeRequest request) {
@@ -61,8 +68,31 @@ public AuthorizeConfirmation handleAuthorizeRequest(int sessionIndex, AuthorizeR
                 confirmation.setIdTagInfo(tagInfo);
                 return confirmation;
             }
+
+            @Override
+            public BootNotificationConfirmation handleBootNotificationRequest(int sessionIndex, BootNotificationRequest request) {
+                receivedRequest = request;
+                BootNotificationConfirmation confirmation = new BootNotificationConfirmation();
+                try {
+                    confirmation.setInterval(1);
+                } catch (Exception e) {
+                }
+                confirmation.setCurrentTime(Calendar.getInstance());
+                confirmation.setStatus(RegistrationStatus.Accepted);
+                return confirmation;
+            }
         }));
-        server.open("localhost", 8887, null);
+        server.open("localhost", 8887, new ServerEvents() {
+            @Override
+            public void newSession(int identity) {
+                sessionIndex = identity;
+            }
+
+            @Override
+            public void lostSession(int identity) {
+                sessionIndex = -1;
+            }
+        });
     }
 
     public boolean hasHandledAuthorizeRequest() {
@@ -72,4 +102,40 @@ public boolean hasHandledAuthorizeRequest() {
     public void stopped() {
         server.close();
     }
+
+    public boolean hasHandledBootNotification(String vendor, String model) {
+        boolean result = receivedRequest instanceof BootNotificationRequest;
+        if (result) {
+            BootNotificationRequest request = (BootNotificationRequest) this.receivedRequest;
+            result &= request.getChargePointVendor().equals(vendor);
+            result &= request.getChargePointModel().equals(model);
+        }
+        return result;
+    }
+
+    public void sendChangeAvailabilityRequest(int connectorId, AvailabilityType type) throws Exception {
+        ChangeAvailabilityRequest request = new ChangeAvailabilityRequest();
+        request.setType(type);
+        request.setConnectorId(connectorId);
+        server.send(sessionIndex, request).whenComplete((confirmation, throwable) -> receivedConfirmation = confirmation);
+
+    }
+
+    public boolean hasReceivedChangeAvailabilityConfirmation(String status) {
+        boolean result = receivedConfirmation instanceof ChangeAvailabilityConfirmation;
+        if (result)
+            result &= ((ChangeAvailabilityConfirmation) receivedConfirmation).getStatus().equals(status);
+        return result;
+    }
+
+    public void sendChangeConfigurationRequest(String key, String value) throws Exception {
+        ChangeConfigurationRequest request = new ChangeConfigurationRequest();
+        request.setKey(key);
+        request.setValue(value);
+        server.send(sessionIndex, request).whenComplete((confirmation, throwable) -> receivedConfirmation = confirmation);
+    }
+
+    public boolean hasReceivedChangeConfigurationConfirmation() {
+        return receivedConfirmation instanceof ChangeConfigurationConfirmation;
+    }
 }
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
@@ -62,7 +62,9 @@ public GetConfigurationConfirmation handleGetConfigurationRequest(GetConfigurati
             @Override
             public ChangeConfigurationConfirmation handleChangeConfigurationRequest(ChangeConfigurationRequest request) {
                 receivedRequest = request;
-                return new ChangeConfigurationConfirmation();
+                ChangeConfigurationConfirmation confirmation = new ChangeConfigurationConfirmation();
+                confirmation.setStatus(ConfigurationStatus.Accepted);
+                return confirmation;
             }
 
             @Override
@@ -183,9 +185,9 @@ private void send(Request request) {
         }
     }
 
-    public boolean hasReceivedBootConfirmation(RegistrationStatus status) {
+    public boolean hasReceivedBootConfirmation(String status) {
         if (receivedConfirmation instanceof BootNotificationConfirmation)
-            return ((BootNotificationConfirmation) receivedConfirmation).objStatus().equals(status);
+            return ((BootNotificationConfirmation) receivedConfirmation).getStatus().equals(status);
         return false;
     }
 
diff --git a/ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/AuthorizeSpec.groovy b/ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/AuthorizeSpec.groovy
@@ -4,12 +4,12 @@ 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;
+import spock.util.concurrent.PollingConditions
 
 class AuthorizeSpec extends Specification
 {
     @Shared
-    FakeCentralSystem centralSystem = new FakeCentralSystem();
+    FakeCentralSystem centralSystem = FakeCentralSystem.instance;
     @Shared FakeChargePoint chargePoint = new FakeChargePoint();
 
     def setupSpec() {
@@ -23,7 +23,6 @@ class AuthorizeSpec extends Specification
 
     def cleanup() {
         chargePoint.disconnect();
-        centralSystem.stopped();
     }
 
     def "Charge point sends Authorize request and receives a response"() {
diff --git a/ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/BootNotificationSpec.groovy b/ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/BootNotificationSpec.groovy
@@ -1,16 +1,15 @@
 package eu.chargetime.ocpp.test.core
 
-import eu.chargetime.ocpp.model.core.RegistrationStatus
+import eu.chargetime.ocpp.test.FakeCentralSystem
 import eu.chargetime.ocpp.test.FakeChargePoint
-import eu.chargetime.ocpp.test.OldFakeCentralSystem
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.util.concurrent.PollingConditions
 
-class BootNotification extends Specification
+class BootNotificationSpec extends Specification
 {
     @Shared
-    OldFakeCentralSystem centralSystem = OldFakeCentralSystem.getInstance();
+    FakeCentralSystem centralSystem = FakeCentralSystem.instance;
     @Shared FakeChargePoint chargePoint = new FakeChargePoint();
 
     def setupSpec() {
@@ -33,15 +32,12 @@ class BootNotification extends Specification
 
         then:
         conditions.eventually {
-            assert centralSystem.hasReceivedBootNotification("VendorX", "SingleSocketCharger");
+            assert centralSystem.hasHandledBootNotification("VendorX", "SingleSocketCharger");
         }
 
-        when:
-        centralSystem.sendBootConfirmation(RegistrationStatus.Accepted);
-
         then:
         conditions.eventually {
-            assert chargePoint.hasReceivedBootConfirmation(RegistrationStatus.Accepted);
+            assert chargePoint.hasReceivedBootConfirmation("Accepted");
         }
     }
 }
diff --git a/ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/ChangeAvailabilitySpec.groovy b/ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/ChangeAvailabilitySpec.groovy
@@ -1,16 +1,16 @@
 package eu.chargetime.ocpp.test.core
 
 import eu.chargetime.ocpp.model.core.AvailabilityType
+import eu.chargetime.ocpp.test.FakeCentralSystem
 import eu.chargetime.ocpp.test.FakeChargePoint
-import eu.chargetime.ocpp.test.OldFakeCentralSystem
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.util.concurrent.PollingConditions
 
-class ChangeAvailability extends Specification
+class ChangeAvailabilitySpec extends Specification
 {
     @Shared
-    OldFakeCentralSystem centralSystem = OldFakeCentralSystem.getInstance();
+    FakeCentralSystem centralSystem = FakeCentralSystem.instance;
     @Shared FakeChargePoint chargePoint = new FakeChargePoint();
 
     def setupSpec() {
@@ -29,7 +29,7 @@ class ChangeAvailability extends Specification
     def "Central System sends a ChangeAvailability request and receives a response"() {
         def conditions = new PollingConditions(timeout: 1)
         when:
-        centralSystem.sendChangeAvailabilityRequest(0, AvailabilityType.Inoperative);
+        centralSystem.sendChangeAvailabilityRequest(1, AvailabilityType.Inoperative);
 
         then:
         conditions.eventually {
diff --git a/ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/ChangeConfigurationSpec.groovy b/ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/ChangeConfigurationSpec.groovy
@@ -1,15 +1,15 @@
 package eu.chargetime.ocpp.test.core
 
+import eu.chargetime.ocpp.test.FakeCentralSystem
 import eu.chargetime.ocpp.test.FakeChargePoint
-import eu.chargetime.ocpp.test.OldFakeCentralSystem
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.util.concurrent.PollingConditions
 
-class ChangeConfiguration extends Specification
+class ChangeConfigurationSpec extends Specification
 {
     @Shared
-    OldFakeCentralSystem centralSystem = OldFakeCentralSystem.getInstance();
+    FakeCentralSystem centralSystem = FakeCentralSystem.instance;
     @Shared FakeChargePoint chargePoint = new FakeChargePoint();
 
     def setupSpec() {
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerCoreEventHandler.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerCoreEventHandler.java
@@ -26,7 +26,11 @@ of this software and associated documentation files (the "Software"), to deal
 
 import eu.chargetime.ocpp.model.core.AuthorizeConfirmation;
 import eu.chargetime.ocpp.model.core.AuthorizeRequest;
+import eu.chargetime.ocpp.model.core.BootNotificationConfirmation;
+import eu.chargetime.ocpp.model.core.BootNotificationRequest;
 
 public interface ServerCoreEventHandler {
     AuthorizeConfirmation handleAuthorizeRequest(int sessionIndex, AuthorizeRequest request);
+
+    BootNotificationConfirmation handleBootNotificationRequest(int sessionIndex, BootNotificationRequest request);
 }
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerCoreProfile.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerCoreProfile.java
@@ -24,25 +24,32 @@ of this software and associated documentation files (the "Software"), to deal
     SOFTWARE.
  */
 
-import eu.chargetime.ocpp.feature.AuthorizeFeature;
-import eu.chargetime.ocpp.feature.Feature;
+import eu.chargetime.ocpp.feature.*;
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
 import eu.chargetime.ocpp.model.core.AuthorizeRequest;
+import eu.chargetime.ocpp.model.core.BootNotificationRequest;
+
+import java.util.HashSet;
 
 public class ServerCoreProfile implements Profile {
 
     private ServerCoreEventHandler handler;
+    private HashSet<Feature> features;
 
     public ServerCoreProfile(ServerCoreEventHandler handler) {
         this.handler = handler;
+
+        features = new HashSet<>();
+        features.add(new AuthorizeFeature(this));
+        features.add(new BootNotificationFeature(this));
+        features.add(new ChangeAvailabilityFeature(this));
+        features.add(new ChangeConfigurationFeature(this));
     }
 
     @Override
     public Feature[] getFeatureList() {
-        Feature[] features = new Feature[1];
-        features[0] = new AuthorizeFeature(this);
-        return features;
+        return features.toArray(new Feature[0]);
     }
 
     @Override
@@ -51,6 +58,8 @@ public Confirmation handleRequest(int sessionIndex, Request request) {
 
         if (request instanceof AuthorizeRequest) {
             result = handler.handleAuthorizeRequest(sessionIndex, (AuthorizeRequest) request);
+        } else if (request instanceof BootNotificationRequest) {
+            result = handler.handleBootNotificationRequest(sessionIndex, (BootNotificationRequest) request);
         }
 
         return result;
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChangeConfigurationConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChangeConfigurationConfirmation.java
@@ -1,6 +1,5 @@
 package eu.chargetime.ocpp.model.core;
 
-import eu.chargetime.ocpp.PropertyConstraintException;
 import eu.chargetime.ocpp.model.Confirmation;
 
 /*
@@ -58,9 +57,8 @@ public ConfigurationStatus objStatus() {
      * Required. Returns whether configuration change has been accepted.
      *
      * @param status the {@link ConfigurationStatus}.
-     * @throws PropertyConstraintException
      */
-    public void setStatus(ConfigurationStatus status) throws PropertyConstraintException {
+    public void setStatus(ConfigurationStatus status) {
         this.status = status;
     }
 
diff --git a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerCoreProfileTest.java b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerCoreProfileTest.java

Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,6 @@ of this software and associated documentation files (the "Software"), to deal`
`26`	`26`
`27`	`27`	`public interface ServerEvents {`
`28`	`28`	`void newSession(int identity);`
	`29`	`+`
	`30`	`+ void lostSession(int identity);`
`29`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,9 @@ public GetConfigurationConfirmation handleGetConfigurationRequest(GetConfigurati`
`62`	`62`	`@Override`
`63`	`63`	`public ChangeConfigurationConfirmation handleChangeConfigurationRequest(ChangeConfigurationRequest request) {`
`64`	`64`	`receivedRequest = request;`
`65`		`- return new ChangeConfigurationConfirmation();`
	`65`	`+ ChangeConfigurationConfirmation confirmation = new ChangeConfigurationConfirmation();`
	`66`	`+ confirmation.setStatus(ConfigurationStatus.Accepted);`
	`67`	`+ return confirmation;`
`66`	`68`	`}`
`67`	`69`
`68`	`70`	`@Override`
`@@ -183,9 +185,9 @@ private void send(Request request) {`
`183`	`185`	`}`
`184`	`186`	`}`
`185`	`187`
`186`		`- public boolean hasReceivedBootConfirmation(RegistrationStatus status) {`
	`188`	`+ public boolean hasReceivedBootConfirmation(String status) {`
`187`	`189`	`if (receivedConfirmation instanceof BootNotificationConfirmation)`
`188`		`- return ((BootNotificationConfirmation) receivedConfirmation).objStatus().equals(status);`
	`190`	`+ return ((BootNotificationConfirmation) receivedConfirmation).getStatus().equals(status);`
`189`	`191`	`return false;`
`190`	`192`	`}`
`191`	`193`