Merge pull request #188 from jmluy/add-opensession

Provide method to check if given session is still open

Author: TVolden

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

@@ -1,41 +1,45 @@
-package eu.chargetime.ocpp; /*
-                               ChargeTime.eu - Java-OCA-OCPP
+package eu.chargetime.ocpp;
+/*
+ ChargeTime.eu - Java-OCA-OCPP
 
-                               MIT License
+ MIT License
 
-                               Copyright (C) 2016-2018 Thomas Volden <[email protected]>
+ Copyright (C) 2016-2018 Thomas Volden <[email protected]>
 
-                               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:
+ 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 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.
-                            */
+ 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.
+*/
 
-/** Exception returned to an outgoing request if an error is reported from the other end. */
+/**
+ * Exception returned to an outgoing request if an error is reported from the other end.
+ */
 public class CallErrorException extends Exception {
+
   private String errorCode;
   private String errorDescription;
   private Object payload;
 
   /**
    * Constructor.
    *
-   * @param errorCode send from the other end.
+   * @param errorCode        send from the other end.
    * @param errorDescription describing the error.
-   * @param payload raw payload send from the other end.
+   * @param payload          raw payload send from the other end.
    */
   public CallErrorException(String errorCode, String errorDescription, Object payload) {
     super(

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

@@ -219,6 +219,10 @@ public CompletableFuture<Confirmation> send(UUID sessionIndex, Request request)
     return promise;
   }
 
+  public boolean isSessionOpen(UUID sessionIndex) {
+    return sessions.containsKey(sessionIndex);
+  }
+
   /**
    * Close connection to a client
    *

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

@@ -69,6 +69,11 @@ public void addFeatureProfile(Profile profile) {
     featureRepository.addFeatureProfile(profile);
   }
 
+  @Override
+  public boolean isSessionOpen(UUID session) {
+    return server.isSessionOpen(session);
+  }
+
   @Override
   public void closeSession(UUID session) {
     server.closeSession(session);

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

@@ -52,6 +52,11 @@ public void addFeatureProfile(Profile profile) {
     featureRepository.addFeatureProfile(profile);
   }
 
+  @Override
+  public boolean isSessionOpen(UUID session) {
+    return server.isSessionOpen(session);
+  }
+
   @Override
   public void closeSession(UUID session) {
     server.closeSession(session);

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

@@ -34,6 +34,8 @@ of this software and associated documentation files (the "Software"), to deal
 public interface IServerAPI {
   void addFeatureProfile(Profile profile);
 
+  boolean isSessionOpen(UUID session);
+
   void closeSession(UUID session);
 
   void open(String host, int port, ServerEvents serverEvents);

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

@@ -137,6 +137,11 @@ public void addFeatureProfile(Profile profile) {
     featureRepository.addFeatureProfile(profile);
   }
 
+  @Override
+  public boolean isSessionOpen(UUID session) {
+    return server.isSessionOpen(session);
+  }
+
   @Override
   public void closeSession(UUID session) {
     server.closeSession(session);

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

@@ -52,6 +52,11 @@ public void addFeatureProfile(Profile profile) {
     featureRepository.addFeatureProfile(profile);
   }
 
+  @Override
+  public boolean isSessionOpen(UUID session) {
+    return server.isSessionOpen(session);
+  }
+
   @Override
   public void closeSession(UUID session) {
     server.closeSession(session);

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

@@ -34,6 +34,8 @@ of this software and associated documentation files (the "Software"), to deal
 public interface IServerAPI {
   void addFeature(Feature feature);
 
+  boolean isSessionOpen(UUID session);
+
   void closeSession(UUID session);
 
   void open(String host, int port, ServerEvents serverEvents);

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

@@ -124,6 +124,11 @@ public void addFeature(Feature feature) {
     featureRepository.addFeature(feature);
   }
 
+  @Override
+  public boolean isSessionOpen(UUID session) {
+    return server.isSessionOpen(session);
+  }
+
   @Override
   public void closeSession(UUID session) {
     server.closeSession(session);