Merge pull request #8 from emilm/identifier-feature

Added identifier on newSession()

Author: TVolden

ocpp-common/src/main/java/eu/chargetime/ocpp/ListenerEvents.java

@@ -25,5 +25,5 @@ of this software and associated documentation files (the "Software"), to deal
  */
 
 public interface ListenerEvents {
-    void newSession(Session session);
+    void newSession(Session session, String identifier);
 }

ocpp-common/src/main/java/eu/chargetime/ocpp/Server.java

@@ -62,7 +62,7 @@ public Server(Listener listener) {
      */
     public void open(String hostname, int port, ServerEvents serverEvents) {
 
-        listener.open(hostname, port, session -> {
+        listener.open(hostname, port, (session, identifier) -> {
             session.accept(new SessionEvents() {
                 @Override
                 public Feature findFeatureByAction(String action) {
@@ -104,7 +104,7 @@ public void handleConnectionOpened() {
                 }
             });
             sessions.put(UUID.randomUUID(), session);
-            serverEvents.newSession(sessions.inverse().get(session));
+            serverEvents.newSession(sessions.inverse().get(session), identifier);
         });
     }
 

ocpp-common/src/main/java/eu/chargetime/ocpp/ServerEvents.java

@@ -27,7 +27,7 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.UUID;
 
 public interface ServerEvents {
-    void newSession(UUID sessionIndex);
+    void newSession(UUID sessionIndex, String identifier);
 
     void lostSession(UUID sessionIndex);
 }

ocpp-common/src/test/java/eu/chargetime/ocpp/test/ClientTest.java

@@ -49,6 +49,7 @@ of this software and associated documentation files (the "Software"), to deal
 public class ClientTest extends TestUtilities {
     private Client client;
     private SessionEvents eventHandler;
+    private static final String IDENTIFIER = "test";
 
     @Mock
     private Session session = mock(Session.class);

ocpp-common/src/test/java/eu/chargetime/ocpp/test/ServerTest.java

@@ -42,6 +42,7 @@ of this software and associated documentation files (the "Software"), to deal
 public class ServerTest extends TestUtilities {
 
     private static final String LOCALHOST = "localhost";
+    private static final String IDENTIFIER = "test";
     private static final int PORT = 42;
 
     private Server server;
@@ -71,7 +72,7 @@ public void setup() {
         when(feature.getAction()).thenReturn(null);
         doAnswer(invocation -> listenerEvents = invocation.getArgumentAt(2, ListenerEvents.class)).when(listener).open(anyString(), anyInt(), any());
         doAnswer(invocation -> sessionEvents = invocation.getArgumentAt(0, SessionEvents.class)).when(session).accept(any());
-        doAnswer(invocation -> sessionIndex = invocation.getArgumentAt(0, UUID.class)).when(serverEvents).newSession(any());
+        doAnswer(invocation -> sessionIndex = invocation.getArgumentAt(0, UUID.class)).when(serverEvents).newSession(any(), anyString());
 
         server = new Server(listener) {
         };
@@ -86,7 +87,7 @@ public void newSession_serverIsListening_sessionIsAccepted() {
         server.open(LOCALHOST, PORT, serverEvents);
 
         // When
-        listenerEvents.newSession(session);
+        listenerEvents.newSession(session, IDENTIFIER);
 
         // Then
         verify(session, times(1)).accept(any());
@@ -98,10 +99,10 @@ public void newSession_serverIsListening_callbackWithIndex0() {
         server.open(LOCALHOST, PORT, serverEvents);
 
         // When
-        listenerEvents.newSession(session);
+        listenerEvents.newSession(session, IDENTIFIER);
 
         // Then
-        verify(serverEvents, times(1)).newSession(any(UUID.class));
+        verify(serverEvents, times(1)).newSession(any(UUID.class), eq(IDENTIFIER));
     }
 
     @Test
@@ -111,7 +112,7 @@ public void send_aMessage_isCommunicated() throws Exception {
 
         when(session.sendRequest(any(), any())).thenReturn(someUniqueId);
         server.open(LOCALHOST, PORT, serverEvents);
-        listenerEvents.newSession(session);
+        listenerEvents.newSession(session, IDENTIFIER);
 
         // When
         server.send(sessionIndex, request);
@@ -124,7 +125,7 @@ public void send_aMessage_isCommunicated() throws Exception {
     public void handleRequest_callsFeatureHandleRequest() {
         // Given
         server.open(LOCALHOST, PORT, serverEvents);
-        listenerEvents.newSession(session);
+        listenerEvents.newSession(session, IDENTIFIER);
 
         // When
         sessionEvents.handleRequest(request);
@@ -137,7 +138,7 @@ public void handleRequest_callsFeatureHandleRequest() {
     public void send_aMessage_validatesMessage() throws Exception {
         // Given
         server.open(LOCALHOST, PORT, serverEvents);
-        listenerEvents.newSession(session);
+        listenerEvents.newSession(session, IDENTIFIER);
 
         // When
         server.send(sessionIndex, request);

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

@@ -49,6 +49,7 @@ public class FakeCentralSystem
 
     private static FakeCentralSystem instance;
     private boolean isRigged;
+    private String currentIdentifier;
 
     public static FakeCentralSystem getInstance () {
         if (instance == null)
@@ -187,13 +188,15 @@ public StopTransactionConfirmation handleStopTransactionRequest(UUID sessionInde
 
         server.open("localhost", port, new ServerEvents() {
             @Override
-            public void newSession(UUID sessionIndex) {
+            public void newSession(UUID sessionIndex, String identifier) {
                 currentSessionIndex = sessionIndex;
+                currentIdentifier = identifier;
             }
 
             @Override
             public void lostSession(UUID identity) {
                 currentSessionIndex = null;
+                currentIdentifier = null;
                 // clear
                 receivedConfirmation = null;
                 receivedRequest = null;

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

@@ -119,7 +119,7 @@ public UnlockConnectorConfirmation handleUnlockConnectorRequest(UnlockConnectorR
 
         switch (type) {
             case JSON:
-                client = new JSONClient(core);
+                client = new JSONClient(core, "test");
                 url = "ws://localhost:8887";
                 break;
             case SOAP:

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/JSONClient.java

@@ -38,7 +38,7 @@ public class JSONClient extends Client {
      *
      * @param coreProfile implementation of the core feature profile.
      */
-    public JSONClient(ClientCoreProfile coreProfile) {
+    public JSONClient(ClientCoreProfile coreProfile, String identity) {
         super(new Session(new JSONCommunicator(new WebSocketTransmitter()), new Queue()));
         addFeatureProfile(coreProfile);
     }

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/WebServiceListener.java

@@ -78,7 +78,7 @@ public SOAPMessage incomingRequest(SOAPMessage message) {
                 WebServiceReceiver webServiceReceiver = new WebServiceReceiver(toUrl);
                 SOAPCommunicator communicator = new SOAPCommunicator(identity, fromUrl, webServiceReceiver);
                 communicator.setToUrl(toUrl);
-                events.newSession(new Session(communicator, new Queue()));
+                events.newSession(new Session(communicator, new Queue()), identity);
                 chargeBoxes.put(identity, webServiceReceiver);
             }
 

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/WebSocketListener.java

@@ -49,7 +49,7 @@ public void open(String hostname, int port, ListenerEvents handler) {
             public void onOpen(WebSocket webSocket, ClientHandshake clientHandshake) {
                 WebSocketReceiver receiver = new WebSocketReceiver(message -> webSocket.send(message));
                 sockets.put(webSocket, receiver);
-                handler.newSession(new Session(new JSONCommunicator(receiver), new Queue()));
+                handler.newSession(new Session(new JSONCommunicator(receiver), new Queue()), clientHandshake.getResourceDescriptor());
             }
 
             @Override