Add a separate disconnect() / handleConnectionClosed() method when there is no code / reason

Author: emilm

OCPP-J/src/main/java/eu/chargetime/ocpp/WebSocketReceiver.java

@@ -37,7 +37,7 @@ public WebSocketReceiver(WebSocketReceiverEvents handler) {
   @Override
   public void disconnect() {
     receiverEvents.close();
-    handler.disconnected(0, "disconnect() method called");
+    handler.disconnected();
   }
 
   void relay(String message) {

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

@@ -112,6 +112,11 @@ public void handleError(
             }
           }
 
+          @Override
+          public void handleConnectionClosed() {
+            if (events != null) events.connectionClosed();
+          }
+
           @Override
           public void handleConnectionClosed(int code, String reason) {
             if (events != null) events.connectionClosed(code, reason);

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

@@ -30,5 +30,6 @@ of this software and associated documentation files (the "Software"), to deal
 public interface ClientEvents {
   void connectionOpened();
 
+  void connectionClosed();
   void connectionClosed(int code, String reason);
 }

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

@@ -291,6 +291,11 @@ public void receivedMessage(Object input) {
       }
     }
 
+    @Override
+    public void disconnected() {
+      events.onDisconnected();
+    }
+
     @Override
     public void disconnected(int code, String reason) {
       events.onDisconnected(code, reason);

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

@@ -66,6 +66,9 @@ public interface CommunicatorEvents {
    */
   void onError(String id, String errorCode, String errorDescription, Object payload);
 
+  /** The connection was disconnected. */
+  void onDisconnected();
+
   /** The connection was disconnected.
    * @param code
    * @param reason*/

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

@@ -39,6 +39,9 @@ public interface RadioEvents {
    */
   void receivedMessage(Object message);
 
+  /** Disconnected from node. */
+  void disconnected();
+
   /** Disconnected from node.
    * @param code
    * @param reason*/

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

@@ -142,8 +142,7 @@ public void handleError(
                     }
                   }
 
-                  @Override
-                  public void handleConnectionClosed(int code, String reason) {
+                  private void connectionClosedInternal() {
                     Optional<UUID> sessionIdOptional = getSessionID(session);
                     if (sessionIdOptional.isPresent()) {
                       serverEvents.lostSession(sessionIdOptional.get());
@@ -153,6 +152,16 @@ public void handleConnectionClosed(int code, String reason) {
                     }
                   }
 
+                  @Override
+                  public void handleConnectionClosed() {
+                    connectionClosedInternal();
+                  }
+
+                  @Override
+                  public void handleConnectionClosed(int code, String reason) {
+                    connectionClosedInternal();
+                  }
+
                   @Override
                   public void handleConnectionOpened() {}
                 });

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

@@ -220,6 +220,11 @@ public void onError(String id, String errorCode, String errorDescription, Object
       events.handleError(id, errorCode, errorDescription, payload);
     }
 
+    @Override
+    public void onDisconnected() {
+      events.handleConnectionClosed();
+    }
+
     @Override
     public void onDisconnected(int code, String reason) {
       events.handleConnectionClosed(code, reason);

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

@@ -59,7 +59,10 @@ public interface SessionEvents {
    */
   void handleError(String uniqueId, String errorCode, String errorDescription, Object payload);
 
-  /** Handle a closed connection.
+  /** Handle a closed connection. */
+  void handleConnectionClosed();
+
+  /** Handle a closed connection with error codes
    * @param code
    * @param reason*/
   void handleConnectionClosed(int code, String reason);

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

@@ -306,7 +306,10 @@ public void connect() {
             @Override
             public void connectionOpened() {}
 
-            @Override
+              @Override
+              public void connectionClosed() {}
+
+              @Override
             public void connectionClosed(int code, String reason) {}
           });
     } catch (Exception ex) {