Skip to content

Commit a8e0b9f

Browse files
TVoldenTVolden
committed
Added source session index to incoming requests handlers. This won't change the externalt interface for clients requests, but may be subject to change in the future.
1 parent 26e2fcc commit a8e0b9f

File tree

7 files changed

+24
-22
lines changed

7 files changed

+24
-22
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void handleConfirmation(String uniqueId, Confirmation confirmation) {
8282
@Override
8383
public Confirmation handleRequest(Request request) {
8484
Feature feature = findFeatureByRequest(request);
85-
return feature.handleRequest(request);
85+
return feature.handleRequest(0, request);
8686
}
8787

8888
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ of this software and associated documentation files (the "Software"), to deal
3838
* Keeps track of outgoing requests.
3939
* Calls back when a confirmation is received.
4040
*/
41-
public class Server extends FeatureHandler {
41+
public abstract class Server extends FeatureHandler {
4242

4343
private ArrayList<Session> sessions;
4444

‎ocpp-common/src/main/java/eu/chargetime/ocpp/feature/Feature.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,12 @@ public Feature(Profile ownerProfile) {
5050
/**
5151
* Calls {@link Profile} to handle a {@link Request}.
5252
*
53+
* @param sessionIndex source of the request.
5354
* @param request the {@link Request} to be handled.
5455
* @return the {@link Confirmation} to be send back.
5556
*/
56-
public Confirmation handleRequest(Request request) {
57-
return profile.handleRequest(request);
57+
public Confirmation handleRequest(int sessionIndex, Request request) {
58+
return profile.handleRequest(sessionIndex, request);
5859
}
5960

6061
/**

‎ocpp-common/src/main/java/eu/chargetime/ocpp/feature/profile/Profile.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ public interface Profile {
4646
/**
4747
* Handle {@link Request}
4848
*
49+
* @param sessionIndex source of the request.
4950
* @param request the {@link Request} to be handled.
5051
* @return the {@link Confirmation} to be send.
5152
*/
52-
Confirmation handleRequest(Request request);
53+
Confirmation handleRequest(int sessionIndex, Request request);
5354
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public void responseReceived_aMessageWasSend_PromiseIsCompleted() throws Excepti
113113
public void handleRequest_returnsConfirmation() {
114114
// Given
115115
client.connect(null);
116-
when(feature.handleRequest(request)).thenReturn(new TestConfirmation());
116+
when(feature.handleRequest(0, request)).thenReturn(new TestConfirmation());
117117

118118
// When
119119
Confirmation conf = eventHandler.handleRequest(request);
@@ -131,7 +131,7 @@ public void handleRequest_callsFeatureHandleRequest() {
131131
eventHandler.handleRequest(request);
132132

133133
// Then
134-
verify(feature, times(1)).handleRequest(eq(request));
134+
verify(feature, times(1)).handleRequest(eq(0), eq(request));
135135
}
136136

137137
}

‎ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ClientCoreProfile.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public Feature[] getFeatureList() {
238238
}
239239

240240
@Override
241-
public Confirmation handleRequest(Request request) {
241+
public Confirmation handleRequest(int sessionIndex, Request request) {
242242
Confirmation result = null;
243243

244244
if (request instanceof ChangeAvailabilityRequest) {

‎ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientCoreProfileTest.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public void handleRequest_aChangeAvailabilityRequest_callsHandleChangeAvailabili
232232
ChangeAvailabilityRequest request = new ChangeAvailabilityRequest();
233233

234234
// When
235-
core.handleRequest(request);
235+
core.handleRequest(0, request);
236236

237237
// Then
238238
verify(handler, times(1)).handleChangeAvailabilityRequest(eq(request));
@@ -244,7 +244,7 @@ public void handleRequest_aRemoteStartTransactionRequest_callsHandleRemoteStartT
244244
RemoteStartTransactionRequest request = new RemoteStartTransactionRequest();
245245

246246
// When
247-
core.handleRequest(request);
247+
core.handleRequest(0, request);
248248

249249
// Then
250250
verify(handler, times(1)).handleRemoteStartTransactionRequest(eq(request));
@@ -256,7 +256,7 @@ public void handleRequest_aRemoteStopTransactionRequest_callsHandleRemoteStopTra
256256
RemoteStopTransactionRequest request = new RemoteStopTransactionRequest();
257257

258258
// When
259-
core.handleRequest(request);
259+
core.handleRequest(0, request);
260260

261261
// Then
262262
verify(handler, times(1)).handleRemoteStopTransactionRequest(eq(request));
@@ -268,7 +268,7 @@ public void handleRequest_aResetRequest_callsHandleResetRequest() {
268268
ResetRequest request = new ResetRequest();
269269

270270
// When
271-
core.handleRequest(request);
271+
core.handleRequest(0, request);
272272

273273
// Then
274274
verify(handler, times(1)).handleResetRequest(eq(request));
@@ -280,7 +280,7 @@ public void handleRequest_anUnlockConnectorRequest_callsHandleUnlockConnectorReq
280280
UnlockConnectorRequest request = new UnlockConnectorRequest();
281281

282282
// When
283-
core.handleRequest(request);
283+
core.handleRequest(0, request);
284284

285285
// Then
286286
verify(handler, times(1)).handleUnlockConnectorRequest(eq(request));
@@ -293,7 +293,7 @@ public void handleRequest_aChangeAvailabilityRequest_returnsChangeAvailabilityCo
293293
ChangeAvailabilityRequest request = new ChangeAvailabilityRequest();
294294

295295
// When
296-
Confirmation conf = core.handleRequest(request);
296+
Confirmation conf = core.handleRequest(0, request);
297297

298298
// Then
299299
assertThat(conf, instanceOf(ChangeAvailabilityConfirmation.class));
@@ -315,7 +315,7 @@ public void handleRequest_aGetConfigurationRequest_callsHandleGetConfigurationRe
315315
GetConfigurationRequest request = new GetConfigurationRequest();
316316

317317
// When
318-
core.handleRequest(request);
318+
core.handleRequest(0, request);
319319

320320
// Then
321321
verify(handler, times(1)).handleGetConfigurationRequest(eq(request));
@@ -328,7 +328,7 @@ public void handleRequest_aGetConfigurationRequest_returnGetConfigurationConfirm
328328
GetConfigurationRequest request = new GetConfigurationRequest();
329329

330330
// When
331-
Confirmation conf = core.handleRequest(request);
331+
Confirmation conf = core.handleRequest(0, request);
332332

333333
// Then
334334
assertThat(conf, instanceOf(GetConfigurationConfirmation.class));
@@ -340,7 +340,7 @@ public void handleRequest_aDataTransferRequest_callsHandleDataTransferRequest()
340340
DataTransferRequest request = new DataTransferRequest();
341341

342342
// When
343-
core.handleRequest(request);
343+
core.handleRequest(0, request);
344344

345345
// Then
346346
verify(handler, times(1)).handleDataTransferRequest(eq(request));
@@ -353,7 +353,7 @@ public void handleRequest_aDataTransferRequest_returnDataTransferConfirmation()
353353
DataTransferRequest request = new DataTransferRequest();
354354

355355
// When
356-
Confirmation conf = core.handleRequest(request);
356+
Confirmation conf = core.handleRequest(0, request);
357357

358358
// Then
359359
assertThat(conf, instanceOf(DataTransferConfirmation.class));
@@ -374,7 +374,7 @@ public void handleRequest_aChangeConfigurationRequest_callsHandleChangeConfigura
374374
ChangeConfigurationRequest request = new ChangeConfigurationRequest();
375375

376376
// When
377-
core.handleRequest(request);
377+
core.handleRequest(0, request);
378378

379379
// Then
380380
verify(handler, times(1)).handleChangeConfigurationRequest(eq(request));
@@ -387,7 +387,7 @@ public void handleRequest_aChangeConfigurationRequest_returnsChangeConfiguration
387387
ChangeConfigurationRequest request = new ChangeConfigurationRequest();
388388

389389
// When
390-
Confirmation conf = core.handleRequest(request);
390+
Confirmation conf = core.handleRequest(0, request);
391391

392392
// Then
393393
assertThat(conf, instanceOf(ChangeConfigurationConfirmation.class));
@@ -408,7 +408,7 @@ public void handleRequest_aClearCacheRequest_callsHandleClearCacheRequest() {
408408
ClearCacheRequest request = new ClearCacheRequest();
409409

410410
// When
411-
core.handleRequest(request);
411+
core.handleRequest(0, request);
412412

413413
// Then
414414
verify(handler, times(1)).handleClearCacheRequest(request);
@@ -421,7 +421,7 @@ public void handleRequest_aClearCacheRequest_returnsClearCacheConfirmation() {
421421
ClearCacheRequest request = new ClearCacheRequest();
422422

423423
// When
424-
Confirmation conf = core.handleRequest(request);
424+
Confirmation conf = core.handleRequest(0, request);
425425

426426
// Then
427427
assertThat(conf, instanceOf(ClearCacheConfirmation.class));

0 commit comments

Comments
 (0)