Skip to content

Commit c30c071

Browse files
goekaygoekay
committed
pull methods to interface for completeness
1 parent b0eab45 commit c30c071

File tree

3 files changed

+79
-0
lines changed

3 files changed

+79
-0
lines changed

‎src/main/java/de/rwth/idsg/steve/ocpp/ChargePointServiceInvoker.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,28 @@
1919
package de.rwth.idsg.steve.ocpp;
2020

2121
import de.rwth.idsg.steve.ocpp.task.CancelReservationTask;
22+
import de.rwth.idsg.steve.ocpp.task.CertificateSignedTask;
2223
import de.rwth.idsg.steve.ocpp.task.ChangeAvailabilityTask;
2324
import de.rwth.idsg.steve.ocpp.task.ChangeConfigurationTask;
2425
import de.rwth.idsg.steve.ocpp.task.ClearCacheTask;
2526
import de.rwth.idsg.steve.ocpp.task.ClearChargingProfileTask;
2627
import de.rwth.idsg.steve.ocpp.task.DataTransferTask;
28+
import de.rwth.idsg.steve.ocpp.task.DeleteCertificateTask;
29+
import de.rwth.idsg.steve.ocpp.task.ExtendedTriggerMessageTask;
2730
import de.rwth.idsg.steve.ocpp.task.GetCompositeScheduleTask;
2831
import de.rwth.idsg.steve.ocpp.task.GetConfigurationTask;
2932
import de.rwth.idsg.steve.ocpp.task.GetDiagnosticsTask;
33+
import de.rwth.idsg.steve.ocpp.task.GetInstalledCertificateIdsTask;
3034
import de.rwth.idsg.steve.ocpp.task.GetLocalListVersionTask;
35+
import de.rwth.idsg.steve.ocpp.task.GetLogTask;
36+
import de.rwth.idsg.steve.ocpp.task.InstallCertificateTask;
3137
import de.rwth.idsg.steve.ocpp.task.RemoteStartTransactionTask;
3238
import de.rwth.idsg.steve.ocpp.task.RemoteStopTransactionTask;
3339
import de.rwth.idsg.steve.ocpp.task.ReserveNowTask;
3440
import de.rwth.idsg.steve.ocpp.task.ResetTask;
3541
import de.rwth.idsg.steve.ocpp.task.SendLocalListTask;
3642
import de.rwth.idsg.steve.ocpp.task.SetChargingProfileTask;
43+
import de.rwth.idsg.steve.ocpp.task.SignedUpdateFirmwareTask;
3744
import de.rwth.idsg.steve.ocpp.task.TriggerMessageTask;
3845
import de.rwth.idsg.steve.ocpp.task.UnlockConnectorTask;
3946
import de.rwth.idsg.steve.ocpp.task.UpdateFirmwareTask;
@@ -94,4 +101,22 @@ public interface ChargePointServiceInvoker {
94101
void getCompositeSchedule(ChargePointSelect cp, GetCompositeScheduleTask task);
95102

96103
void triggerMessage(ChargePointSelect cp, TriggerMessageTask task);
104+
105+
// -------------------------------------------------------------------------
106+
// "Improved security for OCPP 1.6-J" additions
107+
// -------------------------------------------------------------------------
108+
109+
void extendedTriggerMessage(ChargePointSelect cp, ExtendedTriggerMessageTask task);
110+
111+
void getLog(ChargePointSelect cp, GetLogTask task);
112+
113+
void signedUpdateFirmware(ChargePointSelect cp, SignedUpdateFirmwareTask task);
114+
115+
void installCertificate(ChargePointSelect cp, InstallCertificateTask task);
116+
117+
void deleteCertificate(ChargePointSelect cp, DeleteCertificateTask task);
118+
119+
void certificateSigned(ChargePointSelect cp, CertificateSignedTask task);
120+
121+
void getInstalledCertificateIds(ChargePointSelect cp, GetInstalledCertificateIdsTask task);
97122
}

‎src/main/java/de/rwth/idsg/steve/ocpp/ChargePointServiceInvokerImpl.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,30 +247,37 @@ public void triggerMessage(ChargePointSelect cp, TriggerMessageTask task) {
247247
// "Improved security for OCPP 1.6-J" additions. Only for JSON
248248
// -------------------------------------------------------------------------
249249

250+
@Override
250251
public void extendedTriggerMessage(ChargePointSelect cp, ExtendedTriggerMessageTask task) {
251252
chargePointServiceJsonInvoker.runPipeline(cp, task);
252253
}
253254

255+
@Override
254256
public void getLog(ChargePointSelect cp, GetLogTask task) {
255257
chargePointServiceJsonInvoker.runPipeline(cp, task);
256258
}
257259

260+
@Override
258261
public void signedUpdateFirmware(ChargePointSelect cp, SignedUpdateFirmwareTask task) {
259262
chargePointServiceJsonInvoker.runPipeline(cp, task);
260263
}
261264

265+
@Override
262266
public void installCertificate(ChargePointSelect cp, InstallCertificateTask task) {
263267
chargePointServiceJsonInvoker.runPipeline(cp, task);
264268
}
265269

270+
@Override
266271
public void deleteCertificate(ChargePointSelect cp, DeleteCertificateTask task) {
267272
chargePointServiceJsonInvoker.runPipeline(cp, task);
268273
}
269274

275+
@Override
270276
public void certificateSigned(ChargePointSelect cp, CertificateSignedTask task) {
271277
chargePointServiceJsonInvoker.runPipeline(cp, task);
272278
}
273279

280+
@Override
274281
public void getInstalledCertificateIds(ChargePointSelect cp, GetInstalledCertificateIdsTask task) {
275282
chargePointServiceJsonInvoker.runPipeline(cp, task);
276283
}

‎src/main/java/de/rwth/idsg/steve/ocpp/soap/ChargePointServiceSoapInvoker.java‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,28 @@
2020

2121
import de.rwth.idsg.steve.ocpp.ChargePointServiceInvoker;
2222
import de.rwth.idsg.steve.ocpp.task.CancelReservationTask;
23+
import de.rwth.idsg.steve.ocpp.task.CertificateSignedTask;
2324
import de.rwth.idsg.steve.ocpp.task.ChangeAvailabilityTask;
2425
import de.rwth.idsg.steve.ocpp.task.ChangeConfigurationTask;
2526
import de.rwth.idsg.steve.ocpp.task.ClearCacheTask;
2627
import de.rwth.idsg.steve.ocpp.task.ClearChargingProfileTask;
2728
import de.rwth.idsg.steve.ocpp.task.DataTransferTask;
29+
import de.rwth.idsg.steve.ocpp.task.DeleteCertificateTask;
30+
import de.rwth.idsg.steve.ocpp.task.ExtendedTriggerMessageTask;
2831
import de.rwth.idsg.steve.ocpp.task.GetCompositeScheduleTask;
2932
import de.rwth.idsg.steve.ocpp.task.GetConfigurationTask;
3033
import de.rwth.idsg.steve.ocpp.task.GetDiagnosticsTask;
34+
import de.rwth.idsg.steve.ocpp.task.GetInstalledCertificateIdsTask;
3135
import de.rwth.idsg.steve.ocpp.task.GetLocalListVersionTask;
36+
import de.rwth.idsg.steve.ocpp.task.GetLogTask;
37+
import de.rwth.idsg.steve.ocpp.task.InstallCertificateTask;
3238
import de.rwth.idsg.steve.ocpp.task.RemoteStartTransactionTask;
3339
import de.rwth.idsg.steve.ocpp.task.RemoteStopTransactionTask;
3440
import de.rwth.idsg.steve.ocpp.task.ReserveNowTask;
3541
import de.rwth.idsg.steve.ocpp.task.ResetTask;
3642
import de.rwth.idsg.steve.ocpp.task.SendLocalListTask;
3743
import de.rwth.idsg.steve.ocpp.task.SetChargingProfileTask;
44+
import de.rwth.idsg.steve.ocpp.task.SignedUpdateFirmwareTask;
3845
import de.rwth.idsg.steve.ocpp.task.TriggerMessageTask;
3946
import de.rwth.idsg.steve.ocpp.task.UnlockConnectorTask;
4047
import de.rwth.idsg.steve.ocpp.task.UpdateFirmwareTask;
@@ -52,6 +59,7 @@ public class ChargePointServiceSoapInvoker implements ChargePointServiceInvoker
5259

5360
public static final Exception EXCEPTION_V12 = new IllegalArgumentException("This operation is not supported by this OCPP 1.2 station");
5461
public static final Exception EXCEPTION_V15 = new IllegalArgumentException("This operation is not supported by this OCPP 1.5 station");
62+
public static final Exception EXCEPTION_NO_SOAP = new IllegalArgumentException("This operation is not supported by SOAP stations");
5563

5664
private final ClientProviderWithCache<ocpp.cp._2010._08.ChargePointService> soapV12Helper;
5765
private final ClientProviderWithCache<ocpp.cp._2012._06.ChargePointService> soapV15Helper;
@@ -244,6 +252,45 @@ public void triggerMessage(ChargePointSelect cp, TriggerMessageTask task) {
244252
}
245253
}
246254

255+
// -------------------------------------------------------------------------
256+
// "Improved security for OCPP 1.6-J" additions
257+
// -------------------------------------------------------------------------
258+
259+
@Override
260+
public void extendedTriggerMessage(ChargePointSelect cp, ExtendedTriggerMessageTask task) {
261+
task.failed(cp.getChargeBoxId(), EXCEPTION_NO_SOAP);
262+
}
263+
264+
@Override
265+
public void getLog(ChargePointSelect cp, GetLogTask task) {
266+
task.failed(cp.getChargeBoxId(), EXCEPTION_NO_SOAP);
267+
}
268+
269+
@Override
270+
public void signedUpdateFirmware(ChargePointSelect cp, SignedUpdateFirmwareTask task) {
271+
task.failed(cp.getChargeBoxId(), EXCEPTION_NO_SOAP);
272+
}
273+
274+
@Override
275+
public void installCertificate(ChargePointSelect cp, InstallCertificateTask task) {
276+
task.failed(cp.getChargeBoxId(), EXCEPTION_NO_SOAP);
277+
}
278+
279+
@Override
280+
public void deleteCertificate(ChargePointSelect cp, DeleteCertificateTask task) {
281+
task.failed(cp.getChargeBoxId(), EXCEPTION_NO_SOAP);
282+
}
283+
284+
@Override
285+
public void certificateSigned(ChargePointSelect cp, CertificateSignedTask task) {
286+
task.failed(cp.getChargeBoxId(), EXCEPTION_NO_SOAP);
287+
}
288+
289+
@Override
290+
public void getInstalledCertificateIds(ChargePointSelect cp, GetInstalledCertificateIdsTask task) {
291+
task.failed(cp.getChargeBoxId(), EXCEPTION_NO_SOAP);
292+
}
293+
247294
// -------------------------------------------------------------------------
248295
// Helpers
249296
// -------------------------------------------------------------------------

0 commit comments

Comments
 (0)