Implemented Server DataTransfer feature.

Author: TVolden

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

@@ -81,6 +81,14 @@ public BootNotificationConfirmation handleBootNotificationRequest(int sessionInd
                 confirmation.setStatus(RegistrationStatus.Accepted);
                 return confirmation;
             }
+
+            @Override
+            public DataTransferConfirmation handleDataTransferRequest(int sessionIndex, DataTransferRequest request) {
+                receivedRequest = request;
+                DataTransferConfirmation confirmation = new DataTransferConfirmation();
+                confirmation.setStatus(DataTransferStatus.Accepted);
+                return confirmation;
+            }
         }));
         server.open("localhost", 8887, new ServerEvents() {
             @Override
@@ -147,4 +155,20 @@ public void sendClearCacheRequest() throws Exception {
     public boolean hasReceivedClearCacheConfirmation() {
         return receivedConfirmation instanceof ClearCacheConfirmation;
     }
+
+    public void sendDataTransferRequest(String vendorId, String messageId, String data) throws Exception {
+        DataTransferRequest request = new DataTransferRequest();
+        request.setVendorId(vendorId);
+        request.setMessageId(messageId);
+        request.setData(data);
+        server.send(sessionIndex, request).whenComplete((confirmation, throwable) -> receivedConfirmation = confirmation);
+    }
+
+    public boolean hasReceivedDataTransferConfirmation() {
+        return receivedConfirmation instanceof DataTransferConfirmation;
+    }
+
+    public boolean hasHandledDataTransferRequest() {
+        return receivedRequest instanceof DataTransferRequest;
+    }
 }

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

@@ -78,7 +78,9 @@ public ClearCacheConfirmation handleClearCacheRequest(ClearCacheRequest request)
             @Override
             public DataTransferConfirmation handleDataTransferRequest(DataTransferRequest request) {
                 receivedRequest = request;
-                return new DataTransferConfirmation();
+                DataTransferConfirmation confirmation = new DataTransferConfirmation();
+                confirmation.setStatus(DataTransferStatus.Accepted);
+                return confirmation;
             }
 
             @Override

…etime/ocpp/test/core/DataTransfer.groovy …e/ocpp/test/core/DataTransferSpec.groovyocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/DataTransfer.groovy renamed to ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/DataTransferSpec.groovy ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/DataTransfer.groovy renamed to ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/DataTransferSpec.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 DataTransfer extends Specification
+class DataTransferSpec extends Specification
 {
     @Shared
-    OldFakeCentralSystem centralSystem = OldFakeCentralSystem.getInstance();
+    FakeCentralSystem centralSystem = FakeCentralSystem.getInstance();
     @Shared FakeChargePoint chargePoint = new FakeChargePoint();
 
     def setupSpec() {
@@ -46,12 +46,9 @@ class DataTransfer extends Specification
 
         then:
         conditions.eventually {
-            assert centralSystem.hasReceivedDataTransferRequest();
+            assert centralSystem.hasHandledDataTransferRequest();
         }
 
-        when:
-            centralSystem.sendDataTransferConfirmation("Accepted");
-
         then:
         conditions.eventually {
             assert chargePoint.hasReceivedDataTransferConfirmation("Accepted");

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

@@ -24,13 +24,11 @@ of this software and associated documentation files (the "Software"), to deal
     SOFTWARE.
  */
 
-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;
+import eu.chargetime.ocpp.model.core.*;
 
 public interface ServerCoreEventHandler {
     AuthorizeConfirmation handleAuthorizeRequest(int sessionIndex, AuthorizeRequest request);
-
     BootNotificationConfirmation handleBootNotificationRequest(int sessionIndex, BootNotificationRequest request);
+
+    DataTransferConfirmation handleDataTransferRequest(int sessionIndex, DataTransferRequest request);
 }

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

@@ -29,6 +29,7 @@ of this software and associated documentation files (the "Software"), to deal
 import eu.chargetime.ocpp.model.Request;
 import eu.chargetime.ocpp.model.core.AuthorizeRequest;
 import eu.chargetime.ocpp.model.core.BootNotificationRequest;
+import eu.chargetime.ocpp.model.core.DataTransferRequest;
 
 import java.util.HashSet;
 
@@ -46,6 +47,7 @@ public ServerCoreProfile(ServerCoreEventHandler handler) {
         features.add(new ChangeAvailabilityFeature(this));
         features.add(new ChangeConfigurationFeature(this));
         features.add(new ClearCacheFeature(this));
+        features.add(new DataTransferFeature(this));
     }
 
     @Override
@@ -61,6 +63,8 @@ public Confirmation handleRequest(int sessionIndex, Request request) {
             result = handler.handleAuthorizeRequest(sessionIndex, (AuthorizeRequest) request);
         } else if (request instanceof BootNotificationRequest) {
             result = handler.handleBootNotificationRequest(sessionIndex, (BootNotificationRequest) request);
+        } else if (request instanceof DataTransferRequest) {
+            result = handler.handleDataTransferRequest(sessionIndex, (DataTransferRequest) request);
         }
 
         return result;

ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerCoreProfileTest.java

@@ -5,6 +5,7 @@
 import eu.chargetime.ocpp.feature.profile.ServerCoreProfile;
 import eu.chargetime.ocpp.model.core.AuthorizeRequest;
 import eu.chargetime.ocpp.model.core.BootNotificationRequest;
+import eu.chargetime.ocpp.model.core.DataTransferRequest;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -123,6 +124,27 @@ public void getFeatureList_containsClearCacheFeature() {
         assertThat(findFeature(features, "ClearCache"), is(instanceOf(ClearCacheFeature.class)));
     }
 
+    @Test
+    public void getFeatureList_containsDataTransferFeature() {
+        // When
+        Feature[] features = core.getFeatureList();
+
+        // Then
+        assertThat(findFeature(features, "DataTransfer"), is(instanceOf(DataTransferFeature.class)));
+    }
+
+    @Test
+    public void handleRequest_aDataTransferRequest_callsHandleDataTransferRequest() {
+        // Given
+        DataTransferRequest request = new DataTransferRequest();
+        int sessionId = 42;
+
+        // When
+        core.handleRequest(sessionId, request);
+
+        // Then
+        verify(handler, times(1)).handleDataTransferRequest(eq(sessionId), eq(request));
+    }
 
     private Feature findFeature(Feature[] features, String action) {
         Feature output = null;