Skip to content

Commit ca48906

Browse files
goekaygoekay
committed
use data models from ocpp-jaxb dependency
* clean up resources folder and pom file * and do necessary changes for project to compile
1 parent b021b4f commit ca48906

32 files changed

+71
-789
lines changed

‎pom.xml‎

Lines changed: 1 addition & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -383,82 +383,6 @@
383383
</generator>
384384
</configuration>
385385
</plugin>
386-
387-
<plugin>
388-
<groupId>com.google.code.maven-replacer-plugin</groupId>
389-
<artifactId>replacer</artifactId>
390-
<version>1.5.3</version>
391-
<configuration>
392-
<preserveDir>false</preserveDir>
393-
<ignoreMissingFile>false</ignoreMissingFile>
394-
</configuration>
395-
<executions>
396-
<execution>
397-
<id>add-request-interface-1-6-security-profile</id>
398-
<goals>
399-
<goal>replace</goal>
400-
</goals>
401-
<phase>generate-resources</phase>
402-
<configuration>
403-
<filesToInclude>${basedir}/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/*Request.json</filesToInclude>
404-
<outputDir>${project.build.directory}/generated-resources/1-6-security-profile</outputDir>
405-
<replacements>
406-
<replacement>
407-
<token>("\$id"\s*:\s*"urn:OCPP:Cp:1\.6:2020:3:[^"]+\.req"\s*,\s*)</token>
408-
<value>$1"javaInterfaces": ["de.rwth.idsg.ocpp.jaxb.RequestType"],</value>
409-
</replacement>
410-
</replacements>
411-
<regex>true</regex>
412-
</configuration>
413-
</execution>
414-
<execution>
415-
<id>add-response-interface-1-6-security-profile</id>
416-
<goals>
417-
<goal>replace</goal>
418-
</goals>
419-
<phase>generate-resources</phase>
420-
<configuration>
421-
<filesToInclude>${basedir}/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/*Response.json</filesToInclude>
422-
<outputDir>${project.build.directory}/generated-resources/1-6-security-profile</outputDir>
423-
<replacements>
424-
<replacement>
425-
<token>("\$id"\s*:\s*"urn:OCPP:Cp:1\.6:2020:3:[^"]+\.conf"\s*,\s*)</token>
426-
<value>$1"javaInterfaces": ["de.rwth.idsg.ocpp.jaxb.ResponseType"],</value>
427-
</replacement>
428-
</replacements>
429-
<regex>true</regex>
430-
</configuration>
431-
</execution>
432-
</executions>
433-
</plugin>
434-
<plugin>
435-
<groupId>org.jsonschema2pojo</groupId>
436-
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
437-
<version>1.2.2</version>
438-
<configuration>
439-
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
440-
<generateBuilders>true</generateBuilders>
441-
<includeJsr303Annotations>true</includeJsr303Annotations>
442-
<includeGeneratedAnnotation>true</includeGeneratedAnnotation>
443-
<useJakartaValidation>true</useJakartaValidation>
444-
<useJodaDates>true</useJodaDates>
445-
<useJodaLocalDates>true</useJodaLocalDates>
446-
<useJodaLocalTimes>true</useJodaLocalTimes>
447-
</configuration>
448-
<executions>
449-
<execution>
450-
<id>generate-1-6-security-profile</id>
451-
<goals>
452-
<goal>generate</goal>
453-
</goals>
454-
<phase>process-resources</phase>
455-
<configuration>
456-
<sourceDirectory>${project.build.directory}/generated-resources/1-6-security-profile</sourceDirectory>
457-
<targetPackage>ocpp._2020._03</targetPackage>
458-
</configuration>
459-
</execution>
460-
</executions>
461-
</plugin>
462386
</plugins>
463387
</build>
464388

@@ -519,7 +443,7 @@
519443
<dependency>
520444
<groupId>com.github.steve-community</groupId>
521445
<artifactId>ocpp-jaxb</artifactId>
522-
<version>0.0.9</version>
446+
<version>0.0.11</version>
523447
</dependency>
524448
<dependency>
525449
<groupId>org.jetbrains</groupId>

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

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
import de.rwth.idsg.steve.service.CentralSystemService16_Service;
2424
import lombok.RequiredArgsConstructor;
2525
import lombok.extern.slf4j.Slf4j;
26-
import ocpp._2020._03.LogStatusNotificationRequest;
27-
import ocpp._2020._03.LogStatusNotificationResponse;
28-
import ocpp._2020._03.SecurityEventNotificationRequest;
29-
import ocpp._2020._03.SecurityEventNotificationResponse;
30-
import ocpp._2020._03.SignCertificateRequest;
31-
import ocpp._2020._03.SignCertificateResponse;
32-
import ocpp._2020._03.SignedFirmwareStatusNotificationRequest;
33-
import ocpp._2020._03.SignedFirmwareStatusNotificationResponse;
26+
import ocpp._2022._02.security.LogStatusNotification;
27+
import ocpp._2022._02.security.LogStatusNotificationResponse;
28+
import ocpp._2022._02.security.SecurityEventNotification;
29+
import ocpp._2022._02.security.SecurityEventNotificationResponse;
30+
import ocpp._2022._02.security.SignCertificate;
31+
import ocpp._2022._02.security.SignCertificateResponse;
32+
import ocpp._2022._02.security.SignedFirmwareStatusNotification;
33+
import ocpp._2022._02.security.SignedFirmwareStatusNotificationResponse;
3434
import ocpp.cs._2015._10.AuthorizeRequest;
3535
import ocpp.cs._2015._10.AuthorizeResponse;
3636
import ocpp.cs._2015._10.BootNotificationRequest;
@@ -142,23 +142,22 @@ public DataTransferResponse dataTransfer(DataTransferRequest parameters, String
142142
return service.dataTransfer(parameters, chargeBoxIdentity);
143143
}
144144

145-
public SignCertificateResponse signCertificate(
146-
SignCertificateRequest parameters, String chargeBoxIdentity) {
145+
public SignCertificateResponse signCertificate(SignCertificate parameters, String chargeBoxIdentity) {
147146
return service.signCertificate(parameters, chargeBoxIdentity);
148147
}
149148

150-
public SecurityEventNotificationResponse securityEventNotification(
151-
SecurityEventNotificationRequest parameters, String chargeBoxIdentity) {
149+
public SecurityEventNotificationResponse securityEventNotification(SecurityEventNotification parameters,
150+
String chargeBoxIdentity) {
152151
return service.securityEventNotification(parameters, chargeBoxIdentity);
153152
}
154153

155-
public SignedFirmwareStatusNotificationResponse signedFirmwareStatusNotification(
156-
SignedFirmwareStatusNotificationRequest parameters, String chargeBoxIdentity) {
154+
public SignedFirmwareStatusNotificationResponse signedFirmwareStatusNotification(SignedFirmwareStatusNotification parameters,
155+
String chargeBoxIdentity) {
157156
return service.signedFirmwareStatusNotification(parameters, chargeBoxIdentity);
158157
}
159158

160-
public LogStatusNotificationResponse logStatusNotification(
161-
LogStatusNotificationRequest parameters, String chargeBoxIdentity) {
159+
public LogStatusNotificationResponse logStatusNotification(LogStatusNotification parameters,
160+
String chargeBoxIdentity) {
162161
return service.logStatusNotification(parameters, chargeBoxIdentity);
163162
}
164163

‎src/main/java/de/rwth/idsg/steve/ocpp/task/DeleteCertificateTask.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import de.rwth.idsg.steve.web.dto.ocpp.DeleteCertificateParams;
2424

2525
import jakarta.xml.ws.AsyncHandler;
26-
import ocpp._2020._03.CertificateHashDataType;
27-
import ocpp._2020._03.DeleteCertificateRequest;
28-
import ocpp._2020._03.DeleteCertificateResponse;
26+
import ocpp._2022._02.security.CertificateHashDataType;
27+
import ocpp._2022._02.security.DeleteCertificate;
28+
import ocpp._2022._02.security.DeleteCertificateResponse;
2929

3030
public class DeleteCertificateTask extends Ocpp16AndAboveTask<DeleteCertificateParams, String> {
3131

@@ -39,8 +39,8 @@ public OcppCallback<String> defaultCallback() {
3939
}
4040

4141
@Override
42-
public DeleteCertificateRequest getOcpp16Request() {
43-
var request = new DeleteCertificateRequest();
42+
public DeleteCertificate getOcpp16Request() {
43+
var request = new DeleteCertificate();
4444

4545
var hashData = new CertificateHashDataType();
4646
hashData.setHashAlgorithm(CertificateHashDataType.HashAlgorithmEnumType.valueOf(params.getHashAlgorithm()));

‎src/main/java/de/rwth/idsg/steve/ocpp/task/ExtendedTriggerMessageTask.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import de.rwth.idsg.steve.web.dto.ocpp.ExtendedTriggerMessageParams;
2424

2525
import jakarta.xml.ws.AsyncHandler;
26-
import ocpp._2020._03.ExtendedTriggerMessageRequest;
27-
import ocpp._2020._03.ExtendedTriggerMessageResponse;
26+
import ocpp._2022._02.security.ExtendedTriggerMessage;
27+
import ocpp._2022._02.security.ExtendedTriggerMessageResponse;
2828

2929
public class ExtendedTriggerMessageTask extends Ocpp16AndAboveTask<ExtendedTriggerMessageParams, String> {
3030

@@ -38,10 +38,10 @@ public OcppCallback<String> defaultCallback() {
3838
}
3939

4040
@Override
41-
public ExtendedTriggerMessageRequest getOcpp16Request() {
42-
var request = new ExtendedTriggerMessageRequest();
41+
public ExtendedTriggerMessage getOcpp16Request() {
42+
var request = new ExtendedTriggerMessage();
4343
request.setRequestedMessage(
44-
ExtendedTriggerMessageRequest.MessageTriggerEnumType.valueOf(params.getRequestedMessage().toString())
44+
ExtendedTriggerMessage.MessageTriggerEnumType.valueOf(params.getRequestedMessage().toString())
4545
);
4646

4747
if (params.getConnectorId() != null) {

‎src/main/java/de/rwth/idsg/steve/ocpp/task/GetInstalledCertificateIdsTask.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import de.rwth.idsg.steve.web.dto.ocpp.GetInstalledCertificateIdsParams;
2424

2525
import jakarta.xml.ws.AsyncHandler;
26-
import ocpp._2020._03.GetInstalledCertificateIdsRequest;
27-
import ocpp._2020._03.GetInstalledCertificateIdsResponse;
26+
import ocpp._2022._02.security.GetInstalledCertificateIds;
27+
import ocpp._2022._02.security.GetInstalledCertificateIdsResponse;
2828

2929
public class GetInstalledCertificateIdsTask extends Ocpp16AndAboveTask<GetInstalledCertificateIdsParams, String> {
3030

@@ -38,10 +38,10 @@ public OcppCallback<String> defaultCallback() {
3838
}
3939

4040
@Override
41-
public GetInstalledCertificateIdsRequest getOcpp16Request() {
42-
var request = new GetInstalledCertificateIdsRequest();
41+
public GetInstalledCertificateIds getOcpp16Request() {
42+
var request = new GetInstalledCertificateIds();
4343
if (params.getCertificateType() != null) {
44-
request.setCertificateType(GetInstalledCertificateIdsRequest.CertificateUseEnumType.valueOf(
44+
request.setCertificateType(GetInstalledCertificateIds.CertificateUseEnumType.valueOf(
4545
params.getCertificateType().toString()));
4646
}
4747
return request;

‎src/main/java/de/rwth/idsg/steve/ocpp/task/GetLogTask.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@
2323
import de.rwth.idsg.steve.web.dto.ocpp.GetLogParams;
2424

2525
import jakarta.xml.ws.AsyncHandler;
26-
import ocpp._2020._03.GetLogRequest;
27-
import ocpp._2020._03.GetLogResponse;
28-
import ocpp._2020._03.LogParametersType;
26+
27+
import ocpp._2022._02.security.GetLog;
28+
import ocpp._2022._02.security.GetLogResponse;
29+
import ocpp._2022._02.security.LogParametersType;
2930

3031
public class GetLogTask extends Ocpp16AndAboveTask<GetLogParams, String> {
3132

@@ -39,9 +40,9 @@ public OcppCallback<String> defaultCallback() {
3940
}
4041

4142
@Override
42-
public GetLogRequest getOcpp16Request() {
43-
var request = new GetLogRequest();
44-
request.setLogType(GetLogRequest.LogEnumType.valueOf(params.getLogType().toString()));
43+
public GetLog getOcpp16Request() {
44+
var request = new GetLog();
45+
request.setLogType(GetLog.LogEnumType.valueOf(params.getLogType().toString()));
4546
request.setRequestId(params.getRequestId());
4647

4748
var logParams = new LogParametersType();

‎src/main/java/de/rwth/idsg/steve/ocpp/task/InstallCertificateTask.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import de.rwth.idsg.steve.web.dto.ocpp.InstallCertificateParams;
2424

2525
import jakarta.xml.ws.AsyncHandler;
26-
import ocpp._2020._03.InstallCertificateRequest;
27-
import ocpp._2020._03.InstallCertificateResponse;
26+
import ocpp._2022._02.security.InstallCertificate;
27+
import ocpp._2022._02.security.InstallCertificateResponse;
2828

2929
public class InstallCertificateTask extends Ocpp16AndAboveTask<InstallCertificateParams, String> {
3030

@@ -38,9 +38,9 @@ public OcppCallback<String> defaultCallback() {
3838
}
3939

4040
@Override
41-
public InstallCertificateRequest getOcpp16Request() {
42-
var request = new InstallCertificateRequest();
43-
request.setCertificateType(InstallCertificateRequest.CertificateUseEnumType.valueOf(
41+
public InstallCertificate getOcpp16Request() {
42+
var request = new InstallCertificate();
43+
request.setCertificateType(InstallCertificate.CertificateUseEnumType.valueOf(
4444
params.getCertificateType().toString()));
4545
request.setCertificate(params.getCertificate());
4646
return request;

‎src/main/java/de/rwth/idsg/steve/ocpp/task/SignedUpdateFirmwareTask.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import de.rwth.idsg.steve.web.dto.ocpp.SignedUpdateFirmwareParams;
2424

2525
import jakarta.xml.ws.AsyncHandler;
26-
import ocpp._2020._03.FirmwareType;
27-
import ocpp._2020._03.SignedUpdateFirmwareRequest;
28-
import ocpp._2020._03.SignedUpdateFirmwareResponse;
26+
import ocpp._2022._02.security.FirmwareType;
27+
import ocpp._2022._02.security.SignedUpdateFirmware;
28+
import ocpp._2022._02.security.SignedUpdateFirmwareResponse;
2929

3030
public class SignedUpdateFirmwareTask extends Ocpp16AndAboveTask<SignedUpdateFirmwareParams, String> {
3131

@@ -39,8 +39,8 @@ public OcppCallback<String> defaultCallback() {
3939
}
4040

4141
@Override
42-
public SignedUpdateFirmwareRequest getOcpp16Request() {
43-
var request = new SignedUpdateFirmwareRequest();
42+
public SignedUpdateFirmware getOcpp16Request() {
43+
var request = new SignedUpdateFirmware();
4444
request.setRequestId(params.getRequestId());
4545

4646
var firmware = new FirmwareType();

‎src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
import de.rwth.idsg.steve.ocpp.ws.FutureResponseContextStore;
2828
import de.rwth.idsg.steve.ocpp.ws.SessionContextStoreHolder;
2929
import de.rwth.idsg.steve.repository.OcppServerRepository;
30-
import ocpp._2020._03.LogStatusNotificationRequest;
31-
import ocpp._2020._03.SecurityEventNotificationRequest;
32-
import ocpp._2020._03.SignCertificateRequest;
33-
import ocpp._2020._03.SignedFirmwareStatusNotificationRequest;
30+
import ocpp._2022._02.security.LogStatusNotification;
31+
import ocpp._2022._02.security.SecurityEventNotification;
32+
import ocpp._2022._02.security.SignCertificate;
33+
import ocpp._2022._02.security.SignedFirmwareStatusNotification;
3434
import ocpp.cs._2015._10.AuthorizeRequest;
3535
import ocpp.cs._2015._10.BootNotificationRequest;
3636
import ocpp.cs._2015._10.DataTransferRequest;
@@ -82,11 +82,13 @@ public ResponseType dispatch(RequestType params, String chargeBoxId) {
8282
case HeartbeatRequest request -> server.heartbeat(request, chargeBoxId);
8383
case AuthorizeRequest request -> server.authorize(request, chargeBoxId);
8484
case DataTransferRequest request -> server.dataTransfer(request, chargeBoxId);
85-
case SignCertificateRequest request -> server.signCertificate(request, chargeBoxId);
86-
case SecurityEventNotificationRequest request -> server.securityEventNotification(request, chargeBoxId);
87-
case SignedFirmwareStatusNotificationRequest request ->
88-
server.signedFirmwareStatusNotification(request, chargeBoxId);
89-
case LogStatusNotificationRequest request -> server.logStatusNotification(request, chargeBoxId);
85+
86+
// "Improved security for OCPP 1.6-J" additions
87+
case SignCertificate request -> server.signCertificate(request, chargeBoxId);
88+
case SecurityEventNotification request -> server.securityEventNotification(request, chargeBoxId);
89+
case SignedFirmwareStatusNotification request -> server.signedFirmwareStatusNotification(request, chargeBoxId);
90+
case LogStatusNotification request -> server.logStatusNotification(request, chargeBoxId);
91+
9092
case null, default ->
9193
throw new IllegalArgumentException("Unexpected RequestType, dispatch method not found");
9294
};

‎src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
import jooq.steve.db.enums.TransactionStopEventActor;
3636
import lombok.RequiredArgsConstructor;
3737
import lombok.extern.slf4j.Slf4j;
38-
import ocpp._2020._03.LogStatusNotificationRequest;
39-
import ocpp._2020._03.LogStatusNotificationResponse;
40-
import ocpp._2020._03.SecurityEventNotificationRequest;
41-
import ocpp._2020._03.SecurityEventNotificationResponse;
42-
import ocpp._2020._03.SignCertificateRequest;
43-
import ocpp._2020._03.SignCertificateResponse;
44-
import ocpp._2020._03.SignedFirmwareStatusNotificationRequest;
45-
import ocpp._2020._03.SignedFirmwareStatusNotificationResponse;
38+
import ocpp._2022._02.security.LogStatusNotification;
39+
import ocpp._2022._02.security.LogStatusNotificationResponse;
40+
import ocpp._2022._02.security.SecurityEventNotification;
41+
import ocpp._2022._02.security.SecurityEventNotificationResponse;
42+
import ocpp._2022._02.security.SignCertificate;
43+
import ocpp._2022._02.security.SignCertificateResponse;
44+
import ocpp._2022._02.security.SignedFirmwareStatusNotification;
45+
import ocpp._2022._02.security.SignedFirmwareStatusNotificationResponse;
4646
import ocpp.cs._2015._10.AuthorizationStatus;
4747
import ocpp.cs._2015._10.AuthorizeRequest;
4848
import ocpp.cs._2015._10.AuthorizeResponse;
@@ -289,7 +289,7 @@ public DataTransferResponse dataTransfer(DataTransferRequest parameters, String
289289
return new DataTransferResponse().withStatus(DataTransferStatus.ACCEPTED);
290290
}
291291

292-
public SignCertificateResponse signCertificate(SignCertificateRequest parameters, String chargeBoxIdentity) {
292+
public SignCertificateResponse signCertificate(SignCertificate parameters, String chargeBoxIdentity) {
293293
log.info("Received SignCertificateRequest from '{}' with CSR length: {}", chargeBoxIdentity,
294294
parameters.getCsr() != null ? parameters.getCsr().length() : 0);
295295

@@ -385,7 +385,7 @@ public SignCertificateResponse signCertificate(SignCertificateRequest parameters
385385
return response;
386386
}
387387

388-
public SecurityEventNotificationResponse securityEventNotification(SecurityEventNotificationRequest parameters,
388+
public SecurityEventNotificationResponse securityEventNotification(SecurityEventNotification parameters,
389389
String chargeBoxIdentity) {
390390
var eventType = parameters.getType();
391391
var eventTimestamp = parameters.getTimestamp();
@@ -416,7 +416,7 @@ public SecurityEventNotificationResponse securityEventNotification(SecurityEvent
416416
}
417417

418418
public SignedFirmwareStatusNotificationResponse signedFirmwareStatusNotification(
419-
SignedFirmwareStatusNotificationRequest parameters, String chargeBoxIdentity) {
419+
SignedFirmwareStatusNotification parameters, String chargeBoxIdentity) {
420420
var status = parameters.getStatus() != null ? parameters.getStatus().toString() : "Unknown";
421421
var requestId = parameters.getRequestId();
422422

@@ -448,7 +448,7 @@ public SignedFirmwareStatusNotificationResponse signedFirmwareStatusNotification
448448
return new SignedFirmwareStatusNotificationResponse();
449449
}
450450

451-
public LogStatusNotificationResponse logStatusNotification(LogStatusNotificationRequest parameters, String chargeBoxIdentity) {
451+
public LogStatusNotificationResponse logStatusNotification(LogStatusNotification parameters, String chargeBoxIdentity) {
452452
var status = parameters.getStatus() != null ? parameters.getStatus().toString() : "Unknown";
453453
var requestId = parameters.getRequestId();
454454

0 commit comments

Comments
 (0)