Merge pull request #180 from m-oben/feature/client-uuid

Expose a client's session ID

Author: TVolden

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

@@ -30,6 +30,7 @@ of this software and associated documentation files (the "Software"), to deal
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -89,7 +90,7 @@ public void handleConfirmation(String uniqueId, Confirmation confirmation) {
           public Confirmation handleRequest(Request request) throws UnsupportedFeatureException {
             Optional<Feature> featureOptional = featureRepository.findFeature(request);
             if (featureOptional.isPresent()) {
-              return featureOptional.get().handleRequest(null, request);
+              return featureOptional.get().handleRequest(getSessionId(), request);
             } else {
               throw new UnsupportedFeatureException();
             }
@@ -160,4 +161,8 @@ public CompletableFuture<Confirmation> send(Request request)
     session.sendRequest(featureOptional.get().getAction(), request, id);
     return promise;
   }
+
+  public UUID getSessionId() {
+      return this.session.getSessionId();
+  }
 }

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

@@ -31,6 +31,7 @@
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
 import java.util.Collections;
+import java.util.UUID;
 import java.util.concurrent.CompletionStage;
 import org.java_websocket.drafts.Draft;
 import org.java_websocket.drafts.Draft_6455;
@@ -88,4 +89,9 @@ public void disconnect() {
   public boolean isClosed() {
     return transmitter.isClosed();
   }
+
+  @Override
+  public UUID getSessionId() {
+    return client.getSessionId();
+  }
 }

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

@@ -35,6 +35,7 @@ of this software and associated documentation files (the "Software"), to deal
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.URL;
+import java.util.UUID;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -116,6 +117,11 @@ public boolean isClosed() {
     return transmitter.isClosed();
   }
 
+  @Override
+  public UUID getSessionId() {
+    return client.getSessionId();
+  }
+
   private int getPort() {
     return callback.getPort() == -1 ? 8000 : callback.getPort();
   }

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

@@ -28,6 +28,8 @@ of this software and associated documentation files (the "Software"), to deal
 import eu.chargetime.ocpp.feature.profile.Profile;
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
+
+import java.util.UUID;
 import java.util.concurrent.CompletionStage;
 
 public interface IClientAPI {
@@ -41,4 +43,6 @@ CompletionStage<Confirmation> send(Request request)
   void disconnect();
 
   boolean isClosed();
+
+  UUID getSessionId();
 }

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

@@ -8,6 +8,7 @@
 import eu.chargetime.ocpp.wss.WssSocketBuilder;
 import java.io.IOException;
 import java.util.Collections;
+import java.util.UUID;
 import java.util.concurrent.CompletionStage;
 import javax.net.ssl.SSLContext;
 import org.java_websocket.drafts.Draft;
@@ -171,4 +172,9 @@ public void disconnect() {
   public boolean isClosed() {
     return transmitter.isClosed();
   }
+
+  @Override
+  public UUID getSessionId() {
+    return client.getSessionId();
+  }
 }

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

@@ -34,6 +34,7 @@ of this software and associated documentation files (the "Software"), to deal
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.URL;
+import java.util.UUID;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -123,6 +124,11 @@ public boolean isClosed() {
     return transmitter.isClosed();
   }
 
+  @Override
+  public UUID getSessionId() {
+    return client.getSessionId();
+  }
+
   private int getPort() {
     return callback.getPort() == -1 ? 8000 : callback.getPort();
   }

ocpp-v2_0/src/main/java/eu/chargetime/ocpp/IClientAPI.java

@@ -28,6 +28,8 @@ of this software and associated documentation files (the "Software"), to deal
 import eu.chargetime.ocpp.feature.Feature;
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
+
+import java.util.UUID;
 import java.util.concurrent.CompletionStage;
 
 public interface IClientAPI {
@@ -41,4 +43,6 @@ CompletionStage<Confirmation> send(Request request)
   void disconnect();
 
   boolean isClosed();
+
+  UUID getSessionId();
 }

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

@@ -32,6 +32,7 @@
 import eu.chargetime.ocpp.wss.WssSocketBuilder;
 import java.io.IOException;
 import java.util.Collections;
+import java.util.UUID;
 import java.util.concurrent.CompletionStage;
 import javax.net.ssl.SSLContext;
 import org.java_websocket.drafts.Draft;
@@ -155,4 +156,9 @@ public void disconnect() {
   public boolean isClosed() {
     return transmitter.isClosed();
   }
+
+  @Override
+  public UUID getSessionId() {
+    return client.getSessionId();
+  }
 }