Skip to content

Commit f041a38

Browse files
committed
Propagate code and reason from disconnect from server on client
1 parent 44def2e commit f041a38

File tree

17 files changed

+33
-27
lines changed

17 files changed

+33
-27
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public WebSocketReceiver(WebSocketReceiverEvents handler) {
3737
@Override
3838
public void disconnect() {
3939
receiverEvents.close();
40-
handler.disconnected();
40+
handler.disconnected(0, "disconnect() method called");
4141
}
4242

4343
void relay(String message) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void onClose(int code, String reason, boolean remote) {
105105
logger.debug(
106106
"On connection close (code: {}, reason: {}, remote: {})", code, reason, remote);
107107

108-
events.disconnected();
108+
events.disconnected(code, reason);
109109
}
110110

111111
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ public void handleError(
113113
}
114114

115115
@Override
116-
public void handleConnectionClosed() {
117-
if (events != null) events.connectionClosed();
116+
public void handleConnectionClosed(int code, String reason) {
117+
if (events != null) events.connectionClosed(code, reason);
118118
}
119119

120120
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ of this software and associated documentation files (the "Software"), to deal
3030
public interface ClientEvents {
3131
void connectionOpened();
3232

33-
void connectionClosed();
33+
void connectionClosed(int code, String reason);
3434
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@ public void receivedMessage(Object input) {
292292
}
293293

294294
@Override
295-
public void disconnected() {
296-
events.onDisconnected();
295+
public void disconnected(int code, String reason) {
296+
events.onDisconnected(code, reason);
297297
}
298298
}
299299

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@ public interface CommunicatorEvents {
6666
*/
6767
void onError(String id, String errorCode, String errorDescription, Object payload);
6868

69-
/** The connection was disconnected. */
70-
void onDisconnected();
69+
/** The connection was disconnected.
70+
* @param code
71+
* @param reason*/
72+
void onDisconnected(int code, String reason);
7173

7274
/** A connection was established. */
7375
void onConnected();

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ public interface RadioEvents {
3939
*/
4040
void receivedMessage(Object message);
4141

42-
/** Disconnected from node. */
43-
void disconnected();
42+
/** Disconnected from node.
43+
* @param code
44+
* @param reason*/
45+
void disconnected(int code, String reason);
4446
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void handleError(
143143
}
144144

145145
@Override
146-
public void handleConnectionClosed() {
146+
public void handleConnectionClosed(int code, String reason) {
147147
Optional<UUID> sessionIdOptional = getSessionID(session);
148148
if (sessionIdOptional.isPresent()) {
149149
serverEvents.lostSession(sessionIdOptional.get());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@ public void onError(String id, String errorCode, String errorDescription, Object
221221
}
222222

223223
@Override
224-
public void onDisconnected() {
225-
events.handleConnectionClosed();
224+
public void onDisconnected(int code, String reason) {
225+
events.handleConnectionClosed(code, reason);
226226
}
227227

228228
@Override

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ public interface SessionEvents {
5959
*/
6060
void handleError(String uniqueId, String errorCode, String errorDescription, Object payload);
6161

62-
/** Handle a closed connection. */
63-
void handleConnectionClosed();
62+
/** Handle a closed connection.
63+
* @param code
64+
* @param reason*/
65+
void handleConnectionClosed(int code, String reason);
6466

6567
/** Handle a opened connection. */
6668
void handleConnectionOpened();

0 commit comments

Comments
 (0)