From 34f50921a8d49a2af9b09a9a2fc274385898cc50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20Go=CC=88kay?= Date: Thu, 15 Jan 2026 12:21:11 +0100 Subject: [PATCH 1/5] convert to multi-module structure one parent project with - ocpp-custom: includes java customizations we want to apply - ocpp-jaxb: the generator, i.e. contains plugins that go over resource files, applies java customizations and generates final POJOs reason: preparation to make some customizations using custom annotator via jsonschema2pojo plugin. jsonschema2pojo expects the custom annotator class to be compiled before the plugin runs --- .gitignore | 6 +- ocpp-custom/pom.xml | 32 ++ ocpp-jaxb/pom.xml | 273 ++++++++++++++ .../idsg/ocpp/jaxb/JodaDateTimeConverter.java | 0 .../de/rwth/idsg/ocpp/jaxb/RequestType.java | 0 .../de/rwth/idsg/ocpp/jaxb/ResponseType.java | 0 .../CertificateSigned.json | 0 .../CertificateSignedResponse.json | 0 .../DeleteCertificate.json | 0 .../DeleteCertificateResponse.json | 0 .../ExtendedTriggerMessage.json | 0 .../ExtendedTriggerMessageResponse.json | 0 .../GetInstalledCertificateIds.json | 0 .../GetInstalledCertificateIdsResponse.json | 0 .../GetLog.json | 0 .../GetLogResponse.json | 0 .../InstallCertificate.json | 0 .../InstallCertificateResponse.json | 0 .../LogStatusNotification.json | 0 .../LogStatusNotificationResponse.json | 0 .../SecurityEventNotification.json | 0 .../SecurityEventNotificationResponse.json | 0 .../SignCertificate.json | 0 .../SignCertificateResponse.json | 0 .../SignedFirmwareStatusNotification.json | 0 ...nedFirmwareStatusNotificationResponse.json | 0 .../SignedUpdateFirmware.json | 0 .../SignedUpdateFirmwareResponse.json | 0 .../AuthorizeRequest.json | 0 .../AuthorizeResponse.json | 0 .../BootNotificationRequest.json | 0 .../BootNotificationResponse.json | 0 .../CancelReservationRequest.json | 0 .../CancelReservationResponse.json | 0 .../CertificateSignedRequest.json | 0 .../CertificateSignedResponse.json | 0 .../ChangeAvailabilityRequest.json | 0 .../ChangeAvailabilityResponse.json | 0 .../ClearCacheRequest.json | 0 .../ClearCacheResponse.json | 0 .../ClearChargingProfileRequest.json | 0 .../ClearChargingProfileResponse.json | 0 .../ClearDisplayMessageRequest.json | 0 .../ClearDisplayMessageResponse.json | 0 .../ClearVariableMonitoringRequest.json | 0 .../ClearVariableMonitoringResponse.json | 0 .../ClearedChargingLimitRequest.json | 0 .../ClearedChargingLimitResponse.json | 0 .../CostUpdatedRequest.json | 0 .../CostUpdatedResponse.json | 0 .../CustomerInformationRequest.json | 0 .../CustomerInformationResponse.json | 0 .../DataTransferRequest.json | 0 .../DataTransferResponse.json | 0 .../DeleteCertificateRequest.json | 0 .../DeleteCertificateResponse.json | 0 .../FirmwareStatusNotificationRequest.json | 0 .../FirmwareStatusNotificationResponse.json | 0 .../Get15118EVCertificateRequest.json | 0 .../Get15118EVCertificateResponse.json | 0 .../GetBaseReportRequest.json | 0 .../GetBaseReportResponse.json | 0 .../GetCertificateStatusRequest.json | 0 .../GetCertificateStatusResponse.json | 0 .../GetChargingProfilesRequest.json | 0 .../GetChargingProfilesResponse.json | 0 .../GetCompositeScheduleRequest.json | 0 .../GetCompositeScheduleResponse.json | 0 .../GetDisplayMessagesRequest.json | 0 .../GetDisplayMessagesResponse.json | 0 .../GetInstalledCertificateIdsRequest.json | 0 .../GetInstalledCertificateIdsResponse.json | 0 .../GetLocalListVersionRequest.json | 0 .../GetLocalListVersionResponse.json | 0 .../GetLogRequest.json | 0 .../GetLogResponse.json | 0 .../GetMonitoringReportRequest.json | 0 .../GetMonitoringReportResponse.json | 0 .../GetReportRequest.json | 0 .../GetReportResponse.json | 0 .../GetTransactionStatusRequest.json | 0 .../GetTransactionStatusResponse.json | 0 .../GetVariablesRequest.json | 0 .../GetVariablesResponse.json | 0 .../HeartbeatRequest.json | 0 .../HeartbeatResponse.json | 0 .../InstallCertificateRequest.json | 0 .../InstallCertificateResponse.json | 0 .../LogStatusNotificationRequest.json | 0 .../LogStatusNotificationResponse.json | 0 .../MeterValuesRequest.json | 0 .../MeterValuesResponse.json | 0 .../NotifyChargingLimitRequest.json | 0 .../NotifyChargingLimitResponse.json | 0 .../NotifyCustomerInformationRequest.json | 0 .../NotifyCustomerInformationResponse.json | 0 .../NotifyDisplayMessagesRequest.json | 0 .../NotifyDisplayMessagesResponse.json | 0 .../NotifyEVChargingNeedsRequest.json | 0 .../NotifyEVChargingNeedsResponse.json | 0 .../NotifyEVChargingScheduleRequest.json | 0 .../NotifyEVChargingScheduleResponse.json | 0 .../NotifyEventRequest.json | 0 .../NotifyEventResponse.json | 0 .../NotifyMonitoringReportRequest.json | 0 .../NotifyMonitoringReportResponse.json | 0 .../NotifyReportRequest.json | 0 .../NotifyReportResponse.json | 0 .../PublishFirmwareRequest.json | 0 .../PublishFirmwareResponse.json | 0 ...lishFirmwareStatusNotificationRequest.json | 0 ...ishFirmwareStatusNotificationResponse.json | 0 .../ReportChargingProfilesRequest.json | 0 .../ReportChargingProfilesResponse.json | 0 .../RequestStartTransactionRequest.json | 0 .../RequestStartTransactionResponse.json | 0 .../RequestStopTransactionRequest.json | 0 .../RequestStopTransactionResponse.json | 0 .../ReservationStatusUpdateRequest.json | 0 .../ReservationStatusUpdateResponse.json | 0 .../ReserveNowRequest.json | 0 .../ReserveNowResponse.json | 0 .../ResetRequest.json | 0 .../ResetResponse.json | 0 .../SecurityEventNotificationRequest.json | 0 .../SecurityEventNotificationResponse.json | 0 .../SendLocalListRequest.json | 0 .../SendLocalListResponse.json | 0 .../SetChargingProfileRequest.json | 0 .../SetChargingProfileResponse.json | 0 .../SetDisplayMessageRequest.json | 0 .../SetDisplayMessageResponse.json | 0 .../SetMonitoringBaseRequest.json | 0 .../SetMonitoringBaseResponse.json | 0 .../SetMonitoringLevelRequest.json | 0 .../SetMonitoringLevelResponse.json | 0 .../SetNetworkProfileRequest.json | 0 .../SetNetworkProfileResponse.json | 0 .../SetVariableMonitoringRequest.json | 0 .../SetVariableMonitoringResponse.json | 0 .../SetVariablesRequest.json | 0 .../SetVariablesResponse.json | 0 .../SignCertificateRequest.json | 0 .../SignCertificateResponse.json | 0 .../StatusNotificationRequest.json | 0 .../StatusNotificationResponse.json | 0 .../TransactionEventRequest.json | 0 .../TransactionEventResponse.json | 0 .../TriggerMessageRequest.json | 0 .../TriggerMessageResponse.json | 0 .../UnlockConnectorRequest.json | 0 .../UnlockConnectorResponse.json | 0 .../UnpublishFirmwareRequest.json | 0 .../UnpublishFirmwareResponse.json | 0 .../UpdateFirmwareRequest.json | 0 .../UpdateFirmwareResponse.json | 0 .../resources/wsdl-binding/add_interface.xml | 0 .../resources/wsdl-binding/async_binding.xml | 0 .../resources/wsdl-binding/ocpp_binding.xml | 0 .../wsdl/OCPP_CentralSystemService_1.6.wsdl | 0 .../wsdl/OCPP_ChargePointService_1.6.wsdl | 0 .../wsdl/centralsystemservice_0.wsdl | 0 .../resources/wsdl/chargepointservice.wsdl | 0 .../ocpp_centralsystemservice_1.5_final.wsdl | 0 .../ocpp_chargepointservice_1.5_final.wsdl | 0 .../idsg/ocpp/jaxb/DateTimePatternTest.java | 0 .../ocpp/jaxb/JodaDateTimeConverterTest.java | 0 pom.xml | 343 ++++-------------- 168 files changed, 384 insertions(+), 270 deletions(-) create mode 100644 ocpp-custom/pom.xml create mode 100644 ocpp-jaxb/pom.xml rename {src => ocpp-jaxb/src}/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java (100%) rename {src => ocpp-jaxb/src}/main/java/de/rwth/idsg/ocpp/jaxb/RequestType.java (100%) rename {src => ocpp-jaxb/src}/main/java/de/rwth/idsg/ocpp/jaxb/ResponseType.java (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSigned.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSignedResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificate.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificateResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessage.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessageResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIds.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIdsResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLog.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLogResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificate.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificateResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotification.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotificationResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotification.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotificationResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificate.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificateResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotification.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotificationResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmware.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmwareResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareRequest.json (100%) rename {src => ocpp-jaxb/src}/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareResponse.json (100%) rename {src => ocpp-jaxb/src}/main/resources/wsdl-binding/add_interface.xml (100%) rename {src => ocpp-jaxb/src}/main/resources/wsdl-binding/async_binding.xml (100%) rename {src => ocpp-jaxb/src}/main/resources/wsdl-binding/ocpp_binding.xml (100%) rename {src => ocpp-jaxb/src}/main/resources/wsdl/OCPP_CentralSystemService_1.6.wsdl (100%) rename {src => ocpp-jaxb/src}/main/resources/wsdl/OCPP_ChargePointService_1.6.wsdl (100%) rename {src => ocpp-jaxb/src}/main/resources/wsdl/centralsystemservice_0.wsdl (100%) rename {src => ocpp-jaxb/src}/main/resources/wsdl/chargepointservice.wsdl (100%) rename {src => ocpp-jaxb/src}/main/resources/wsdl/ocpp_centralsystemservice_1.5_final.wsdl (100%) rename {src => ocpp-jaxb/src}/main/resources/wsdl/ocpp_chargepointservice_1.5_final.wsdl (100%) rename {src => ocpp-jaxb/src}/test/java/de/rwth/idsg/ocpp/jaxb/DateTimePatternTest.java (100%) rename {src => ocpp-jaxb/src}/test/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverterTest.java (100%) diff --git a/.gitignore b/.gitignore index e5b50b8..8f268bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/target -/.idea +target +.idea *.iml -.DS_Store \ No newline at end of file +.DS_Store diff --git a/ocpp-custom/pom.xml b/ocpp-custom/pom.xml new file mode 100644 index 0000000..134c713 --- /dev/null +++ b/ocpp-custom/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + + de.rwth.idsg + ocpp-parent + 0.0.14-SNAPSHOT + + + ocpp-custom + jar + + + + org.jsonschema2pojo + jsonschema2pojo-core + + + com.fasterxml.jackson.core + jackson-annotations + + + joda-time + joda-time + + + jakarta.xml.bind + jakarta.xml.bind-api + + + diff --git a/ocpp-jaxb/pom.xml b/ocpp-jaxb/pom.xml new file mode 100644 index 0000000..4bfa62a --- /dev/null +++ b/ocpp-jaxb/pom.xml @@ -0,0 +1,273 @@ + + + 4.0.0 + + + de.rwth.idsg + ocpp-parent + 0.0.14-SNAPSHOT + + + ocpp-jaxb + jar + + + OCPP-1.6_Security_3rd_Edition_schemas + OCPP-2.0.1_part3_JSON_schemas + + 4.0.5 + + + + + + org.apache.cxf + cxf-codegen-plugin + ${cxf.version} + + ${project.build.directory}/generated-sources + ${basedir}/src/main/resources/wsdl + + + ${basedir}/src/main/resources/wsdl-binding/ocpp_binding.xml + ${basedir}/src/main/resources/wsdl-binding/async_binding.xml + ${basedir}/src/main/resources/wsdl-binding/add_interface.xml + + + -xjc-Xfluent-api + -xjc-Xinheritance + -xjc-Xannotate + + -exsh + true + + + + + + generate-sources + generate-sources + + wsdl2java + + + + + + org.projectlombok + lombok + ${lombok.version} + + + org.jvnet.jaxb + jaxb-plugins + 4.0.8 + + + org.jvnet.jaxb + jaxb-plugin-annotate + 4.0.8 + + + + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + + + + add-request-interface-ocpp-1.6j-security + generate-resources + + replace + + + ${basedir}/src/main/resources/${ocpp-1.6-security-schemas-dir}/*.json + false + ${project.build.directory}/generated-resources/${ocpp-1.6-security-schemas-dir} + + + "\$schema" + + "javaInterfaces" : ["de.rwth.idsg.ocpp.jaxb.RequestType"], + "\$schema" + + + + + + add-response-interface-ocpp-1.6j-security + generate-resources + + replace + + + ${basedir}/src/main/resources/${ocpp-1.6-security-schemas-dir}/*Response.json + false + ${project.build.directory}/generated-resources/${ocpp-1.6-security-schemas-dir} + + + "\$schema" + + "javaInterfaces" : ["de.rwth.idsg.ocpp.jaxb.ResponseType"], + "\$schema" + + + + + + + add-request-interface-ocpp-2.0.1 + generate-resources + + replace + + + ${basedir}/src/main/resources/${ocpp-2.0.1-schemas-dir}/*Request.json + false + ${project.build.directory}/generated-resources/${ocpp-2.0.1-schemas-dir} + + + "\$schema" + + "javaInterfaces" : ["de.rwth.idsg.ocpp.jaxb.RequestType"], + "\$schema" + + + + + + add-response-interface-ocpp-2.0.1 + generate-resources + + replace + + + ${basedir}/src/main/resources/${ocpp-2.0.1-schemas-dir}/*Response.json + false + ${project.build.directory}/generated-resources/${ocpp-2.0.1-schemas-dir} + + + "\$schema" + + "javaInterfaces" : ["de.rwth.idsg.ocpp.jaxb.ResponseType"], + "\$schema" + + + + + + + + org.jsonschema2pojo + jsonschema2pojo-maven-plugin + ${jsonschema2pojo.version} + + ${project.build.directory}/generated-sources + true + true + false + true + true + true + true + + + + generate-ocpp-1.6j-security + process-resources + + generate + + + ${project.build.directory}/generated-resources/${ocpp-1.6-security-schemas-dir} + + ocpp._2022._02.security + yyyy-MM-dd'T'HH:mm:ss.SSS'Z' + + + + generate-ocpp-2.0.1 + process-resources + + generate + + + ${project.build.directory}/generated-resources/${ocpp-2.0.1-schemas-dir} + ocpp._2020._03 + yyyy-MM-dd'T'HH:mm:ss.SSS'Z' + + + + + + + + + + ${project.groupId} + ocpp-custom + + + + jakarta.validation + jakarta.validation-api + + + jakarta.xml.soap + jakarta.xml.soap-api + + + jakarta.jws + jakarta.jws-api + + + jakarta.xml.bind + jakarta.xml.bind-api + + + jakarta.xml.ws + jakarta.xml.ws-api + + + joda-time + joda-time + + + org.projectlombok + lombok + + + + com.fasterxml.jackson.core + jackson-annotations + + + + org.junit.jupiter + junit-jupiter-engine + 5.10.3 + test + + + org.junit.jupiter + junit-jupiter-params + 5.10.3 + test + + + tools.jackson.datatype + jackson-datatype-joda + 3.0.2 + test + + + diff --git a/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java similarity index 100% rename from src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java rename to ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java diff --git a/src/main/java/de/rwth/idsg/ocpp/jaxb/RequestType.java b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/RequestType.java similarity index 100% rename from src/main/java/de/rwth/idsg/ocpp/jaxb/RequestType.java rename to ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/RequestType.java diff --git a/src/main/java/de/rwth/idsg/ocpp/jaxb/ResponseType.java b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/ResponseType.java similarity index 100% rename from src/main/java/de/rwth/idsg/ocpp/jaxb/ResponseType.java rename to ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/ResponseType.java diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSigned.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSigned.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSigned.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSigned.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSignedResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSignedResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSignedResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSignedResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificate.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificate.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificate.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificate.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificateResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificateResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificateResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificateResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessage.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessage.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessage.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessage.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessageResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessageResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessageResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessageResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIds.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIds.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIds.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIds.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIdsResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIdsResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIdsResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIdsResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLog.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLog.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLog.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLog.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLogResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLogResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLogResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLogResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificate.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificate.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificate.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificate.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificateResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificateResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificateResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificateResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotification.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotification.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotification.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotification.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotificationResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotification.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotification.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotification.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotification.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotificationResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificate.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificate.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificate.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificate.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificateResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificateResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificateResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificateResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotification.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotification.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotification.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotification.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotificationResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmware.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmware.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmware.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmware.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmwareResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmwareResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmwareResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmwareResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareResponse.json diff --git a/src/main/resources/wsdl-binding/add_interface.xml b/ocpp-jaxb/src/main/resources/wsdl-binding/add_interface.xml similarity index 100% rename from src/main/resources/wsdl-binding/add_interface.xml rename to ocpp-jaxb/src/main/resources/wsdl-binding/add_interface.xml diff --git a/src/main/resources/wsdl-binding/async_binding.xml b/ocpp-jaxb/src/main/resources/wsdl-binding/async_binding.xml similarity index 100% rename from src/main/resources/wsdl-binding/async_binding.xml rename to ocpp-jaxb/src/main/resources/wsdl-binding/async_binding.xml diff --git a/src/main/resources/wsdl-binding/ocpp_binding.xml b/ocpp-jaxb/src/main/resources/wsdl-binding/ocpp_binding.xml similarity index 100% rename from src/main/resources/wsdl-binding/ocpp_binding.xml rename to ocpp-jaxb/src/main/resources/wsdl-binding/ocpp_binding.xml diff --git a/src/main/resources/wsdl/OCPP_CentralSystemService_1.6.wsdl b/ocpp-jaxb/src/main/resources/wsdl/OCPP_CentralSystemService_1.6.wsdl similarity index 100% rename from src/main/resources/wsdl/OCPP_CentralSystemService_1.6.wsdl rename to ocpp-jaxb/src/main/resources/wsdl/OCPP_CentralSystemService_1.6.wsdl diff --git a/src/main/resources/wsdl/OCPP_ChargePointService_1.6.wsdl b/ocpp-jaxb/src/main/resources/wsdl/OCPP_ChargePointService_1.6.wsdl similarity index 100% rename from src/main/resources/wsdl/OCPP_ChargePointService_1.6.wsdl rename to ocpp-jaxb/src/main/resources/wsdl/OCPP_ChargePointService_1.6.wsdl diff --git a/src/main/resources/wsdl/centralsystemservice_0.wsdl b/ocpp-jaxb/src/main/resources/wsdl/centralsystemservice_0.wsdl similarity index 100% rename from src/main/resources/wsdl/centralsystemservice_0.wsdl rename to ocpp-jaxb/src/main/resources/wsdl/centralsystemservice_0.wsdl diff --git a/src/main/resources/wsdl/chargepointservice.wsdl b/ocpp-jaxb/src/main/resources/wsdl/chargepointservice.wsdl similarity index 100% rename from src/main/resources/wsdl/chargepointservice.wsdl rename to ocpp-jaxb/src/main/resources/wsdl/chargepointservice.wsdl diff --git a/src/main/resources/wsdl/ocpp_centralsystemservice_1.5_final.wsdl b/ocpp-jaxb/src/main/resources/wsdl/ocpp_centralsystemservice_1.5_final.wsdl similarity index 100% rename from src/main/resources/wsdl/ocpp_centralsystemservice_1.5_final.wsdl rename to ocpp-jaxb/src/main/resources/wsdl/ocpp_centralsystemservice_1.5_final.wsdl diff --git a/src/main/resources/wsdl/ocpp_chargepointservice_1.5_final.wsdl b/ocpp-jaxb/src/main/resources/wsdl/ocpp_chargepointservice_1.5_final.wsdl similarity index 100% rename from src/main/resources/wsdl/ocpp_chargepointservice_1.5_final.wsdl rename to ocpp-jaxb/src/main/resources/wsdl/ocpp_chargepointservice_1.5_final.wsdl diff --git a/src/test/java/de/rwth/idsg/ocpp/jaxb/DateTimePatternTest.java b/ocpp-jaxb/src/test/java/de/rwth/idsg/ocpp/jaxb/DateTimePatternTest.java similarity index 100% rename from src/test/java/de/rwth/idsg/ocpp/jaxb/DateTimePatternTest.java rename to ocpp-jaxb/src/test/java/de/rwth/idsg/ocpp/jaxb/DateTimePatternTest.java diff --git a/src/test/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverterTest.java b/ocpp-jaxb/src/test/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverterTest.java similarity index 100% rename from src/test/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverterTest.java rename to ocpp-jaxb/src/test/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverterTest.java diff --git a/pom.xml b/pom.xml index c69907c..c40b5e0 100644 --- a/pom.xml +++ b/pom.xml @@ -3,9 +3,15 @@ 4.0.0 de.rwth.idsg - ocpp-jaxb + ocpp-parent 0.0.14-SNAPSHOT - jar + pom + + + + ocpp-custom + ocpp-jaxb + SteVe Community Team @@ -27,17 +33,6 @@ - - 17 - UTF-8 - - OCPP-1.6_Security_3rd_Edition_schemas - OCPP-2.0.1_part3_JSON_schemas - - 4.0.5 - 1.18.34 - - scm:git:https://github.com/steve-community/ocpp-jaxb.git scm:git:https://github.com/steve-community/ocpp-jaxb.git @@ -45,6 +40,14 @@ HEAD + + 17 + UTF-8 + + 1.18.34 + 1.2.1 + + github @@ -52,6 +55,65 @@ + + + + + ${project.groupId} + ocpp-custom + ${project.version} + + + + org.jsonschema2pojo + jsonschema2pojo-core + ${jsonschema2pojo.version} + + + jakarta.validation + jakarta.validation-api + 3.1.0 + + + jakarta.xml.soap + jakarta.xml.soap-api + 3.0.2 + + + jakarta.jws + jakarta.jws-api + 3.0.0 + + + jakarta.xml.bind + jakarta.xml.bind-api + 3.0.1 + + + jakarta.xml.ws + jakarta.xml.ws-api + 3.0.1 + + + joda-time + joda-time + 2.12.7 + provided + + + org.projectlombok + lombok + ${lombok.version} + + + + com.fasterxml.jackson.core + jackson-annotations + 2.20 + + + + @@ -80,264 +142,11 @@ maven-release-plugin 3.1.1 + true @{project.version} - - org.apache.cxf - cxf-codegen-plugin - ${cxf.version} - - ${project.build.directory}/generated-sources - ${basedir}/src/main/resources/wsdl - - - ${basedir}/src/main/resources/wsdl-binding/ocpp_binding.xml - ${basedir}/src/main/resources/wsdl-binding/async_binding.xml - ${basedir}/src/main/resources/wsdl-binding/add_interface.xml - - - -xjc-Xfluent-api - -xjc-Xinheritance - -xjc-Xannotate - - -exsh - true - - - - - - generate-sources - generate-sources - - wsdl2java - - - - - - org.projectlombok - lombok - ${lombok.version} - - - org.jvnet.jaxb - jaxb-plugins - 4.0.8 - - - org.jvnet.jaxb - jaxb-plugin-annotate - 4.0.8 - - - - - com.google.code.maven-replacer-plugin - replacer - 1.5.3 - - - - - add-request-interface-ocpp-1.6j-security - generate-resources - - replace - - - ${basedir}/src/main/resources/${ocpp-1.6-security-schemas-dir}/*.json - false - ${project.build.directory}/generated-resources/${ocpp-1.6-security-schemas-dir} - - - "\$schema" - - "javaInterfaces" : ["de.rwth.idsg.ocpp.jaxb.RequestType"], - "\$schema" - - - - - - add-response-interface-ocpp-1.6j-security - generate-resources - - replace - - - ${basedir}/src/main/resources/${ocpp-1.6-security-schemas-dir}/*Response.json - false - ${project.build.directory}/generated-resources/${ocpp-1.6-security-schemas-dir} - - - "\$schema" - - "javaInterfaces" : ["de.rwth.idsg.ocpp.jaxb.ResponseType"], - "\$schema" - - - - - - - add-request-interface-ocpp-2.0.1 - generate-resources - - replace - - - ${basedir}/src/main/resources/${ocpp-2.0.1-schemas-dir}/*Request.json - false - ${project.build.directory}/generated-resources/${ocpp-2.0.1-schemas-dir} - - - "\$schema" - - "javaInterfaces" : ["de.rwth.idsg.ocpp.jaxb.RequestType"], - "\$schema" - - - - - - add-response-interface-ocpp-2.0.1 - generate-resources - - replace - - - ${basedir}/src/main/resources/${ocpp-2.0.1-schemas-dir}/*Response.json - false - ${project.build.directory}/generated-resources/${ocpp-2.0.1-schemas-dir} - - - "\$schema" - - "javaInterfaces" : ["de.rwth.idsg.ocpp.jaxb.ResponseType"], - "\$schema" - - - - - - - - org.jsonschema2pojo - jsonschema2pojo-maven-plugin - 1.2.1 - - ${project.build.directory}/generated-sources - true - true - false - true - true - true - true - - - - generate-ocpp-1.6j-security - process-resources - - generate - - - ${project.build.directory}/generated-resources/${ocpp-1.6-security-schemas-dir} - - ocpp._2022._02.security - yyyy-MM-dd'T'HH:mm:ss.SSS'Z' - - - - generate-ocpp-2.0.1 - process-resources - - generate - - - ${project.build.directory}/generated-resources/${ocpp-2.0.1-schemas-dir} - ocpp._2020._03 - yyyy-MM-dd'T'HH:mm:ss.SSS'Z' - - - - - - - jakarta.validation - jakarta.validation-api - 3.1.0 - - - jakarta.xml.soap - jakarta.xml.soap-api - 3.0.2 - - - jakarta.jws - jakarta.jws-api - 3.0.0 - - - jakarta.xml.bind - jakarta.xml.bind-api - 3.0.1 - - - jakarta.xml.ws - jakarta.xml.ws-api - 3.0.1 - - - - joda-time - joda-time - 2.12.7 - provided - - - org.projectlombok - lombok - ${lombok.version} - - - - - com.fasterxml.jackson.core - jackson-annotations - 2.20 - - - - org.junit.jupiter - junit-jupiter-engine - 5.10.3 - test - - - org.junit.jupiter - junit-jupiter-params - 5.10.3 - test - - - tools.jackson.datatype - jackson-datatype-joda - 3.0.2 - test - - - From d25825a93f1c19ea0a70411cbae50268711a1b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20Go=CC=88kay?= Date: Thu, 15 Jan 2026 15:16:10 +0100 Subject: [PATCH 2/5] add CustomAnnotator for DateTime JsonSerialize and JsonDeserialize --- ocpp-custom/pom.xml | 12 --- .../rwth/idsg/ocpp/jaxb/CustomAnnotator.java | 29 ++++++++ ocpp-jaxb/pom.xml | 11 ++- .../idsg/ocpp/jaxb/JodaDateTimeConverter.java | 71 +----------------- .../ocpp/jaxb/JodaDateTimeDeserializer.java | 24 ++++++ .../ocpp/jaxb/JodaDateTimeSerializer.java | 20 +++++ .../java/de/rwth/idsg/ocpp/jaxb/Utils.java | 73 +++++++++++++++++++ 7 files changed, 158 insertions(+), 82 deletions(-) create mode 100644 ocpp-custom/src/main/java/de/rwth/idsg/ocpp/jaxb/CustomAnnotator.java create mode 100644 ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeDeserializer.java create mode 100644 ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeSerializer.java create mode 100644 ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/Utils.java diff --git a/ocpp-custom/pom.xml b/ocpp-custom/pom.xml index 134c713..07571d6 100644 --- a/ocpp-custom/pom.xml +++ b/ocpp-custom/pom.xml @@ -16,17 +16,5 @@ org.jsonschema2pojo jsonschema2pojo-core - - com.fasterxml.jackson.core - jackson-annotations - - - joda-time - joda-time - - - jakarta.xml.bind - jakarta.xml.bind-api - diff --git a/ocpp-custom/src/main/java/de/rwth/idsg/ocpp/jaxb/CustomAnnotator.java b/ocpp-custom/src/main/java/de/rwth/idsg/ocpp/jaxb/CustomAnnotator.java new file mode 100644 index 0000000..fe619d2 --- /dev/null +++ b/ocpp-custom/src/main/java/de/rwth/idsg/ocpp/jaxb/CustomAnnotator.java @@ -0,0 +1,29 @@ +package de.rwth.idsg.ocpp.jaxb; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.sun.codemodel.JDefinedClass; +import com.sun.codemodel.JFieldVar; +import org.joda.time.DateTime; +import org.jsonschema2pojo.AbstractAnnotator; + +public class CustomAnnotator extends AbstractAnnotator { + + @Override + public void propertyField(JFieldVar field, JDefinedClass clazz, + String propertyName, + com.fasterxml.jackson.databind.JsonNode propertyNode) { + super.propertyField(field, clazz, propertyName, propertyNode); + + // Add custom converter annotations to all DateTime fields + if (field.type().fullName().equals(DateTime.class.getName())) { + // Add @JsonSerialize annotation + field.annotate(JsonSerialize.class) + .param("using", clazz.owner().ref("de.rwth.idsg.ocpp.jaxb.JodaDateTimeSerializer").dotclass()); + + // Add @JsonDeserialize annotation + field.annotate(JsonDeserialize.class) + .param("using", clazz.owner().ref("de.rwth.idsg.ocpp.jaxb.JodaDateTimeDeserializer").dotclass()); + } + } +} diff --git a/ocpp-jaxb/pom.xml b/ocpp-jaxb/pom.xml index 4bfa62a..d5692fc 100644 --- a/ocpp-jaxb/pom.xml +++ b/ocpp-jaxb/pom.xml @@ -179,6 +179,7 @@ true true true + de.rwth.idsg.ocpp.jaxb.CustomAnnotator @@ -191,7 +192,6 @@ ${project.build.directory}/generated-resources/${ocpp-1.6-security-schemas-dir} ocpp._2022._02.security - yyyy-MM-dd'T'HH:mm:ss.SSS'Z' @@ -203,10 +203,16 @@ ${project.build.directory}/generated-resources/${ocpp-2.0.1-schemas-dir} ocpp._2020._03 - yyyy-MM-dd'T'HH:mm:ss.SSS'Z' + + + ${project.groupId} + ocpp-custom + ${project.version} + + @@ -215,6 +221,7 @@ ${project.groupId} ocpp-custom + compile diff --git a/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java index 57b00c1..bdea3d0 100644 --- a/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java +++ b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java @@ -1,12 +1,11 @@ package de.rwth.idsg.ocpp.jaxb; import org.joda.time.DateTime; -import org.joda.time.format.DateTimeFormatter; -import org.joda.time.format.DateTimeFormatterBuilder; import jakarta.xml.bind.annotation.adapters.XmlAdapter; -import static org.joda.time.format.ISODateTimeFormat.date; +import static de.rwth.idsg.ocpp.jaxb.Utils.FORMATTER; +import static de.rwth.idsg.ocpp.jaxb.Utils.isNullOrEmpty; /** * Joda-Time and XSD represent data and time information according to ISO 8601. @@ -16,14 +15,12 @@ */ public class JodaDateTimeConverter extends XmlAdapter { - private static final DateTimeFormatter formatter = dateTimeParser(); - @Override public DateTime unmarshal(String v) throws Exception { if (isNullOrEmpty(v)) { return null; } else { - return DateTime.parse(v, formatter); + return FORMATTER.parseDateTime(v); } } @@ -35,66 +32,4 @@ public String marshal(DateTime v) throws Exception { return v.toString(); } } - - /** - * Because I did not want to include Guava or similar only for this. - */ - private static boolean isNullOrEmpty(String string) { - return string == null || string.isEmpty(); - } - - /** - * A custom DateTimeFormatter that follows the strictness and flexibility of XSD:dateTime (ISO 8601). - * This exact composition (with optional fields) is not present under {@link org.joda.time.format.ISODateTimeFormat}. - */ - private static DateTimeFormatter dateTimeParser() { - return new DateTimeFormatterBuilder() - .append(date()) - .appendLiteral('T') - .append(hourElement()) - .append(minuteElement()) - .append(secondElement()) - .appendOptional(fractionElement().getParser()) - .appendOptional(offsetElement().getParser()) - .toFormatter(); - } - - // ------------------------------------------------------------------------- - // Copy-paste from "private" methods in ISODateTimeFormat - // ------------------------------------------------------------------------- - - private static DateTimeFormatter hourElement() { - return new DateTimeFormatterBuilder() - .appendHourOfDay(2) - .toFormatter(); - } - - private static DateTimeFormatter minuteElement() { - return new DateTimeFormatterBuilder() - .appendLiteral(':') - .appendMinuteOfHour(2) - .toFormatter(); - } - - private static DateTimeFormatter secondElement() { - return new DateTimeFormatterBuilder() - .appendLiteral(':') - .appendSecondOfMinute(2) - .toFormatter(); - } - - private static DateTimeFormatter fractionElement() { - return new DateTimeFormatterBuilder() - .appendLiteral('.') - // Support parsing up to nanosecond precision even though - // those extra digits will be dropped. - .appendFractionOfSecond(3, 9) - .toFormatter(); - } - - private static DateTimeFormatter offsetElement() { - return new DateTimeFormatterBuilder() - .appendTimeZoneOffset("Z", true, 2, 4) - .toFormatter(); - } } diff --git a/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeDeserializer.java b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeDeserializer.java new file mode 100644 index 0000000..a1b06d1 --- /dev/null +++ b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeDeserializer.java @@ -0,0 +1,24 @@ +package de.rwth.idsg.ocpp.jaxb; + +import com.fasterxml.jackson.core.JacksonException; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import org.joda.time.DateTime; + +import java.io.IOException; + +import static de.rwth.idsg.ocpp.jaxb.Utils.FORMATTER; +import static de.rwth.idsg.ocpp.jaxb.Utils.isNullOrEmpty; + +public class JodaDateTimeDeserializer extends JsonDeserializer { + + @Override + public DateTime deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JacksonException { + String value = p.getText(); + if (isNullOrEmpty(value)) { + return null; + } + return FORMATTER.parseDateTime(value); + } +} diff --git a/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeSerializer.java b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeSerializer.java new file mode 100644 index 0000000..1e584cb --- /dev/null +++ b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeSerializer.java @@ -0,0 +1,20 @@ +package de.rwth.idsg.ocpp.jaxb; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; +import org.joda.time.DateTime; + +import java.io.IOException; + +public class JodaDateTimeSerializer extends JsonSerializer { + + @Override + public void serialize(DateTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException { + if (value == null) { + gen.writeNull(); + } else { + gen.writeString(value.toString()); + } + } +} diff --git a/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/Utils.java b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/Utils.java new file mode 100644 index 0000000..d6385d7 --- /dev/null +++ b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/Utils.java @@ -0,0 +1,73 @@ +package de.rwth.idsg.ocpp.jaxb; + +import org.joda.time.format.DateTimeFormatter; +import org.joda.time.format.DateTimeFormatterBuilder; + +import static org.joda.time.format.ISODateTimeFormat.date; + +public class Utils { + + public static final DateTimeFormatter FORMATTER = dateTimeParser(); + + /** + * Because I did not want to include Guava or similar only for this. + */ + public static boolean isNullOrEmpty(String string) { + return string == null || string.isEmpty(); + } + + /** + * A custom DateTimeFormatter that follows the strictness and flexibility of XSD:dateTime (ISO 8601). + * This exact composition (with optional fields) is not present under {@link org.joda.time.format.ISODateTimeFormat}. + */ + private static DateTimeFormatter dateTimeParser() { + return new DateTimeFormatterBuilder() + .append(date()) + .appendLiteral('T') + .append(hourElement()) + .append(minuteElement()) + .append(secondElement()) + .appendOptional(fractionElement().getParser()) + .appendOptional(offsetElement().getParser()) + .toFormatter(); + } + + // ------------------------------------------------------------------------- + // Copy-paste from "private" methods in ISODateTimeFormat + // ------------------------------------------------------------------------- + + private static DateTimeFormatter hourElement() { + return new DateTimeFormatterBuilder() + .appendHourOfDay(2) + .toFormatter(); + } + + private static DateTimeFormatter minuteElement() { + return new DateTimeFormatterBuilder() + .appendLiteral(':') + .appendMinuteOfHour(2) + .toFormatter(); + } + + private static DateTimeFormatter secondElement() { + return new DateTimeFormatterBuilder() + .appendLiteral(':') + .appendSecondOfMinute(2) + .toFormatter(); + } + + private static DateTimeFormatter fractionElement() { + return new DateTimeFormatterBuilder() + .appendLiteral('.') + // Support parsing up to nanosecond precision even though + // those extra digits will be dropped. + .appendFractionOfSecond(3, 9) + .toFormatter(); + } + + private static DateTimeFormatter offsetElement() { + return new DateTimeFormatterBuilder() + .appendTimeZoneOffset("Z", true, 2, 4) + .toFormatter(); + } +} From ff441b911b0b7bad0a98138ad82b457902df2728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20Go=CC=88kay?= Date: Thu, 15 Jan 2026 16:03:20 +0100 Subject: [PATCH 3/5] enhance with lombok annotations --- ocpp-custom/pom.xml | 4 ++++ .../de/rwth/idsg/ocpp/jaxb/CustomAnnotator.java | 15 +++++++++++++++ ocpp-jaxb/pom.xml | 5 +++++ 3 files changed, 24 insertions(+) diff --git a/ocpp-custom/pom.xml b/ocpp-custom/pom.xml index 07571d6..89ed637 100644 --- a/ocpp-custom/pom.xml +++ b/ocpp-custom/pom.xml @@ -16,5 +16,9 @@ org.jsonschema2pojo jsonschema2pojo-core + + org.projectlombok + lombok + diff --git a/ocpp-custom/src/main/java/de/rwth/idsg/ocpp/jaxb/CustomAnnotator.java b/ocpp-custom/src/main/java/de/rwth/idsg/ocpp/jaxb/CustomAnnotator.java index fe619d2..9949462 100644 --- a/ocpp-custom/src/main/java/de/rwth/idsg/ocpp/jaxb/CustomAnnotator.java +++ b/ocpp-custom/src/main/java/de/rwth/idsg/ocpp/jaxb/CustomAnnotator.java @@ -1,14 +1,29 @@ package de.rwth.idsg.ocpp.jaxb; +import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.sun.codemodel.JDefinedClass; import com.sun.codemodel.JFieldVar; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; import org.joda.time.DateTime; import org.jsonschema2pojo.AbstractAnnotator; public class CustomAnnotator extends AbstractAnnotator { + @Override + public void typeInfo(JDefinedClass clazz, JsonNode schema) { + super.typeInfo(clazz, schema); + + clazz.annotate(ToString.class); + clazz.annotate(Getter.class); + clazz.annotate(Setter.class); + clazz.annotate(EqualsAndHashCode.class); + } + @Override public void propertyField(JFieldVar field, JDefinedClass clazz, String propertyName, diff --git a/ocpp-jaxb/pom.xml b/ocpp-jaxb/pom.xml index d5692fc..0e6b23e 100644 --- a/ocpp-jaxb/pom.xml +++ b/ocpp-jaxb/pom.xml @@ -180,6 +180,11 @@ true true de.rwth.idsg.ocpp.jaxb.CustomAnnotator + + false + false + false + false From 56abd52aae82d0f627c0798c95759f87959eea0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20Go=CC=88kay?= Date: Sat, 17 Jan 2026 20:08:32 +0100 Subject: [PATCH 4/5] refactor --- ocpp-custom/pom.xml | 10 --- ocpp-jaxb/pom.xml | 61 ------------------ pom.xml | 148 ++++++++++++++++++++++++-------------------- 3 files changed, 81 insertions(+), 138 deletions(-) diff --git a/ocpp-custom/pom.xml b/ocpp-custom/pom.xml index 89ed637..1adf4d5 100644 --- a/ocpp-custom/pom.xml +++ b/ocpp-custom/pom.xml @@ -11,14 +11,4 @@ ocpp-custom jar - - - org.jsonschema2pojo - jsonschema2pojo-core - - - org.projectlombok - lombok - - diff --git a/ocpp-jaxb/pom.xml b/ocpp-jaxb/pom.xml index 0e6b23e..7a291ea 100644 --- a/ocpp-jaxb/pom.xml +++ b/ocpp-jaxb/pom.xml @@ -14,8 +14,6 @@ OCPP-1.6_Security_3rd_Edition_schemas OCPP-2.0.1_part3_JSON_schemas - - 4.0.5 @@ -222,64 +220,5 @@ - - - ${project.groupId} - ocpp-custom - compile - - - - jakarta.validation - jakarta.validation-api - - - jakarta.xml.soap - jakarta.xml.soap-api - - - jakarta.jws - jakarta.jws-api - - - jakarta.xml.bind - jakarta.xml.bind-api - - - jakarta.xml.ws - jakarta.xml.ws-api - - - joda-time - joda-time - - - org.projectlombok - lombok - - - - com.fasterxml.jackson.core - jackson-annotations - - - org.junit.jupiter - junit-jupiter-engine - 5.10.3 - test - - - org.junit.jupiter - junit-jupiter-params - 5.10.3 - test - - - tools.jackson.datatype - jackson-datatype-joda - 3.0.2 - test - - diff --git a/pom.xml b/pom.xml index c40b5e0..7e7f48e 100644 --- a/pom.xml +++ b/pom.xml @@ -33,21 +33,22 @@ - - scm:git:https://github.com/steve-community/ocpp-jaxb.git - scm:git:https://github.com/steve-community/ocpp-jaxb.git - https://github.com/steve-community/ocpp-jaxb - HEAD - - 17 UTF-8 + 4.0.5 1.18.34 1.2.1 + + scm:git:https://github.com/steve-community/ocpp-jaxb.git + scm:git:https://github.com/steve-community/ocpp-jaxb.git + https://github.com/steve-community/ocpp-jaxb + HEAD + + github @@ -55,65 +56,6 @@ - - - - - ${project.groupId} - ocpp-custom - ${project.version} - - - - org.jsonschema2pojo - jsonschema2pojo-core - ${jsonschema2pojo.version} - - - jakarta.validation - jakarta.validation-api - 3.1.0 - - - jakarta.xml.soap - jakarta.xml.soap-api - 3.0.2 - - - jakarta.jws - jakarta.jws-api - 3.0.0 - - - jakarta.xml.bind - jakarta.xml.bind-api - 3.0.1 - - - jakarta.xml.ws - jakarta.xml.ws-api - 3.0.1 - - - joda-time - joda-time - 2.12.7 - provided - - - org.projectlombok - lombok - ${lombok.version} - - - - com.fasterxml.jackson.core - jackson-annotations - 2.20 - - - - @@ -149,4 +91,76 @@ - + + + org.jsonschema2pojo + jsonschema2pojo-core + ${jsonschema2pojo.version} + compile + + + jakarta.validation + jakarta.validation-api + 3.1.0 + + + jakarta.xml.soap + jakarta.xml.soap-api + 3.0.2 + + + jakarta.jws + jakarta.jws-api + 3.0.0 + + + jakarta.xml.bind + jakarta.xml.bind-api + 3.0.1 + + + jakarta.xml.ws + jakarta.xml.ws-api + 3.0.1 + + + + joda-time + joda-time + 2.12.7 + provided + + + org.projectlombok + lombok + ${lombok.version} + + + + + com.fasterxml.jackson.core + jackson-annotations + 2.20 + + + + org.junit.jupiter + junit-jupiter-engine + 5.10.3 + test + + + org.junit.jupiter + junit-jupiter-params + 5.10.3 + test + + + tools.jackson.datatype + jackson-datatype-joda + 3.0.2 + test + + + + \ No newline at end of file From 3d6d7789a251b3a5a42c8681ac8ee82b9f275675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20Go=CC=88kay?= Date: Sat, 17 Jan 2026 20:44:34 +0100 Subject: [PATCH 5/5] upgrade to jackson 3 --- ocpp-custom/pom.xml | 8 ++++++++ .../de/rwth/idsg/ocpp/jaxb/CustomAnnotator.java | 6 +++--- ocpp-jaxb/pom.xml | 6 +++++- .../idsg/ocpp/jaxb/JodaDateTimeDeserializer.java | 16 +++++++--------- .../idsg/ocpp/jaxb/JodaDateTimeSerializer.java | 13 ++++++------- pom.xml | 15 ++++++++------- 6 files changed, 37 insertions(+), 27 deletions(-) diff --git a/ocpp-custom/pom.xml b/ocpp-custom/pom.xml index 1adf4d5..f7206ef 100644 --- a/ocpp-custom/pom.xml +++ b/ocpp-custom/pom.xml @@ -11,4 +11,12 @@ ocpp-custom jar + + + org.jsonschema2pojo + jsonschema2pojo-core + ${jsonschema2pojo.version} + + + diff --git a/ocpp-custom/src/main/java/de/rwth/idsg/ocpp/jaxb/CustomAnnotator.java b/ocpp-custom/src/main/java/de/rwth/idsg/ocpp/jaxb/CustomAnnotator.java index 9949462..ccd7a3b 100644 --- a/ocpp-custom/src/main/java/de/rwth/idsg/ocpp/jaxb/CustomAnnotator.java +++ b/ocpp-custom/src/main/java/de/rwth/idsg/ocpp/jaxb/CustomAnnotator.java @@ -1,8 +1,6 @@ package de.rwth.idsg.ocpp.jaxb; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.sun.codemodel.JDefinedClass; import com.sun.codemodel.JFieldVar; import lombok.EqualsAndHashCode; @@ -11,6 +9,8 @@ import lombok.ToString; import org.joda.time.DateTime; import org.jsonschema2pojo.AbstractAnnotator; +import tools.jackson.databind.annotation.JsonDeserialize; +import tools.jackson.databind.annotation.JsonSerialize; public class CustomAnnotator extends AbstractAnnotator { @@ -27,7 +27,7 @@ public void typeInfo(JDefinedClass clazz, JsonNode schema) { @Override public void propertyField(JFieldVar field, JDefinedClass clazz, String propertyName, - com.fasterxml.jackson.databind.JsonNode propertyNode) { + JsonNode propertyNode) { super.propertyField(field, clazz, propertyName, propertyNode); // Add custom converter annotations to all DateTime fields diff --git a/ocpp-jaxb/pom.xml b/ocpp-jaxb/pom.xml index 7a291ea..fad436e 100644 --- a/ocpp-jaxb/pom.xml +++ b/ocpp-jaxb/pom.xml @@ -215,10 +215,14 @@ ocpp-custom ${project.version} + + tools.jackson.core + jackson-databind + ${jackson.version} + - diff --git a/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeDeserializer.java b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeDeserializer.java index a1b06d1..0556cd1 100644 --- a/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeDeserializer.java +++ b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeDeserializer.java @@ -1,21 +1,19 @@ package de.rwth.idsg.ocpp.jaxb; -import com.fasterxml.jackson.core.JacksonException; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; import org.joda.time.DateTime; - -import java.io.IOException; +import tools.jackson.core.JacksonException; +import tools.jackson.core.JsonParser; +import tools.jackson.databind.DeserializationContext; +import tools.jackson.databind.ValueDeserializer; import static de.rwth.idsg.ocpp.jaxb.Utils.FORMATTER; import static de.rwth.idsg.ocpp.jaxb.Utils.isNullOrEmpty; -public class JodaDateTimeDeserializer extends JsonDeserializer { +public class JodaDateTimeDeserializer extends ValueDeserializer { @Override - public DateTime deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JacksonException { - String value = p.getText(); + public DateTime deserialize(JsonParser p, DeserializationContext ctxt) throws JacksonException { + String value = p.getString(); if (isNullOrEmpty(value)) { return null; } diff --git a/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeSerializer.java b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeSerializer.java index 1e584cb..61d281a 100644 --- a/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeSerializer.java +++ b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeSerializer.java @@ -1,16 +1,15 @@ package de.rwth.idsg.ocpp.jaxb; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; import org.joda.time.DateTime; +import tools.jackson.core.JacksonException; +import tools.jackson.core.JsonGenerator; +import tools.jackson.databind.SerializationContext; +import tools.jackson.databind.ValueSerializer; -import java.io.IOException; - -public class JodaDateTimeSerializer extends JsonSerializer { +public class JodaDateTimeSerializer extends ValueSerializer { @Override - public void serialize(DateTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException { + public void serialize(DateTime value, JsonGenerator gen, SerializationContext serializers) throws JacksonException { if (value == null) { gen.writeNull(); } else { diff --git a/pom.xml b/pom.xml index 7e7f48e..a1e799d 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,7 @@ 4.0.5 1.18.34 1.2.1 + 3.0.3 @@ -92,12 +93,6 @@ - - org.jsonschema2pojo - jsonschema2pojo-core - ${jsonschema2pojo.version} - compile - jakarta.validation jakarta.validation-api @@ -142,6 +137,12 @@ jackson-annotations 2.20 + + tools.jackson.core + jackson-databind + ${jackson.version} + provided + org.junit.jupiter @@ -163,4 +164,4 @@ - \ No newline at end of file +