From 5c0d66cc769f3a348c906b0d128f87ee7074f1bb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2020 13:24:37 +0000 Subject: [PATCH 001/548] Bump spring-framework-bom from 5.2.3.RELEASE to 5.2.4.RELEASE Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.2.3.RELEASE to 5.2.4.RELEASE. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.3.RELEASE...v5.2.4.RELEASE) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fcdcbbdaa..da8db97d2 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.12.4 3.3.5 - 5.2.3.RELEASE + 5.2.4.RELEASE 5.2.2.RELEASE 8.0.19 9.4.19.v20190610 From ed916d9ea2f597009631df445952cc642cfcfcaf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 3 Mar 2020 13:25:55 +0000 Subject: [PATCH 002/548] Bump jackson.version from 2.10.2 to 2.10.3 Bumps `jackson.version` from 2.10.2 to 2.10.3. Updates `jackson-databind` from 2.10.2 to 2.10.3 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-module-jaxb-annotations` from 2.10.2 to 2.10.3 - [Release notes](https://github.com/FasterXML/jackson-modules-base/releases) - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.10.2...jackson-modules-base-2.10.3) Updates `jackson-annotations` from 2.10.2 to 2.10.3 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 20e062061..edc239f14 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 8.0.19 9.4.19.v20190610 1.18.12 - 2.10.2 + 2.10.3 jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true&serverTimezone=UTC From ae71269e0d43cd718a5f76dda28952bd0301da88 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 5 Mar 2020 13:16:09 +0000 Subject: [PATCH 003/548] Bump spring.security.version from 5.2.2.RELEASE to 5.3.0.RELEASE Bumps `spring.security.version` from 5.2.2.RELEASE to 5.3.0.RELEASE. Updates `spring-security-web` from 5.2.2.RELEASE to 5.3.0.RELEASE - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.2.2.RELEASE...5.3.0.RELEASE) Updates `spring-security-config` from 5.2.2.RELEASE to 5.3.0.RELEASE - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.2.2.RELEASE...5.3.0.RELEASE) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9669355ea..be80e0052 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.12.4 3.3.5 5.2.4.RELEASE - 5.2.2.RELEASE + 5.3.0.RELEASE 8.0.19 9.4.19.v20190610 1.18.12 From d4982952334b01c559cfb1a37dbf915f225d72e8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 5 Mar 2020 13:16:36 +0000 Subject: [PATCH 004/548] Bump flyway-maven-plugin from 6.2.4 to 6.3.0 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 6.2.4 to 6.3.0. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-6.2.4...flyway-6.3.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9669355ea..95e0de0f5 100644 --- a/pom.xml +++ b/pom.xml @@ -288,7 +288,7 @@ org.flywaydb flyway-maven-plugin - 6.2.4 + 6.3.0 From 2d6ec84891a3114059bf5cbe19877c03d47f8c46 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2020 13:14:56 +0000 Subject: [PATCH 005/548] Bump flyway-maven-plugin from 6.3.0 to 6.3.1 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 6.3.0 to 6.3.1. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-6.3.0...flyway-6.3.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e8632ce4f..f57816502 100644 --- a/pom.xml +++ b/pom.xml @@ -288,7 +288,7 @@ org.flywaydb flyway-maven-plugin - 6.3.0 + 6.3.1 From 067b1a73fb539ff3dc54a1a3e2c78762e20fcf3d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2020 13:14:21 +0000 Subject: [PATCH 006/548] Bump spring-framework-bom from 5.2.4.RELEASE to 5.2.5.RELEASE Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.2.4.RELEASE to 5.2.5.RELEASE. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.4.RELEASE...v5.2.5.RELEASE) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f57816502..6736389d7 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.12.4 3.3.5 - 5.2.4.RELEASE + 5.2.5.RELEASE 5.3.0.RELEASE 8.0.19 9.4.19.v20190610 From f42b458337e67f4c5c7330acb31d17f5b1d778a5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2020 13:14:44 +0000 Subject: [PATCH 007/548] Bump flyway-maven-plugin from 6.3.1 to 6.3.2 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 6.3.1 to 6.3.2. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-6.3.1...flyway-6.3.2) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f57816502..2cf6aff7d 100644 --- a/pom.xml +++ b/pom.xml @@ -288,7 +288,7 @@ org.flywaydb flyway-maven-plugin - 6.3.1 + 6.3.2 From f2ba5184266a1385a65c612de8a75f61963e90d2 Mon Sep 17 00:00:00 2001 From: Christian Samsel Date: Wed, 25 Mar 2020 22:55:58 +0100 Subject: [PATCH 008/548] Revert "Bump flyway-maven-plugin from 6.3.1 to 6.3.2" --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b0a894ed..6736389d7 100644 --- a/pom.xml +++ b/pom.xml @@ -288,7 +288,7 @@ org.flywaydb flyway-maven-plugin - 6.3.2 + 6.3.1 From df0f8bca93e3cbc52600b0b697d153e8796a8341 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 12:13:27 +0000 Subject: [PATCH 009/548] Bump cxf.version from 3.3.5 to 3.3.6 Bumps `cxf.version` from 3.3.5 to 3.3.6. Updates `cxf-rt-frontend-jaxws` from 3.3.5 to 3.3.6 Updates `cxf-rt-transports-http` from 3.3.5 to 3.3.6 Updates `cxf-rt-transports-http-hc` from 3.3.5 to 3.3.6 Updates `cxf-rt-features-logging` from 3.3.5 to 3.3.6 Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6736389d7..9ab9446ef 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ UTF-8 3.12.4 - 3.3.5 + 3.3.6 5.2.5.RELEASE 5.3.0.RELEASE 8.0.19 From 819c394c84c8d2c292c6d2b54ac45346b79378ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20Go=CC=88kay?= Date: Wed, 1 Apr 2020 00:34:37 +0200 Subject: [PATCH 010/548] update current year in copyright notice --- pom.xml | 2 +- src/main/java/de/rwth/idsg/steve/Application.java | 2 +- src/main/java/de/rwth/idsg/steve/ApplicationProfile.java | 2 +- src/main/java/de/rwth/idsg/steve/ApplicationStarter.java | 2 +- src/main/java/de/rwth/idsg/steve/JettyServer.java | 2 +- src/main/java/de/rwth/idsg/steve/NotificationFeature.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveAppContext.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveConfiguration.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveDevStarter.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveException.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveProdCondition.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveProdStarter.java | 2 +- src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java | 2 +- src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java | 2 +- .../java/de/rwth/idsg/steve/config/SecurityConfiguration.java | 2 +- .../java/de/rwth/idsg/steve/config/WebSocketConfiguration.java | 2 +- .../de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java | 2 +- .../rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java | 2 +- .../de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java | 2 +- .../rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java | 2 +- .../de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java | 2 +- .../rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/converter/Server12to15.java | 2 +- .../de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/converter/Server15to16.java | 2 +- .../de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java | 2 +- .../idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java | 2 +- .../idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java | 2 +- .../idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java | 2 +- .../de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java | 2 +- .../de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java | 2 +- .../de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java | 2 +- .../rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java | 2 +- .../rwth/idsg/steve/ocpp/ws/FutureResponseContextStoreImpl.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/SessionContextStoreImpl.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java | 2 +- .../idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java | 2 +- .../rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java | 2 +- .../idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java | 2 +- .../rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java | 2 +- .../rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java | 2 +- .../rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java | 2 +- .../rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java | 2 +- .../rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java | 2 +- .../java/de/rwth/idsg/steve/repository/AddressRepository.java | 2 +- .../de/rwth/idsg/steve/repository/ChargePointRepository.java | 2 +- .../rwth/idsg/steve/repository/ChargingProfileRepository.java | 2 +- .../java/de/rwth/idsg/steve/repository/GenericRepository.java | 2 +- .../de/rwth/idsg/steve/repository/OcppServerRepository.java | 2 +- .../java/de/rwth/idsg/steve/repository/OcppTagRepository.java | 2 +- .../de/rwth/idsg/steve/repository/ReservationRepository.java | 2 +- .../java/de/rwth/idsg/steve/repository/ReservationStatus.java | 2 +- .../java/de/rwth/idsg/steve/repository/SettingsRepository.java | 2 +- src/main/java/de/rwth/idsg/steve/repository/TaskStore.java | 2 +- .../de/rwth/idsg/steve/repository/TransactionRepository.java | 2 +- src/main/java/de/rwth/idsg/steve/repository/UserRepository.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/ChargePoint.java | 2 +- .../de/rwth/idsg/steve/repository/dto/ChargePointSelect.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java | 2 +- .../idsg/steve/repository/dto/ChargingProfileAssignment.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java | 2 +- src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java | 2 +- .../idsg/steve/repository/dto/InsertConnectorStatusParams.java | 2 +- .../rwth/idsg/steve/repository/dto/InsertReservationParams.java | 2 +- .../rwth/idsg/steve/repository/dto/InsertTransactionParams.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/MailSettings.java | 2 +- src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/Reservation.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/TaskOverview.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/Transaction.java | 2 +- .../de/rwth/idsg/steve/repository/dto/TransactionDetails.java | 2 +- .../rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java | 2 +- .../rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java | 2 +- .../rwth/idsg/steve/repository/dto/UpdateTransactionParams.java | 2 +- src/main/java/de/rwth/idsg/steve/repository/dto/User.java | 2 +- .../rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java | 2 +- .../idsg/steve/repository/impl/ChargePointRepositoryImpl.java | 2 +- .../steve/repository/impl/ChargingProfileRepositoryImpl.java | 2 +- .../rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java | 2 +- .../idsg/steve/repository/impl/OcppServerRepositoryImpl.java | 2 +- .../rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java | 2 +- .../idsg/steve/repository/impl/ReservationRepositoryImpl.java | 2 +- .../rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java | 2 +- .../java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java | 2 +- .../idsg/steve/repository/impl/TransactionRepositoryImpl.java | 2 +- .../de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java | 2 +- src/main/java/de/rwth/idsg/steve/service/BackgroundService.java | 2 +- .../rwth/idsg/steve/service/CentralSystemService16_Service.java | 2 +- .../de/rwth/idsg/steve/service/ChargePointHelperService.java | 2 +- .../rwth/idsg/steve/service/ChargePointHelperServiceImpl.java | 2 +- .../de/rwth/idsg/steve/service/ChargePointService12_Client.java | 2 +- .../de/rwth/idsg/steve/service/ChargePointService15_Client.java | 2 +- .../de/rwth/idsg/steve/service/ChargePointService16_Client.java | 2 +- .../de/rwth/idsg/steve/service/DummyReleaseCheckService.java | 2 +- .../de/rwth/idsg/steve/service/GithubReleaseCheckService.java | 2 +- src/main/java/de/rwth/idsg/steve/service/MailService.java | 2 +- .../java/de/rwth/idsg/steve/service/NotificationService.java | 2 +- .../de/rwth/idsg/steve/service/NotificationServiceImpl.java | 2 +- src/main/java/de/rwth/idsg/steve/service/OcppTagService.java | 2 +- .../java/de/rwth/idsg/steve/service/OcppTagServiceImpl.java | 2 +- .../java/de/rwth/idsg/steve/service/ReleaseCheckService.java | 2 +- .../java/de/rwth/idsg/steve/service/TransactionStopService.java | 2 +- .../idsg/steve/service/UnidentifiedIncomingObjectService.java | 2 +- .../rwth/idsg/steve/service/dto/EnhancedReserveNowParams.java | 2 +- .../steve/service/dto/EnhancedSetChargingProfileParams.java | 2 +- .../rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java | 2 +- .../de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java | 2 +- .../java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/DateConverter.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java | 2 +- .../java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/StringUtils.java | 2 +- .../de/rwth/idsg/steve/utils/ssl/CompositeX509KeyManager.java | 2 +- .../de/rwth/idsg/steve/utils/ssl/CompositeX509TrustManager.java | 2 +- .../de/rwth/idsg/steve/utils/ssl/KeyManagerAlgorithmStep.java | 2 +- .../de/rwth/idsg/steve/utils/ssl/KeyManagerPasswordStep.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/ssl/KeyStoreStep.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/ssl/ProtocolStep.java | 2 +- .../java/de/rwth/idsg/steve/utils/ssl/SslContextBuilder.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/ssl/SslContextStep.java | 2 +- src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java | 2 +- .../java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java | 2 +- .../java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java | 2 +- src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java | 2 +- src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java | 2 +- .../rwth/idsg/steve/web/controller/AboutSettingsController.java | 2 +- .../de/rwth/idsg/steve/web/controller/AjaxCallController.java | 2 +- .../rwth/idsg/steve/web/controller/ChargePointsController.java | 2 +- .../idsg/steve/web/controller/ChargingProfilesController.java | 2 +- .../java/de/rwth/idsg/steve/web/controller/HomeController.java | 2 +- .../java/de/rwth/idsg/steve/web/controller/LogController.java | 2 +- .../de/rwth/idsg/steve/web/controller/Ocpp12Controller.java | 2 +- .../de/rwth/idsg/steve/web/controller/Ocpp15Controller.java | 2 +- .../de/rwth/idsg/steve/web/controller/Ocpp16Controller.java | 2 +- .../de/rwth/idsg/steve/web/controller/OcppTagsController.java | 2 +- .../de/rwth/idsg/steve/web/controller/SignOutController.java | 2 +- .../java/de/rwth/idsg/steve/web/controller/TaskController.java | 2 +- .../web/controller/TransactionsReservationsController.java | 2 +- .../java/de/rwth/idsg/steve/web/controller/UsersController.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/Address.java | 2 +- .../de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java | 2 +- .../idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java | 2 +- .../de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java | 2 +- .../idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java | 2 +- .../idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java | 2 +- .../idsg/steve/web/dto/ocpp/ConfigurationKeyReadWriteEnum.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java | 2 +- .../idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java | 2 +- .../idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java | 2 +- .../idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageParams.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java | 2 +- .../java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java | 2 +- .../idsg/steve/web/validation/ChargeBoxIdListValidator.java | 2 +- .../de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java | 2 +- .../java/de/rwth/idsg/steve/web/validation/EmailCollection.java | 2 +- .../idsg/steve/web/validation/EmailCollectionValidator.java | 2 +- src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java | 2 +- .../de/rwth/idsg/steve/web/validation/IdTagListValidator.java | 2 +- .../java/de/rwth/idsg/steve/web/validation/IdTagValidator.java | 2 +- src/main/resources/webapp/WEB-INF/views/00-context.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/00-cp-multiple.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/00-cp-single.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/00-error.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/00-footer.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/00-header.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/00-op-bind-errors.jsp | 2 +- .../resources/webapp/WEB-INF/views/GetConfigurationResponse.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/about.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/data-man/00-address.jsp | 2 +- .../webapp/WEB-INF/views/data-man/00-charging-profile.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/data-man/00-cp-misc.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/data-man/00-ocppTag.jsp | 2 +- .../resources/webapp/WEB-INF/views/data-man/00-user-ocpp.jsp | 2 +- .../resources/webapp/WEB-INF/views/data-man/00-user-profile.jsp | 2 +- .../resources/webapp/WEB-INF/views/data-man/chargepointAdd.jsp | 2 +- .../webapp/WEB-INF/views/data-man/chargepointDetails.jsp | 2 +- .../resources/webapp/WEB-INF/views/data-man/chargepoints.jsp | 2 +- .../webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp | 2 +- .../WEB-INF/views/data-man/chargingProfileAssignments.jsp | 2 +- .../webapp/WEB-INF/views/data-man/chargingProfileDetails.jsp | 2 +- .../webapp/WEB-INF/views/data-man/chargingProfiles.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp | 2 +- .../resources/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp | 2 +- .../resources/webapp/WEB-INF/views/data-man/reservations.jsp | 2 +- .../webapp/WEB-INF/views/data-man/transactionDetails.jsp | 2 +- .../resources/webapp/WEB-INF/views/data-man/transactions.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/data-man/userAdd.jsp | 2 +- .../resources/webapp/WEB-INF/views/data-man/userDetails.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/data-man/users.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/home.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/ocppJsonStatus.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/ChangeConfigurationForm.jsp | 2 +- .../resources/webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/ClearChargingProfileForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/DataTransferForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp | 2 +- .../WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp | 2 +- .../resources/webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op-forms/ResetForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp | 2 +- .../resources/webapp/WEB-INF/views/op12/ChangeAvailability.jsp | 2 +- .../resources/webapp/WEB-INF/views/op12/ChangeConfiguration.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op12/ClearCache.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op12/GetDiagnostics.jsp | 2 +- .../webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp | 2 +- .../webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op12/Reset.jsp | 2 +- .../resources/webapp/WEB-INF/views/op12/UnlockConnector.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op12/UpdateFirmware.jsp | 2 +- .../resources/webapp/WEB-INF/views/op15/CancelReservation.jsp | 2 +- .../resources/webapp/WEB-INF/views/op15/ChangeAvailability.jsp | 2 +- .../resources/webapp/WEB-INF/views/op15/ChangeConfiguration.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op15/ClearCache.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op15/DataTransfer.jsp | 2 +- .../resources/webapp/WEB-INF/views/op15/GetConfiguration.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op15/GetDiagnostics.jsp | 2 +- .../resources/webapp/WEB-INF/views/op15/GetLocalListVersion.jsp | 2 +- .../webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp | 2 +- .../webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op15/ReserveNow.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op15/Reset.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op15/SendLocalList.jsp | 2 +- .../resources/webapp/WEB-INF/views/op15/UnlockConnector.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op15/UpdateFirmware.jsp | 2 +- .../resources/webapp/WEB-INF/views/op16/CancelReservation.jsp | 2 +- .../resources/webapp/WEB-INF/views/op16/ChangeAvailability.jsp | 2 +- .../resources/webapp/WEB-INF/views/op16/ChangeConfiguration.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op16/ClearCache.jsp | 2 +- .../webapp/WEB-INF/views/op16/ClearChargingProfile.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op16/DataTransfer.jsp | 2 +- .../webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp | 2 +- .../webapp/WEB-INF/views/op16/GetCompositeScheduleResponse.jsp | 2 +- .../resources/webapp/WEB-INF/views/op16/GetConfiguration.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op16/GetDiagnostics.jsp | 2 +- .../resources/webapp/WEB-INF/views/op16/GetLocalListVersion.jsp | 2 +- .../webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp | 2 +- .../webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op16/ReserveNow.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op16/Reset.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op16/SendLocalList.jsp | 2 +- .../resources/webapp/WEB-INF/views/op16/SetChargingProfile.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op16/TriggerMessage.jsp | 2 +- .../resources/webapp/WEB-INF/views/op16/UnlockConnector.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op16/UpdateFirmware.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/settings.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/signin.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/taskResult.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/tasks.jsp | 2 +- src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java | 2 +- src/test/java/de/rwth/idsg/steve/ApplicationTest.java | 2 +- src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java | 2 +- src/test/java/de/rwth/idsg/steve/StressTest.java | 2 +- src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java | 2 +- src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java | 2 +- src/test/java/de/rwth/idsg/steve/TypeStoreTest.java | 2 +- src/test/java/de/rwth/idsg/steve/issues/Issue72.java | 2 +- .../java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java | 2 +- src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java | 2 +- src/test/java/de/rwth/idsg/steve/issues/Issue81.java | 2 +- src/test/java/de/rwth/idsg/steve/utils/Helpers.java | 2 +- src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java | 2 +- src/test/java/de/rwth/idsg/steve/utils/StressTester.java | 2 +- .../java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java | 2 +- 384 files changed, 384 insertions(+), 384 deletions(-) diff --git a/pom.xml b/pom.xml index 6736389d7..93f55b2be 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ ${project.organization.name} ${project.inceptionYear} - 2019 + 2020 **/*.txt diff --git a/src/main/java/de/rwth/idsg/steve/Application.java b/src/main/java/de/rwth/idsg/steve/Application.java index 1af202234..4b966c310 100644 --- a/src/main/java/de/rwth/idsg/steve/Application.java +++ b/src/main/java/de/rwth/idsg/steve/Application.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ApplicationProfile.java b/src/main/java/de/rwth/idsg/steve/ApplicationProfile.java index 03bb39852..4099cbea0 100644 --- a/src/main/java/de/rwth/idsg/steve/ApplicationProfile.java +++ b/src/main/java/de/rwth/idsg/steve/ApplicationProfile.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ApplicationStarter.java b/src/main/java/de/rwth/idsg/steve/ApplicationStarter.java index 6c0d56caf..94138f164 100644 --- a/src/main/java/de/rwth/idsg/steve/ApplicationStarter.java +++ b/src/main/java/de/rwth/idsg/steve/ApplicationStarter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/JettyServer.java b/src/main/java/de/rwth/idsg/steve/JettyServer.java index b666ddc5e..0b47a0981 100644 --- a/src/main/java/de/rwth/idsg/steve/JettyServer.java +++ b/src/main/java/de/rwth/idsg/steve/JettyServer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/NotificationFeature.java b/src/main/java/de/rwth/idsg/steve/NotificationFeature.java index 352f43eff..6174a037f 100644 --- a/src/main/java/de/rwth/idsg/steve/NotificationFeature.java +++ b/src/main/java/de/rwth/idsg/steve/NotificationFeature.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveAppContext.java b/src/main/java/de/rwth/idsg/steve/SteveAppContext.java index 1b6639f58..875a2fe15 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveAppContext.java +++ b/src/main/java/de/rwth/idsg/steve/SteveAppContext.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveConfiguration.java b/src/main/java/de/rwth/idsg/steve/SteveConfiguration.java index 6f0462074..d9f93697e 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/SteveConfiguration.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveDevStarter.java b/src/main/java/de/rwth/idsg/steve/SteveDevStarter.java index 198c97a4c..4ee2b6867 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveDevStarter.java +++ b/src/main/java/de/rwth/idsg/steve/SteveDevStarter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveException.java b/src/main/java/de/rwth/idsg/steve/SteveException.java index 285a92be7..3b89f889e 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveException.java +++ b/src/main/java/de/rwth/idsg/steve/SteveException.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveProdCondition.java b/src/main/java/de/rwth/idsg/steve/SteveProdCondition.java index c092959fb..4939557a0 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveProdCondition.java +++ b/src/main/java/de/rwth/idsg/steve/SteveProdCondition.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveProdStarter.java b/src/main/java/de/rwth/idsg/steve/SteveProdStarter.java index ef29608e4..d1214fa01 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveProdStarter.java +++ b/src/main/java/de/rwth/idsg/steve/SteveProdStarter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java index 4ce50eb0f..2d370895a 100644 --- a/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java index 976da53b9..74cc1b612 100644 --- a/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/config/SecurityConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/SecurityConfiguration.java index 4e5f32fd4..651e6b570 100644 --- a/src/main/java/de/rwth/idsg/steve/config/SecurityConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/SecurityConfiguration.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java index 17a004c4c..9d4a2b424 100644 --- a/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java index b6aa4a0d0..f65a92b1d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java index 559dc024c..a5e8494ad 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java index be973604a..c7ab50399 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java index ca563fc8f..9df6c65e2 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java index 49bdbd5c4..d87bd76bf 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java index 859c1d3d9..6245f4d64 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java index e80966709..f92bb6c7a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java index 6cf2ad8ce..d5a35682e 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java index cf4b132ee..8c2f30a33 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java b/src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java index 32739021c..0902218be 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java b/src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java index 43d57b308..b91d263ad 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java b/src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java index 4a10b2dff..24cbe31b4 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java b/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java index cc80dfa0c..fba7a1fbf 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java b/src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java index 6a139a0c9..e9430a972 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java b/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java index adfd8d810..ad7182676 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java index f27704f49..386caf56b 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15.java index 34ed09330..8caa69620 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java index f50569d46..adbe39367 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16.java index fa16d07d8..54275c774 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java index 5f57c455d..fe557e6b1 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java index 95c0557dd..7ce1d2eb6 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java index dd8e6ce6f..e3e0828a0 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java index 0f43cd445..07661727b 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java index 0fc7f1cc0..44d2abbcf 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java index c3b8587c5..870ac4d7d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java index 7aa7622d9..ddca587ac 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java index 9678a2b61..92010d496 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java index 2d087f5db..ef2540b32 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java index 36bb94b92..e75ffbe09 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java index 84ebefc14..2c2028a6e 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java index 49e6ea8bd..219436d27 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java index 2708892a8..c97ee614d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java index d8c8177fc..4c845522b 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java index b91e1e9ed..204f2354f 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java index 8ff0bad34..8368a3a6f 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java index 4f9d805fd..54e3c2175 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java index 964ac52b8..a075c840a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java index 631d4515f..0886a386e 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java index a2e6c9ccf..16219b562 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java index a568b9ede..dd151244e 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java index 2aaee0077..2a8950215 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java index fc4dabdf2..d2ae0e500 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java index 2b83d2d0b..edfb914b2 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java index 5ecfb0871..0427dd25a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java index fb2d54ff4..9cdf5f1d8 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java index 5ca24e253..732375a21 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java index 78fe95cab..565fcf3d9 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java index ff6128e8c..37d3ed796 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java index 89173cdd3..2e14e89dd 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java index 23a098ab8..c4462a159 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java index 8d66f9b98..b2f43f2d6 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java index a92b8d555..d1638edb8 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java index de400b6ba..ea5731f9d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java index ed3b727c7..112355b0f 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStoreImpl.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStoreImpl.java index a458cd1bb..b9ae0d29d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStoreImpl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStoreImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java index 161b0cbba..2fca3eef2 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java index 751537049..f5de8e94d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java index 26dcc9e8a..96e3760ca 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java index 8d4d7405e..e0d5f3b57 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStoreImpl.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStoreImpl.java index 5d1747321..a6ae7624a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStoreImpl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStoreImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java index 03f459a17..6d4d0e8cc 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java index ee21cdd11..ec3d4db98 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java index 43a1c6aef..77928c15d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java index 3d9f87d3a..a45531d2f 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java index 095e51147..2c9d6852f 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java index 4fefddeac..7ef271a4e 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java index 6635f4bc6..9b5ecb834 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java index 8d1e216fa..f0d3eab07 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java index f8923f867..2dbeb1d12 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java index 144f2096c..0d11142aa 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java index 1fcdc22dd..f5a0cd057 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java index c05478999..0b0f68b71 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java index 234b58fc8..f43066183 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java index d6b7bc03d..0d8bad53d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java index 22a53604a..014444d7a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java index 9d4420646..caaa36182 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java index ceb33a752..c5ed13172 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java index d3c2f6c78..a31bfdafe 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java index a980627bf..d19d4b62d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java index a469b6db7..7dfd41f81 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java index c87657b85..560341e61 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java index cb5add742..d82443f11 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java index ed63fce5c..06237be68 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java index a965fd22d..ec8ce38c0 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java index 1db4fd69e..285e5aaf5 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java index 31b1db85a..6935c5b40 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java index 3d7a71b1c..c25be7f82 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java index d80bc8e54..1d77d8ad3 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java index 0972788ba..11b451343 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java index 2c5e79f4f..99e614fac 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java index 9237ef4c1..6eb32becd 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java index 1f2298f32..4acee7e94 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java index d2f8afa89..d40967351 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java index 3dc6975a5..7146187ed 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/AddressRepository.java b/src/main/java/de/rwth/idsg/steve/repository/AddressRepository.java index 172ee7a1d..d86f78c1a 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/AddressRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/AddressRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java b/src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java index a08c31499..1f2f557da 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/ChargingProfileRepository.java b/src/main/java/de/rwth/idsg/steve/repository/ChargingProfileRepository.java index ba99ac26a..c67a23137 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/ChargingProfileRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/ChargingProfileRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/GenericRepository.java b/src/main/java/de/rwth/idsg/steve/repository/GenericRepository.java index 1b28dd911..c9fd2ca16 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/GenericRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/GenericRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java b/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java index 5d82ec751..11e3e3817 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/OcppTagRepository.java b/src/main/java/de/rwth/idsg/steve/repository/OcppTagRepository.java index 9424da20d..11b6abc2b 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/OcppTagRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/OcppTagRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java b/src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java index 367633882..2132e5d03 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/ReservationStatus.java b/src/main/java/de/rwth/idsg/steve/repository/ReservationStatus.java index cc28fc2ab..a657ed77a 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/ReservationStatus.java +++ b/src/main/java/de/rwth/idsg/steve/repository/ReservationStatus.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/SettingsRepository.java b/src/main/java/de/rwth/idsg/steve/repository/SettingsRepository.java index 49a880d0f..9eaebdef5 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/SettingsRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/SettingsRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/TaskStore.java b/src/main/java/de/rwth/idsg/steve/repository/TaskStore.java index 110f694dd..2ae5b16eb 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/TaskStore.java +++ b/src/main/java/de/rwth/idsg/steve/repository/TaskStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java b/src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java index 050ca3eae..73d73887b 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/UserRepository.java b/src/main/java/de/rwth/idsg/steve/repository/UserRepository.java index e5c722891..e298c68ba 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/UserRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/UserRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java index 98e01cdd7..9d8b442ba 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java index 8098761e5..5cc2cf1f7 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java index 112faf46b..9f9fd4ab4 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfileAssignment.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfileAssignment.java index e1a825573..4356cb858 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfileAssignment.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfileAssignment.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java index 5f479f5a2..8e670a2b6 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java b/src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java index 4087246e6..99155997c 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java index 574248fd9..1ed00a1d6 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java index f8b369ebf..b3e6da7bc 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertTransactionParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertTransactionParams.java index a2f605f39..a31baa2cd 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertTransactionParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertTransactionParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/MailSettings.java b/src/main/java/de/rwth/idsg/steve/repository/dto/MailSettings.java index 5b22cc68c..9fae49bba 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/MailSettings.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/MailSettings.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java b/src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java index c29ffc02d..6a53d72a1 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/Reservation.java b/src/main/java/de/rwth/idsg/steve/repository/dto/Reservation.java index 3474d9a21..ed010718a 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/Reservation.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/Reservation.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/TaskOverview.java b/src/main/java/de/rwth/idsg/steve/repository/dto/TaskOverview.java index 7c48bd3a0..540401509 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/TaskOverview.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/TaskOverview.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/Transaction.java b/src/main/java/de/rwth/idsg/steve/repository/dto/Transaction.java index 90dd376a7..eae2eea85 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/Transaction.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/Transaction.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java b/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java index 21e400521..11a74b136 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java b/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java index 9d40402a5..b159b5f8a 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java index d344b019a..9a8ebcc79 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateTransactionParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateTransactionParams.java index b53863aba..8af7215dd 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateTransactionParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateTransactionParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/User.java b/src/main/java/de/rwth/idsg/steve/repository/dto/User.java index 7075341b6..37bb9b51c 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/User.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/User.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java index bf770ab95..10a487895 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java index 7e5010459..73213b76a 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java index fdd134d62..bf7122532 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java index 3a46b8aaa..65f99404d 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java index a89e44826..b34546735 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java index 544eb3db8..cd6590f31 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java index 9c1e933a2..94e772dd7 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java index adedcb291..ab18f9a98 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java index e6f460a94..84b399c39 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java index 3b1b3e764..fe946a6de 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java index c1b3704e5..6122d7411 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/BackgroundService.java b/src/main/java/de/rwth/idsg/steve/service/BackgroundService.java index e6ec8ed36..1cf49a621 100644 --- a/src/main/java/de/rwth/idsg/steve/service/BackgroundService.java +++ b/src/main/java/de/rwth/idsg/steve/service/BackgroundService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java b/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java index d3ca850ae..e36ab80f3 100644 --- a/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java +++ b/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java index 9eda7f6e7..e550d96f6 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperServiceImpl.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperServiceImpl.java index 8577972e9..4787d634a 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperServiceImpl.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperServiceImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointService12_Client.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointService12_Client.java index bca3a8fd4..4fb9098be 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointService12_Client.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointService12_Client.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointService15_Client.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointService15_Client.java index 8d4952bfc..357445bba 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointService15_Client.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointService15_Client.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java index b0af66ee9..2f2196802 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/DummyReleaseCheckService.java b/src/main/java/de/rwth/idsg/steve/service/DummyReleaseCheckService.java index 1bec2f9eb..cd9a44169 100644 --- a/src/main/java/de/rwth/idsg/steve/service/DummyReleaseCheckService.java +++ b/src/main/java/de/rwth/idsg/steve/service/DummyReleaseCheckService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java b/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java index 4c6492638..24498f31c 100644 --- a/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java +++ b/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/MailService.java b/src/main/java/de/rwth/idsg/steve/service/MailService.java index 3c185f9ea..1ae54d67c 100644 --- a/src/main/java/de/rwth/idsg/steve/service/MailService.java +++ b/src/main/java/de/rwth/idsg/steve/service/MailService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java index 1373e857b..d59cc48e2 100644 --- a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java +++ b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/NotificationServiceImpl.java b/src/main/java/de/rwth/idsg/steve/service/NotificationServiceImpl.java index f9c7a72d9..8696e8e8e 100644 --- a/src/main/java/de/rwth/idsg/steve/service/NotificationServiceImpl.java +++ b/src/main/java/de/rwth/idsg/steve/service/NotificationServiceImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java b/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java index 3e6529653..bbf7b8c1b 100644 --- a/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java +++ b/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/OcppTagServiceImpl.java b/src/main/java/de/rwth/idsg/steve/service/OcppTagServiceImpl.java index 8a21256c3..c6ac73d24 100644 --- a/src/main/java/de/rwth/idsg/steve/service/OcppTagServiceImpl.java +++ b/src/main/java/de/rwth/idsg/steve/service/OcppTagServiceImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/ReleaseCheckService.java b/src/main/java/de/rwth/idsg/steve/service/ReleaseCheckService.java index 844534760..ac00e2165 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ReleaseCheckService.java +++ b/src/main/java/de/rwth/idsg/steve/service/ReleaseCheckService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java b/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java index 32177c5bc..1dbdf10eb 100644 --- a/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java +++ b/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java b/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java index 591a9a54f..fa9123547 100644 --- a/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java +++ b/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedReserveNowParams.java b/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedReserveNowParams.java index 4a6238137..f88411272 100644 --- a/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedReserveNowParams.java +++ b/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedReserveNowParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedSetChargingProfileParams.java b/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedSetChargingProfileParams.java index 01c06dba4..38d9f0db1 100644 --- a/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedSetChargingProfileParams.java +++ b/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedSetChargingProfileParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java b/src/main/java/de/rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java index 31a60baed..32da5461b 100644 --- a/src/main/java/de/rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java +++ b/src/main/java/de/rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java index 03f5867fa..5023519a4 100755 --- a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java index bf8d0cf33..623593a71 100755 --- a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java b/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java index 557960908..9b28a101d 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java b/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java index 246be42a3..316ce7940 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java +++ b/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/DateConverter.java b/src/main/java/de/rwth/idsg/steve/utils/DateConverter.java index 45a4d8c60..137335d1b 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/DateConverter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/DateConverter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java b/src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java index 9f7acfbff..96d9fa8e8 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java b/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java index fff7b8697..2bb07b89b 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java +++ b/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java b/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java index 8501c7847..2dae7ab15 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java +++ b/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java b/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java index 190a17918..edaf46c5f 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java +++ b/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java b/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java index 4574e86c2..8d221326b 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java +++ b/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java b/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java index 174d392cb..e2f1d6fb0 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java +++ b/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/ssl/CompositeX509KeyManager.java b/src/main/java/de/rwth/idsg/steve/utils/ssl/CompositeX509KeyManager.java index 2c722b3ac..72fe540ad 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/ssl/CompositeX509KeyManager.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ssl/CompositeX509KeyManager.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/ssl/CompositeX509TrustManager.java b/src/main/java/de/rwth/idsg/steve/utils/ssl/CompositeX509TrustManager.java index c9e1f8691..f8963415b 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/ssl/CompositeX509TrustManager.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ssl/CompositeX509TrustManager.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyManagerAlgorithmStep.java b/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyManagerAlgorithmStep.java index 6fea2f050..1bf0fca25 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyManagerAlgorithmStep.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyManagerAlgorithmStep.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyManagerPasswordStep.java b/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyManagerPasswordStep.java index c249cb6d7..840231ae4 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyManagerPasswordStep.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyManagerPasswordStep.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyStoreStep.java b/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyStoreStep.java index f7473beee..c7dd1b77b 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyStoreStep.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyStoreStep.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/ssl/ProtocolStep.java b/src/main/java/de/rwth/idsg/steve/utils/ssl/ProtocolStep.java index 6a2376a1e..f033d5545 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/ssl/ProtocolStep.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ssl/ProtocolStep.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/ssl/SslContextBuilder.java b/src/main/java/de/rwth/idsg/steve/utils/ssl/SslContextBuilder.java index 4c094d440..a242c063f 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/ssl/SslContextBuilder.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ssl/SslContextBuilder.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/ssl/SslContextStep.java b/src/main/java/de/rwth/idsg/steve/utils/ssl/SslContextStep.java index 4e5047996..dea4b4e45 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/ssl/SslContextStep.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ssl/SslContextStep.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java b/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java index 6983ee89d..bff780ca5 100644 --- a/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java +++ b/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java b/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java index 8ddbac09d..80e5d5d51 100644 --- a/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java +++ b/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java b/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java index 556c8a7a3..4ff8cfb7b 100644 --- a/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java +++ b/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java b/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java index 3b3bf3cdc..14e67ac28 100644 --- a/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java +++ b/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java b/src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java index 1c5cc30ba..83d618a23 100644 --- a/src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java +++ b/src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java index 9264dd0c2..41706f266 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java b/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java index f5a66cf8d..a5e433b50 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java index 37238e432..b1b4ba1b4 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java b/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java index 147f14df2..9d4de6f5b 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java b/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java index 16ed1484b..0c153be22 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java b/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java index 21ffa7a10..75a9d0fa7 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java index aadd7003e..e6be6c8ce 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java index 86192ace3..7c9319bf0 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java index fce057fd9..163d21aba 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java index 0aa4a268e..adcda0cb0 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/SignOutController.java b/src/main/java/de/rwth/idsg/steve/web/controller/SignOutController.java index a1fe45900..0444d27a1 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/SignOutController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/SignOutController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java b/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java index db48dd3ba..e5d876123 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java index 893fc5089..553dcb93b 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java b/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java index b2a306121..9f51ed36e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/Address.java b/src/main/java/de/rwth/idsg/steve/web/dto/Address.java index 3a92e42bc..0c6ee0ee7 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/Address.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/Address.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java index 3e531a9e3..6db7b69a0 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java index 53eb42651..b46a0d98c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java index 8dd4bd8fd..9ba009a5f 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java index 4779a5414..4c25504eb 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java index 3c125227f..43319ef7d 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java index ba23ecc22..9aec21f3d 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java index b791fc1e9..f92b4fc89 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java b/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java index 6823e3c16..270ef0bed 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java index 50e755715..82cb85545 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java index 4195d77b6..6ff1ddb73 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java index 866a837c8..51455c741 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java index 1ddb6d8c4..e3a11a739 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java index 9dccff15b..99c65e761 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java b/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java index 3b61ac498..dc7e9e062 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java b/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java index c1477f668..7a45e0479 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java index 73b5769c5..a7c8ac5f2 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java index 470eebe6b..953bcef58 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java b/src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java index 8737041ac..c7f8b4e70 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java index 31d2858d7..e2ddeb746 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java index c626a6fba..dfa9bde96 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java index fa0e55ecf..0bf9c0324 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java b/src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java index c7bc80396..a92961952 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java index f68f8361c..2f51c0058 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java index d0a6b8c2d..33f7a464c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java index 27391b3e8..da93e6813 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java index d92450a1d..a726f8a0c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java index a697f4d1e..ea39b2072 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java index 9bd6a89b9..ea8c943b9 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java index cbf977c3a..52a289d73 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java index b29615538..6d32bbf6b 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyReadWriteEnum.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyReadWriteEnum.java index cf9638028..a185a7975 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyReadWriteEnum.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyReadWriteEnum.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java index f1767bb57..8f31e8f8e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java index 916c5dcb2..7cfb032e1 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java index 70a678c6d..1987f63c2 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java index 74cd60d49..0f9c91882 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java index c487e2cca..71ce01b5e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java index 8a43d6a7f..f749aa380 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java index f67448d7d..851e5aad4 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java index 9649590ca..53b2751ca 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java index b21a892ca..0e0c8605f 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java index 9cdcb88ae..4d54ed435 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java index 61c68f090..a986a9f9e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java index 1a23649ca..8d82df338 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java index b814da4c7..c9065244a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java index d9e54723c..2d6aa6f5d 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java index 659946bee..993653fc9 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageParams.java index a6c72646f..ba3b5f86a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java index b00e0daf7..3bf764226 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java index 69c157730..fb59f384f 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java index 79409500b..c49f31ef6 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdListValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdListValidator.java index 2c3fd6a2f..0cc0d5c49 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdListValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdListValidator.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java index 8804d675d..847163702 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollection.java b/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollection.java index ec842189f..e5ead973b 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollection.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollection.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollectionValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollectionValidator.java index 817433720..f4f8fd0a5 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollectionValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollectionValidator.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java b/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java index 36546f4ab..d0cf97012 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagListValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagListValidator.java index 4efa5d69b..5214f8c59 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagListValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagListValidator.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java index ac5b77f8c..1b90250d7 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-context.jsp b/src/main/resources/webapp/WEB-INF/views/00-context.jsp index 252ba1706..b6b6b1dcb 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-context.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-context.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-cp-multiple.jsp b/src/main/resources/webapp/WEB-INF/views/00-cp-multiple.jsp index f7d688ab2..3ea964fec 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-cp-multiple.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-cp-multiple.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-cp-single.jsp b/src/main/resources/webapp/WEB-INF/views/00-cp-single.jsp index 66dc94609..5822f4cb9 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-cp-single.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-cp-single.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-error.jsp b/src/main/resources/webapp/WEB-INF/views/00-error.jsp index 0d14ea4b8..97474f63e 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-error.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-error.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-footer.jsp b/src/main/resources/webapp/WEB-INF/views/00-footer.jsp index 7a6e8e543..59c05ed86 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-footer.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-footer.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-header.jsp b/src/main/resources/webapp/WEB-INF/views/00-header.jsp index d65977e10..283033ecf 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-header.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-header.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-op-bind-errors.jsp b/src/main/resources/webapp/WEB-INF/views/00-op-bind-errors.jsp index a73217190..54697d3cf 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-op-bind-errors.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-op-bind-errors.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/GetConfigurationResponse.jsp b/src/main/resources/webapp/WEB-INF/views/GetConfigurationResponse.jsp index 618bab109..9ba59c6ff 100644 --- a/src/main/resources/webapp/WEB-INF/views/GetConfigurationResponse.jsp +++ b/src/main/resources/webapp/WEB-INF/views/GetConfigurationResponse.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/about.jsp b/src/main/resources/webapp/WEB-INF/views/about.jsp index 3f45c9fb5..a3a41a031 100644 --- a/src/main/resources/webapp/WEB-INF/views/about.jsp +++ b/src/main/resources/webapp/WEB-INF/views/about.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp b/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp index fef4161ff..5dec5d6c7 100644 --- a/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp +++ b/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-address.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-address.jsp index 97986d07c..98ebb9749 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-address.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-address.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp index 1762d3e8e..712770681 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-cp-misc.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-cp-misc.jsp index 97cf3e4d3..8a5482000 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-cp-misc.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-cp-misc.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-ocppTag.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-ocppTag.jsp index a0dbba733..ed4a3e034 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-ocppTag.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-ocppTag.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-user-ocpp.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-user-ocpp.jsp index 87d2112ba..13dc7272c 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-user-ocpp.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-user-ocpp.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-user-profile.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-user-profile.jsp index f591eae10..4e6048d91 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-user-profile.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-user-profile.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargepointAdd.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargepointAdd.jsp index fd76b552f..0dcf269ec 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargepointAdd.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargepointAdd.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargepointDetails.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargepointDetails.jsp index 2de3012f3..e1bc91c97 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargepointDetails.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargepointDetails.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargepoints.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargepoints.jsp index 1a2023876..3ac4951be 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargepoints.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargepoints.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp index 1fbbd2ffb..037e980be 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAssignments.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAssignments.jsp index 14a524d97..9775e0fb6 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAssignments.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAssignments.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileDetails.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileDetails.jsp index e8b5e263c..851dfa184 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileDetails.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileDetails.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfiles.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfiles.jsp index 5c0ee00c5..26ec25a9d 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfiles.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfiles.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp index aefc8cacd..1760fa153 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp index 722db958e..304fe6cae 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp index 1f594dd7e..8908fd811 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/reservations.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/reservations.jsp index cb7a934a1..eeab1c0df 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/reservations.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/reservations.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/transactionDetails.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/transactionDetails.jsp index b297eced8..9b995385e 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/transactionDetails.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/transactionDetails.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp index 4eeaad878..23cfdcc2e 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/userAdd.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/userAdd.jsp index 581ca7f29..d8738edcc 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/userAdd.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/userAdd.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/userDetails.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/userDetails.jsp index babe4326b..83ad471c3 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/userDetails.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/userDetails.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/users.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/users.jsp index 974ead772..45f372e6e 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/users.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/users.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/home.jsp b/src/main/resources/webapp/WEB-INF/views/home.jsp index 14c61baa5..ff857539c 100644 --- a/src/main/resources/webapp/WEB-INF/views/home.jsp +++ b/src/main/resources/webapp/WEB-INF/views/home.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/ocppJsonStatus.jsp b/src/main/resources/webapp/WEB-INF/views/ocppJsonStatus.jsp index dc392206a..1bf428d7a 100644 --- a/src/main/resources/webapp/WEB-INF/views/ocppJsonStatus.jsp +++ b/src/main/resources/webapp/WEB-INF/views/ocppJsonStatus.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp index abaab97b8..f9db1de00 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp index 2d1335c07..06d9ba6d5 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeConfigurationForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeConfigurationForm.jsp index bb1ccb158..089e4b767 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeConfigurationForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeConfigurationForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp index 934bb81b2..bf223c728 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ClearChargingProfileForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ClearChargingProfileForm.jsp index c2e48a655..02e9f27e8 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ClearChargingProfileForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ClearChargingProfileForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp index 4793b63cd..4b98220c5 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp index d3ef4d919..b8151b926 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp index 766045ae1..9d6d331c3 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp index 0e89f623d..a4a808475 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp index 4340a60e0..3535a6922 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp index a43619852..127383527 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp index f128cc35c..2926f01f5 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp index 314f2290a..f6af805f3 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ResetForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ResetForm.jsp index aa129a1d5..9c7bd9c27 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ResetForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ResetForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp index 40514dafe..372b6dae7 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp index 4d491bad3..cf7d0fb27 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp index 0aa2c84db..d2555b990 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp index 14f62ff9f..cc216afd8 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp index 250116258..a72a85496 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/ChangeAvailability.jsp b/src/main/resources/webapp/WEB-INF/views/op12/ChangeAvailability.jsp index adf82e208..8eadcd6d0 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/ChangeAvailability.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/ChangeAvailability.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/ChangeConfiguration.jsp b/src/main/resources/webapp/WEB-INF/views/op12/ChangeConfiguration.jsp index 7926246ad..a9280ee88 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/ChangeConfiguration.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/ChangeConfiguration.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/ClearCache.jsp b/src/main/resources/webapp/WEB-INF/views/op12/ClearCache.jsp index 06b1d8cfe..fecc4edf4 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/ClearCache.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/ClearCache.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/GetDiagnostics.jsp b/src/main/resources/webapp/WEB-INF/views/op12/GetDiagnostics.jsp index 794bc5b18..f8d943ba2 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/GetDiagnostics.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/GetDiagnostics.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp index 347c75808..22fb22dc6 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp index 79d54c3ae..8222e00ce 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/Reset.jsp b/src/main/resources/webapp/WEB-INF/views/op12/Reset.jsp index a8af2303d..236525d3d 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/Reset.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/Reset.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/UnlockConnector.jsp b/src/main/resources/webapp/WEB-INF/views/op12/UnlockConnector.jsp index 2a0d13275..126f1908c 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/UnlockConnector.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/UnlockConnector.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/UpdateFirmware.jsp b/src/main/resources/webapp/WEB-INF/views/op12/UpdateFirmware.jsp index 914ba9cd7..f133b3ec8 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/UpdateFirmware.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/UpdateFirmware.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/CancelReservation.jsp b/src/main/resources/webapp/WEB-INF/views/op15/CancelReservation.jsp index 4b4775c96..1f1873413 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/CancelReservation.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/CancelReservation.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/ChangeAvailability.jsp b/src/main/resources/webapp/WEB-INF/views/op15/ChangeAvailability.jsp index 13c00eb39..aed3965a0 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/ChangeAvailability.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/ChangeAvailability.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/ChangeConfiguration.jsp b/src/main/resources/webapp/WEB-INF/views/op15/ChangeConfiguration.jsp index 53f30e6eb..4d47d3cd2 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/ChangeConfiguration.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/ChangeConfiguration.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/ClearCache.jsp b/src/main/resources/webapp/WEB-INF/views/op15/ClearCache.jsp index 7af86586a..482659bb7 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/ClearCache.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/ClearCache.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/DataTransfer.jsp b/src/main/resources/webapp/WEB-INF/views/op15/DataTransfer.jsp index 78f612eff..ec1af16dc 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/DataTransfer.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/DataTransfer.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/GetConfiguration.jsp b/src/main/resources/webapp/WEB-INF/views/op15/GetConfiguration.jsp index f435372f5..4150b19ca 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/GetConfiguration.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/GetConfiguration.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/GetDiagnostics.jsp b/src/main/resources/webapp/WEB-INF/views/op15/GetDiagnostics.jsp index 31f58a5b4..c8de83356 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/GetDiagnostics.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/GetDiagnostics.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/GetLocalListVersion.jsp b/src/main/resources/webapp/WEB-INF/views/op15/GetLocalListVersion.jsp index fe31cfb89..7930ae351 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/GetLocalListVersion.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/GetLocalListVersion.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp index 9259d2e75..374e40b93 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp index f59d06d16..146ef2414 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/ReserveNow.jsp b/src/main/resources/webapp/WEB-INF/views/op15/ReserveNow.jsp index e581025dc..c13782237 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/ReserveNow.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/ReserveNow.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/Reset.jsp b/src/main/resources/webapp/WEB-INF/views/op15/Reset.jsp index 7661e51e3..d56658a28 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/Reset.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/Reset.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/SendLocalList.jsp b/src/main/resources/webapp/WEB-INF/views/op15/SendLocalList.jsp index f7ec020c7..a437bdb31 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/SendLocalList.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/SendLocalList.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/UnlockConnector.jsp b/src/main/resources/webapp/WEB-INF/views/op15/UnlockConnector.jsp index ad006f93f..a67a6a0aa 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/UnlockConnector.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/UnlockConnector.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/UpdateFirmware.jsp b/src/main/resources/webapp/WEB-INF/views/op15/UpdateFirmware.jsp index cfb01dfbf..6fe0e2f73 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/UpdateFirmware.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/UpdateFirmware.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/CancelReservation.jsp b/src/main/resources/webapp/WEB-INF/views/op16/CancelReservation.jsp index 462bde3bd..ffe343bd7 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/CancelReservation.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/CancelReservation.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/ChangeAvailability.jsp b/src/main/resources/webapp/WEB-INF/views/op16/ChangeAvailability.jsp index d3e6beb30..6665e6a06 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/ChangeAvailability.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/ChangeAvailability.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/ChangeConfiguration.jsp b/src/main/resources/webapp/WEB-INF/views/op16/ChangeConfiguration.jsp index d05cc5c27..e2d7c79a5 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/ChangeConfiguration.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/ChangeConfiguration.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/ClearCache.jsp b/src/main/resources/webapp/WEB-INF/views/op16/ClearCache.jsp index 24bf26176..0b1ee9153 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/ClearCache.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/ClearCache.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/ClearChargingProfile.jsp b/src/main/resources/webapp/WEB-INF/views/op16/ClearChargingProfile.jsp index 16c0f6360..9f369ad82 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/ClearChargingProfile.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/ClearChargingProfile.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/DataTransfer.jsp b/src/main/resources/webapp/WEB-INF/views/op16/DataTransfer.jsp index d1b1679ad..a3b46e7de 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/DataTransfer.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/DataTransfer.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp b/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp index b8a38cfed..43b16da5f 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeScheduleResponse.jsp b/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeScheduleResponse.jsp index e4118f6b5..a4620e08e 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeScheduleResponse.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeScheduleResponse.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/GetConfiguration.jsp b/src/main/resources/webapp/WEB-INF/views/op16/GetConfiguration.jsp index a68435117..d2d3acee5 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/GetConfiguration.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/GetConfiguration.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/GetDiagnostics.jsp b/src/main/resources/webapp/WEB-INF/views/op16/GetDiagnostics.jsp index b070bffad..257799842 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/GetDiagnostics.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/GetDiagnostics.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/GetLocalListVersion.jsp b/src/main/resources/webapp/WEB-INF/views/op16/GetLocalListVersion.jsp index 86b0a3754..d0cb610a9 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/GetLocalListVersion.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/GetLocalListVersion.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp index b996c291f..df5d9e9ff 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp index 8ed4c6e57..5448be96c 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/ReserveNow.jsp b/src/main/resources/webapp/WEB-INF/views/op16/ReserveNow.jsp index ab222eafc..c3a945c1d 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/ReserveNow.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/ReserveNow.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/Reset.jsp b/src/main/resources/webapp/WEB-INF/views/op16/Reset.jsp index 62b7041a7..f7c36fa05 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/Reset.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/Reset.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/SendLocalList.jsp b/src/main/resources/webapp/WEB-INF/views/op16/SendLocalList.jsp index 76eb69269..45c5cd2b4 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/SendLocalList.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/SendLocalList.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/SetChargingProfile.jsp b/src/main/resources/webapp/WEB-INF/views/op16/SetChargingProfile.jsp index 7f000684d..4471de830 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/SetChargingProfile.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/SetChargingProfile.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/TriggerMessage.jsp b/src/main/resources/webapp/WEB-INF/views/op16/TriggerMessage.jsp index 4624d344a..8f8a7d84d 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/TriggerMessage.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/TriggerMessage.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/UnlockConnector.jsp b/src/main/resources/webapp/WEB-INF/views/op16/UnlockConnector.jsp index cdec32b80..65de2b8be 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/UnlockConnector.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/UnlockConnector.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/UpdateFirmware.jsp b/src/main/resources/webapp/WEB-INF/views/op16/UpdateFirmware.jsp index 5d9e957f1..a8bcda67e 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/UpdateFirmware.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/UpdateFirmware.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/settings.jsp b/src/main/resources/webapp/WEB-INF/views/settings.jsp index 3bb3ed75b..bdf4515a1 100644 --- a/src/main/resources/webapp/WEB-INF/views/settings.jsp +++ b/src/main/resources/webapp/WEB-INF/views/settings.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/signin.jsp b/src/main/resources/webapp/WEB-INF/views/signin.jsp index c99e10ccd..5d1a19869 100644 --- a/src/main/resources/webapp/WEB-INF/views/signin.jsp +++ b/src/main/resources/webapp/WEB-INF/views/signin.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/taskResult.jsp b/src/main/resources/webapp/WEB-INF/views/taskResult.jsp index c0212082b..2b1d92c1a 100644 --- a/src/main/resources/webapp/WEB-INF/views/taskResult.jsp +++ b/src/main/resources/webapp/WEB-INF/views/taskResult.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/tasks.jsp b/src/main/resources/webapp/WEB-INF/views/tasks.jsp index 91ba7c9c1..a3051e70b 100644 --- a/src/main/resources/webapp/WEB-INF/views/tasks.jsp +++ b/src/main/resources/webapp/WEB-INF/views/tasks.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java index afb95cc84..cb7b8af35 100644 --- a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java +++ b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/ApplicationTest.java b/src/test/java/de/rwth/idsg/steve/ApplicationTest.java index a2d8ca297..10cb4692e 100644 --- a/src/test/java/de/rwth/idsg/steve/ApplicationTest.java +++ b/src/test/java/de/rwth/idsg/steve/ApplicationTest.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java b/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java index 5a6504563..51010ed15 100644 --- a/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java +++ b/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/StressTest.java b/src/test/java/de/rwth/idsg/steve/StressTest.java index efb0df4fa..d8aee6fae 100644 --- a/src/test/java/de/rwth/idsg/steve/StressTest.java +++ b/src/test/java/de/rwth/idsg/steve/StressTest.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java b/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java index bd932b4b4..a3864bdc1 100644 --- a/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java +++ b/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java b/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java index 1835bd940..c45ff4d69 100644 --- a/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java +++ b/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java b/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java index a1d1b115f..8a16b92a7 100644 --- a/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java +++ b/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue72.java b/src/test/java/de/rwth/idsg/steve/issues/Issue72.java index 1d21e51b7..28e90dbe5 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue72.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue72.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java b/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java index 5481eba40..9c11105d0 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java b/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java index cbce4ad20..35faa25b9 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue81.java b/src/test/java/de/rwth/idsg/steve/issues/Issue81.java index 0ea55d12f..72ac435f1 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue81.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue81.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/utils/Helpers.java b/src/test/java/de/rwth/idsg/steve/utils/Helpers.java index ff32920fb..77d665b5b 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/Helpers.java +++ b/src/test/java/de/rwth/idsg/steve/utils/Helpers.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java b/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java index 13a55f1ed..fa921fb9e 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java +++ b/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/utils/StressTester.java b/src/test/java/de/rwth/idsg/steve/utils/StressTester.java index a58f62ec5..a4b2d3f32 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/StressTester.java +++ b/src/test/java/de/rwth/idsg/steve/utils/StressTester.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java b/src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java index 184c922d7..480efad69 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java +++ b/src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify From 2bc190309614fff05e2224a4afc38fc1546c43c2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 12:13:11 +0000 Subject: [PATCH 011/548] Bump spring.security.version from 5.3.0.RELEASE to 5.3.1.RELEASE Bumps `spring.security.version` from 5.3.0.RELEASE to 5.3.1.RELEASE. Updates `spring-security-web` from 5.3.0.RELEASE to 5.3.1.RELEASE - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.3.0.RELEASE...5.3.1.RELEASE) Updates `spring-security-config` from 5.3.0.RELEASE to 5.3.1.RELEASE - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.3.0.RELEASE...5.3.1.RELEASE) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0cabf2182..059c6daba 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.12.4 3.3.6 5.2.5.RELEASE - 5.3.0.RELEASE + 5.3.1.RELEASE 8.0.19 9.4.19.v20190610 1.18.12 From e2c9e185caf81e6e3f39733fa6d94c94a8de732b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Apr 2020 12:12:45 +0000 Subject: [PATCH 012/548] Bump hibernate-validator from 6.1.2.Final to 6.1.3.Final Bumps [hibernate-validator](https://github.com/hibernate/hibernate-validator) from 6.1.2.Final to 6.1.3.Final. - [Release notes](https://github.com/hibernate/hibernate-validator/releases) - [Changelog](https://github.com/hibernate/hibernate-validator/blob/6.1.3.Final/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-validator/compare/6.1.2.Final...6.1.3.Final) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 059c6daba..f101e511d 100644 --- a/pom.xml +++ b/pom.xml @@ -505,7 +505,7 @@ org.hibernate.validator hibernate-validator - 6.1.2.Final + 6.1.3.Final com.google.guava From 6fb3f5ed50dc2c5df29aa31801affcd6c514b82e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 14 Apr 2020 12:12:21 +0000 Subject: [PATCH 013/548] Bump guava from 28.2-jre to 29.0-jre Bumps [guava](https://github.com/google/guava) from 28.2-jre to 29.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f101e511d..13ab857e4 100644 --- a/pom.xml +++ b/pom.xml @@ -510,7 +510,7 @@ com.google.guava guava - 28.2-jre + 29.0-jre com.fasterxml.jackson.core From 132b5e320332f90d35c498e117bc8949a4af09b7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 20 Apr 2020 12:13:12 +0000 Subject: [PATCH 014/548] Bump hibernate-validator from 6.1.3.Final to 6.1.4.Final Bumps [hibernate-validator](https://github.com/hibernate/hibernate-validator) from 6.1.3.Final to 6.1.4.Final. - [Release notes](https://github.com/hibernate/hibernate-validator/releases) - [Changelog](https://github.com/hibernate/hibernate-validator/blob/6.1.4.Final/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-validator/compare/6.1.3.Final...6.1.4.Final) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 13ab857e4..14a7b5702 100644 --- a/pom.xml +++ b/pom.xml @@ -505,7 +505,7 @@ org.hibernate.validator hibernate-validator - 6.1.3.Final + 6.1.4.Final com.google.guava From 6421edc533422f007981668ff10741738ff3460d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Tue, 21 Apr 2020 12:36:47 +0200 Subject: [PATCH 015/548] version bump --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 14a7b5702..95ababe2c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 de.rwth.idsg steve - 3.4.2 + 3.4.3 jar From 20213ec67a9c11319829d573bcff1bd4f0535be3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 21 Apr 2020 12:12:54 +0000 Subject: [PATCH 016/548] Bump flyway-maven-plugin from 6.3.1 to 6.4.0 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 6.3.1 to 6.4.0. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-6.3.1...flyway-6.4.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 95ababe2c..8c035b640 100644 --- a/pom.xml +++ b/pom.xml @@ -288,7 +288,7 @@ org.flywaydb flyway-maven-plugin - 6.3.1 + 6.4.0 From 4dd8cd4111cbb5d77b9bd73ba507197909467ad0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 24 Apr 2020 12:15:58 +0000 Subject: [PATCH 017/548] Bump joda-time from 2.10.5 to 2.10.6 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.5 to 2.10.6. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.5...v2.10.6) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8c035b640..41525f9c0 100644 --- a/pom.xml +++ b/pom.xml @@ -500,7 +500,7 @@ joda-time joda-time - 2.10.5 + 2.10.6 org.hibernate.validator From 8d0d0bd3c686be5a9ec6745d7e6107e584ec4c2b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 24 Apr 2020 12:16:49 +0000 Subject: [PATCH 018/548] Bump log4j-bom from 2.13.1 to 2.13.2 Bumps log4j-bom from 2.13.1 to 2.13.2. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8c035b640..4eda99dfa 100644 --- a/pom.xml +++ b/pom.xml @@ -443,7 +443,7 @@ org.apache.logging.log4j log4j-bom - 2.13.1 + 2.13.2 import pom From 125f9113f5fa256739a6adea5c1eb60340c688ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20Go=CC=88kay?= Date: Sat, 25 Apr 2020 18:30:41 +0200 Subject: [PATCH 019/548] Fix paths with dots in them (e.g. with chargebox id and id tag) (Fixes #300) --- .../de/rwth/idsg/steve/web/controller/OcppTagsController.java | 4 ++-- .../de/rwth/idsg/steve/web/controller/TaskController.java | 2 +- src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp | 4 ++-- src/main/resources/webapp/WEB-INF/views/taskResult.jsp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java index adcda0cb0..5c5b90d7c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java @@ -66,8 +66,8 @@ public class OcppTagsController { protected static final String ADD_SINGLE_PATH = "/add/single"; protected static final String ADD_BATCH_PATH = "/add/batch"; - protected static final String UNKNOWN_REMOVE_PATH = "/unknown/remove/{idTag}"; - protected static final String UNKNOWN_ADD_PATH = "/unknown/add/{idTag}"; + protected static final String UNKNOWN_REMOVE_PATH = "/unknown/remove/{idTag}/"; + protected static final String UNKNOWN_ADD_PATH = "/unknown/add/{idTag}/"; // ------------------------------------------------------------------------- // HTTP methods diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java b/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java index e5d876123..a4d6978c6 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java @@ -47,7 +47,7 @@ public class TaskController { // ------------------------------------------------------------------------- private static final String TASK_ID_PATH = "/{taskId}"; - private static final String TASK_DETAILS_PATH = TASK_ID_PATH + "/details/{chargeBoxId}"; + private static final String TASK_DETAILS_PATH = TASK_ID_PATH + "/details/{chargeBoxId}/"; // ------------------------------------------------------------------------- // HTTP methods diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp index 8908fd811..34e780eb5 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp @@ -52,11 +52,11 @@ ${item.numberOfAttempts} ${item.lastAttemptTimestamp} - +   - + diff --git a/src/main/resources/webapp/WEB-INF/views/taskResult.jsp b/src/main/resources/webapp/WEB-INF/views/taskResult.jsp index 2b1d92c1a..d958f1e95 100644 --- a/src/main/resources/webapp/WEB-INF/views/taskResult.jsp +++ b/src/main/resources/webapp/WEB-INF/views/taskResult.jsp @@ -55,7 +55,7 @@ ${result.value.response} - ${result.value.response} (Details) + ${result.value.response} (Details) From c57b6f1520f26ad67097b0cf8bfa51566a70c1ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20Go=CC=88kay?= Date: Sat, 25 Apr 2020 18:54:46 +0200 Subject: [PATCH 020/548] refactor: delete unnecessary interfaces with one implementing class reason: reduce noise and clutter --- .../ocpp/ws/AbstractWebSocketEndpoint.java | 3 +- .../ocpp/ws/FutureResponseContextStore.java | 67 ++++- .../ws/FutureResponseContextStoreImpl.java | 95 ------- .../steve/ocpp/ws/SessionContextStore.java | 127 ++++++++- .../ocpp/ws/SessionContextStoreImpl.java | 159 ------------ .../service/ChargePointHelperService.java | 193 +++++++++++++- .../service/ChargePointHelperServiceImpl.java | 232 ----------------- .../steve/service/NotificationService.java | 119 ++++++++- .../service/NotificationServiceImpl.java | 148 ----------- .../idsg/steve/service/OcppTagService.java | 206 ++++++++++++++- .../steve/service/OcppTagServiceImpl.java | 241 ------------------ 11 files changed, 675 insertions(+), 915 deletions(-) delete mode 100644 src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStoreImpl.java delete mode 100644 src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStoreImpl.java delete mode 100644 src/main/java/de/rwth/idsg/steve/service/ChargePointHelperServiceImpl.java delete mode 100644 src/main/java/de/rwth/idsg/steve/service/NotificationServiceImpl.java delete mode 100644 src/main/java/de/rwth/idsg/steve/service/OcppTagServiceImpl.java diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java index c4462a159..ed349cce1 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java @@ -32,7 +32,6 @@ import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.PongMessage; import org.springframework.web.socket.TextMessage; -import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.WebSocketMessage; import org.springframework.web.socket.WebSocketSession; @@ -58,7 +57,7 @@ public abstract class AbstractWebSocketEndpoint extends ConcurrentWebSocketHandl public static final String CHARGEBOX_ID_KEY = "CHARGEBOX_ID_KEY"; - private final SessionContextStoreImpl sessionContextStore = new SessionContextStoreImpl(); + private final SessionContextStore sessionContextStore = new SessionContextStore(); private final List> connectedCallbackList = new ArrayList<>(); private final List> disconnectedCallbackList = new ArrayList<>(); private final Object sessionContextLock = new Object(); diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java index 112355b0f..624a023c6 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java @@ -19,16 +19,73 @@ package de.rwth.idsg.steve.ocpp.ws; import de.rwth.idsg.steve.ocpp.ws.data.FutureResponseContext; +import lombok.AccessLevel; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.Nullable; +import org.springframework.stereotype.Service; import org.springframework.web.socket.WebSocketSession; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.BiFunction; + /** + * Presumption: The responses must be sent using the same connection as the requests! + * * @author Sevket Goekay * @since 21.03.2015 */ -public interface FutureResponseContextStore { - void addSession(WebSocketSession session); - void removeSession(WebSocketSession session); - void add(WebSocketSession session, String messageId, FutureResponseContext context); - @Nullable FutureResponseContext get(WebSocketSession session, String messageId); +@Slf4j +@Service +public class FutureResponseContextStore { + + // We store for each chargeBox connection, multiple pairs of (messageId, context) + // (session, (messageId, context)) + private final Map> lookupTable = new ConcurrentHashMap<>(); + + public void addSession(WebSocketSession session) { + addIfAbsent(session); + } + + public void removeSession(WebSocketSession session) { + log.debug("Deleting the store for sessionId '{}'", session.getId()); + lookupTable.remove(session); + } + + public void add(WebSocketSession session, String messageId, FutureResponseContext context) { + Map map = addIfAbsent(session); + map.put(messageId, context); + log.debug("Store size for sessionId '{}': {}", session.getId(), map.size()); + } + + @Nullable + public FutureResponseContext get(WebSocketSession session, String messageId) { + RemoveFunction removeFunction = new RemoveFunction(messageId); + lookupTable.computeIfPresent(session, removeFunction); + return removeFunction.removedContext; + } + + private Map addIfAbsent(WebSocketSession session) { + return lookupTable.computeIfAbsent(session, innerSession -> { + log.debug("Creating new store for sessionId '{}'", innerSession.getId()); + return new ConcurrentHashMap<>(); + }); + } + + @RequiredArgsConstructor(access = AccessLevel.PRIVATE) + private static class RemoveFunction implements + BiFunction, Map> { + + private final String messageId; + @Nullable private FutureResponseContext removedContext; + + @Override + public Map apply(WebSocketSession session, + Map map) { + removedContext = map.remove(messageId); + log.debug("Store size for sessionId '{}': {}", session.getId(), map.size()); + return map; + } + } } diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStoreImpl.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStoreImpl.java deleted file mode 100644 index b9ae0d29d..000000000 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStoreImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). - * All Rights Reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package de.rwth.idsg.steve.ocpp.ws; - -import de.rwth.idsg.steve.ocpp.ws.data.FutureResponseContext; -import lombok.AccessLevel; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.Nullable; -import org.springframework.stereotype.Service; -import org.springframework.web.socket.WebSocketSession; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.BiFunction; - -/** - * Presumption: The responses must be sent using the same connection as the requests! - * - * @author Sevket Goekay - * @since 21.03.2015 - */ -@Slf4j -@Service -public class FutureResponseContextStoreImpl implements FutureResponseContextStore { - - // We store for each chargeBox connection, multiple pairs of (messageId, context) - // (session, (messageId, context)) - private final Map> lookupTable = new ConcurrentHashMap<>(); - - @Override - public void addSession(WebSocketSession session) { - addIfAbsent(session); - } - - @Override - public void removeSession(WebSocketSession session) { - log.debug("Deleting the store for sessionId '{}'", session.getId()); - lookupTable.remove(session); - } - - @Override - public void add(WebSocketSession session, String messageId, FutureResponseContext context) { - Map map = addIfAbsent(session); - map.put(messageId, context); - log.debug("Store size for sessionId '{}': {}", session.getId(), map.size()); - } - - @Nullable - @Override - public FutureResponseContext get(WebSocketSession session, String messageId) { - RemoveFunction removeFunction = new RemoveFunction(messageId); - lookupTable.computeIfPresent(session, removeFunction); - return removeFunction.removedContext; - } - - private Map addIfAbsent(WebSocketSession session) { - return lookupTable.computeIfAbsent(session, innerSession -> { - log.debug("Creating new store for sessionId '{}'", innerSession.getId()); - return new ConcurrentHashMap<>(); - }); - } - - @RequiredArgsConstructor(access = AccessLevel.PRIVATE) - private static class RemoveFunction implements - BiFunction, Map> { - - private final String messageId; - @Nullable private FutureResponseContext removedContext; - - @Override - public Map apply(WebSocketSession session, - Map map) { - removedContext = map.remove(messageId); - log.debug("Store size for sessionId '{}': {}", session.getId(), map.size()); - return map; - } - } -} diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java index e0d5f3b57..ae13dcf25 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java @@ -18,24 +18,135 @@ */ package de.rwth.idsg.steve.ocpp.ws; +import com.google.common.collect.ImmutableMap; +import com.google.common.util.concurrent.Striped; +import de.rwth.idsg.steve.SteveException; +import de.rwth.idsg.steve.ocpp.ws.custom.WsSessionSelectStrategy; import de.rwth.idsg.steve.ocpp.ws.data.SessionContext; +import lombok.extern.slf4j.Slf4j; +import org.joda.time.DateTime; import org.springframework.web.socket.WebSocketSession; +import java.util.ArrayDeque; +import java.util.Collections; import java.util.Deque; import java.util.List; import java.util.Map; +import java.util.NoSuchElementException; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.locks.Lock; + +import static de.rwth.idsg.steve.SteveConfiguration.CONFIG; /** * @author Sevket Goekay * @since 17.03.2015 */ -public interface SessionContextStore { - void add(String chargeBoxId, WebSocketSession session, ScheduledFuture pingSchedule); - void remove(String chargeBoxId, WebSocketSession session); - WebSocketSession getSession(String chargeBoxId); - int getSize(String chargeBoxId); - int getNumberOfChargeBoxes(); - List getChargeBoxIdList(); - Map> getACopy(); +@Slf4j +public class SessionContextStore { + + /** + * Key (String) = chargeBoxId + * Value (Deque) = WebSocket session contexts + */ + private final ConcurrentHashMap> lookupTable = new ConcurrentHashMap<>(); + + private final Striped locks = Striped.lock(16); + + private final WsSessionSelectStrategy wsSessionSelectStrategy = CONFIG.getOcpp().getWsSessionSelectStrategy(); + + public void add(String chargeBoxId, WebSocketSession session, ScheduledFuture pingSchedule) { + Lock l = locks.get(chargeBoxId); + l.lock(); + try { + SessionContext context = new SessionContext(session, pingSchedule, DateTime.now()); + + Deque endpointDeque = lookupTable.computeIfAbsent(chargeBoxId, str -> new ArrayDeque<>()); + endpointDeque.addLast(context); // Adding at the end + + log.debug("A new SessionContext is stored for chargeBoxId '{}'. Store size: {}", + chargeBoxId, endpointDeque.size()); + } finally { + l.unlock(); + } + } + + public void remove(String chargeBoxId, WebSocketSession session) { + Lock l = locks.get(chargeBoxId); + l.lock(); + try { + Deque endpointDeque = lookupTable.get(chargeBoxId); + if (endpointDeque == null) { + log.debug("No session context to remove for chargeBoxId '{}'", chargeBoxId); + return; + } + + // Prevent "java.util.ConcurrentModificationException: null" + // Reason: Cannot modify the set (remove the item) we are iterating + // Solution: Iterate the set, find the item, remove the item after the for-loop + // + SessionContext toRemove = null; + for (SessionContext context : endpointDeque) { + if (context.getSession().getId().equals(session.getId())) { + toRemove = context; + break; + } + } + + if (toRemove != null) { + // 1. Cancel the ping task + toRemove.getPingSchedule().cancel(true); + // 2. Delete from collection + if (endpointDeque.remove(toRemove)) { + log.debug("A SessionContext is removed for chargeBoxId '{}'. Store size: {}", + chargeBoxId, endpointDeque.size()); + } + // 3. Delete empty collection from lookup table in order to correctly calculate + // the number of connected chargeboxes with getNumberOfChargeBoxes() + if (endpointDeque.size() == 0) { + lookupTable.remove(chargeBoxId); + } + } + } finally { + l.unlock(); + } + } + + public WebSocketSession getSession(String chargeBoxId) { + Lock l = locks.get(chargeBoxId); + l.lock(); + try { + Deque endpointDeque = lookupTable.get(chargeBoxId); + if (endpointDeque == null) { + throw new NoSuchElementException(); + } + return wsSessionSelectStrategy.getSession(endpointDeque); + } catch (NoSuchElementException e) { + throw new SteveException("No session context for chargeBoxId '%s'", chargeBoxId, e); + } finally { + l.unlock(); + } + } + + public int getSize(String chargeBoxId) { + Deque endpointDeque = lookupTable.get(chargeBoxId); + if (endpointDeque == null) { + return 0; + } else { + return endpointDeque.size(); + } + } + + public int getNumberOfChargeBoxes() { + return lookupTable.size(); + } + + public List getChargeBoxIdList() { + return Collections.list(lookupTable.keys()); + } + + public Map> getACopy() { + return ImmutableMap.copyOf(lookupTable); + } } diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStoreImpl.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStoreImpl.java deleted file mode 100644 index a6ae7624a..000000000 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStoreImpl.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). - * All Rights Reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package de.rwth.idsg.steve.ocpp.ws; - -import com.google.common.collect.ImmutableMap; -import com.google.common.util.concurrent.Striped; -import de.rwth.idsg.steve.SteveException; -import de.rwth.idsg.steve.ocpp.ws.custom.WsSessionSelectStrategy; -import de.rwth.idsg.steve.ocpp.ws.data.SessionContext; -import lombok.extern.slf4j.Slf4j; -import org.joda.time.DateTime; -import org.springframework.web.socket.WebSocketSession; - -import java.util.ArrayDeque; -import java.util.Collections; -import java.util.Deque; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.locks.Lock; - -import static de.rwth.idsg.steve.SteveConfiguration.CONFIG; - -/** - * @author Sevket Goekay - * @since 17.03.2015 - */ -@Slf4j -public class SessionContextStoreImpl implements SessionContextStore { - - /** - * Key (String) = chargeBoxId - * Value (Deque) = WebSocket session contexts - */ - private final ConcurrentHashMap> lookupTable = new ConcurrentHashMap<>(); - - private final Striped locks = Striped.lock(16); - - private final WsSessionSelectStrategy wsSessionSelectStrategy = CONFIG.getOcpp().getWsSessionSelectStrategy(); - - @Override - public void add(String chargeBoxId, WebSocketSession session, ScheduledFuture pingSchedule) { - Lock l = locks.get(chargeBoxId); - l.lock(); - try { - SessionContext context = new SessionContext(session, pingSchedule, DateTime.now()); - - Deque endpointDeque = lookupTable.computeIfAbsent(chargeBoxId, str -> new ArrayDeque<>()); - endpointDeque.addLast(context); // Adding at the end - - log.debug("A new SessionContext is stored for chargeBoxId '{}'. Store size: {}", - chargeBoxId, endpointDeque.size()); - } finally { - l.unlock(); - } - } - - @Override - public void remove(String chargeBoxId, WebSocketSession session) { - Lock l = locks.get(chargeBoxId); - l.lock(); - try { - Deque endpointDeque = lookupTable.get(chargeBoxId); - if (endpointDeque == null) { - log.debug("No session context to remove for chargeBoxId '{}'", chargeBoxId); - return; - } - - // Prevent "java.util.ConcurrentModificationException: null" - // Reason: Cannot modify the set (remove the item) we are iterating - // Solution: Iterate the set, find the item, remove the item after the for-loop - // - SessionContext toRemove = null; - for (SessionContext context : endpointDeque) { - if (context.getSession().getId().equals(session.getId())) { - toRemove = context; - break; - } - } - - if (toRemove != null) { - // 1. Cancel the ping task - toRemove.getPingSchedule().cancel(true); - // 2. Delete from collection - if (endpointDeque.remove(toRemove)) { - log.debug("A SessionContext is removed for chargeBoxId '{}'. Store size: {}", - chargeBoxId, endpointDeque.size()); - } - // 3. Delete empty collection from lookup table in order to correctly calculate - // the number of connected chargeboxes with getNumberOfChargeBoxes() - if (endpointDeque.size() == 0) { - lookupTable.remove(chargeBoxId); - } - } - } finally { - l.unlock(); - } - } - - @Override - public WebSocketSession getSession(String chargeBoxId) { - Lock l = locks.get(chargeBoxId); - l.lock(); - try { - Deque endpointDeque = lookupTable.get(chargeBoxId); - if (endpointDeque == null) { - throw new NoSuchElementException(); - } - return wsSessionSelectStrategy.getSession(endpointDeque); - } catch (NoSuchElementException e) { - throw new SteveException("No session context for chargeBoxId '%s'", chargeBoxId, e); - } finally { - l.unlock(); - } - } - - @Override - public int getSize(String chargeBoxId) { - Deque endpointDeque = lookupTable.get(chargeBoxId); - if (endpointDeque == null) { - return 0; - } else { - return endpointDeque.size(); - } - } - - @Override - public int getNumberOfChargeBoxes() { - return lookupTable.size(); - } - - @Override - public List getChargeBoxIdList() { - return Collections.list(lookupTable.keys()); - } - - @Override - public Map> getACopy() { - return ImmutableMap.copyOf(lookupTable); - } -} diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java index e550d96f6..8e5321bc0 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java @@ -18,37 +18,212 @@ */ package de.rwth.idsg.steve.service; +import com.google.common.util.concurrent.Striped; +import de.rwth.idsg.steve.ocpp.OcppProtocol; +import de.rwth.idsg.steve.ocpp.OcppTransport; import de.rwth.idsg.steve.ocpp.OcppVersion; +import de.rwth.idsg.steve.ocpp.ws.AbstractWebSocketEndpoint; +import de.rwth.idsg.steve.ocpp.ws.data.SessionContext; +import de.rwth.idsg.steve.ocpp.ws.ocpp12.Ocpp12WebSocketEndpoint; +import de.rwth.idsg.steve.ocpp.ws.ocpp15.Ocpp15WebSocketEndpoint; +import de.rwth.idsg.steve.ocpp.ws.ocpp16.Ocpp16WebSocketEndpoint; +import de.rwth.idsg.steve.repository.ChargePointRepository; +import de.rwth.idsg.steve.repository.GenericRepository; import de.rwth.idsg.steve.repository.dto.ChargePointSelect; +import de.rwth.idsg.steve.repository.dto.ConnectorStatus; import de.rwth.idsg.steve.service.dto.UnidentifiedIncomingObject; +import de.rwth.idsg.steve.utils.ConnectorStatusCountFilter; +import de.rwth.idsg.steve.utils.DateTimeUtils; import de.rwth.idsg.steve.web.dto.OcppJsonStatus; import de.rwth.idsg.steve.web.dto.Statistics; +import lombok.extern.slf4j.Slf4j; import ocpp.cs._2015._10.RegistrationStatus; +import org.joda.time.DateTime; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; import java.util.Collections; +import java.util.Deque; import java.util.List; +import java.util.Map; import java.util.Optional; +import java.util.concurrent.locks.Lock; +import java.util.stream.Collectors; + +import static de.rwth.idsg.steve.SteveConfiguration.CONFIG; /** * @author Sevket Goekay * @since 24.03.2015 */ -public interface ChargePointHelperService { - Optional getRegistrationStatus(String chargeBoxId); +@Slf4j +@Service +public class ChargePointHelperService { + + private final boolean autoRegisterUnknownStations = CONFIG.getOcpp().isAutoRegisterUnknownStations(); + private final Striped isRegisteredLocks = Striped.lock(16); + + @Autowired private GenericRepository genericRepository; + + // SOAP-based charge points are stored in DB with an endpoint address + @Autowired private ChargePointRepository chargePointRepository; + + // For WebSocket-based charge points, the active sessions are stored in memory + @Autowired private Ocpp12WebSocketEndpoint ocpp12WebSocketEndpoint; + @Autowired private Ocpp15WebSocketEndpoint ocpp15WebSocketEndpoint; + @Autowired private Ocpp16WebSocketEndpoint ocpp16WebSocketEndpoint; + + private final UnidentifiedIncomingObjectService unknownChargePointService = new UnidentifiedIncomingObjectService(100); + + public Optional getRegistrationStatus(String chargeBoxId) { + Lock l = isRegisteredLocks.get(chargeBoxId); + l.lock(); + try { + Optional status = getRegistrationStatusInternal(chargeBoxId); + if (status.isEmpty()) { + unknownChargePointService.processNewUnidentified(chargeBoxId); + } + return status; + } finally { + l.unlock(); + } + } + + public Statistics getStats() { + Statistics stats = genericRepository.getStats(); + stats.setNumOcpp12JChargeBoxes(ocpp12WebSocketEndpoint.getNumberOfChargeBoxes()); + stats.setNumOcpp15JChargeBoxes(ocpp15WebSocketEndpoint.getNumberOfChargeBoxes()); + stats.setNumOcpp16JChargeBoxes(ocpp16WebSocketEndpoint.getNumberOfChargeBoxes()); - Statistics getStats(); + List latestList = chargePointRepository.getChargePointConnectorStatus(); + stats.setStatusCountMap(ConnectorStatusCountFilter.getStatusCountMap(latestList)); - List getOcppJsonStatus(); + return stats; + } + + public List getOcppJsonStatus() { + Map> ocpp12Map = ocpp12WebSocketEndpoint.getACopy(); + Map> ocpp15Map = ocpp15WebSocketEndpoint.getACopy(); + Map> ocpp16Map = ocpp16WebSocketEndpoint.getACopy(); + + List idList = extractIds(Arrays.asList(ocpp12Map, ocpp15Map, ocpp16Map)); + Map primaryKeyLookup = chargePointRepository.getChargeBoxIdPkPair(idList); - List getChargePoints(OcppVersion version, List inStatusFilter); + DateTime now = DateTime.now(); + List returnList = new ArrayList<>(); + + appendList(ocpp12Map, returnList, now, OcppVersion.V_12, primaryKeyLookup); + appendList(ocpp15Map, returnList, now, OcppVersion.V_15, primaryKeyLookup); + appendList(ocpp16Map, returnList, now, OcppVersion.V_16, primaryKeyLookup); + return returnList; + } - default List getChargePoints(OcppVersion version) { + public List getChargePoints(OcppVersion version) { return getChargePoints(version, Collections.singletonList(RegistrationStatus.ACCEPTED)); } - List getUnknownChargePoints(); + public List getChargePoints(OcppVersion version, List inStatusFilter) { + switch (version) { + case V_12: + return getChargePoints(OcppProtocol.V_12_SOAP, inStatusFilter, ocpp12WebSocketEndpoint); + case V_15: + return getChargePoints(OcppProtocol.V_15_SOAP, inStatusFilter, ocpp15WebSocketEndpoint); + case V_16: + return getChargePoints(OcppProtocol.V_16_SOAP, inStatusFilter, ocpp16WebSocketEndpoint); + default: + throw new IllegalArgumentException("Unknown OCPP version: " + version); + } + } + + public List getUnknownChargePoints() { + return unknownChargePointService.getObjects(); + } - void removeUnknown(String chargeBoxId); + public void removeUnknown(String chargeBoxId) { + unknownChargePointService.remove(chargeBoxId); + } - void removeUnknown(List chargeBoxIdList); + public void removeUnknown(List chargeBoxIdList) { + unknownChargePointService.removeAll(chargeBoxIdList); + } + + // ------------------------------------------------------------------------- + // Helpers + // ------------------------------------------------------------------------- + + private Optional getRegistrationStatusInternal(String chargeBoxId) { + // 1. exit if already registered + Optional status = chargePointRepository.getRegistrationStatus(chargeBoxId); + if (status.isPresent()) { + try { + return Optional.ofNullable(RegistrationStatus.fromValue(status.get())); + } catch (Exception e) { + // in cases where the database entry (string) is altered, and therefore cannot be converted to enum + log.error("Exception happened", e); + return Optional.empty(); + } + } + + // 2. ok, this chargeBoxId is unknown. exit if auto-register is disabled + if (!autoRegisterUnknownStations) { + return Optional.empty(); + } + + // 3. chargeBoxId is unknown and auto-register is enabled. insert chargeBoxId + try { + chargePointRepository.addChargePointList(Collections.singletonList(chargeBoxId)); + log.warn("Auto-registered unknown chargebox '{}'", chargeBoxId); + return Optional.of(RegistrationStatus.ACCEPTED); // default db value is accepted + } catch (Exception e) { + log.error("Failed to auto-register unknown chargebox '" + chargeBoxId + "'", e); + return Optional.empty(); + } + } + + private List getChargePoints(OcppProtocol protocol, List inStatusFilter, + AbstractWebSocketEndpoint jsonEndpoint) { + List statusFilter = inStatusFilter.stream() + .map(RegistrationStatus::value) + .collect(Collectors.toList()); + + List returnList = chargePointRepository.getChargePointSelect(protocol, statusFilter); + for (String chargeBoxId : jsonEndpoint.getChargeBoxIdList()) { + returnList.add(new ChargePointSelect(OcppTransport.JSON, chargeBoxId)); + } + return returnList; + } + + private static List extractIds(List>> ocppMaps) { + return ocppMaps.stream() + .map(Map::keySet) + .flatMap(Collection::stream) + .collect(Collectors.toList()); + } + + private static void appendList(Map> map, List returnList, + DateTime now, OcppVersion version, Map primaryKeyLookup) { + + for (Map.Entry> entry : map.entrySet()) { + String chargeBoxId = entry.getKey(); + Deque endpointDeque = entry.getValue(); + + for (SessionContext ctx : endpointDeque) { + DateTime openSince = ctx.getOpenSince(); + + OcppJsonStatus status = OcppJsonStatus.builder() + .chargeBoxPk(primaryKeyLookup.get(chargeBoxId)) + .chargeBoxId(chargeBoxId) + .connectedSinceDT(openSince) + .connectedSince(DateTimeUtils.humanize(openSince)) + .connectionDuration(DateTimeUtils.timeElapsed(openSince, now)) + .version(version) + .build(); + + returnList.add(status); + } + } + } } diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperServiceImpl.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperServiceImpl.java deleted file mode 100644 index 4787d634a..000000000 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperServiceImpl.java +++ /dev/null @@ -1,232 +0,0 @@ -/* - * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). - * All Rights Reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package de.rwth.idsg.steve.service; - -import com.google.common.util.concurrent.Striped; -import de.rwth.idsg.steve.ocpp.OcppProtocol; -import de.rwth.idsg.steve.ocpp.OcppTransport; -import de.rwth.idsg.steve.ocpp.OcppVersion; -import de.rwth.idsg.steve.ocpp.ws.AbstractWebSocketEndpoint; -import de.rwth.idsg.steve.ocpp.ws.data.SessionContext; -import de.rwth.idsg.steve.ocpp.ws.ocpp12.Ocpp12WebSocketEndpoint; -import de.rwth.idsg.steve.ocpp.ws.ocpp15.Ocpp15WebSocketEndpoint; -import de.rwth.idsg.steve.ocpp.ws.ocpp16.Ocpp16WebSocketEndpoint; -import de.rwth.idsg.steve.repository.ChargePointRepository; -import de.rwth.idsg.steve.repository.GenericRepository; -import de.rwth.idsg.steve.repository.dto.ChargePointSelect; -import de.rwth.idsg.steve.repository.dto.ConnectorStatus; -import de.rwth.idsg.steve.service.dto.UnidentifiedIncomingObject; -import de.rwth.idsg.steve.utils.ConnectorStatusCountFilter; -import de.rwth.idsg.steve.utils.DateTimeUtils; -import de.rwth.idsg.steve.web.dto.OcppJsonStatus; -import de.rwth.idsg.steve.web.dto.Statistics; -import lombok.extern.slf4j.Slf4j; -import ocpp.cs._2015._10.RegistrationStatus; -import org.joda.time.DateTime; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Deque; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.locks.Lock; -import java.util.stream.Collectors; - -import static de.rwth.idsg.steve.SteveConfiguration.CONFIG; - -/** - * @author Sevket Goekay - * @since 24.03.2015 - */ -@Slf4j -@Service -public class ChargePointHelperServiceImpl implements ChargePointHelperService { - - private final boolean autoRegisterUnknownStations = CONFIG.getOcpp().isAutoRegisterUnknownStations(); - private final Striped isRegisteredLocks = Striped.lock(16); - - @Autowired private GenericRepository genericRepository; - - // SOAP-based charge points are stored in DB with an endpoint address - @Autowired private ChargePointRepository chargePointRepository; - - // For WebSocket-based charge points, the active sessions are stored in memory - @Autowired private Ocpp12WebSocketEndpoint ocpp12WebSocketEndpoint; - @Autowired private Ocpp15WebSocketEndpoint ocpp15WebSocketEndpoint; - @Autowired private Ocpp16WebSocketEndpoint ocpp16WebSocketEndpoint; - - private final UnidentifiedIncomingObjectService unknownChargePointService = new UnidentifiedIncomingObjectService(100); - - @Override - public Optional getRegistrationStatus(String chargeBoxId) { - Lock l = isRegisteredLocks.get(chargeBoxId); - l.lock(); - try { - Optional status = getRegistrationStatusInternal(chargeBoxId); - if (status.isEmpty()) { - unknownChargePointService.processNewUnidentified(chargeBoxId); - } - return status; - } finally { - l.unlock(); - } - } - - @Override - public Statistics getStats() { - Statistics stats = genericRepository.getStats(); - stats.setNumOcpp12JChargeBoxes(ocpp12WebSocketEndpoint.getNumberOfChargeBoxes()); - stats.setNumOcpp15JChargeBoxes(ocpp15WebSocketEndpoint.getNumberOfChargeBoxes()); - stats.setNumOcpp16JChargeBoxes(ocpp16WebSocketEndpoint.getNumberOfChargeBoxes()); - - List latestList = chargePointRepository.getChargePointConnectorStatus(); - stats.setStatusCountMap(ConnectorStatusCountFilter.getStatusCountMap(latestList)); - - return stats; - } - - @Override - public List getOcppJsonStatus() { - Map> ocpp12Map = ocpp12WebSocketEndpoint.getACopy(); - Map> ocpp15Map = ocpp15WebSocketEndpoint.getACopy(); - Map> ocpp16Map = ocpp16WebSocketEndpoint.getACopy(); - - List idList = extractIds(Arrays.asList(ocpp12Map, ocpp15Map, ocpp16Map)); - Map primaryKeyLookup = chargePointRepository.getChargeBoxIdPkPair(idList); - - DateTime now = DateTime.now(); - List returnList = new ArrayList<>(); - - appendList(ocpp12Map, returnList, now, OcppVersion.V_12, primaryKeyLookup); - appendList(ocpp15Map, returnList, now, OcppVersion.V_15, primaryKeyLookup); - appendList(ocpp16Map, returnList, now, OcppVersion.V_16, primaryKeyLookup); - return returnList; - } - - @Override - public List getChargePoints(OcppVersion version, List inStatusFilter) { - switch (version) { - case V_12: - return getChargePoints(OcppProtocol.V_12_SOAP, inStatusFilter, ocpp12WebSocketEndpoint); - case V_15: - return getChargePoints(OcppProtocol.V_15_SOAP, inStatusFilter, ocpp15WebSocketEndpoint); - case V_16: - return getChargePoints(OcppProtocol.V_16_SOAP, inStatusFilter, ocpp16WebSocketEndpoint); - default: - throw new IllegalArgumentException("Unknown OCPP version: " + version); - } - } - - @Override - public List getUnknownChargePoints() { - return unknownChargePointService.getObjects(); - } - - @Override - public void removeUnknown(String chargeBoxId) { - unknownChargePointService.remove(chargeBoxId); - } - - @Override - public void removeUnknown(List chargeBoxIdList) { - unknownChargePointService.removeAll(chargeBoxIdList); - } - - // ------------------------------------------------------------------------- - // Helpers - // ------------------------------------------------------------------------- - - private Optional getRegistrationStatusInternal(String chargeBoxId) { - // 1. exit if already registered - Optional status = chargePointRepository.getRegistrationStatus(chargeBoxId); - if (status.isPresent()) { - try { - return Optional.ofNullable(RegistrationStatus.fromValue(status.get())); - } catch (Exception e) { - // in cases where the database entry (string) is altered, and therefore cannot be converted to enum - log.error("Exception happened", e); - return Optional.empty(); - } - } - - // 2. ok, this chargeBoxId is unknown. exit if auto-register is disabled - if (!autoRegisterUnknownStations) { - return Optional.empty(); - } - - // 3. chargeBoxId is unknown and auto-register is enabled. insert chargeBoxId - try { - chargePointRepository.addChargePointList(Collections.singletonList(chargeBoxId)); - log.warn("Auto-registered unknown chargebox '{}'", chargeBoxId); - return Optional.of(RegistrationStatus.ACCEPTED); // default db value is accepted - } catch (Exception e) { - log.error("Failed to auto-register unknown chargebox '" + chargeBoxId + "'", e); - return Optional.empty(); - } - } - - private List getChargePoints(OcppProtocol protocol, List inStatusFilter, - AbstractWebSocketEndpoint jsonEndpoint) { - List statusFilter = inStatusFilter.stream() - .map(RegistrationStatus::value) - .collect(Collectors.toList()); - - List returnList = chargePointRepository.getChargePointSelect(protocol, statusFilter); - for (String chargeBoxId : jsonEndpoint.getChargeBoxIdList()) { - returnList.add(new ChargePointSelect(OcppTransport.JSON, chargeBoxId)); - } - return returnList; - } - - private static List extractIds(List>> ocppMaps) { - return ocppMaps.stream() - .map(Map::keySet) - .flatMap(Collection::stream) - .collect(Collectors.toList()); - } - - private static void appendList(Map> map, List returnList, - DateTime now, OcppVersion version, Map primaryKeyLookup) { - - for (Map.Entry> entry : map.entrySet()) { - String chargeBoxId = entry.getKey(); - Deque endpointDeque = entry.getValue(); - - for (SessionContext ctx : endpointDeque) { - DateTime openSince = ctx.getOpenSince(); - - OcppJsonStatus status = OcppJsonStatus.builder() - .chargeBoxPk(primaryKeyLookup.get(chargeBoxId)) - .chargeBoxId(chargeBoxId) - .connectedSinceDT(openSince) - .connectedSince(DateTimeUtils.humanize(openSince)) - .connectionDuration(DateTimeUtils.timeElapsed(openSince, now)) - .version(version) - .build(); - - returnList.add(status); - } - } - } -} diff --git a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java index d59cc48e2..8b1ebeeb9 100644 --- a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java +++ b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java @@ -18,20 +18,125 @@ */ package de.rwth.idsg.steve.service; +import com.google.common.base.Strings; +import de.rwth.idsg.steve.NotificationFeature; +import de.rwth.idsg.steve.repository.dto.MailSettings; +import lombok.extern.slf4j.Slf4j; import ocpp.cs._2015._10.RegistrationStatus; +import org.joda.time.DateTime; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.Optional; +import static de.rwth.idsg.steve.NotificationFeature.OcppStationBooted; +import static de.rwth.idsg.steve.NotificationFeature.OcppStationStatusFailure; +import static de.rwth.idsg.steve.NotificationFeature.OcppStationWebSocketConnected; +import static de.rwth.idsg.steve.NotificationFeature.OcppStationWebSocketDisconnected; +import static de.rwth.idsg.steve.NotificationFeature.OcppTransactionStarted; +import static de.rwth.idsg.steve.NotificationFeature.OcppTransactionEnded; +import static java.lang.String.format; + /** * @author Sevket Goekay * @since 22.01.2016 */ -public interface NotificationService { - void ocppStationBooted(String chargeBoxId, Optional status); - void ocppStationWebSocketConnected(String chargeBoxId); - void ocppStationWebSocketDisconnected(String chargeBoxId); - void ocppStationStatusFailure(String chargeBoxId, int connectorId, String errorCode); - void ocppTransactionStarted(String chargeBoxId, int transactionId, int connectorId); - void ocppTransactionEnded(String chargeBoxId, int transactionId); +@Slf4j +@Service +public class NotificationService { + + @Autowired private MailService mailService; + + public void ocppStationBooted(String chargeBoxId, Optional status) { + if (isDisabled(OcppStationBooted)) { + return; + } + + String subject = format("Received boot notification from '%s'", chargeBoxId); + String body; + if (status.isPresent()) { + body = format("Charging station '%s' is in database and has registration status '%s'.", chargeBoxId, status.get().value()); + } else { + body = format("Charging station '%s' is NOT in database", chargeBoxId); + } + + mailService.sendAsync(subject, addTimestamp(body)); + } + + public void ocppStationWebSocketConnected(String chargeBoxId) { + if (isDisabled(OcppStationWebSocketConnected)) { + return; + } + + String subject = format("Connected to JSON charging station '%s'", chargeBoxId); + + mailService.sendAsync(subject, addTimestamp("")); + } + + public void ocppStationWebSocketDisconnected(String chargeBoxId) { + if (isDisabled(OcppStationWebSocketDisconnected)) { + return; + } + + String subject = format("Disconnected from JSON charging station '%s'", chargeBoxId); + + mailService.sendAsync(subject, addTimestamp("")); + } + + public void ocppStationStatusFailure(String chargeBoxId, int connectorId, String errorCode) { + if (isDisabled(OcppStationStatusFailure)) { + return; + } + + String subject = format("Connector '%s' of charging station '%s' is FAULTED", connectorId, chargeBoxId); + String body = format("Status Error Code: '%s'", errorCode); + + mailService.sendAsync(subject, addTimestamp(body)); + } + + public void ocppTransactionStarted(String chargeBoxId, int transactionId, int connectorId) { + if (isDisabled(OcppTransactionStarted)) { + return; + } + + String subject = format("Transaction '%s' has started on charging station '%s' on connector '%s'", transactionId, chargeBoxId, connectorId); + + mailService.sendAsync(subject, addTimestamp("")); + } + + public void ocppTransactionEnded(String chargeBoxId, int transactionId) { + if (isDisabled(OcppTransactionEnded)) { + return; + } + + String subject = format("Transaction '%s' has ended on charging station '%s'", transactionId, chargeBoxId); + + mailService.sendAsync(subject, addTimestamp("")); + } + + // ------------------------------------------------------------------------- + // Private helpers + // ------------------------------------------------------------------------- + + private boolean isDisabled(NotificationFeature f) { + MailSettings settings = mailService.getSettings(); + + boolean isEnabled = settings.isEnabled() + && settings.getEnabledFeatures().contains(f) + && !settings.getRecipients().isEmpty(); + + return !isEnabled; + } + + private static String addTimestamp(String body) { + String eventTs = "Timestamp of the event: " + DateTime.now().toString(); + String newLine = "\r\n\r\n"; + + if (Strings.isNullOrEmpty(body)) { + return eventTs; + } else { + return body + newLine + "--" + newLine + eventTs; + } + } } diff --git a/src/main/java/de/rwth/idsg/steve/service/NotificationServiceImpl.java b/src/main/java/de/rwth/idsg/steve/service/NotificationServiceImpl.java deleted file mode 100644 index 8696e8e8e..000000000 --- a/src/main/java/de/rwth/idsg/steve/service/NotificationServiceImpl.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). - * All Rights Reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package de.rwth.idsg.steve.service; - -import com.google.common.base.Strings; -import de.rwth.idsg.steve.NotificationFeature; -import de.rwth.idsg.steve.repository.dto.MailSettings; -import lombok.extern.slf4j.Slf4j; -import ocpp.cs._2015._10.RegistrationStatus; -import org.joda.time.DateTime; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Optional; - -import static de.rwth.idsg.steve.NotificationFeature.OcppStationBooted; -import static de.rwth.idsg.steve.NotificationFeature.OcppStationStatusFailure; -import static de.rwth.idsg.steve.NotificationFeature.OcppStationWebSocketConnected; -import static de.rwth.idsg.steve.NotificationFeature.OcppStationWebSocketDisconnected; -import static de.rwth.idsg.steve.NotificationFeature.OcppTransactionStarted; -import static de.rwth.idsg.steve.NotificationFeature.OcppTransactionEnded; -import static java.lang.String.format; - -/** - * @author Sevket Goekay - * @since 22.01.2016 - */ -@Slf4j -@Service -public class NotificationServiceImpl implements NotificationService { - - @Autowired private MailService mailService; - - @Override - public void ocppStationBooted(String chargeBoxId, Optional status) { - if (isDisabled(OcppStationBooted)) { - return; - } - - String subject = format("Received boot notification from '%s'", chargeBoxId); - String body; - if (status.isPresent()) { - body = format("Charging station '%s' is in database and has registration status '%s'.", chargeBoxId, status.get().value()); - } else { - body = format("Charging station '%s' is NOT in database", chargeBoxId); - } - - mailService.sendAsync(subject, addTimestamp(body)); - } - - @Override - public void ocppStationWebSocketConnected(String chargeBoxId) { - if (isDisabled(OcppStationWebSocketConnected)) { - return; - } - - String subject = format("Connected to JSON charging station '%s'", chargeBoxId); - - mailService.sendAsync(subject, addTimestamp("")); - } - - @Override - public void ocppStationWebSocketDisconnected(String chargeBoxId) { - if (isDisabled(OcppStationWebSocketDisconnected)) { - return; - } - - String subject = format("Disconnected from JSON charging station '%s'", chargeBoxId); - - mailService.sendAsync(subject, addTimestamp("")); - } - - @Override - public void ocppStationStatusFailure(String chargeBoxId, int connectorId, String errorCode) { - if (isDisabled(OcppStationStatusFailure)) { - return; - } - - String subject = format("Connector '%s' of charging station '%s' is FAULTED", connectorId, chargeBoxId); - String body = format("Status Error Code: '%s'", errorCode); - - mailService.sendAsync(subject, addTimestamp(body)); - } - - @Override - public void ocppTransactionStarted(String chargeBoxId, int transactionId, int connectorId) { - if (isDisabled(OcppTransactionStarted)) { - return; - } - - String subject = format("Transaction '%s' has started on charging station '%s' on connector '%s'", transactionId, chargeBoxId, connectorId); - - mailService.sendAsync(subject, addTimestamp("")); - } - - @Override - public void ocppTransactionEnded(String chargeBoxId, int transactionId) { - if (isDisabled(OcppTransactionEnded)) { - return; - } - - String subject = format("Transaction '%s' has ended on charging station '%s'", transactionId, chargeBoxId); - - mailService.sendAsync(subject, addTimestamp("")); - } - - // ------------------------------------------------------------------------- - // Private helpers - // ------------------------------------------------------------------------- - - private boolean isDisabled(NotificationFeature f) { - MailSettings settings = mailService.getSettings(); - - boolean isEnabled = settings.isEnabled() - && settings.getEnabledFeatures().contains(f) - && !settings.getRecipients().isEmpty(); - - return !isEnabled; - } - - private static String addTimestamp(String body) { - String eventTs = "Timestamp of the event: " + DateTime.now().toString(); - String newLine = "\r\n\r\n"; - - if (Strings.isNullOrEmpty(body)) { - return eventTs; - } else { - return body + newLine + "--" + newLine + eventTs; - } - } - -} diff --git a/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java b/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java index bbf7b8c1b..a5981ff89 100644 --- a/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java +++ b/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java @@ -18,10 +18,23 @@ */ package de.rwth.idsg.steve.service; +import com.google.common.base.Strings; +import de.rwth.idsg.steve.SteveException; +import de.rwth.idsg.steve.repository.OcppTagRepository; +import de.rwth.idsg.steve.repository.SettingsRepository; import de.rwth.idsg.steve.service.dto.UnidentifiedIncomingObject; +import jooq.steve.db.tables.records.OcppTagActivityRecord; +import lombok.AccessLevel; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import ocpp.cp._2015._10.AuthorizationData; +import ocpp.cs._2015._10.AuthorizationStatus; import ocpp.cs._2015._10.IdTagInfo; import org.jetbrains.annotations.Nullable; +import org.joda.time.DateTime; +import org.jooq.RecordMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.List; import java.util.function.Supplier; @@ -30,16 +43,191 @@ * @author Sevket Goekay * @since 03.01.2015 */ -public interface OcppTagService { +@Slf4j +@Service +public class OcppTagService { - @Nullable IdTagInfo getIdTagInfo(@Nullable String idTag, boolean isStartTransactionReqContext); - @Nullable IdTagInfo getIdTagInfo(@Nullable String idTag, boolean isStartTransactionReqContext, - Supplier supplierWhenException); + @Autowired private SettingsRepository settingsRepository; + @Autowired private OcppTagRepository ocppTagRepository; - List getAuthDataOfAllTags(); - List getAuthData(List idTagList); + private final UnidentifiedIncomingObjectService invalidOcppTagService = new UnidentifiedIncomingObjectService(1000); - List getUnknownOcppTags(); - void removeUnknown(String idTag); - void removeUnknown(List idTagList); + public List getAuthDataOfAllTags() { + return ocppTagRepository.getRecords() + .map(new AuthorisationDataMapper()); + } + + public List getAuthData(List idTagList) { + return ocppTagRepository.getRecords(idTagList) + .map(new AuthorisationDataMapper()); + } + + public List getUnknownOcppTags() { + return invalidOcppTagService.getObjects(); + } + + public void removeUnknown(String idTag) { + invalidOcppTagService.remove(idTag); + } + + public void removeUnknown(List idTagList) { + invalidOcppTagService.removeAll(idTagList); + } + + @Nullable + public IdTagInfo getIdTagInfo(@Nullable String idTag, boolean isStartTransactionReqContext) { + if (Strings.isNullOrEmpty(idTag)) { + return null; + } + + OcppTagActivityRecord record = ocppTagRepository.getRecord(idTag); + AuthorizationStatus status = decideStatus(record, idTag, isStartTransactionReqContext); + + switch (status) { + case INVALID: + invalidOcppTagService.processNewUnidentified(idTag); + return new IdTagInfo().withStatus(status); + + case BLOCKED: + case EXPIRED: + case CONCURRENT_TX: + case ACCEPTED: + return new IdTagInfo().withStatus(status) + .withParentIdTag(record.getParentIdTag()) + .withExpiryDate(getExpiryDateOrDefault(record)); + default: + throw new SteveException("Unexpected AuthorizationStatus"); + } + } + + @Nullable + public IdTagInfo getIdTagInfo(@Nullable String idTag, boolean isStartTransactionReqContext, Supplier supplierWhenException) { + try { + return getIdTagInfo(idTag, isStartTransactionReqContext); + } catch (Exception e) { + log.error("Exception occurred", e); + return supplierWhenException.get(); + } + } + + // ------------------------------------------------------------------------- + // Private helpers + // ------------------------------------------------------------------------- + + /** + * If the database contains an actual expiry, use it. Otherwise, calculate an expiry for cached info + */ + @Nullable + private DateTime getExpiryDateOrDefault(OcppTagActivityRecord record) { + if (record.getExpiryDate() != null) { + return record.getExpiryDate(); + } + + int hoursToExpire = settingsRepository.getHoursToExpire(); + + // From web page: The value 0 disables this functionality (i.e. no expiry date will be set). + if (hoursToExpire == 0) { + return null; + } else { + return DateTime.now().plusHours(hoursToExpire); + } + } + + private AuthorizationStatus decideStatus(OcppTagActivityRecord record, String idTag, boolean isStartTransactionReqContext) { + if (record == null) { + log.error("The user with idTag '{}' is INVALID (not present in DB).", idTag); + return AuthorizationStatus.INVALID; + } + + if (isBlocked(record)) { + log.error("The user with idTag '{}' is BLOCKED.", idTag); + return AuthorizationStatus.BLOCKED; + } + + if (isExpired(record, DateTime.now())) { + log.error("The user with idTag '{}' is EXPIRED.", idTag); + return AuthorizationStatus.EXPIRED; + } + + // https://github.com/RWTH-i5-IDSG/steve/issues/219 + if (isStartTransactionReqContext && reachedLimitOfActiveTransactions(record)) { + log.warn("The user with idTag '{}' is ALREADY in another transaction(s).", idTag); + return AuthorizationStatus.CONCURRENT_TX; + } + + log.debug("The user with idTag '{}' is ACCEPTED.", record.getIdTag()); + return AuthorizationStatus.ACCEPTED; + } + + /** + * ConcurrentTx is only valid for StartTransactionRequest + */ + private static ocpp.cp._2015._10.AuthorizationStatus decideStatusForAuthData(OcppTagActivityRecord record, DateTime now) { + if (isBlocked(record)) { + return ocpp.cp._2015._10.AuthorizationStatus.BLOCKED; + } else if (isExpired(record, now)) { + return ocpp.cp._2015._10.AuthorizationStatus.EXPIRED; +// } else if (reachedLimitOfActiveTransactions(record)) { +// return ocpp.cp._2015._10.AuthorizationStatus.CONCURRENT_TX; + } else { + return ocpp.cp._2015._10.AuthorizationStatus.ACCEPTED; + } + } + + private static boolean isExpired(OcppTagActivityRecord record, DateTime now) { + DateTime expiry = record.getExpiryDate(); + return expiry != null && now.isAfter(expiry); + } + + private static boolean isBlocked(OcppTagActivityRecord record) { + return getToggle(record) == ConcurrencyToggle.Blocked; + } + + private static boolean reachedLimitOfActiveTransactions(OcppTagActivityRecord record) { + ConcurrencyToggle toggle = getToggle(record); + switch (toggle) { + case Blocked: + return true; // for completeness + case AllowAll: + return false; + case AllowAsSpecified: + int max = record.getMaxActiveTransactionCount(); + long active = record.getActiveTransactionCount(); + return active >= max; + default: + throw new RuntimeException("Unexpected ConcurrencyToggle"); + } + } + + @RequiredArgsConstructor(access = AccessLevel.PRIVATE) + private static class AuthorisationDataMapper implements RecordMapper { + + private final DateTime nowDt = DateTime.now(); + + @Override + public AuthorizationData map(OcppTagActivityRecord record) { + return new AuthorizationData().withIdTag(record.getIdTag()) + .withIdTagInfo( + new ocpp.cp._2015._10.IdTagInfo() + .withStatus(decideStatusForAuthData(record, nowDt)) + .withParentIdTag(record.getParentIdTag()) + .withExpiryDate(record.getExpiryDate()) + ); + } + } + + private enum ConcurrencyToggle { + Blocked, AllowAll, AllowAsSpecified + } + + private static ConcurrencyToggle getToggle(OcppTagActivityRecord r) { + int max = r.getMaxActiveTransactionCount(); + if (max == 0) { + return ConcurrencyToggle.Blocked; + } else if (max < 0) { + return ConcurrencyToggle.AllowAll; + } else { + return ConcurrencyToggle.AllowAsSpecified; + } + } } diff --git a/src/main/java/de/rwth/idsg/steve/service/OcppTagServiceImpl.java b/src/main/java/de/rwth/idsg/steve/service/OcppTagServiceImpl.java deleted file mode 100644 index c6ac73d24..000000000 --- a/src/main/java/de/rwth/idsg/steve/service/OcppTagServiceImpl.java +++ /dev/null @@ -1,241 +0,0 @@ -/* - * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). - * All Rights Reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package de.rwth.idsg.steve.service; - -import com.google.common.base.Strings; -import de.rwth.idsg.steve.SteveException; -import de.rwth.idsg.steve.repository.OcppTagRepository; -import de.rwth.idsg.steve.repository.SettingsRepository; -import de.rwth.idsg.steve.service.dto.UnidentifiedIncomingObject; -import jooq.steve.db.tables.records.OcppTagActivityRecord; -import lombok.AccessLevel; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import ocpp.cp._2015._10.AuthorizationData; -import ocpp.cs._2015._10.AuthorizationStatus; -import ocpp.cs._2015._10.IdTagInfo; -import org.jetbrains.annotations.Nullable; -import org.joda.time.DateTime; -import org.jooq.RecordMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.function.Supplier; - -/** - * @author Sevket Goekay - * @since 03.01.2015 - */ -@Slf4j -@Service -public class OcppTagServiceImpl implements OcppTagService { - - @Autowired private SettingsRepository settingsRepository; - @Autowired private OcppTagRepository ocppTagRepository; - - private final UnidentifiedIncomingObjectService invalidOcppTagService = new UnidentifiedIncomingObjectService(1000); - - @Override - public List getAuthDataOfAllTags() { - return ocppTagRepository.getRecords() - .map(new AuthorisationDataMapper()); - } - - @Override - public List getAuthData(List idTagList) { - return ocppTagRepository.getRecords(idTagList) - .map(new AuthorisationDataMapper()); - } - - @Override - public List getUnknownOcppTags() { - return invalidOcppTagService.getObjects(); - } - - @Override - public void removeUnknown(String idTag) { - invalidOcppTagService.remove(idTag); - } - - @Override - public void removeUnknown(List idTagList) { - invalidOcppTagService.removeAll(idTagList); - } - - @Override - @Nullable - public IdTagInfo getIdTagInfo(@Nullable String idTag, boolean isStartTransactionReqContext) { - if (Strings.isNullOrEmpty(idTag)) { - return null; - } - - OcppTagActivityRecord record = ocppTagRepository.getRecord(idTag); - AuthorizationStatus status = decideStatus(record, idTag, isStartTransactionReqContext); - - switch (status) { - case INVALID: - invalidOcppTagService.processNewUnidentified(idTag); - return new IdTagInfo().withStatus(status); - - case BLOCKED: - case EXPIRED: - case CONCURRENT_TX: - case ACCEPTED: - return new IdTagInfo().withStatus(status) - .withParentIdTag(record.getParentIdTag()) - .withExpiryDate(getExpiryDateOrDefault(record)); - default: - throw new SteveException("Unexpected AuthorizationStatus"); - } - } - - @Override - @Nullable - public IdTagInfo getIdTagInfo(@Nullable String idTag, boolean isStartTransactionReqContext, - Supplier supplierWhenException) { - try { - return getIdTagInfo(idTag, isStartTransactionReqContext); - } catch (Exception e) { - log.error("Exception occurred", e); - return supplierWhenException.get(); - } - } - - // ------------------------------------------------------------------------- - // Private helpers - // ------------------------------------------------------------------------- - - /** - * If the database contains an actual expiry, use it. Otherwise, calculate an expiry for cached info - */ - @Nullable - private DateTime getExpiryDateOrDefault(OcppTagActivityRecord record) { - if (record.getExpiryDate() != null) { - return record.getExpiryDate(); - } - - int hoursToExpire = settingsRepository.getHoursToExpire(); - - // From web page: The value 0 disables this functionality (i.e. no expiry date will be set). - if (hoursToExpire == 0) { - return null; - } else { - return DateTime.now().plusHours(hoursToExpire); - } - } - - private AuthorizationStatus decideStatus(OcppTagActivityRecord record, String idTag, boolean isStartTransactionReqContext) { - if (record == null) { - log.error("The user with idTag '{}' is INVALID (not present in DB).", idTag); - return AuthorizationStatus.INVALID; - } - - if (isBlocked(record)) { - log.error("The user with idTag '{}' is BLOCKED.", idTag); - return AuthorizationStatus.BLOCKED; - } - - if (isExpired(record, DateTime.now())) { - log.error("The user with idTag '{}' is EXPIRED.", idTag); - return AuthorizationStatus.EXPIRED; - } - - // https://github.com/RWTH-i5-IDSG/steve/issues/219 - if (isStartTransactionReqContext && reachedLimitOfActiveTransactions(record)) { - log.warn("The user with idTag '{}' is ALREADY in another transaction(s).", idTag); - return AuthorizationStatus.CONCURRENT_TX; - } - - log.debug("The user with idTag '{}' is ACCEPTED.", record.getIdTag()); - return AuthorizationStatus.ACCEPTED; - } - - /** - * ConcurrentTx is only valid for StartTransactionRequest - */ - private static ocpp.cp._2015._10.AuthorizationStatus decideStatusForAuthData(OcppTagActivityRecord record, DateTime now) { - if (isBlocked(record)) { - return ocpp.cp._2015._10.AuthorizationStatus.BLOCKED; - } else if (isExpired(record, now)) { - return ocpp.cp._2015._10.AuthorizationStatus.EXPIRED; -// } else if (reachedLimitOfActiveTransactions(record)) { -// return ocpp.cp._2015._10.AuthorizationStatus.CONCURRENT_TX; - } else { - return ocpp.cp._2015._10.AuthorizationStatus.ACCEPTED; - } - } - - private static boolean isExpired(OcppTagActivityRecord record, DateTime now) { - DateTime expiry = record.getExpiryDate(); - return expiry != null && now.isAfter(expiry); - } - - private static boolean isBlocked(OcppTagActivityRecord record) { - return getToggle(record) == ConcurrencyToggle.Blocked; - } - - private static boolean reachedLimitOfActiveTransactions(OcppTagActivityRecord record) { - ConcurrencyToggle toggle = getToggle(record); - switch (toggle) { - case Blocked: - return true; // for completeness - case AllowAll: - return false; - case AllowAsSpecified: - int max = record.getMaxActiveTransactionCount(); - long active = record.getActiveTransactionCount(); - return active >= max; - default: - throw new RuntimeException("Unexpected ConcurrencyToggle"); - } - } - - @RequiredArgsConstructor(access = AccessLevel.PRIVATE) - private static class AuthorisationDataMapper implements RecordMapper { - - private final DateTime nowDt = DateTime.now(); - - @Override - public AuthorizationData map(OcppTagActivityRecord record) { - return new AuthorizationData().withIdTag(record.getIdTag()) - .withIdTagInfo( - new ocpp.cp._2015._10.IdTagInfo() - .withStatus(decideStatusForAuthData(record, nowDt)) - .withParentIdTag(record.getParentIdTag()) - .withExpiryDate(record.getExpiryDate()) - ); - } - } - - private enum ConcurrencyToggle { - Blocked, AllowAll, AllowAsSpecified - } - - private static ConcurrencyToggle getToggle(OcppTagActivityRecord r) { - int max = r.getMaxActiveTransactionCount(); - if (max == 0) { - return ConcurrencyToggle.Blocked; - } else if (max < 0) { - return ConcurrencyToggle.AllowAll; - } else { - return ConcurrencyToggle.AllowAsSpecified; - } - } -} From 90777a4359beab2796cdfd414b44a2bedc4c1f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20Go=CC=88kay?= Date: Sat, 25 Apr 2020 19:09:37 +0200 Subject: [PATCH 021/548] refactor: start using compositejks from github repo and delete local classes --- pom.xml | 6 +- .../idsg/steve/ocpp/soap/ClientProvider.java | 2 +- .../utils/ssl/CompositeX509KeyManager.java | 87 ----------- .../utils/ssl/CompositeX509TrustManager.java | 77 ---------- .../utils/ssl/KeyManagerAlgorithmStep.java | 39 ----- .../utils/ssl/KeyManagerPasswordStep.java | 38 ----- .../idsg/steve/utils/ssl/KeyStoreStep.java | 47 ------ .../idsg/steve/utils/ssl/ProtocolStep.java | 32 ---- .../steve/utils/ssl/SslContextBuilder.java | 141 ------------------ .../idsg/steve/utils/ssl/SslContextStep.java | 36 ----- 10 files changed, 6 insertions(+), 499 deletions(-) delete mode 100644 src/main/java/de/rwth/idsg/steve/utils/ssl/CompositeX509KeyManager.java delete mode 100644 src/main/java/de/rwth/idsg/steve/utils/ssl/CompositeX509TrustManager.java delete mode 100644 src/main/java/de/rwth/idsg/steve/utils/ssl/KeyManagerAlgorithmStep.java delete mode 100644 src/main/java/de/rwth/idsg/steve/utils/ssl/KeyManagerPasswordStep.java delete mode 100644 src/main/java/de/rwth/idsg/steve/utils/ssl/KeyStoreStep.java delete mode 100644 src/main/java/de/rwth/idsg/steve/utils/ssl/ProtocolStep.java delete mode 100644 src/main/java/de/rwth/idsg/steve/utils/ssl/SslContextBuilder.java delete mode 100644 src/main/java/de/rwth/idsg/steve/utils/ssl/SslContextStep.java diff --git a/pom.xml b/pom.xml index 695f54a2f..3a132f55d 100644 --- a/pom.xml +++ b/pom.xml @@ -451,7 +451,11 @@ - + + com.github.goekay + CompositeJKS + 2.0 + com.github.RWTH-i5-IDSG ocpp-jaxb diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java index 44d2abbcf..6020ff51b 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java @@ -18,7 +18,7 @@ */ package de.rwth.idsg.steve.ocpp.soap; -import de.rwth.idsg.steve.utils.ssl.SslContextBuilder; +import com.oneandone.compositejks.SslContextBuilder; import org.apache.cxf.configuration.jsse.TLSClientParameters; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientProxy; diff --git a/src/main/java/de/rwth/idsg/steve/utils/ssl/CompositeX509KeyManager.java b/src/main/java/de/rwth/idsg/steve/utils/ssl/CompositeX509KeyManager.java deleted file mode 100644 index 72fe540ad..000000000 --- a/src/main/java/de/rwth/idsg/steve/utils/ssl/CompositeX509KeyManager.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). - * All Rights Reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package de.rwth.idsg.steve.utils.ssl; - -import javax.net.ssl.X509KeyManager; -import java.net.Socket; -import java.security.Principal; -import java.security.PrivateKey; -import java.security.cert.X509Certificate; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.function.Function; - -/** - * Taken from https://github.com/1and1/CompositeJKS and adapted/improved. - * - * Merges multiple {@link X509KeyManager}s into a delegating composite. - */ -public class CompositeX509KeyManager implements X509KeyManager { - - private final List children; - - public CompositeX509KeyManager(List children) { - this.children = children; - } - - @Override - public String chooseClientAlias(String[] keyType, Principal[] issuers, Socket socket) { - return getFirstNonNull(x -> x.chooseClientAlias(keyType, issuers, socket)); - } - - @Override - public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) { - return getFirstNonNull(x -> x.chooseServerAlias(keyType, issuers, socket)); - } - - @Override - public X509Certificate[] getCertificateChain(String alias) { - return getFirstNonNull(x -> x.getCertificateChain(alias)); - } - - @Override - public PrivateKey getPrivateKey(String alias) { - return getFirstNonNull(x -> x.getPrivateKey(alias)); - } - - @Override - public String[] getClientAliases(String keyType, Principal[] issuers) { - return merge(x -> x.getClientAliases(keyType, issuers)); - } - - @Override - public String[] getServerAliases(String keyType, Principal[] issuers) { - return merge(x -> x.getServerAliases(keyType, issuers)); - } - - private TOut getFirstNonNull(Function map) { - return children.stream() - .map(map) - .filter(Objects::nonNull) - .findFirst() - .orElse(null); - } - - private String[] merge(Function map) { - return children.stream() - .flatMap(x -> Arrays.stream(map.apply(x))) - .toArray(String[]::new); - } -} diff --git a/src/main/java/de/rwth/idsg/steve/utils/ssl/CompositeX509TrustManager.java b/src/main/java/de/rwth/idsg/steve/utils/ssl/CompositeX509TrustManager.java deleted file mode 100644 index f8963415b..000000000 --- a/src/main/java/de/rwth/idsg/steve/utils/ssl/CompositeX509TrustManager.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). - * All Rights Reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package de.rwth.idsg.steve.utils.ssl; - -import javax.net.ssl.X509TrustManager; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; -import java.util.Arrays; -import java.util.List; - -/** - * Taken from https://github.com/1and1/CompositeJKS and adapted/improved. - * - * Merges multiple {@link X509TrustManager}s into a delegating composite. - */ -public class CompositeX509TrustManager implements X509TrustManager { - - private final List children; - - public CompositeX509TrustManager(List children) { - this.children = children; - } - - @Override - public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException { - checkTrusted(x -> x.checkClientTrusted(chain, authType)); - } - - @Override - public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException { - checkTrusted(x -> x.checkServerTrusted(chain, authType)); - } - - @Override - public X509Certificate[] getAcceptedIssuers() { - return children.stream() - .flatMap(x -> Arrays.stream(x.getAcceptedIssuers())) - .toArray(X509Certificate[]::new); - } - - private void checkTrusted(ThrowingProcessor processor) throws CertificateException { - CertificateException lastError = null; - for (X509TrustManager manager : children) { - try { - processor.process(manager); - return; - } catch (CertificateException ex) { - lastError = ex; - } - } - - if (lastError != null) { - throw lastError; - } - } - - private interface ThrowingProcessor { - - void process(X509TrustManager manager) throws CertificateException; - } -} diff --git a/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyManagerAlgorithmStep.java b/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyManagerAlgorithmStep.java deleted file mode 100644 index 1bf0fca25..000000000 --- a/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyManagerAlgorithmStep.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). - * All Rights Reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package de.rwth.idsg.steve.utils.ssl; - -/** - * @author Sevket Goekay - * @since 29.08.2018 - */ -public interface KeyManagerAlgorithmStep { - - /** - * @param keyManagerAlgorithm The algorithm for the custom key store. Defaults to system one, if null. - */ - KeyManagerPasswordStep usingAlgorithm(String keyManagerAlgorithm); - - default KeyManagerPasswordStep usingDefaultAlgorithm() { - return usingAlgorithm(null); - } - - default KeyManagerPasswordStep usingSunX509() { - return usingAlgorithm("SunX509"); - } -} diff --git a/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyManagerPasswordStep.java b/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyManagerPasswordStep.java deleted file mode 100644 index 840231ae4..000000000 --- a/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyManagerPasswordStep.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). - * All Rights Reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package de.rwth.idsg.steve.utils.ssl; - -import javax.net.ssl.KeyManagerFactory; - -/** - * @author Sevket Goekay - * @since 29.08.2018 - */ -public interface KeyManagerPasswordStep { - - /** - * @param keyManagerPwd The password to init {@link KeyManagerFactory}. Defaults to KeyStore password, if null. - */ - SslContextStep usingKeyManagerPassword(String keyManagerPwd); - - default SslContextStep usingKeyManagerPasswordFromKeyStore() { - return usingKeyManagerPassword(null); - } - -} diff --git a/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyStoreStep.java b/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyStoreStep.java deleted file mode 100644 index c7dd1b77b..000000000 --- a/src/main/java/de/rwth/idsg/steve/utils/ssl/KeyStoreStep.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). - * All Rights Reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package de.rwth.idsg.steve.utils.ssl; - -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.security.GeneralSecurityException; - -/** - * @author Sevket Goekay - * @since 28.08.2018 - */ -public interface KeyStoreStep { - - ProtocolStep keyStoreFromStream(InputStream stream, String password) throws IOException, GeneralSecurityException; - - default ProtocolStep keyStoreFromStream(InputStream stream) throws IOException, GeneralSecurityException { - return keyStoreFromStream(stream, null); - } - - default ProtocolStep keyStoreFromFile(String path, String password) throws IOException, GeneralSecurityException { - try (FileInputStream stream = new FileInputStream(path)) { - return keyStoreFromStream(stream, password); - } - } - - default ProtocolStep keyStoreFromFile(String path) throws IOException, GeneralSecurityException { - return keyStoreFromFile(path, null); - } -} diff --git a/src/main/java/de/rwth/idsg/steve/utils/ssl/ProtocolStep.java b/src/main/java/de/rwth/idsg/steve/utils/ssl/ProtocolStep.java deleted file mode 100644 index f033d5545..000000000 --- a/src/main/java/de/rwth/idsg/steve/utils/ssl/ProtocolStep.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). - * All Rights Reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package de.rwth.idsg.steve.utils.ssl; - -/** - * @author Sevket Goekay - * @since 29.08.2018 - */ -public interface ProtocolStep { - - KeyManagerAlgorithmStep usingProtocol(String socketProtocol); - - default KeyManagerAlgorithmStep usingTLS() { - return usingProtocol("TLS"); - } -} diff --git a/src/main/java/de/rwth/idsg/steve/utils/ssl/SslContextBuilder.java b/src/main/java/de/rwth/idsg/steve/utils/ssl/SslContextBuilder.java deleted file mode 100644 index a242c063f..000000000 --- a/src/main/java/de/rwth/idsg/steve/utils/ssl/SslContextBuilder.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). - * All Rights Reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package de.rwth.idsg.steve.utils.ssl; - -import javax.net.ssl.KeyManager; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.TrustManagerFactory; -import javax.net.ssl.X509KeyManager; -import javax.net.ssl.X509TrustManager; -import java.io.IOException; -import java.io.InputStream; -import java.security.GeneralSecurityException; -import java.security.KeyStore; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @author Sevket Goekay - * @since 29.08.2018 - */ -public final class SslContextBuilder implements - KeyStoreStep, KeyManagerAlgorithmStep, KeyManagerPasswordStep, ProtocolStep, SslContextStep { - - private char[] keyStorePassword; - private KeyStore keyStore; - - private String socketProtocol; - private String keyManagerAlgorithm; - private char[] keyManagerPassword; // because it is possible that KeyManagerFactory pwd != KeyStore pwd - - private SslContextBuilder() { } - - public static KeyStoreStep builder() { - return new SslContextBuilder(); - } - - @Override - public ProtocolStep keyStoreFromStream(InputStream stream, String password) throws IOException, GeneralSecurityException { - keyStorePassword = (password == null) ? null : password.toCharArray(); - keyStore = KeyStore.getInstance(KeyStore.getDefaultType()); - keyStore.load(stream, keyStorePassword); - return this; - } - - @Override - public KeyManagerAlgorithmStep usingProtocol(String socketProtocol) { - this.socketProtocol = socketProtocol; - return this; - } - - /** - * @param keyManagerAlgorithm The algorithm for the custom key store. Defaults to system one, if null. - */ - @Override - public KeyManagerPasswordStep usingAlgorithm(String keyManagerAlgorithm) { - this.keyManagerAlgorithm = (keyManagerAlgorithm == null) ? KeyManagerFactory.getDefaultAlgorithm() : keyManagerAlgorithm; - return this; - } - - /** - * @param keyManagerPwd The password to init {@link KeyManagerFactory}. Defaults to KeyStore password, if null. - */ - @Override - public SslContextStep usingKeyManagerPassword(String keyManagerPwd) { - this.keyManagerPassword = (keyManagerPwd == null) ? keyStorePassword : keyManagerPwd.toCharArray(); - return this; - } - - @Override - public SSLContext buildMergedWithSystem() throws GeneralSecurityException { - String defaultAlgorithm = KeyManagerFactory.getDefaultAlgorithm(); - - KeyManager[] keyManagers = { - new CompositeX509KeyManager( - union( - getSystemKeyManagers(keyManagerAlgorithm, keyStore, keyManagerPassword), - getSystemKeyManagers(defaultAlgorithm, null, null) - ) - ) - }; - - TrustManager[] trustManagers = { - new CompositeX509TrustManager( - union( - getSystemTrustManagers(keyManagerAlgorithm, keyStore), - getSystemTrustManagers(defaultAlgorithm, null) - ) - ) - }; - - SSLContext context = SSLContext.getInstance(socketProtocol); - context.init(keyManagers, trustManagers, null); - return context; - } - - private static List getSystemKeyManagers(String algorithm, KeyStore keystore, char[] password) - throws GeneralSecurityException { - KeyManagerFactory factory = KeyManagerFactory.getInstance(algorithm); - factory.init(keystore, password); - return Arrays.stream(factory.getKeyManagers()) - .filter(x -> x instanceof X509KeyManager) - .map(x -> (X509KeyManager) x) - .collect(Collectors.toList()); - } - - private static List getSystemTrustManagers(String algorithm, KeyStore keystore) - throws GeneralSecurityException { - TrustManagerFactory factory = TrustManagerFactory.getInstance(algorithm); - factory.init(keystore); - return Arrays.stream(factory.getTrustManagers()) - .filter(x -> x instanceof X509TrustManager) - .map(x -> (X509TrustManager) x) - .collect(Collectors.toList()); - } - - private static List union(List col1, List col2) { - List newList = new ArrayList<>(col1); - newList.addAll(col2); - return newList; - } -} diff --git a/src/main/java/de/rwth/idsg/steve/utils/ssl/SslContextStep.java b/src/main/java/de/rwth/idsg/steve/utils/ssl/SslContextStep.java deleted file mode 100644 index dea4b4e45..000000000 --- a/src/main/java/de/rwth/idsg/steve/utils/ssl/SslContextStep.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). - * All Rights Reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package de.rwth.idsg.steve.utils.ssl; - -import javax.net.ssl.SSLContext; -import java.security.GeneralSecurityException; - -/** - * @author Sevket Goekay - * @since 28.08.2018 - */ -public interface SslContextStep { - - SSLContext buildMergedWithSystem() throws GeneralSecurityException; - - default void buildMergedWithSystemAndSetDefault() throws GeneralSecurityException { - SSLContext.setDefault(buildMergedWithSystem()); - } - -} From 5fe72bc8e21d8a7895b3b77a35819d17275e4d59 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 27 Apr 2020 12:13:07 +0000 Subject: [PATCH 022/548] Bump jackson.version from 2.10.3 to 2.11.0 Bumps `jackson.version` from 2.10.3 to 2.11.0. Updates `jackson-databind` from 2.10.3 to 2.11.0 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-module-jaxb-annotations` from 2.10.3 to 2.11.0 - [Release notes](https://github.com/FasterXML/jackson-modules-base/releases) - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.10.3...jackson-modules-base-2.11.0) Updates `jackson-annotations` from 2.10.3 to 2.11.0 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a132f55d..35c8f0726 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 8.0.19 9.4.19.v20190610 1.18.12 - 2.10.3 + 2.11.0 jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true&serverTimezone=UTC From 7dae78a1311374d63654c5dc7d1df42ac3472ee8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 27 Apr 2020 12:13:41 +0000 Subject: [PATCH 023/548] Bump mysql-connector-java from 8.0.19 to 8.0.20 Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.19 to 8.0.20. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.19...8.0.20) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a132f55d..2df08773b 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 3.3.6 5.2.5.RELEASE 5.3.1.RELEASE - 8.0.19 + 8.0.20 9.4.19.v20190610 1.18.12 2.10.3 From c8c920ee26e378644505c06dcb131938fa9923d7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 27 Apr 2020 12:14:02 +0000 Subject: [PATCH 024/548] Bump HikariCP from 3.4.2 to 3.4.3 Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 3.4.2 to 3.4.3. - [Release notes](https://github.com/brettwooldridge/HikariCP/releases) - [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES) - [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-3.4.2...HikariCP-3.4.3) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a132f55d..96ada8382 100644 --- a/pom.xml +++ b/pom.xml @@ -665,7 +665,7 @@ com.zaxxer HikariCP - 3.4.2 + 3.4.3 org.jooq From aaa5b78a33aeba0e5badfd6dcee4730495df075a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 29 Apr 2020 12:12:28 +0000 Subject: [PATCH 025/548] Bump spring-framework-bom from 5.2.5.RELEASE to 5.2.6.RELEASE Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.2.5.RELEASE to 5.2.6.RELEASE. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.5.RELEASE...v5.2.6.RELEASE) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2beda1caa..0e1034f94 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.12.4 3.3.6 - 5.2.5.RELEASE + 5.2.6.RELEASE 5.3.1.RELEASE 8.0.20 9.4.19.v20190610 From 8fc5b28a5d2d4b7b356e33aeb33bd5bf2a5ee5ae Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 29 Apr 2020 12:12:48 +0000 Subject: [PATCH 026/548] Bump jaxb-runtime from 2.3.2 to 2.3.3 Bumps jaxb-runtime from 2.3.2 to 2.3.3. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2beda1caa..b16e902ce 100644 --- a/pom.xml +++ b/pom.xml @@ -486,7 +486,7 @@ org.glassfish.jaxb jaxb-runtime - 2.3.2 + 2.3.3 org.jetbrains From de40297d67b417dc2fd5e762f27a97a6be852a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20Go=CC=88kay?= Date: Sat, 2 May 2020 20:45:22 +0200 Subject: [PATCH 027/548] add the configuration key SupportedFileTransferProtocols for OCPP 1.6 (Closes #337) --- .../de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java index 6d32bbf6b..6223a3ae7 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java @@ -95,6 +95,7 @@ public enum ConfigurationKeyEnum { LocalAuthListMaxLength("LocalAuthListMaxLength", "integer", R, newHashSet(V_16)), SendLocalListMaxLength("SendLocalListMaxLength", "integer", R, newHashSet(V_16)), ReserveConnectorZeroSupported("ReserveConnectorZeroSupported", "boolean", R, newHashSet(V_16)), + SupportedFileTransferProtocols("SupportedFileTransferProtocols", "comma seperated list", R, newHashSet(V_16)), // ------------------------------------------------------------------------- // New in OCPP 1.6 for Smart Charging profile From 76d8bdf9f742fcd022dd8b1e05ee22cadefcf284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20Go=CC=88kay?= Date: Sat, 2 May 2020 20:51:23 +0200 Subject: [PATCH 028/548] fix typo in conf key text (seperated -> separated) --- .../steve/web/dto/ocpp/ConfigurationKeyEnum.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java index 6223a3ae7..ae0fecafd 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java @@ -57,10 +57,10 @@ public enum ConfigurationKeyEnum { // ------------------------------------------------------------------------- ClockAlignedDataInterval("ClockAlignedDataInterval", "in seconds", RW, newHashSet(V_15, V_16)), - MeterValuesSampledData("MeterValuesSampledData", "comma seperated list", RW, newHashSet(V_15, V_16)), - MeterValuesAlignedData("MeterValuesAlignedData", "comma seperated list", RW, newHashSet(V_15, V_16)), - StopTxnSampledData("StopTxnSampledData", "comma seperated list", RW, newHashSet(V_15, V_16)), - StopTxnAlignedData("StopTxnAlignedData", "comma seperated list", RW, newHashSet(V_15, V_16)), + MeterValuesSampledData("MeterValuesSampledData", "comma separated list", RW, newHashSet(V_15, V_16)), + MeterValuesAlignedData("MeterValuesAlignedData", "comma separated list", RW, newHashSet(V_15, V_16)), + StopTxnSampledData("StopTxnSampledData", "comma separated list", RW, newHashSet(V_15, V_16)), + StopTxnAlignedData("StopTxnAlignedData", "comma separated list", RW, newHashSet(V_15, V_16)), // ------------------------------------------------------------------------- // New in OCPP 1.6 @@ -71,7 +71,7 @@ public enum ConfigurationKeyEnum { AuthorizationCacheEnabled("AuthorizationCacheEnabled", "boolean", RW, newHashSet(V_16)), // AuthorizeRemoteTxRequests Read or Read-Write is up to Charge Point implementation so set to RW for now AuthorizeRemoteTxRequests("AuthorizeRemoteTxRequests", "boolean", RW, newHashSet(V_16)), - ConnectorPhaseRotation("ConnectorPhaseRotation", "comma seperated list", RW, newHashSet(V_16)), + ConnectorPhaseRotation("ConnectorPhaseRotation", "comma separated list", RW, newHashSet(V_16)), ConnectorPhaseRotationMaxLength("ConnectorPhaseRotationMaxLength", "integer", R, newHashSet(V_16)), GetConfigurationMaxKeys("GetConfigurationMaxKeys", "integer", R, newHashSet(V_16)), LocalAuthorizeOffline("LocalAuthorizeOffline", "boolean", RW, newHashSet(V_16)), @@ -85,7 +85,7 @@ public enum ConfigurationKeyEnum { StopTransactionOnInvalidId("StopTransactionOnInvalidId", "boolean", RW, newHashSet(V_16)), StopTxnAlignedDataMaxLength("StopTxnAlignedDataMaxLength", "integer", R, newHashSet(V_16)), StopTxnSampledDataMaxLength("StopTxnSampledDataMaxLength", "integer", R, newHashSet(V_16)), - SupportedFeatureProfiles("SupportedFeatureProfiles", "comma seperated list", R, newHashSet(V_16)), + SupportedFeatureProfiles("SupportedFeatureProfiles", "comma separated list", R, newHashSet(V_16)), SupportedFeatureProfilesMaxLength("SupportedFeatureProfilesMaxLength", "integer", R, newHashSet(V_16)), TransactionMessageAttempts("TransactionMessageAttempts", "in times", RW, newHashSet(V_16)), TransactionMessageRetryInterval("TransactionMessageRetryInterval", "in seconds", RW, newHashSet(V_16)), @@ -95,14 +95,14 @@ public enum ConfigurationKeyEnum { LocalAuthListMaxLength("LocalAuthListMaxLength", "integer", R, newHashSet(V_16)), SendLocalListMaxLength("SendLocalListMaxLength", "integer", R, newHashSet(V_16)), ReserveConnectorZeroSupported("ReserveConnectorZeroSupported", "boolean", R, newHashSet(V_16)), - SupportedFileTransferProtocols("SupportedFileTransferProtocols", "comma seperated list", R, newHashSet(V_16)), + SupportedFileTransferProtocols("SupportedFileTransferProtocols", "comma separated list", R, newHashSet(V_16)), // ------------------------------------------------------------------------- // New in OCPP 1.6 for Smart Charging profile // ------------------------------------------------------------------------- ChargeProfileMaxStackLevel("ChargeProfileMaxStackLevel", "integer", R, newHashSet(V_16)), - ChargingScheduleAllowedChargingRateUnit("ChargingScheduleAllowedChargingRateUnit", "comma seperated list", R, newHashSet(V_16)), + ChargingScheduleAllowedChargingRateUnit("ChargingScheduleAllowedChargingRateUnit", "comma separated list", R, newHashSet(V_16)), ChargingScheduleMaxPeriods("ChargingScheduleMaxPeriods", "integer", R, newHashSet(V_16)), ConnectorSwitch3to1PhaseSupported("ConnectorSwitch3to1PhaseSupported", "boolean", R, newHashSet(V_16)), MaxChargingProfilesInstalled("MaxChargingProfilesInstalled", "integer", R, newHashSet(V_16)); From 484c2606dd55dc06408792e8777ede89f8066384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20Go=CC=88kay?= Date: Sun, 3 May 2020 20:15:48 +0200 Subject: [PATCH 029/548] refactor: remove constructor param (textual value), it be deduced from enum name reason: the first constructor param is the same as the enum name and therefore unnecessary --- .../web/dto/ocpp/ConfigurationKeyEnum.java | 103 +++++++++--------- 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java index ae0fecafd..f6a73e52e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java @@ -42,70 +42,70 @@ public enum ConfigurationKeyEnum { // From OCPP 1.2 // ------------------------------------------------------------------------- - HeartBeatInterval("HeartBeatInterval", "in seconds", RW, newHashSet(V_12, V_15)), - ConnectionTimeOut("ConnectionTimeOut", "in seconds", RW, newHashSet(V_12, V_15, V_16)), - ProximityContactRetries("ProximityContactRetries", "in times", RW, newHashSet(V_12, V_15)), - ProximityLockRetries("ProximityLockRetries", "in times", RW, newHashSet(V_12, V_15)), - ResetRetries("ResetRetries", "in times", RW, newHashSet(V_12, V_15, V_16)), - BlinkRepeat("BlinkRepeat", "in times", RW, newHashSet(V_12, V_15, V_16)), - LightIntensity("LightIntensity", "in %", RW, newHashSet(V_12, V_15, V_16)), - ChargePointId("ChargePointId", "string", RW, newHashSet(V_12, V_15)), - MeterValueSampleInterval("MeterValueSampleInterval", "in seconds", RW, newHashSet(V_12, V_15, V_16)), + HeartBeatInterval("in seconds", RW, newHashSet(V_12, V_15)), + ConnectionTimeOut("in seconds", RW, newHashSet(V_12, V_15, V_16)), + ProximityContactRetries("in times", RW, newHashSet(V_12, V_15)), + ProximityLockRetries("in times", RW, newHashSet(V_12, V_15)), + ResetRetries("in times", RW, newHashSet(V_12, V_15, V_16)), + BlinkRepeat("in times", RW, newHashSet(V_12, V_15, V_16)), + LightIntensity("in %", RW, newHashSet(V_12, V_15, V_16)), + ChargePointId("string", RW, newHashSet(V_12, V_15)), + MeterValueSampleInterval("in seconds", RW, newHashSet(V_12, V_15, V_16)), // ------------------------------------------------------------------------- // New in OCPP 1.5 // ------------------------------------------------------------------------- - ClockAlignedDataInterval("ClockAlignedDataInterval", "in seconds", RW, newHashSet(V_15, V_16)), - MeterValuesSampledData("MeterValuesSampledData", "comma separated list", RW, newHashSet(V_15, V_16)), - MeterValuesAlignedData("MeterValuesAlignedData", "comma separated list", RW, newHashSet(V_15, V_16)), - StopTxnSampledData("StopTxnSampledData", "comma separated list", RW, newHashSet(V_15, V_16)), - StopTxnAlignedData("StopTxnAlignedData", "comma separated list", RW, newHashSet(V_15, V_16)), + ClockAlignedDataInterval("in seconds", RW, newHashSet(V_15, V_16)), + MeterValuesSampledData("comma separated list", RW, newHashSet(V_15, V_16)), + MeterValuesAlignedData("comma separated list", RW, newHashSet(V_15, V_16)), + StopTxnSampledData("comma separated list", RW, newHashSet(V_15, V_16)), + StopTxnAlignedData("comma separated list", RW, newHashSet(V_15, V_16)), // ------------------------------------------------------------------------- // New in OCPP 1.6 // ------------------------------------------------------------------------- - HeartbeatInterval("HeartbeatInterval", "in seconds", RW, newHashSet(V_16)), - AllowOfflineTxForUnknownId("AllowOfflineTxForUnknownId", "boolean", RW, newHashSet(V_16)), - AuthorizationCacheEnabled("AuthorizationCacheEnabled", "boolean", RW, newHashSet(V_16)), + HeartbeatInterval("in seconds", RW, newHashSet(V_16)), + AllowOfflineTxForUnknownId("boolean", RW, newHashSet(V_16)), + AuthorizationCacheEnabled("boolean", RW, newHashSet(V_16)), // AuthorizeRemoteTxRequests Read or Read-Write is up to Charge Point implementation so set to RW for now - AuthorizeRemoteTxRequests("AuthorizeRemoteTxRequests", "boolean", RW, newHashSet(V_16)), - ConnectorPhaseRotation("ConnectorPhaseRotation", "comma separated list", RW, newHashSet(V_16)), - ConnectorPhaseRotationMaxLength("ConnectorPhaseRotationMaxLength", "integer", R, newHashSet(V_16)), - GetConfigurationMaxKeys("GetConfigurationMaxKeys", "integer", R, newHashSet(V_16)), - LocalAuthorizeOffline("LocalAuthorizeOffline", "boolean", RW, newHashSet(V_16)), - LocalPreAuthorize("LocalPreAuthorize", "boolean", RW, newHashSet(V_16)), - MaxEnergyOnInvalidId("MaxEnergyOnInvalidId", "in Wh", RW, newHashSet(V_16)), - MeterValuesAlignedDataMaxLength("MeterValuesAlignedDataMaxLength", "integer", R, newHashSet(V_16)), - MeterValuesSampledDataMaxLength("MeterValuesSampledDataMaxLength", "integer", R, newHashSet(V_16)), - MinimumStatusDuration("MinimumStatusDuration", "in seconds", RW, newHashSet(V_16)), - NumberOfConnectors("NumberOfConnectors", "integer", R, newHashSet(V_16)), - StopTransactionOnEVSideDisconnect("StopTransactionOnEVSideDisconnect", "boolean", RW, newHashSet(V_16)), - StopTransactionOnInvalidId("StopTransactionOnInvalidId", "boolean", RW, newHashSet(V_16)), - StopTxnAlignedDataMaxLength("StopTxnAlignedDataMaxLength", "integer", R, newHashSet(V_16)), - StopTxnSampledDataMaxLength("StopTxnSampledDataMaxLength", "integer", R, newHashSet(V_16)), - SupportedFeatureProfiles("SupportedFeatureProfiles", "comma separated list", R, newHashSet(V_16)), - SupportedFeatureProfilesMaxLength("SupportedFeatureProfilesMaxLength", "integer", R, newHashSet(V_16)), - TransactionMessageAttempts("TransactionMessageAttempts", "in times", RW, newHashSet(V_16)), - TransactionMessageRetryInterval("TransactionMessageRetryInterval", "in seconds", RW, newHashSet(V_16)), - UnlockConnectorOnEVSideDisconnect("UnlockConnectorOnEVSideDisconnect", "boolean", RW, newHashSet(V_16)), - WebSocketPingInterval("WebSocketPingInterval", "in seconds", RW, newHashSet(V_16)), - LocalAuthListEnabled("LocalAuthListEnabled", "boolean", RW, newHashSet(V_16)), - LocalAuthListMaxLength("LocalAuthListMaxLength", "integer", R, newHashSet(V_16)), - SendLocalListMaxLength("SendLocalListMaxLength", "integer", R, newHashSet(V_16)), - ReserveConnectorZeroSupported("ReserveConnectorZeroSupported", "boolean", R, newHashSet(V_16)), - SupportedFileTransferProtocols("SupportedFileTransferProtocols", "comma separated list", R, newHashSet(V_16)), + AuthorizeRemoteTxRequests("boolean", RW, newHashSet(V_16)), + ConnectorPhaseRotation("comma separated list", RW, newHashSet(V_16)), + ConnectorPhaseRotationMaxLength("integer", R, newHashSet(V_16)), + GetConfigurationMaxKeys("integer", R, newHashSet(V_16)), + LocalAuthorizeOffline("boolean", RW, newHashSet(V_16)), + LocalPreAuthorize("boolean", RW, newHashSet(V_16)), + MaxEnergyOnInvalidId("in Wh", RW, newHashSet(V_16)), + MeterValuesAlignedDataMaxLength("integer", R, newHashSet(V_16)), + MeterValuesSampledDataMaxLength("integer", R, newHashSet(V_16)), + MinimumStatusDuration("in seconds", RW, newHashSet(V_16)), + NumberOfConnectors("integer", R, newHashSet(V_16)), + StopTransactionOnEVSideDisconnect("boolean", RW, newHashSet(V_16)), + StopTransactionOnInvalidId("boolean", RW, newHashSet(V_16)), + StopTxnAlignedDataMaxLength("integer", R, newHashSet(V_16)), + StopTxnSampledDataMaxLength("integer", R, newHashSet(V_16)), + SupportedFeatureProfiles("comma separated list", R, newHashSet(V_16)), + SupportedFeatureProfilesMaxLength("integer", R, newHashSet(V_16)), + TransactionMessageAttempts("in times", RW, newHashSet(V_16)), + TransactionMessageRetryInterval("in seconds", RW, newHashSet(V_16)), + UnlockConnectorOnEVSideDisconnect("boolean", RW, newHashSet(V_16)), + WebSocketPingInterval("in seconds", RW, newHashSet(V_16)), + LocalAuthListEnabled("boolean", RW, newHashSet(V_16)), + LocalAuthListMaxLength("integer", R, newHashSet(V_16)), + SendLocalListMaxLength("integer", R, newHashSet(V_16)), + ReserveConnectorZeroSupported("boolean", R, newHashSet(V_16)), + SupportedFileTransferProtocols("comma separated list", R, newHashSet(V_16)), // ------------------------------------------------------------------------- // New in OCPP 1.6 for Smart Charging profile // ------------------------------------------------------------------------- - ChargeProfileMaxStackLevel("ChargeProfileMaxStackLevel", "integer", R, newHashSet(V_16)), - ChargingScheduleAllowedChargingRateUnit("ChargingScheduleAllowedChargingRateUnit", "comma separated list", R, newHashSet(V_16)), - ChargingScheduleMaxPeriods("ChargingScheduleMaxPeriods", "integer", R, newHashSet(V_16)), - ConnectorSwitch3to1PhaseSupported("ConnectorSwitch3to1PhaseSupported", "boolean", R, newHashSet(V_16)), - MaxChargingProfilesInstalled("MaxChargingProfilesInstalled", "integer", R, newHashSet(V_16)); + ChargeProfileMaxStackLevel("integer", R, newHashSet(V_16)), + ChargingScheduleAllowedChargingRateUnit("comma separated list", R, newHashSet(V_16)), + ChargingScheduleMaxPeriods("integer", R, newHashSet(V_16)), + ConnectorSwitch3to1PhaseSupported("boolean", R, newHashSet(V_16)), + MaxChargingProfilesInstalled("integer", R, newHashSet(V_16)); private final String value; private final String text; @@ -119,9 +119,10 @@ public enum ConfigurationKeyEnum { public static final Map OCPP_16_MAP_R = asMap(OcppVersion.V_16, R); public static final Map OCPP_16_MAP_RW = asMap(OcppVersion.V_16, RW); - ConfigurationKeyEnum(String value, String comment, ConfigurationKeyReadWriteEnum rw, Set versions) { - this.value = value; - this.text = String.format("%s (%s)", value, comment); + + ConfigurationKeyEnum(String valueType, ConfigurationKeyReadWriteEnum rw, Set versions) { + this.value = this.name(); + this.text = String.format("%s (%s)", value, valueType); this.rw = rw; this.versions = versions; } From 27b1e4e4fbfd59d357678eb6075ae18c73c250a3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 7 May 2020 12:13:30 +0000 Subject: [PATCH 030/548] Bump spring.security.version from 5.3.1.RELEASE to 5.3.2.RELEASE Bumps `spring.security.version` from 5.3.1.RELEASE to 5.3.2.RELEASE. Updates `spring-security-web` from 5.3.1.RELEASE to 5.3.2.RELEASE - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.3.1.RELEASE...5.3.2.RELEASE) Updates `spring-security-config` from 5.3.1.RELEASE to 5.3.2.RELEASE - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.3.1.RELEASE...5.3.2.RELEASE) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4a7a862b3..29a3037cc 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.12.4 3.3.6 5.2.6.RELEASE - 5.3.1.RELEASE + 5.3.2.RELEASE 8.0.20 9.4.19.v20190610 1.18.12 From 494075779d9c41e74628fd33b7c7bab0bc01002b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 7 May 2020 12:14:29 +0000 Subject: [PATCH 031/548] Bump hibernate-validator from 6.1.4.Final to 6.1.5.Final Bumps [hibernate-validator](https://github.com/hibernate/hibernate-validator) from 6.1.4.Final to 6.1.5.Final. - [Release notes](https://github.com/hibernate/hibernate-validator/releases) - [Changelog](https://github.com/hibernate/hibernate-validator/blob/6.1.5.Final/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-validator/compare/6.1.4.Final...6.1.5.Final) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4a7a862b3..45d1915fc 100644 --- a/pom.xml +++ b/pom.xml @@ -509,7 +509,7 @@ org.hibernate.validator hibernate-validator - 6.1.4.Final + 6.1.5.Final com.google.guava From 42c35fd8f61e7c9f88a7000309c8a76f57f2b805 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 8 May 2020 12:13:32 +0000 Subject: [PATCH 032/548] Bump HikariCP from 3.4.3 to 3.4.4 Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 3.4.3 to 3.4.4. - [Release notes](https://github.com/brettwooldridge/HikariCP/releases) - [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES) - [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-3.4.3...HikariCP-3.4.4) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2e1f3f6d4..2b22febe8 100644 --- a/pom.xml +++ b/pom.xml @@ -665,7 +665,7 @@ com.zaxxer HikariCP - 3.4.3 + 3.4.4 org.jooq From 3d6b58f5ae17768dd9246a3ba06f5de2f25fa145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20Go=CC=88kay?= Date: Sat, 9 May 2020 15:38:39 +0200 Subject: [PATCH 033/548] order ocpp configuration keys alphabetically (Closes #344) --- .../rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java index f6a73e52e..d93fa7651 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java @@ -19,10 +19,9 @@ package de.rwth.idsg.steve.web.dto.ocpp; import de.rwth.idsg.steve.ocpp.OcppVersion; - -import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; +import java.util.TreeMap; import static com.google.common.collect.Sets.newHashSet; import static de.rwth.idsg.steve.ocpp.OcppVersion.V_12; @@ -141,7 +140,7 @@ public static ConfigurationKeyEnum fromValue(String v) { } private static Map asMap(OcppVersion version, ConfigurationKeyReadWriteEnum rw) { - Map map = new LinkedHashMap<>(); + Map map = new TreeMap<>(); for (ConfigurationKeyEnum c : ConfigurationKeyEnum.values()) { if (c.versions.contains(version) && c.rw == rw) { map.put(c.value, c.text); From 4a67f2a7556d9b3006742b400a76fe6a55ac3c01 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 11 May 2020 12:13:10 +0000 Subject: [PATCH 034/548] Bump HikariCP from 3.4.4 to 3.4.5 Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 3.4.4 to 3.4.5. - [Release notes](https://github.com/brettwooldridge/HikariCP/releases) - [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES) - [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-3.4.4...HikariCP-3.4.5) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2b22febe8..79d491ca0 100644 --- a/pom.xml +++ b/pom.xml @@ -665,7 +665,7 @@ com.zaxxer HikariCP - 3.4.4 + 3.4.5 org.jooq From 5d977ffcae992b7dbaa11f9b0776d578933efe47 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 14 May 2020 12:12:42 +0000 Subject: [PATCH 035/548] Bump log4j-bom from 2.13.2 to 2.13.3 Bumps log4j-bom from 2.13.2 to 2.13.3. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 79d491ca0..5094283a7 100644 --- a/pom.xml +++ b/pom.xml @@ -443,7 +443,7 @@ org.apache.logging.log4j log4j-bom - 2.13.2 + 2.13.3 import pom From 6b654bc054f9a12ad7343ea7a25ab65d32549757 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2020 12:13:24 +0000 Subject: [PATCH 036/548] Bump spring.security.version from 5.3.2.RELEASE to 5.3.3.RELEASE Bumps `spring.security.version` from 5.3.2.RELEASE to 5.3.3.RELEASE. Updates `spring-security-web` from 5.3.2.RELEASE to 5.3.3.RELEASE - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.3.2.RELEASE...5.3.3.RELEASE) Updates `spring-security-config` from 5.3.2.RELEASE to 5.3.3.RELEASE - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.3.2.RELEASE...5.3.3.RELEASE) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5094283a7..955adf0fd 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.12.4 3.3.6 5.2.6.RELEASE - 5.3.2.RELEASE + 5.3.3.RELEASE 8.0.20 9.4.19.v20190610 1.18.12 From 3c7319767974f2cfa2ba3d74933a4b35f03e4122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sat, 6 Jun 2020 14:39:13 +0200 Subject: [PATCH 037/548] update readme to include mysql 8.x setup --- README.md | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 8da3df0cc..ef257c205 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ https://github.com/RWTH-i5-IDSG/steve/wiki/Charging-Station-Compatibility SteVe requires * JDK 11 (both Oracle JDK and OpenJDK are supported) * Maven -* At least MySQL 5.7.7 (MariaDB 10.2.1 or later works as well) as database (**Note: MySQL 8.x is not supported yet**) +* At least MySQL 5.7.7 (MariaDB 10.2.1 or later works as well) as database to build and run. @@ -38,17 +38,30 @@ SteVe is designed to run standalone, a java servlet container / web server (e.g. 1. Database preparation: - Make sure MySQL is reachable via TCP (e.g., remove `skip-networking` from `my.cnf`). - The following MySQL statements can be used as database initialization (adjust database name and credentials according to your setup): - - ``` - CREATE DATABASE stevedb CHARACTER SET utf8 COLLATE utf8_unicode_ci; - GRANT ALL PRIVILEGES ON stevedb.* TO 'steve'@'localhost' IDENTIFIED BY 'changeme'; - GRANT SELECT ON mysql.proc TO 'steve'@'localhost' IDENTIFIED BY 'changeme'; - ``` - **Important**: Make sure that the time zone of the MySQL server is the same as [the time zone of SteVe](src/main/java/de/rwth/idsg/steve/SteveConfiguration.java#L46). Since `UTC` is strongly recommended by OCPP, it is the default in SteVe and you should set it in MySQL, accordingly. + Make sure MySQL is reachable via TCP (e.g., remove `skip-networking` from `my.cnf`). + The following MySQL statements can be used as database initialization (adjust database name and credentials according to your setup). + + * For MySQL 5.7: + ``` + CREATE DATABASE stevedb CHARACTER SET utf8 COLLATE utf8_unicode_ci; + GRANT ALL PRIVILEGES ON stevedb.* TO 'steve'@'localhost' IDENTIFIED BY 'changeme'; + GRANT SELECT ON mysql.proc TO 'steve'@'localhost' IDENTIFIED BY 'changeme'; + ``` + + * For MySQL 8: + ``` + CREATE DATABASE stevedb CHARACTER SET utf8 COLLATE utf8_unicode_ci; + CREATE USER 'steve'@'localhost' IDENTIFIED BY 'changeme'; + GRANT ALL PRIVILEGES ON stevedb.* TO 'steve'@'localhost'; + GRANT SUPER ON *.* TO 'steve'@'localhost'; + ``` + Note: The statement `GRANT SUPER [...]` is only necessary to execute some of the previous migration files and is only needed for the initial database setup. Afterwards, you can remove this privilage by executing + ``` + REVOKE SUPER ON *.* FROM 'steve'@'localhost'; + ``` + 2. Download and extract tarball: You can download and extract the SteVe releases using the following commands (replace X.X.X with the desired version number): From b73cfe697e73e43096e38347c1ab005a565677e3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 9 Jun 2020 12:13:11 +0000 Subject: [PATCH 038/548] Bump spring-framework-bom from 5.2.6.RELEASE to 5.2.7.RELEASE Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.2.6.RELEASE to 5.2.7.RELEASE. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.6.RELEASE...v5.2.7.RELEASE) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 955adf0fd..4115a6e60 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.12.4 3.3.6 - 5.2.6.RELEASE + 5.2.7.RELEASE 5.3.3.RELEASE 8.0.20 9.4.19.v20190610 From 0193c5c5a0c9899ad6d894317cb80142b46831f4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 25 Jun 2020 12:13:12 +0000 Subject: [PATCH 039/548] Bump jackson.version from 2.11.0 to 2.11.1 Bumps `jackson.version` from 2.11.0 to 2.11.1. Updates `jackson-databind` from 2.11.0 to 2.11.1 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-module-jaxb-annotations` from 2.11.0 to 2.11.1 - [Release notes](https://github.com/FasterXML/jackson-modules-base/releases) - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.11.0...jackson-modules-base-2.11.1) Updates `jackson-annotations` from 2.11.0 to 2.11.1 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4115a6e60..6346a6bb9 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 8.0.20 9.4.19.v20190610 1.18.12 - 2.11.0 + 2.11.1 jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true&serverTimezone=UTC From 14fed97f3fc06844a87d9de3971172258aa480a1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 12:13:00 +0000 Subject: [PATCH 040/548] Bump cxf.version from 3.3.6 to 3.3.7 Bumps `cxf.version` from 3.3.6 to 3.3.7. Updates `cxf-rt-frontend-jaxws` from 3.3.6 to 3.3.7 Updates `cxf-rt-transports-http` from 3.3.6 to 3.3.7 Updates `cxf-rt-transports-http-hc` from 3.3.6 to 3.3.7 Updates `cxf-rt-features-logging` from 3.3.6 to 3.3.7 Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6346a6bb9..1ddddeeb3 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ UTF-8 3.12.4 - 3.3.6 + 3.3.7 5.2.7.RELEASE 5.3.3.RELEASE 8.0.20 From bfe06e22aa24bf0157c78ad7a9010ef71dec1225 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 12:13:38 +0000 Subject: [PATCH 041/548] Bump flyway-maven-plugin from 6.4.0 to 6.5.0 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 6.4.0 to 6.5.0. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-6.4.0...flyway-6.5.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6346a6bb9..a214de1d0 100644 --- a/pom.xml +++ b/pom.xml @@ -288,7 +288,7 @@ org.flywaydb flyway-maven-plugin - 6.4.0 + 6.5.0 From c6301162a68979911ef0ba13b8a704ac2bffb8f8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 13 Jul 2020 12:13:50 +0000 Subject: [PATCH 042/548] Bump mysql-connector-java from 8.0.20 to 8.0.21 Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.20 to 8.0.21. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.20...8.0.21) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f53b7080d..c96648ae5 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 3.3.7 5.2.7.RELEASE 5.3.3.RELEASE - 8.0.20 + 8.0.21 9.4.19.v20190610 1.18.12 2.11.1 From eda6de21cc283417470638173e0994ab73742c9f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2020 12:13:13 +0000 Subject: [PATCH 043/548] Bump flyway-maven-plugin from 6.5.0 to 6.5.1 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 6.5.0 to 6.5.1. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-6.5.0...flyway-6.5.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f53b7080d..0d5d4df21 100644 --- a/pom.xml +++ b/pom.xml @@ -288,7 +288,7 @@ org.flywaydb flyway-maven-plugin - 6.5.0 + 6.5.1 From 4da0384d16a4751aecf38b2bd42c4b1c2aacab72 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 16 Jul 2020 12:13:08 +0000 Subject: [PATCH 044/548] Bump git-commit-id-plugin from 4.0.0 to 4.0.1 Bumps git-commit-id-plugin from 4.0.0 to 4.0.1. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dbc275bc0..79212ecde 100644 --- a/pom.xml +++ b/pom.xml @@ -196,7 +196,7 @@ pl.project13.maven git-commit-id-plugin - 4.0.0 + 4.0.1 initialize From d91820059bf5b9827be5ee666093b419611224d2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2020 12:13:03 +0000 Subject: [PATCH 045/548] Bump spring-framework-bom from 5.2.7.RELEASE to 5.2.8.RELEASE Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.2.7.RELEASE to 5.2.8.RELEASE. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.7.RELEASE...v5.2.8.RELEASE) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 79212ecde..b23172299 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.12.4 3.3.7 - 5.2.7.RELEASE + 5.2.8.RELEASE 5.3.3.RELEASE 8.0.21 9.4.19.v20190610 From 2ee0efd4816f41b4d10636f02523b9dd23072f7f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 23 Jul 2020 12:12:53 +0000 Subject: [PATCH 046/548] Bump flyway-maven-plugin from 6.5.1 to 6.5.2 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 6.5.1 to 6.5.2. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-6.5.1...flyway-6.5.2) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b23172299..16c20a584 100644 --- a/pom.xml +++ b/pom.xml @@ -288,7 +288,7 @@ org.flywaydb flyway-maven-plugin - 6.5.1 + 6.5.2 From 6c468fa1841c41ca4da19e89661944bc3aa67480 Mon Sep 17 00:00:00 2001 From: Daniel Pegg Date: Tue, 28 Jul 2020 14:21:11 +0100 Subject: [PATCH 047/548] add k8s support --- README.md | 16 ++++++ k8s/docker/Dockerfile | 25 ++++++++ k8s/yaml/Deployment.yaml | 32 +++++++++++ k8s/yaml/Service.yaml | 15 +++++ pom.xml | 7 +++ .../resources/config/kubernetes/log4j2.xml | 34 +++++++++++ .../config/kubernetes/main.properties | 57 +++++++++++++++++++ 7 files changed, 186 insertions(+) create mode 100644 k8s/docker/Dockerfile create mode 100644 k8s/yaml/Deployment.yaml create mode 100644 k8s/yaml/Service.yaml create mode 100644 src/main/resources/config/kubernetes/log4j2.xml create mode 100644 src/main/resources/config/kubernetes/main.properties diff --git a/README.md b/README.md index ef257c205..aa5c4065e 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,22 @@ If you prefer to build and start this project via docker (you can skip the steps The web interface will be accessible at: `http://localhost:8180` +# Kubernetes + +First build your image, and push it to a registry your K8S cluster can access. Make sure the build args in the docker build command are set with the same database configuration that the main deployment will use. + +`docker build --no-cache --build-arg DB_HOST= --build-arg DB_PASSWORD= --build-arg DB_USERNAME= --build-arg DB_DATABASE= -f k8s/docker/Dockerfile -t .` + +`docker push ` + + +Then go to `k8s/yaml/Deployment.yaml` and change `### YOUR BUILT IMAGE HERE ###` to your image tag, and fill in the environment variables with the same details that you used at build time. + +After this, create the namespace using `kubectl create ns steve` and apply your yaml with `kubectl apply -f k8s/yaml/Deployment.yaml` followed by `kubectl apply -f k8s/yaml/Service.yaml` + + +To access this publically, you'll also have to setup an ingress using something like nginx or traefik. + # Ubuntu You'll find a tutorial how to prepare Ubuntu for SteVe here: https://github.com/RWTH-i5-IDSG/steve/wiki/Prepare-Ubuntu-VM-for-SteVe diff --git a/k8s/docker/Dockerfile b/k8s/docker/Dockerfile new file mode 100644 index 000000000..00f9427ce --- /dev/null +++ b/k8s/docker/Dockerfile @@ -0,0 +1,25 @@ +FROM maven:3.6.1-jdk-11 +MAINTAINER daynnnnn + +ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV DB_PORT=3307 + +ARG DB_HOST +ARG DB_USERNAME +ARG DB_PASSWORD +ARG DB_DATABASE + +WORKDIR /code + +ADD /src /code/src +ADD /website /code/website +ADD /pom.xml /code/pom.xml + +RUN sed -i 's|jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true\&serverTimezone=UTC|jdbc:mysql://${env.DB_HOST}:${env.DB_PORT}/${env.DB_DATABASE}?useSSL=true\&serverTimezone=UTC|g' pom.xml +RUN sed -i 's|${db.user}|${env.DB_USERNAME}|g' pom.xml +RUN sed -i 's|${db.password}|${env.DB_PASSWORD}|g' pom.xml + +RUN mvn clean package -Pkubernetes -Djdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2" + +CMD java -jar target/steve.jar + diff --git a/k8s/yaml/Deployment.yaml b/k8s/yaml/Deployment.yaml new file mode 100644 index 000000000..36b36498e --- /dev/null +++ b/k8s/yaml/Deployment.yaml @@ -0,0 +1,32 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: steve-deployment + namespace: steve +spec: + replicas: 1 + selector: + matchLabels: + app: steve-deployment + template: + metadata: + labels: + app: steve-deployment + spec: + containers: + - name: steve + image: "### YOUR BUILT IMAGE HERE ###" + imagePullPolicy: Always + env: + - name: DB_HOST + value: "" + - name: DB_PORT + value: "" + - name: DB_USERNAME + value: "" + - name: DB_PASSWORD + value: "" + - name: ADMIN_USERNAME + value: "" + - name: ADMIN_PASSWORD + value: "" \ No newline at end of file diff --git a/k8s/yaml/Service.yaml b/k8s/yaml/Service.yaml new file mode 100644 index 000000000..4e6d43df2 --- /dev/null +++ b/k8s/yaml/Service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: 'steve-service' + namespace: 'steve' +spec: + ports: + - name: steve + port: 8180 + protocol: TCP + targetPort: 8180 + selector: + app: 'steve-deployment' + sessionAffinity: None + type: ClusterIP \ No newline at end of file diff --git a/pom.xml b/pom.xml index 16c20a584..92e531056 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,13 @@ true + + kubernetes + + kubernetes + true + + dev diff --git a/src/main/resources/config/kubernetes/log4j2.xml b/src/main/resources/config/kubernetes/log4j2.xml new file mode 100644 index 000000000..9e72a1bda --- /dev/null +++ b/src/main/resources/config/kubernetes/log4j2.xml @@ -0,0 +1,34 @@ + + + + + [%-5p] %d %c (%t) - %m%n + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/config/kubernetes/main.properties b/src/main/resources/config/kubernetes/main.properties new file mode 100644 index 000000000..8eda52202 --- /dev/null +++ b/src/main/resources/config/kubernetes/main.properties @@ -0,0 +1,57 @@ +# Just to be backwards compatible with previous versions, this is set to "steve", +# since there might be already configured chargepoints expecting the older path. +# Otherwise, might as well be changed to something else or be left empty. +# +context.path = steve + +# Database configuration +# +db.ip=$DB_HOST +db.port=$DB_PORT +db.schema=$DB_DATABASE +db.user=$DB_USERNAME +db.password=$DB_PASSWORD + +# Credentials for Web interface access +# +auth.user=$ADMIN_USERNAME +auth.password=$ADMIN_PASSWORD + +# Jetty configuration +# +server.host = 0.0.0.0 +server.gzip.enabled = false + +# Jetty HTTP configuration +# +http.enabled = true +http.port = 8180 + +# Jetty HTTPS configuration +# +https.enabled = false +https.port = 8443 +keystore.path = +keystore.password = + +# When the WebSocket/Json charge point opens more than one WebSocket connection, +# we need a mechanism/strategy to select one of them for outgoing requests. +# For allowed values see de.rwth.idsg.steve.ocpp.ws.custom.WsSessionSelectStrategyEnum. +# +ws.session.select.strategy = ALWAYS_LAST + +# if BootNotification messages arrive (SOAP) or WebSocket connection attempts are made (JSON) from unknown charging +# stations, we reject these charging stations, because stations with these chargeBoxIds were NOT inserted into database +# beforehand. by setting this property to true, this behaviour can be modified to automatically insert unknown +# stations into database and accept their requests. +# +# CAUTION: setting this property to true is very dangerous, because we will accept EVERY BootNotification or WebSocket +# connection attempt from ANY sender as long as the sender knows the URL and sends a valid message. +# +auto.register.unknown.stations = false + +### DO NOT MODIFY ### +steve.version = ${project.version} +git.describe = ${git.commit.id.describe} +db.sql.logging = false +profile = prod From 2e04acad24ce34658658892b9703592461bb4293 Mon Sep 17 00:00:00 2001 From: Dan Pegg Date: Wed, 29 Jul 2020 00:21:54 +0100 Subject: [PATCH 048/548] Improve k8s docs, find and replace, fix deployment, allow custom DB port --- README.md | 6 +++--- k8s/docker/Dockerfile | 10 ++++++---- k8s/yaml/Deployment.yaml | 2 ++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index aa5c4065e..c3235dbdc 100644 --- a/README.md +++ b/README.md @@ -107,17 +107,17 @@ The web interface will be accessible at: `http://localhost:8180` First build your image, and push it to a registry your K8S cluster can access. Make sure the build args in the docker build command are set with the same database configuration that the main deployment will use. -`docker build --no-cache --build-arg DB_HOST= --build-arg DB_PASSWORD= --build-arg DB_USERNAME= --build-arg DB_DATABASE= -f k8s/docker/Dockerfile -t .` +`docker build --build-arg DB_HOST= --build-arg DB_PORT= --build-arg DB_USERNAME= --build-arg DB_PASSWORD= --build-arg DB_DATABASE= -f k8s/docker/Dockerfile -t .` `docker push ` -Then go to `k8s/yaml/Deployment.yaml` and change `### YOUR BUILT IMAGE HERE ###` to your image tag, and fill in the environment variables with the same details that you used at build time. +Then go to `k8s/yaml/Deployment.yaml` and change `### YOUR BUILT IMAGE HERE ###` to your image tag, and fill in the environment variables with the same database connection that you used at build time. After this, create the namespace using `kubectl create ns steve` and apply your yaml with `kubectl apply -f k8s/yaml/Deployment.yaml` followed by `kubectl apply -f k8s/yaml/Service.yaml` -To access this publically, you'll also have to setup an ingress using something like nginx or traefik. +To access this publicaly, you'll also have to setup an ingress using something like nginx or traefik. # Ubuntu diff --git a/k8s/docker/Dockerfile b/k8s/docker/Dockerfile index 00f9427ce..48b19a9cf 100644 --- a/k8s/docker/Dockerfile +++ b/k8s/docker/Dockerfile @@ -2,12 +2,12 @@ FROM maven:3.6.1-jdk-11 MAINTAINER daynnnnn ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 -ENV DB_PORT=3307 ARG DB_HOST ARG DB_USERNAME ARG DB_PASSWORD ARG DB_DATABASE +ARG DB_PORT WORKDIR /code @@ -15,9 +15,11 @@ ADD /src /code/src ADD /website /code/website ADD /pom.xml /code/pom.xml -RUN sed -i 's|jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true\&serverTimezone=UTC|jdbc:mysql://${env.DB_HOST}:${env.DB_PORT}/${env.DB_DATABASE}?useSSL=true\&serverTimezone=UTC|g' pom.xml -RUN sed -i 's|${db.user}|${env.DB_USERNAME}|g' pom.xml -RUN sed -i 's|${db.password}|${env.DB_PASSWORD}|g' pom.xml +RUN sed -i 's|${db.ip}|${env.DB_HOST}|g' pom.xml +RUN sed -i 's|${db.port}|${env.DB_PORT}|g' pom.xml +RUN sed -i 's|${db.user}|${env.DB_USERNAME}|g' pom.xml +RUN sed -i 's|${db.password}|${env.DB_PASSWORD}|g' pom.xml +RUN sed -i 's|${db.schema}|${env.DB_DATABASE}|g' pom.xml RUN mvn clean package -Pkubernetes -Djdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2" diff --git a/k8s/yaml/Deployment.yaml b/k8s/yaml/Deployment.yaml index 36b36498e..b27113d24 100644 --- a/k8s/yaml/Deployment.yaml +++ b/k8s/yaml/Deployment.yaml @@ -26,6 +26,8 @@ spec: value: "" - name: DB_PASSWORD value: "" + - name: DB_DATABASE + value: "" - name: ADMIN_USERNAME value: "" - name: ADMIN_PASSWORD From b2695621d73066315e0753148be2be5b97cfbe68 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 29 Jul 2020 12:13:30 +0000 Subject: [PATCH 049/548] Bump flyway-maven-plugin from 6.5.2 to 6.5.3 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-6.5.2...flyway-6.5.3) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 16c20a584..f1bcebc3c 100644 --- a/pom.xml +++ b/pom.xml @@ -288,7 +288,7 @@ org.flywaydb flyway-maven-plugin - 6.5.2 + 6.5.3 From c0f0c31052e5aef99bd69ba4999341dc34574a8d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 3 Aug 2020 12:13:11 +0000 Subject: [PATCH 050/548] Bump jackson.version from 2.11.1 to 2.11.2 Bumps `jackson.version` from 2.11.1 to 2.11.2. Updates `jackson-databind` from 2.11.1 to 2.11.2 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-module-jaxb-annotations` from 2.11.1 to 2.11.2 - [Release notes](https://github.com/FasterXML/jackson-modules-base/releases) - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.11.1...jackson-modules-base-2.11.2) Updates `jackson-annotations` from 2.11.1 to 2.11.2 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f1bcebc3c..079b96321 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 8.0.21 9.4.19.v20190610 1.18.12 - 2.11.1 + 2.11.2 jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true&serverTimezone=UTC From 37201613226db8e6ae838f23478cfb7597877ed5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 6 Aug 2020 12:12:29 +0000 Subject: [PATCH 051/548] Bump spring.security.version from 5.3.3.RELEASE to 5.3.4.RELEASE Bumps `spring.security.version` from 5.3.3.RELEASE to 5.3.4.RELEASE. Updates `spring-security-web` from 5.3.3.RELEASE to 5.3.4.RELEASE - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.3.3.RELEASE...5.3.4.RELEASE) Updates `spring-security-config` from 5.3.3.RELEASE to 5.3.4.RELEASE - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.3.3.RELEASE...5.3.4.RELEASE) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 079b96321..5a06dbfac 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.12.4 3.3.7 5.2.8.RELEASE - 5.3.3.RELEASE + 5.3.4.RELEASE 8.0.21 9.4.19.v20190610 1.18.12 From a06fbb5c4eda2fc94f62566e9cd5e3d6baf8ddd3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 7 Aug 2020 12:13:24 +0000 Subject: [PATCH 052/548] Bump git-commit-id-plugin from 4.0.1 to 4.0.2 Bumps git-commit-id-plugin from 4.0.1 to 4.0.2. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5a06dbfac..9020b4bd8 100644 --- a/pom.xml +++ b/pom.xml @@ -196,7 +196,7 @@ pl.project13.maven git-commit-id-plugin - 4.0.1 + 4.0.2 initialize From 9f2a6ef79f910a7f63dde4b47af1c06183e0ce3c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 10 Aug 2020 12:13:13 +0000 Subject: [PATCH 053/548] Bump annotations from 19.0.0 to 20.0.0 Bumps [annotations](https://github.com/JetBrains/java-annotations) from 19.0.0 to 20.0.0. - [Release notes](https://github.com/JetBrains/java-annotations/releases) - [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/java-annotations/compare/19.0.0...20.0.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e442d0493..581cb6e5b 100644 --- a/pom.xml +++ b/pom.xml @@ -498,7 +498,7 @@ org.jetbrains annotations - 19.0.0 + 20.0.0 compile From 01d14e20d98464e5164b2058d2654b14f26e6f1f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 12 Aug 2020 12:12:46 +0000 Subject: [PATCH 054/548] Bump flyway-maven-plugin from 6.5.3 to 6.5.4 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-6.5.3...flyway-6.5.4) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 581cb6e5b..547f5f02f 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 6.5.3 + 6.5.4 From 049dc24aec1afa9ff84468f26a62e87958ce2859 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 18 Aug 2020 12:13:00 +0000 Subject: [PATCH 055/548] Bump flyway-maven-plugin from 6.5.4 to 6.5.5 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 6.5.4 to 6.5.5. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-6.5.4...flyway-6.5.5) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 547f5f02f..6f22563af 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 6.5.4 + 6.5.5 From 9f548a4224ed9d77627fd51edd3bef48416438a3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 25 Aug 2020 12:13:12 +0000 Subject: [PATCH 056/548] Bump cxf.version from 3.3.7 to 3.4.0 Bumps `cxf.version` from 3.3.7 to 3.4.0. Updates `cxf-rt-frontend-jaxws` from 3.3.7 to 3.4.0 Updates `cxf-rt-transports-http` from 3.3.7 to 3.4.0 Updates `cxf-rt-transports-http-hc` from 3.3.7 to 3.4.0 Updates `cxf-rt-features-logging` from 3.3.7 to 3.4.0 Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6f22563af..8af98bc14 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ UTF-8 3.12.4 - 3.3.7 + 3.4.0 5.2.8.RELEASE 5.3.4.RELEASE 8.0.21 From c20869bb85316f2bd732aedaf95f2db67c18fdbb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 12:12:38 +0000 Subject: [PATCH 057/548] Bump annotations from 20.0.0 to 20.1.0 Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.0.0 to 20.1.0. - [Release notes](https://github.com/JetBrains/java-annotations/releases) - [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/java-annotations/compare/20.0.0...20.1.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8af98bc14..0f00a4d72 100644 --- a/pom.xml +++ b/pom.xml @@ -498,7 +498,7 @@ org.jetbrains annotations - 20.0.0 + 20.1.0 compile From 2d7b67a5feb406700ec1e8d1c2d84d3759852be3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 10 Sep 2020 12:13:30 +0000 Subject: [PATCH 058/548] Bump spring.security.version from 5.3.4.RELEASE to 5.4.0 Bumps `spring.security.version` from 5.3.4.RELEASE to 5.4.0. Updates `spring-security-web` from 5.3.4.RELEASE to 5.4.0 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.3.4.RELEASE...5.4.0) Updates `spring-security-config` from 5.3.4.RELEASE to 5.4.0 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.3.4.RELEASE...5.4.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0f00a4d72..ab4b79a2b 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.12.4 3.4.0 5.2.8.RELEASE - 5.3.4.RELEASE + 5.4.0 8.0.21 9.4.19.v20190610 1.18.12 From f9caa8b4d4b208de80a99e6607a8f92f42947fac Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 15 Sep 2020 12:13:19 +0000 Subject: [PATCH 059/548] Bump spring-framework-bom from 5.2.8.RELEASE to 5.2.9.RELEASE Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.2.8.RELEASE to 5.2.9.RELEASE. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.8.RELEASE...v5.2.9.RELEASE) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ab4b79a2b..413d34c8e 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.12.4 3.4.0 - 5.2.8.RELEASE + 5.2.9.RELEASE 5.4.0 8.0.21 9.4.19.v20190610 From 4bc2c14c2295fd95501377968ca27220aede2dee Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 17 Sep 2020 12:13:04 +0000 Subject: [PATCH 060/548] Bump flyway-maven-plugin from 6.5.5 to 6.5.6 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 6.5.5 to 6.5.6. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-6.5.5...flyway-6.5.6) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ab4b79a2b..2735c1606 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 6.5.5 + 6.5.6 From 8659428486622df8d12ff1a43d161de3b4b26809 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 22 Sep 2020 12:12:25 +0000 Subject: [PATCH 061/548] Bump flyway-maven-plugin from 6.5.6 to 6.5.7 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 6.5.6 to 6.5.7. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-6.5.6...flyway-6.5.7) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d81f4694a..f2353878a 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 6.5.6 + 6.5.7 From fce779e8ba512715e404af9a398de842d8b2da27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 27 Sep 2020 20:08:34 +0200 Subject: [PATCH 062/548] update websocket url on readme to prevent confusion remove the chargeboxid from the websocket url, because, apparently, charge points add it themselves. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c3235dbdc..aba1e43ac 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ The default port number is 8080. 2. The charge points must be configured to communicate with following addresses. Depending on the OCPP version of the charge point, SteVe will automatically route messages to the version-specific implementation. - SOAP: `http://:/steve/services/CentralSystemService` - - WebSocket/JSON: `ws://:/steve/websocket/CentralSystemService/` + - WebSocket/JSON: `ws://:/steve/websocket/CentralSystemService` As soon as a heartbeat is received, you should see the status of the charge point in the SteVe Dashboard. From 288143c26ab158b36a16663380c8c28e4f2f5e57 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 28 Sep 2020 12:13:28 +0000 Subject: [PATCH 063/548] Bump flyway-maven-plugin from 6.5.7 to 7.0.0 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 6.5.7 to 7.0.0. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-6.5.7...flyway-7.0.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f2353878a..f6821df4c 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 6.5.7 + 7.0.0 From f938c43f3dd1e6f7be149d735998604ae4eec21d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 1 Oct 2020 12:13:39 +0000 Subject: [PATCH 064/548] Bump hibernate-validator from 6.1.5.Final to 6.1.6.Final Bumps [hibernate-validator](https://github.com/hibernate/hibernate-validator) from 6.1.5.Final to 6.1.6.Final. - [Release notes](https://github.com/hibernate/hibernate-validator/releases) - [Changelog](https://github.com/hibernate/hibernate-validator/blob/6.1.6.Final/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-validator/compare/6.1.5.Final...6.1.6.Final) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f6821df4c..707449d2e 100644 --- a/pom.xml +++ b/pom.xml @@ -516,7 +516,7 @@ org.hibernate.validator hibernate-validator - 6.1.5.Final + 6.1.6.Final com.google.guava From 23ed01c69fa25aecf340b42ea059bdcb980d159f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 2 Oct 2020 12:12:54 +0000 Subject: [PATCH 065/548] Bump jackson.version from 2.11.2 to 2.11.3 Bumps `jackson.version` from 2.11.2 to 2.11.3. Updates `jackson-databind` from 2.11.2 to 2.11.3 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-module-jaxb-annotations` from 2.11.2 to 2.11.3 - [Release notes](https://github.com/FasterXML/jackson-modules-base/releases) - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.11.2...jackson-modules-base-2.11.3) Updates `jackson-annotations` from 2.11.2 to 2.11.3 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 707449d2e..3f85a04fe 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 8.0.21 9.4.19.v20190610 1.18.12 - 2.11.2 + 2.11.3 jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true&serverTimezone=UTC From 8989f42985ee29c8103e92ee5479b5c4db94eddd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 7 Oct 2020 12:13:48 +0000 Subject: [PATCH 066/548] Bump flyway-maven-plugin from 7.0.0 to 7.0.1 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.0.0 to 7.0.1. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.0.0...flyway-7.0.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3f85a04fe..d1fc2e108 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.0.0 + 7.0.1 From 5ee11f6ce6211b6175282a5fda6ff635b73388d8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 8 Oct 2020 12:13:22 +0000 Subject: [PATCH 067/548] Bump spring.security.version from 5.4.0 to 5.4.1 Bumps `spring.security.version` from 5.4.0 to 5.4.1. Updates `spring-security-web` from 5.4.0 to 5.4.1 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.4.0...5.4.1) Updates `spring-security-config` from 5.4.0 to 5.4.1 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.4.0...5.4.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d1fc2e108..dc514a7d9 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.12.4 3.4.0 5.2.9.RELEASE - 5.4.0 + 5.4.1 8.0.21 9.4.19.v20190610 1.18.12 From 8e31ba0a56b309ad53de1a77c86039c7049647a9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 9 Oct 2020 12:13:52 +0000 Subject: [PATCH 068/548] Bump lombok from 1.18.12 to 1.18.14 Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.12 to 1.18.14. - [Release notes](https://github.com/rzwitserloot/lombok/releases) - [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.12...v1.18.14) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d1fc2e108..666fbdf83 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 5.4.0 8.0.21 9.4.19.v20190610 - 1.18.12 + 1.18.14 2.11.3 From c87d31d699f1215a9c1b09b89cb28533f2f4151e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 12 Oct 2020 12:12:59 +0000 Subject: [PATCH 069/548] Bump junit from 4.13 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.13...r4.13.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2ae2545d2..c93b70fc2 100644 --- a/pom.xml +++ b/pom.xml @@ -689,7 +689,7 @@ junit junit - 4.13 + 4.13.1 test From ac7f88063d9d96be2c4b9b8f6eaa3e242f902a74 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 12 Oct 2020 12:13:22 +0000 Subject: [PATCH 070/548] Bump flyway-maven-plugin from 7.0.1 to 7.0.2 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.0.1 to 7.0.2. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.0.1...flyway-7.0.2) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2ae2545d2..61fdb98f4 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.0.1 + 7.0.2 From e47f70dd3e37600ab22176a0f4cef6d119184ea6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 15 Oct 2020 12:12:01 +0000 Subject: [PATCH 071/548] Bump flyway-maven-plugin from 7.0.2 to 7.0.3 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.0.2 to 7.0.3. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.0.2...flyway-7.0.3) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99493b9ba..d1db942be 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.0.2 + 7.0.3 From 13a8e7fd3b5cae5a6f3ca3d634f2eceb5d388f4f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 16 Oct 2020 12:12:53 +0000 Subject: [PATCH 072/548] Bump lombok from 1.18.14 to 1.18.16 Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.14 to 1.18.16. - [Release notes](https://github.com/rzwitserloot/lombok/releases) - [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.14...v1.18.16) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99493b9ba..62c9e23a3 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 5.4.1 8.0.21 9.4.19.v20190610 - 1.18.14 + 1.18.16 2.11.3 From 7babed6bb6daa98e0423d157f35260f6f65441d4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 19 Oct 2020 12:12:48 +0000 Subject: [PATCH 073/548] Bump mysql-connector-java from 8.0.21 to 8.0.22 Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.21 to 8.0.22. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a8bea3f6..7bbb1a2c9 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 3.4.0 5.2.9.RELEASE 5.4.1 - 8.0.21 + 8.0.22 9.4.19.v20190610 1.18.16 2.11.3 From 925f46c00b95a1acb80bda5a591a146a5c8d90af Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 19 Oct 2020 12:13:20 +0000 Subject: [PATCH 074/548] Bump flyway-maven-plugin from 7.0.3 to 7.0.4 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.0.3 to 7.0.4. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.0.3...flyway-7.0.4) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a8bea3f6..0634cd2e3 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.0.3 + 7.0.4 From ca5a6c0d60df5d573e3aec873baf45756cd6b8be Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 21 Oct 2020 12:12:58 +0000 Subject: [PATCH 075/548] Bump joda-time from 2.10.6 to 2.10.7 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.6 to 2.10.7. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.6...v2.10.7) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a8bea3f6..62283de24 100644 --- a/pom.xml +++ b/pom.xml @@ -511,7 +511,7 @@ joda-time joda-time - 2.10.6 + 2.10.7 org.hibernate.validator From 849f0f01470fb5fbcb3170363907c9eaa728d491 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 26 Oct 2020 13:15:03 +0000 Subject: [PATCH 076/548] Bump joda-time from 2.10.7 to 2.10.8 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.7 to 2.10.8. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.7...v2.10.8) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 582a8c366..afb345545 100644 --- a/pom.xml +++ b/pom.xml @@ -511,7 +511,7 @@ joda-time joda-time - 2.10.7 + 2.10.8 org.hibernate.validator From 12ddbdf0daeb43e7e10ff82cc01e24ab231ad052 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 28 Oct 2020 13:17:55 +0000 Subject: [PATCH 077/548] Bump spring-framework-bom from 5.2.9.RELEASE to 5.3.0 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.2.9.RELEASE to 5.3.0. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.2.9.RELEASE...v5.3.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index afb345545..5de97e105 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.12.4 3.4.0 - 5.2.9.RELEASE + 5.3.0 5.4.1 8.0.22 9.4.19.v20190610 From 10aad16043b294fbcfbd9e48548278a85167c627 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 28 Oct 2020 13:18:30 +0000 Subject: [PATCH 078/548] Bump flyway-maven-plugin from 7.0.4 to 7.1.0 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.0.4 to 7.1.0. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.0.4...flyway-7.1.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index afb345545..bcbef969a 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.0.4 + 7.1.0 From 4950b85f6c4806d8a32b569da300b42fd9904b54 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 29 Oct 2020 13:21:35 +0000 Subject: [PATCH 079/548] Bump flyway-maven-plugin from 7.1.0 to 7.1.1 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.1.0 to 7.1.1. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.1.0...flyway-7.1.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3abdbcf4d..775a872f6 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.1.0 + 7.1.1 From 71cda2d3f619c81dd2d7aa4610caa2ccb0f06495 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Nov 2020 13:13:36 +0000 Subject: [PATCH 080/548] Bump git-commit-id-plugin from 4.0.2 to 4.0.3 Bumps git-commit-id-plugin from 4.0.2 to 4.0.3. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3abdbcf4d..6ffece956 100644 --- a/pom.xml +++ b/pom.xml @@ -203,7 +203,7 @@ pl.project13.maven git-commit-id-plugin - 4.0.2 + 4.0.3 initialize From 24b3a39915ea5d6018379308b9a0119411169a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sat, 7 Nov 2020 13:31:30 +0100 Subject: [PATCH 081/548] switch back to mysql for travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a80991f55..7ab271efb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,8 @@ sudo: false language: java dist: xenial jdk: openjdk11 -# services: mysql +services: + - mysql # install dependencies install: mvn dependency:go-offline -s .travis-maven-settings.xml -B -V @@ -26,7 +27,6 @@ script: addons: - mariadb: "10.3" apt: packages: - elinks From 3340c1479e5efd0aac4c0042c1fe2f3e37c32781 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 7 Nov 2020 10:41:17 +0000 Subject: [PATCH 082/548] Bump jetty.version from 9.4.19.v20190610 to 9.4.34.v20201102 Bumps `jetty.version` from 9.4.19.v20190610 to 9.4.34.v20201102. Updates `jetty-server` from 9.4.19.v20190610 to 9.4.34.v20201102 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.19.v20190610...jetty-9.4.34.v20201102) Updates `jetty-webapp` from 9.4.19.v20190610 to 9.4.34.v20201102 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.19.v20190610...jetty-9.4.34.v20201102) Updates `jetty-annotations` from 9.4.19.v20190610 to 9.4.34.v20201102 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.19.v20190610...jetty-9.4.34.v20201102) Updates `apache-jsp` from 9.4.19.v20190610 to 9.4.34.v20201102 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.19.v20190610...jetty-9.4.34.v20201102) Updates `apache-jstl` from 9.4.19.v20190610 to 9.4.34.v20201102 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.19.v20190610...jetty-9.4.34.v20201102) Updates `jetty-rewrite` from 9.4.19.v20190610 to 9.4.34.v20201102 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.19.v20190610...jetty-9.4.34.v20201102) Updates `websocket-server` from 9.4.19.v20190610 to 9.4.34.v20201102 Updates `jetty-jspc-maven-plugin` from 9.4.19.v20190610 to 9.4.34.v20201102 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.19.v20190610...jetty-9.4.34.v20201102) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3f4c485b5..247b046aa 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 5.3.0 5.4.1 8.0.22 - 9.4.19.v20190610 + 9.4.34.v20201102 1.18.16 2.11.3 From f31bf0d09ca90fb646526c5ec11ea26ba13baf9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sat, 7 Nov 2020 12:33:25 +0100 Subject: [PATCH 083/548] prevent secondary errors in test classes reason: due to db issues tests cannot start. during destroy we get NPEs --- src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java | 4 +++- src/test/java/de/rwth/idsg/steve/ApplicationTest.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java index cb7b8af35..682299811 100644 --- a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java +++ b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java @@ -61,7 +61,9 @@ public static void init() throws Exception { @AfterClass public static void destroy() throws Exception { - app.stop(); + if (app != null) { + app.stop(); + } __DatabasePreparer__.cleanUp(); } diff --git a/src/test/java/de/rwth/idsg/steve/ApplicationTest.java b/src/test/java/de/rwth/idsg/steve/ApplicationTest.java index 10cb4692e..a49b0d8be 100644 --- a/src/test/java/de/rwth/idsg/steve/ApplicationTest.java +++ b/src/test/java/de/rwth/idsg/steve/ApplicationTest.java @@ -64,7 +64,9 @@ public static void init() throws Exception { @AfterClass public static void destroy() throws Exception { - app.stop(); + if (app != null) { + app.stop(); + } __DatabasePreparer__.cleanUp(); } From 2e609b5183cd3195ff332db7652ef4393d6f07a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sat, 7 Nov 2020 16:43:41 +0100 Subject: [PATCH 084/548] add travis build matrix --- .travis.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ab271efb..e21b2ebc4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,16 @@ sudo: false language: java dist: xenial -jdk: openjdk11 -services: - - mysql +jdk: + - openjdk11 + - openjdk13 + - openjdk15 # install dependencies install: mvn dependency:go-offline -s .travis-maven-settings.xml -B -V before_script: - # initalize empty database and privileges + # initalize empty database and privileges - mysql -uroot -e "CREATE DATABASE stevedb_test_2aa6a783d47d;" -v - mysql -uroot -e "GRANT ALL PRIVILEGES ON stevedb_test_2aa6a783d47d.* TO 'steve'@'localhost' IDENTIFIED BY 'changeme';" -v - mysql -uroot -e "GRANT SELECT ON mysql.proc TO 'steve'@'localhost' IDENTIFIED BY 'changeme';" -v @@ -17,7 +18,7 @@ before_script: - mysql -uroot -e "GRANT SUPER ON *.* TO 'steve'@'localhost' IDENTIFIED BY 'changeme';" -v # start the actual build -script: +script: - mvn -s .travis-maven-settings.xml -Dmaven.javadoc.skip=true clean package -Ptest -B -V - java -Djava.net.preferIPv4Stack=true -jar target/steve.jar & - sleep 30 @@ -25,6 +26,15 @@ script: - elinks -dump -no-references http://localhost:8080/steve/manager/signin - killall java +jobs: + include: + - services: + - mysql + - addons: + mariadb: "10.3" + allow_failures: + - addons: + mariadb: "10.3" addons: apt: From 3b6ddd2cfe3267977983dd3974421a1252db7109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sat, 7 Nov 2020 17:04:25 +0100 Subject: [PATCH 085/548] refactor --- .travis.yml | 56 ++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index e21b2ebc4..542001847 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,45 +2,45 @@ sudo: false language: java dist: xenial jdk: - - openjdk11 - - openjdk13 - - openjdk15 + - openjdk11 + - openjdk13 + - openjdk15 # install dependencies install: mvn dependency:go-offline -s .travis-maven-settings.xml -B -V before_script: - # initalize empty database and privileges - - mysql -uroot -e "CREATE DATABASE stevedb_test_2aa6a783d47d;" -v - - mysql -uroot -e "GRANT ALL PRIVILEGES ON stevedb_test_2aa6a783d47d.* TO 'steve'@'localhost' IDENTIFIED BY 'changeme';" -v - - mysql -uroot -e "GRANT SELECT ON mysql.proc TO 'steve'@'localhost' IDENTIFIED BY 'changeme';" -v - # grant super privilege required by MariaDB running with log-bin - - mysql -uroot -e "GRANT SUPER ON *.* TO 'steve'@'localhost' IDENTIFIED BY 'changeme';" -v + # initalize empty database and privileges + - mysql -uroot -e "CREATE DATABASE stevedb_test_2aa6a783d47d;" -v + - mysql -uroot -e "GRANT ALL PRIVILEGES ON stevedb_test_2aa6a783d47d.* TO 'steve'@'localhost' IDENTIFIED BY 'changeme';" -v + - mysql -uroot -e "GRANT SELECT ON mysql.proc TO 'steve'@'localhost' IDENTIFIED BY 'changeme';" -v + # grant super privilege required by MariaDB running with log-bin + - mysql -uroot -e "GRANT SUPER ON *.* TO 'steve'@'localhost' IDENTIFIED BY 'changeme';" -v # start the actual build script: - - mvn -s .travis-maven-settings.xml -Dmaven.javadoc.skip=true clean package -Ptest -B -V - - java -Djava.net.preferIPv4Stack=true -jar target/steve.jar & - - sleep 30 - - 'grep -C 50 -e "Exception: " ~/logs/steve.log && exit 255 || true' - - elinks -dump -no-references http://localhost:8080/steve/manager/signin - - killall java + - mvn -s .travis-maven-settings.xml -Dmaven.javadoc.skip=true clean package -Ptest -B -V + - java -Djava.net.preferIPv4Stack=true -jar target/steve.jar & + - sleep 30 + - 'grep -C 50 -e "Exception: " ~/logs/steve.log && exit 255 || true' + - elinks -dump -no-references http://localhost:8080/steve/manager/signin + - killall java jobs: - include: - - services: - - mysql - - addons: - mariadb: "10.3" - allow_failures: - - addons: - mariadb: "10.3" + include: + - services: + - mysql + - addons: + mariadb: "10.3" + allow_failures: + - addons: + mariadb: "10.3" addons: - apt: - packages: - - elinks + apt: + packages: + - elinks cache: - directories: - - $HOME/.m2 + directories: + - $HOME/.m2 From a8b29f1b350dd406b426a5c096c4ae85c7f05e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sat, 7 Nov 2020 17:06:14 +0100 Subject: [PATCH 086/548] update build matrix description --- .travis.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 542001847..31187c549 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,6 @@ sudo: false language: java dist: xenial -jdk: - - openjdk11 - - openjdk13 - - openjdk15 # install dependencies install: mvn dependency:go-offline -s .travis-maven-settings.xml -B -V @@ -28,9 +24,14 @@ script: jobs: include: - - services: - - mysql - - addons: + - jdk: openjdk11 + services: mysql + - jdk: openjdk13 + services: mysql + - jdk: openjdk15 + services: mysql + - jdk: openjdk11 + addons: mariadb: "10.3" allow_failures: - addons: From c87c6b7ae383336982b37b465a91b0be737de30b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 10 Nov 2020 13:17:05 +0000 Subject: [PATCH 087/548] Bump spring-framework-bom from 5.3.0 to 5.3.1 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.0 to 5.3.1. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.0...v5.3.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 247b046aa..97cf74556 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.12.4 3.4.0 - 5.3.0 + 5.3.1 5.4.1 8.0.22 9.4.34.v20201102 From 97afa57f4efdace08d79b290417f8eebedb036c7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 10 Nov 2020 13:17:37 +0000 Subject: [PATCH 088/548] Bump flyway-maven-plugin from 7.1.1 to 7.2.0 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.1.1 to 7.2.0. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.1.1...flyway-7.2.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 247b046aa..0fd4ffdee 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.1.1 + 7.2.0 From 4620d435babc5f3f978f63d692e2a1eefa565565 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 10 Nov 2020 13:18:00 +0000 Subject: [PATCH 089/548] Bump log4j-bom from 2.13.3 to 2.14.0 Bumps log4j-bom from 2.13.3 to 2.14.0. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 247b046aa..ecaf117ab 100644 --- a/pom.xml +++ b/pom.xml @@ -450,7 +450,7 @@ org.apache.logging.log4j log4j-bom - 2.13.3 + 2.14.0 import pom From c6f935e90eec92545f6d2991b4d9c2408b4b2fba Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 12 Nov 2020 21:49:57 +0000 Subject: [PATCH 090/548] Bump cxf.version from 3.4.0 to 3.4.1 Bumps `cxf.version` from 3.4.0 to 3.4.1. Updates `cxf-rt-frontend-jaxws` from 3.4.0 to 3.4.1 Updates `cxf-rt-transports-http` from 3.4.0 to 3.4.1 Updates `cxf-rt-transports-http-hc` from 3.4.0 to 3.4.1 Updates `cxf-rt-features-logging` from 3.4.0 to 3.4.1 Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 97cf74556..6377c887b 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ UTF-8 3.12.4 - 3.4.0 + 3.4.1 5.3.1 5.4.1 8.0.22 From 3ebc743e29fde4aef772353af51790b86e083959 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 19 Nov 2020 13:25:23 +0000 Subject: [PATCH 091/548] Bump flyway-maven-plugin from 7.2.0 to 7.2.1 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.2.0 to 7.2.1. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.2.0...flyway-7.2.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca454cabd..fb066fed9 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.2.0 + 7.2.1 From 7a4a024ce873cea406067140470e0f85d0b7d507 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Nov 2020 13:14:40 +0000 Subject: [PATCH 092/548] Bump maven-pmd-plugin from 3.13.0 to 3.14.0 Bumps [maven-pmd-plugin](https://github.com/apache/maven-pmd-plugin) from 3.13.0 to 3.14.0. - [Release notes](https://github.com/apache/maven-pmd-plugin/releases) - [Commits](https://github.com/apache/maven-pmd-plugin/compare/maven-pmd-plugin-3.13.0...maven-pmd-plugin-3.14.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb066fed9..e06984342 100644 --- a/pom.xml +++ b/pom.xml @@ -173,7 +173,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.13.0 + 3.14.0 org.codehaus.mojo From 8408b18a37e195822007fbc129ca64eb9acc46ae Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 24 Nov 2020 13:24:03 +0000 Subject: [PATCH 093/548] Bump jetty.version from 9.4.34.v20201102 to 9.4.35.v20201120 Bumps `jetty.version` from 9.4.34.v20201102 to 9.4.35.v20201120. Updates `jetty-server` from 9.4.34.v20201102 to 9.4.35.v20201120 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.34.v20201102...jetty-9.4.35.v20201120) Updates `jetty-webapp` from 9.4.34.v20201102 to 9.4.35.v20201120 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.34.v20201102...jetty-9.4.35.v20201120) Updates `jetty-annotations` from 9.4.34.v20201102 to 9.4.35.v20201120 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.34.v20201102...jetty-9.4.35.v20201120) Updates `apache-jsp` from 9.4.34.v20201102 to 9.4.35.v20201120 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.34.v20201102...jetty-9.4.35.v20201120) Updates `apache-jstl` from 9.4.34.v20201102 to 9.4.35.v20201120 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.34.v20201102...jetty-9.4.35.v20201120) Updates `jetty-rewrite` from 9.4.34.v20201102 to 9.4.35.v20201120 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.34.v20201102...jetty-9.4.35.v20201120) Updates `websocket-server` from 9.4.34.v20201102 to 9.4.35.v20201120 Updates `jetty-jspc-maven-plugin` from 9.4.34.v20201102 to 9.4.35.v20201120 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.34.v20201102...jetty-9.4.35.v20201120) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb066fed9..fb16af896 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 5.3.1 5.4.1 8.0.22 - 9.4.34.v20201102 + 9.4.35.v20201120 1.18.16 2.11.3 From e1271d34bff01beb6e7e2c12e565a2d0e0be6ec6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Nov 2020 13:36:29 +0000 Subject: [PATCH 094/548] Bump flyway-maven-plugin from 7.2.1 to 7.3.0 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.2.1 to 7.3.0. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.2.1...flyway-7.3.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d84c41f73..b670a8876 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.2.1 + 7.3.0 From faa9bafb0dfee96bff123f426abc2ecc0367722f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 13:14:44 +0000 Subject: [PATCH 095/548] Bump jackson.version from 2.11.3 to 2.12.0 Bumps `jackson.version` from 2.11.3 to 2.12.0. Updates `jackson-databind` from 2.11.3 to 2.12.0 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-module-jaxb-annotations` from 2.11.3 to 2.12.0 - [Release notes](https://github.com/FasterXML/jackson-modules-base/releases) - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.11.3...jackson-modules-base-2.12.0) Updates `jackson-annotations` from 2.11.3 to 2.12.0 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b670a8876..82688a4fc 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 8.0.22 9.4.35.v20201120 1.18.16 - 2.11.3 + 2.12.0 jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true&serverTimezone=UTC From bdca9559428946138b5591b1c28f5c1528c99823 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 3 Dec 2020 13:23:38 +0000 Subject: [PATCH 096/548] Bump spring.security.version from 5.4.1 to 5.4.2 Bumps `spring.security.version` from 5.4.1 to 5.4.2. Updates `spring-security-web` from 5.4.1 to 5.4.2 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.4.1...5.4.2) Updates `spring-security-config` from 5.4.1 to 5.4.2 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.4.1...5.4.2) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 80cba4a3e..a5768b705 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.12.4 3.4.1 5.3.1 - 5.4.1 + 5.4.2 8.0.22 9.4.35.v20201120 1.18.16 From 6757b609d1cbbfc0226f5afe7767b03efc0047a5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 7 Dec 2020 13:16:35 +0000 Subject: [PATCH 097/548] Bump flyway-maven-plugin from 7.3.0 to 7.3.1 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.3.0 to 7.3.1. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.3.0...flyway-7.3.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 80cba4a3e..90843f2fa 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.3.0 + 7.3.1 From e763c706e539d7a58cb3b1c0a17f35ab8beac369 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 11 Dec 2020 12:06:56 +0000 Subject: [PATCH 098/548] Bump spring-framework-bom from 5.3.1 to 5.3.2 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.1 to 5.3.2. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.1...v5.3.2) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1610a4e24..c20b10b02 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.12.4 3.4.1 - 5.3.1 + 5.3.2 5.4.2 8.0.22 9.4.35.v20201120 From 3d65be1434ccb642a19d9321e2de1c5c3ed80c11 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 17 Dec 2020 13:33:30 +0000 Subject: [PATCH 099/548] Bump flyway-maven-plugin from 7.3.1 to 7.3.2 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.3.1 to 7.3.2. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.3.1...flyway-7.3.2) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c20b10b02..b9cb544aa 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.3.1 + 7.3.2 From fea687d92b3f3322ce381b8c01104d10bf9a439b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 17 Dec 2020 13:33:56 +0000 Subject: [PATCH 100/548] Bump hibernate-validator from 6.1.6.Final to 6.1.7.Final Bumps [hibernate-validator](https://github.com/hibernate/hibernate-validator) from 6.1.6.Final to 6.1.7.Final. - [Release notes](https://github.com/hibernate/hibernate-validator/releases) - [Changelog](https://github.com/hibernate/hibernate-validator/blob/6.1.7.Final/changelog.txt) - [Commits](https://github.com/hibernate/hibernate-validator/compare/6.1.6.Final...6.1.7.Final) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c20b10b02..a1cc21b9c 100644 --- a/pom.xml +++ b/pom.xml @@ -516,7 +516,7 @@ org.hibernate.validator hibernate-validator - 6.1.6.Final + 6.1.7.Final com.google.guava From 91eca19b984378e8161120ad890ff44c2bde6e15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20Go=CC=88kay?= Date: Thu, 17 Dec 2020 19:17:49 +0100 Subject: [PATCH 101/548] add start/end transaction details to notification mails (Closes #467) --- .../CentralSystemService16_Service.java | 4 +- .../steve/service/NotificationService.java | 43 ++++++++++++++++--- 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java b/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java index e36ab80f3..501215991 100644 --- a/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java +++ b/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java @@ -184,7 +184,7 @@ public StartTransactionResponse startTransaction(StartTransactionRequest paramet int transactionId = ocppServerRepository.insertTransaction(params); - notificationService.ocppTransactionStarted(chargeBoxIdentity, transactionId, parameters.getConnectorId()); + notificationService.ocppTransactionStarted(transactionId, params); return new StartTransactionResponse() .withIdTagInfo(info) @@ -217,7 +217,7 @@ public StopTransactionResponse stopTransaction(StopTransactionRequest parameters ocppServerRepository.insertMeterValues(chargeBoxIdentity, parameters.getTransactionData(), transactionId); - notificationService.ocppTransactionEnded(chargeBoxIdentity, transactionId); + notificationService.ocppTransactionEnded(params); return new StopTransactionResponse().withIdTagInfo(idTagInfo); } diff --git a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java index 8b1ebeeb9..a3fa310cf 100644 --- a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java +++ b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java @@ -20,7 +20,9 @@ import com.google.common.base.Strings; import de.rwth.idsg.steve.NotificationFeature; +import de.rwth.idsg.steve.repository.dto.InsertTransactionParams; import de.rwth.idsg.steve.repository.dto.MailSettings; +import de.rwth.idsg.steve.repository.dto.UpdateTransactionParams; import lombok.extern.slf4j.Slf4j; import ocpp.cs._2015._10.RegistrationStatus; import org.joda.time.DateTime; @@ -94,30 +96,57 @@ public void ocppStationStatusFailure(String chargeBoxId, int connectorId, String mailService.sendAsync(subject, addTimestamp(body)); } - public void ocppTransactionStarted(String chargeBoxId, int transactionId, int connectorId) { + public void ocppTransactionStarted(int transactionId, InsertTransactionParams params) { if (isDisabled(OcppTransactionStarted)) { return; } - String subject = format("Transaction '%s' has started on charging station '%s' on connector '%s'", transactionId, chargeBoxId, connectorId); + String subject = format("Transaction '%s' has started on charging station '%s' on connector '%s'", transactionId, params.getChargeBoxId(), params.getConnectorId()); - mailService.sendAsync(subject, addTimestamp("")); + mailService.sendAsync(subject, addTimestamp(createContent(params))); } - public void ocppTransactionEnded(String chargeBoxId, int transactionId) { + public void ocppTransactionEnded(UpdateTransactionParams params) { if (isDisabled(OcppTransactionEnded)) { return; } - String subject = format("Transaction '%s' has ended on charging station '%s'", transactionId, chargeBoxId); + String subject = format("Transaction '%s' has ended on charging station '%s'", params.getTransactionId(), params.getChargeBoxId()); - mailService.sendAsync(subject, addTimestamp("")); + mailService.sendAsync(subject, addTimestamp(createContent(params))); } // ------------------------------------------------------------------------- // Private helpers // ------------------------------------------------------------------------- + + private static String createContent(InsertTransactionParams params) { + StringBuilder sb = new StringBuilder("Details:").append(System.lineSeparator()) + .append("- chargeBoxId: ").append(params.getChargeBoxId()).append(System.lineSeparator()) + .append("- connectorId: ").append(params.getConnectorId()).append(System.lineSeparator()) + .append("- idTag: ").append(params.getIdTag()).append(System.lineSeparator()) + .append("- startTimestamp: ").append(params.getStartTimestamp()).append(System.lineSeparator()) + .append("- startMeterValue: ").append(params.getStartMeterValue()); + + if (params.isSetReservationId()) { + sb.append(System.lineSeparator()).append("- reservationId: ").append(params.getReservationId()); + } + + return sb.toString(); + } + + private static String createContent(UpdateTransactionParams params) { + return new StringBuilder("Details:").append(System.lineSeparator()) + .append("- chargeBoxId: ").append(params.getChargeBoxId()).append(System.lineSeparator()) + .append("- transactionId: ").append(params.getTransactionId()).append(System.lineSeparator()) + .append("- stopTimestamp: ").append(params.getStopTimestamp()).append(System.lineSeparator()) + .append("- stopMeterValue: ").append(params.getStopMeterValue()).append(System.lineSeparator()) + .append("- stopReason: ").append(params.getStopReason()) + .toString(); + } + + private boolean isDisabled(NotificationFeature f) { MailSettings settings = mailService.getSettings(); @@ -130,7 +159,7 @@ private boolean isDisabled(NotificationFeature f) { private static String addTimestamp(String body) { String eventTs = "Timestamp of the event: " + DateTime.now().toString(); - String newLine = "\r\n\r\n"; + String newLine = System.lineSeparator() + System.lineSeparator(); if (Strings.isNullOrEmpty(body)) { return eventTs; From 72a6ebb3261f952c07d34e7c8b2a9e4d737e6a8b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 29 Dec 2020 13:31:46 +0000 Subject: [PATCH 102/548] Bump cxf.version from 3.4.1 to 3.4.2 Bumps `cxf.version` from 3.4.1 to 3.4.2. Updates `cxf-rt-frontend-jaxws` from 3.4.1 to 3.4.2 Updates `cxf-rt-transports-http` from 3.4.1 to 3.4.2 Updates `cxf-rt-transports-http-hc` from 3.4.1 to 3.4.2 Updates `cxf-rt-features-logging` from 3.4.1 to 3.4.2 Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 674efe958..73bc21c62 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ UTF-8 3.12.4 - 3.4.1 + 3.4.2 5.3.2 5.4.2 8.0.22 From a24cd406a21df22a7eb4a876bf11eedcdc42559a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Tue, 29 Dec 2020 23:34:48 +0100 Subject: [PATCH 103/548] version bump --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 674efe958..1242f27c1 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 de.rwth.idsg steve - 3.4.3 + 3.4.4 jar From 7d3c3221a9317e237e49d15b844f53295f3218f0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 30 Dec 2020 13:36:19 +0000 Subject: [PATCH 104/548] Bump joda-time from 2.10.8 to 2.10.9 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.8 to 2.10.9. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.8...v2.10.9) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 312874887..33a98b217 100644 --- a/pom.xml +++ b/pom.xml @@ -511,7 +511,7 @@ joda-time joda-time - 2.10.8 + 2.10.9 org.hibernate.validator From 206b8a9c023f48fcfc166ceda13b54c092204c5d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 11 Jan 2021 13:15:42 +0000 Subject: [PATCH 105/548] Bump jackson.version from 2.12.0 to 2.12.1 Bumps `jackson.version` from 2.12.0 to 2.12.1. Updates `jackson-databind` from 2.12.0 to 2.12.1 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-module-jaxb-annotations` from 2.12.0 to 2.12.1 - [Release notes](https://github.com/FasterXML/jackson-modules-base/releases) - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.12.0...jackson-modules-base-2.12.1) Updates `jackson-annotations` from 2.12.0 to 2.12.1 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 312874887..be0b5ace1 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 8.0.22 9.4.35.v20201120 1.18.16 - 2.12.0 + 2.12.1 jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true&serverTimezone=UTC From 59f726eae442f7e688d3cae2c7419529dd03736f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 11 Jan 2021 13:16:24 +0000 Subject: [PATCH 106/548] Bump flyway-maven-plugin from 7.3.2 to 7.5.0 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.3.2 to 7.5.0. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.3.2...flyway-7.5.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 312874887..11f96cd39 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.3.2 + 7.5.0 From d986174a199aa14a4dd11059d729a6242d0e3202 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 12 Jan 2021 13:18:23 +0000 Subject: [PATCH 107/548] Bump spring-framework-bom from 5.3.2 to 5.3.3 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.2 to 5.3.3. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.2...v5.3.3) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 312874887..60fdefbe0 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.12.4 3.4.2 - 5.3.2 + 5.3.3 5.4.2 8.0.22 9.4.35.v20201120 From 4d60644d6fe78ab0f801e83ba156fef164377747 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 20 Jan 2021 13:31:17 +0000 Subject: [PATCH 108/548] Bump jetty.version from 9.4.35.v20201120 to 9.4.36.v20210114 Bumps `jetty.version` from 9.4.35.v20201120 to 9.4.36.v20210114. Updates `jetty-server` from 9.4.35.v20201120 to 9.4.36.v20210114 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.35.v20201120...jetty-9.4.36.v20210114) Updates `jetty-webapp` from 9.4.35.v20201120 to 9.4.36.v20210114 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.35.v20201120...jetty-9.4.36.v20210114) Updates `jetty-annotations` from 9.4.35.v20201120 to 9.4.36.v20210114 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.35.v20201120...jetty-9.4.36.v20210114) Updates `apache-jsp` from 9.4.35.v20201120 to 9.4.36.v20210114 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.35.v20201120...jetty-9.4.36.v20210114) Updates `apache-jstl` from 9.4.35.v20201120 to 9.4.36.v20210114 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.35.v20201120...jetty-9.4.36.v20210114) Updates `jetty-rewrite` from 9.4.35.v20201120 to 9.4.36.v20210114 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.35.v20201120...jetty-9.4.36.v20210114) Updates `websocket-server` from 9.4.35.v20201120 to 9.4.36.v20210114 Updates `jetty-jspc-maven-plugin` from 9.4.35.v20201120 to 9.4.36.v20210114 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.35.v20201120...jetty-9.4.36.v20210114) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 312874887..a26474b72 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 5.3.2 5.4.2 8.0.22 - 9.4.35.v20201120 + 9.4.36.v20210114 1.18.16 2.12.0 From dbd77ef2c99828f9dfa7662f87f968c9a4a542a6 Mon Sep 17 00:00:00 2001 From: Christian Samsel Date: Wed, 20 Jan 2021 19:17:03 +0100 Subject: [PATCH 109/548] Update .travis.yml remove allow failures for mariadb as maria seems to work fine (problem was missing elinks) --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31187c549..c5bb9b18e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,9 +33,9 @@ jobs: - jdk: openjdk11 addons: mariadb: "10.3" - allow_failures: - - addons: - mariadb: "10.3" + apt: + packages: + - elinks addons: apt: From 510cfeb5969cb0521fc9e9fef24ac6da15ee981d Mon Sep 17 00:00:00 2001 From: Christian Samsel Date: Thu, 21 Jan 2021 22:37:39 +0100 Subject: [PATCH 110/548] update travis.yml - no need to run tests when maven failed --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c5bb9b18e..78133afc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ before_script: # start the actual build script: - - mvn -s .travis-maven-settings.xml -Dmaven.javadoc.skip=true clean package -Ptest -B -V + - mvn -s .travis-maven-settings.xml -Dmaven.javadoc.skip=true clean package -Ptest -B -V || travis_terminate 0 - java -Djava.net.preferIPv4Stack=true -jar target/steve.jar & - sleep 30 - 'grep -C 50 -e "Exception: " ~/logs/steve.log && exit 255 || true' From 9fdfd8775b504d55b8a8be5b3bea9b8b7c2afaab Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 22 Jan 2021 13:31:49 +0000 Subject: [PATCH 111/548] Bump flyway-maven-plugin from 7.5.0 to 7.5.1 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.5.0 to 7.5.1. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.5.0...flyway-7.5.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 441800e78..fe3ec33ff 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.5.0 + 7.5.1 From a669de1c60004c0090e77bfa41f2f50e675c5470 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 25 Jan 2021 13:16:58 +0000 Subject: [PATCH 112/548] Bump HikariCP from 3.4.5 to 4.0.0 Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 3.4.5 to 4.0.0. - [Release notes](https://github.com/brettwooldridge/HikariCP/releases) - [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES) - [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-3.4.5...HikariCP-4.0.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fe3ec33ff..4887a3c7e 100644 --- a/pom.xml +++ b/pom.xml @@ -672,7 +672,7 @@ com.zaxxer HikariCP - 3.4.5 + 4.0.0 org.jooq From 7632a3984fc245f0b1778dbde5526550e3cba392 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 26 Jan 2021 13:18:15 +0000 Subject: [PATCH 113/548] Bump HikariCP from 4.0.0 to 4.0.1 Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/brettwooldridge/HikariCP/releases) - [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES) - [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-4.0.0...HikariCP-4.0.1) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4887a3c7e..32683453d 100644 --- a/pom.xml +++ b/pom.xml @@ -672,7 +672,7 @@ com.zaxxer HikariCP - 4.0.0 + 4.0.1 org.jooq From 5d124aa3b0e6cbb85dd37c5f18fd65dfab8578d2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 27 Jan 2021 13:27:47 +0000 Subject: [PATCH 114/548] Bump flyway-maven-plugin from 7.5.1 to 7.5.2 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.5.1 to 7.5.2. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.5.1...flyway-7.5.2) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4887a3c7e..0ee1db0be 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.5.1 + 7.5.2 From 8715d828ed6fd4b240161ff5ae5841c6c232d3ce Mon Sep 17 00:00:00 2001 From: Christian Samsel Date: Wed, 27 Jan 2021 22:51:20 +0100 Subject: [PATCH 115/548] Create dependabot.yml --- .github/dependabot.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..7914fdb65 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,13 @@ +# Please see the documentation for all configuration options: +# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + + - package-ecosystem: "maven" + directory: "/" + open-pull-requests-limit: 10 + schedule: + interval: "weekly" + day: "saturday" + From 205060a67286c52fa0fd176a8e6c4fc1f39fa851 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Jan 2021 21:51:59 +0000 Subject: [PATCH 116/548] Bump jooq.version from 3.12.4 to 3.14.6 Bumps `jooq.version` from 3.12.4 to 3.14.6. Updates `jooq-meta` from 3.12.4 to 3.14.6 Updates `jooq-codegen` from 3.12.4 to 3.14.6 Updates `jooq` from 3.12.4 to 3.14.6 Updates `jooq-codegen-maven` from 3.12.4 to 3.14.6 Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 38948bdbb..564fde7ad 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 11 UTF-8 - 3.12.4 + 3.14.6 3.4.2 5.3.3 5.4.2 From 711f198241f42397db515fab33c327eaa21c406b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Jan 2021 21:52:09 +0000 Subject: [PATCH 117/548] Bump guava from 29.0-jre to 30.1-jre Bumps [guava](https://github.com/google/guava) from 29.0-jre to 30.1-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 38948bdbb..043185163 100644 --- a/pom.xml +++ b/pom.xml @@ -521,7 +521,7 @@ com.google.guava guava - 29.0-jre + 30.1-jre com.fasterxml.jackson.core From 78e4fb349d7eb7253a1696bb8bba21cb3caacebd Mon Sep 17 00:00:00 2001 From: Christian Samsel Date: Fri, 29 Jan 2021 14:17:33 +0100 Subject: [PATCH 118/548] breaks build Revert "Bump jooq.version from 3.12.4 to 3.14.6" This reverts commit 205060a67286c52fa0fd176a8e6c4fc1f39fa851. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6595ff2c5..043185163 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 11 UTF-8 - 3.14.6 + 3.12.4 3.4.2 5.3.3 5.4.2 From 3a6d606910c2e7870066dc0dbc3162072efc4d96 Mon Sep 17 00:00:00 2001 From: Christian Samsel Date: Fri, 29 Jan 2021 14:20:05 +0100 Subject: [PATCH 119/548] Update .travis.yml change travis_terminate return value to indicate broken build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 78133afc9..9f68b9955 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ before_script: # start the actual build script: - - mvn -s .travis-maven-settings.xml -Dmaven.javadoc.skip=true clean package -Ptest -B -V || travis_terminate 0 + - mvn -s .travis-maven-settings.xml -Dmaven.javadoc.skip=true clean package -Ptest -B -V || travis_terminate 1 - java -Djava.net.preferIPv4Stack=true -jar target/steve.jar & - sleep 30 - 'grep -C 50 -e "Exception: " ~/logs/steve.log && exit 255 || true' From 430ee816c3251b2b376774c319bb1002f6600d75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 30 Jan 2021 05:01:06 +0000 Subject: [PATCH 120/548] Bump lombok from 1.18.16 to 1.18.18 Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.16 to 1.18.18. - [Release notes](https://github.com/rzwitserloot/lombok/releases) - [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.16...v1.18.18) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 043185163..d3921272f 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 5.4.2 8.0.22 9.4.36.v20210114 - 1.18.16 + 1.18.18 2.12.1 From 9dd27232cdb285bd778cb92ff3d3191bd8d0a2e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 6 Feb 2021 05:01:03 +0000 Subject: [PATCH 121/548] Bump maven-checkstyle-plugin from 3.1.1 to 3.1.2 Bumps [maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/apache/maven-checkstyle-plugin/releases) - [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.1.1...maven-checkstyle-plugin-3.1.2) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d3921272f..4f7f5388d 100644 --- a/pom.xml +++ b/pom.xml @@ -194,7 +194,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.1 + 3.1.2 ${basedir}/src/main/resources/checkstyle.xml From 0d77e7c404cb792dffceeca5ac3479636886e626 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 6 Feb 2021 05:01:03 +0000 Subject: [PATCH 122/548] Bump joda-time from 2.10.9 to 2.10.10 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.9 to 2.10.10. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.9...v2.10.10) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d3921272f..f986e4ca2 100644 --- a/pom.xml +++ b/pom.xml @@ -511,7 +511,7 @@ joda-time joda-time - 2.10.9 + 2.10.10 org.hibernate.validator From f0ddde1b95e4aff92bb83ca400475b4385616cc8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Feb 2021 05:00:24 +0000 Subject: [PATCH 123/548] Bump flyway-maven-plugin from 7.5.2 to 7.5.3 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.5.2 to 7.5.3. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.5.2...flyway-7.5.3) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 231be9cd3..e19527a61 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.5.2 + 7.5.3 From 321a2cbe31c4c33fb9b3cb0e0b28da401922a4b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Feb 2021 05:00:34 +0000 Subject: [PATCH 124/548] Bump spring.security.version from 5.4.2 to 5.4.4 Bumps `spring.security.version` from 5.4.2 to 5.4.4. Updates `spring-security-web` from 5.4.2 to 5.4.4 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.4.2...5.4.4) Updates `spring-security-config` from 5.4.2 to 5.4.4 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.4.2...5.4.4) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 231be9cd3..a68de5c56 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.12.4 3.4.2 5.3.3 - 5.4.2 + 5.4.4 8.0.22 9.4.36.v20210114 1.18.18 From 87cc4f6b374ac41c25977c88a1036b4e0f1b6670 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Feb 2021 05:00:52 +0000 Subject: [PATCH 125/548] Bump spring-framework-bom from 5.3.3 to 5.3.4 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.3 to 5.3.4. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.3...v5.3.4) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 771c867c3..3902241f4 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.12.4 3.4.2 - 5.3.3 + 5.3.4 5.4.4 8.0.22 9.4.36.v20210114 From 81ecb65b4fea207e4ccf94fb4f51ca78b16c45c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Feb 2021 05:01:20 +0000 Subject: [PATCH 126/548] Bump HikariCP from 4.0.1 to 4.0.2 Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/brettwooldridge/HikariCP/releases) - [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES) - [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-4.0.1...HikariCP-4.0.2) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 771c867c3..c16150722 100644 --- a/pom.xml +++ b/pom.xml @@ -672,7 +672,7 @@ com.zaxxer HikariCP - 4.0.1 + 4.0.2 org.jooq From cb90101fae11bb8cfb7f7e779906dbbbd8116b08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Feb 2021 05:01:41 +0000 Subject: [PATCH 127/548] Bump junit from 4.13.1 to 4.13.2 Bumps [junit](https://github.com/junit-team/junit4) from 4.13.1 to 4.13.2. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.13.1...r4.13.2) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 771c867c3..161c247f2 100644 --- a/pom.xml +++ b/pom.xml @@ -689,7 +689,7 @@ junit junit - 4.13.1 + 4.13.2 test From 2f23e969f0940af81bc4df459cd9ff18d789c33d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Feb 2021 14:22:35 +0000 Subject: [PATCH 128/548] Bump spring.security.version from 5.4.4 to 5.4.5 Bumps `spring.security.version` from 5.4.4 to 5.4.5. Updates `spring-security-web` from 5.4.4 to 5.4.5 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.4.4...5.4.5) Updates `spring-security-config` from 5.4.4 to 5.4.5 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Commits](https://github.com/spring-projects/spring-security/compare/5.4.4...5.4.5) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 797d9473a..a25c4e8ca 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.12.4 3.4.2 5.3.4 - 5.4.4 + 5.4.5 8.0.22 9.4.36.v20210114 1.18.18 From 1665e0f9ba8e92fef2accc91bfabf8c85917b7ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sat, 20 Feb 2021 15:07:42 +0100 Subject: [PATCH 129/548] add checkbox for empty list with SendLocalList (issue #488) --- .../rwth/idsg/steve/ocpp/task/SendLocalListTask.java | 10 +++++++++- .../idsg/steve/web/dto/ocpp/SendLocalListParams.java | 3 +++ .../WEB-INF/views/op-forms/SendLocalListForm.jsp | 5 +++++ .../webapp/WEB-INF/views/snippets/sendLocalList.js | 2 ++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java index 0427dd25a..b03e839b4 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java @@ -24,9 +24,11 @@ import de.rwth.idsg.steve.service.OcppTagService; import de.rwth.idsg.steve.web.dto.ocpp.SendLocalListParams; import de.rwth.idsg.steve.web.dto.ocpp.SendLocalListUpdateType; +import ocpp.cp._2015._10.AuthorizationData; import javax.xml.ws.AsyncHandler; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -109,10 +111,16 @@ private ocpp.cp._2015._10.SendLocalListRequest createOcpp16Request(OcppTagServic // FULL update } else { + List values = Collections.emptyList(); + + if (Boolean.FALSE.equals(params.getSendEmptyListWhenFull())) { + values = ocppTagService.getAuthDataOfAllTags(); + } + return new ocpp.cp._2015._10.SendLocalListRequest() .withListVersion(params.getListVersion()) .withUpdateType(ocpp.cp._2015._10.UpdateType.FULL) - .withLocalAuthorizationList(ocppTagService.getAuthDataOfAllTags()); + .withLocalAuthorizationList(values); } } diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java index a986a9f9e..2e2618a8c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java @@ -41,6 +41,9 @@ public class SendLocalListParams extends MultipleChargePointSelect { @NotNull(message = "Update Type is required") private SendLocalListUpdateType updateType = SendLocalListUpdateType.FULL; + @NotNull + private Boolean sendEmptyListWhenFull = Boolean.FALSE; + private List deleteList; private List addUpdateList; diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp index 372b6dae7..b6c354fc3 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp @@ -46,6 +46,11 @@ + Send empty list?: + + If selected and the update type is FULL, an empty list will be sent.
+ As a result, the charge point will remove all idTags from its list. +
\ No newline at end of file diff --git a/src/main/resources/webapp/WEB-INF/views/snippets/sendLocalList.js b/src/main/resources/webapp/WEB-INF/views/snippets/sendLocalList.js index 62b5cdcf9..aab7c88cc 100644 --- a/src/main/resources/webapp/WEB-INF/views/snippets/sendLocalList.js +++ b/src/main/resources/webapp/WEB-INF/views/snippets/sendLocalList.js @@ -7,10 +7,12 @@ updateSelection.change(function() { function changeMultiSelects(value) { if (value == 'DIFFERENTIAL') { $("#addUpdateList, #deleteList").prop("disabled", false); + $("#sendEmptyListWhenFull").prop("disabled", true); } else if (value == 'FULL') { selectNone(document.getElementById('addUpdateList')); selectNone(document.getElementById('deleteList')); $("#addUpdateList, #deleteList").prop("disabled", true); + $("#sendEmptyListWhenFull").prop("disabled", false); } } \ No newline at end of file From cddc6ac2052f843302b37b65cb566387de97307a Mon Sep 17 00:00:00 2001 From: Christian Samsel Date: Mon, 22 Feb 2021 22:13:12 +0100 Subject: [PATCH 130/548] Delete CHANGELOG.md --- CHANGELOG.md | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index eb7fcf579..000000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,44 +0,0 @@ -### We manage the development using [Github releases](https://github.com/RWTH-i5-IDSG/steve/releases). This file is obsolete, won't be updated anymore. - -## 1.0.2 -Complete rewrite of the backend: - - - Using Spring, Hibernate Validator and JOOQ with the embedded Jetty server now. Doing database migrations with Flyway. - - Printing form validation errors on the Web page. - - Switched to async OCPP calls. "Tasks" menu to track the call results. - - Transactions can be exported as CSV. - - Better reservation modeling and handling. - - Date and time picker for Web frontend. - -## 1.0.1 - - Fix: Start and stop date/time values for Get Diagnostics must be in the past. Frontend allows to do that now. - - New: Backend validates input date/time variables for Get Diagnostics. - -## 1.0.0 - - DB updated to 0.6.7. - - Home page displays various statistics now (See the screenshot). Data is returned by a stored procedure in DB. - - Transactions can be accessed under Data Management. - - Latest received heartbeats are stored in DB and can be accessed from home page. - - Latest connector status information can be accessed from home page. - - "Humanize" the date if it's from today or yesterday. - - Drop-down date picker (JQuery plugin) for user-friendly input. - - Time input field defaults to 00:00 when left empty. - - Drop-down select list of user and parent id tags where applicable. - - Drop-down select list for connector, transaction and reservation ids (via Ajax calls) for user-friendly input after a charge point is selected for an OCPP operation. - - Client-side input control for required fields (needs HTML5). - - Server-side fixes for mandatory/optional fields to conform to OCPP. - - User ID Tag restriction: It must be between 1 and 20 characters long. Allowed characters are upper or lower case letters, numbers and dot, dash, underscore symbols. - -## 0.6.8 - - Started using MVC, JQuery and Ajax. - - InputUtils for user input validation. - - New function to update user info. - - Tabbed UI for data management operations. - - CSS updates for better cross-browser compatibility. - -## 0.6.7 - - New about page. - - Dropped update function because of difficulties with Linux permissions. - -## 0.6.6 - - Started versioning the app and db dump. \ No newline at end of file From ec0af654f8bf5e91e9447d81528ffeea0b6697dd Mon Sep 17 00:00:00 2001 From: Christian Samsel Date: Mon, 22 Feb 2021 22:37:55 +0100 Subject: [PATCH 131/548] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aba1e43ac..8f8080f33 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ SteVe is designed to run standalone, a java servlet container / web server (e.g. Make sure MySQL is reachable via TCP (e.g., remove `skip-networking` from `my.cnf`). The following MySQL statements can be used as database initialization (adjust database name and credentials according to your setup). - * For MySQL 5.7: + * For MySQL 5.7 (and MariaDB 10.3): ``` CREATE DATABASE stevedb CHARACTER SET utf8 COLLATE utf8_unicode_ci; GRANT ALL PRIVILEGES ON stevedb.* TO 'steve'@'localhost' IDENTIFIED BY 'changeme'; From 09c04fc5c497c6ebf9911131628e3671f3ff240e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 27 Feb 2021 05:00:21 +0000 Subject: [PATCH 132/548] Bump jooq.version from 3.12.4 to 3.14.8 Bumps `jooq.version` from 3.12.4 to 3.14.8. Updates `jooq-meta` from 3.12.4 to 3.14.8 Updates `jooq-codegen` from 3.12.4 to 3.14.8 Updates `jooq` from 3.12.4 to 3.14.8 Updates `jooq-codegen-maven` from 3.12.4 to 3.14.8 Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a25c4e8ca..dac98ecba 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 11 UTF-8 - 3.12.4 + 3.14.8 3.4.2 5.3.4 5.4.5 From de81e57ea1db1094d87506ef9540a6c8e1d20ab4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 27 Feb 2021 05:00:25 +0000 Subject: [PATCH 133/548] Bump flyway-maven-plugin from 7.5.3 to 7.5.4 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.5.3 to 7.5.4. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.5.3...flyway-7.5.4) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a25c4e8ca..62a0b48b2 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.5.3 + 7.5.4 From 61c488c44823b23762238715fdbb96bc66f2a79f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 27 Feb 2021 05:00:55 +0000 Subject: [PATCH 134/548] Bump jetty.version from 9.4.36.v20210114 to 9.4.38.v20210224 Bumps `jetty.version` from 9.4.36.v20210114 to 9.4.38.v20210224. Updates `jetty-server` from 9.4.36.v20210114 to 9.4.38.v20210224 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.36.v20210114...jetty-9.4.38.v20210224) Updates `jetty-webapp` from 9.4.36.v20210114 to 9.4.38.v20210224 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.36.v20210114...jetty-9.4.38.v20210224) Updates `jetty-annotations` from 9.4.36.v20210114 to 9.4.38.v20210224 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.36.v20210114...jetty-9.4.38.v20210224) Updates `apache-jsp` from 9.4.36.v20210114 to 9.4.38.v20210224 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.36.v20210114...jetty-9.4.38.v20210224) Updates `apache-jstl` from 9.4.36.v20210114 to 9.4.38.v20210224 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.36.v20210114...jetty-9.4.38.v20210224) Updates `jetty-rewrite` from 9.4.36.v20210114 to 9.4.38.v20210224 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.36.v20210114...jetty-9.4.38.v20210224) Updates `websocket-server` from 9.4.36.v20210114 to 9.4.38.v20210224 Updates `jetty-jspc-maven-plugin` from 9.4.36.v20210114 to 9.4.38.v20210224 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.36.v20210114...jetty-9.4.38.v20210224) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a25c4e8ca..f0e139880 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 5.3.4 5.4.5 8.0.22 - 9.4.36.v20210114 + 9.4.38.v20210224 1.18.18 2.12.1 From 379bb9e770482bee5f136a7bc1283a4c774a7edd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 27 Feb 2021 15:49:41 +0000 Subject: [PATCH 135/548] Bump mysql-connector-java from 8.0.22 to 8.0.23 Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.22 to 8.0.23. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.22...8.0.23) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 87e721a1c..209617453 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 3.4.2 5.3.4 5.4.5 - 8.0.22 + 8.0.23 9.4.38.v20210224 1.18.18 2.12.1 From a9054068e31783025f0179c6bd1428a6ec2fabdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20Go=CC=88kay?= Date: Tue, 2 Mar 2021 23:11:23 +0100 Subject: [PATCH 136/548] use the new key that is logically equivalent https://dev.mysql.com/doc/relnotes/connector-j/8.0/en/news-8-0-23.html#connector-j-8-0-23-feature --- src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java index 2d370895a..0032c7596 100644 --- a/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java @@ -94,7 +94,7 @@ private void initDataSource() { hc.addDataSourceProperty(PropertyKey.prepStmtCacheSize.getKeyName(), 250); hc.addDataSourceProperty(PropertyKey.prepStmtCacheSqlLimit.getKeyName(), 2048); hc.addDataSourceProperty(PropertyKey.characterEncoding.getKeyName(), "utf8"); - hc.addDataSourceProperty(PropertyKey.serverTimezone.getKeyName(), CONFIG.getTimeZoneId()); + hc.addDataSourceProperty(PropertyKey.connectionTimeZone.getKeyName(), CONFIG.getTimeZoneId()); hc.addDataSourceProperty(PropertyKey.useSSL.getKeyName(), true); dataSource = new HikariDataSource(hc); From 749a3c6c642fc4926545c508fa9e81c6b16f4a2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 6 Mar 2021 05:00:37 +0000 Subject: [PATCH 137/548] Bump jackson.version from 2.12.1 to 2.12.2 Bumps `jackson.version` from 2.12.1 to 2.12.2. Updates `jackson-databind` from 2.12.1 to 2.12.2 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-module-jaxb-annotations` from 2.12.1 to 2.12.2 - [Release notes](https://github.com/FasterXML/jackson-modules-base/releases) - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.12.1...jackson-modules-base-2.12.2) Updates `jackson-annotations` from 2.12.1 to 2.12.2 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 209617453..845159735 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 8.0.23 9.4.38.v20210224 1.18.18 - 2.12.1 + 2.12.2 jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true&serverTimezone=UTC From 8929d0556aa1918f1dd62d8dc02fd43eed0cc46b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 6 Mar 2021 05:00:44 +0000 Subject: [PATCH 138/548] Bump HikariCP from 4.0.2 to 4.0.3 Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 4.0.2 to 4.0.3. - [Release notes](https://github.com/brettwooldridge/HikariCP/releases) - [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES) - [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-4.0.2...HikariCP-4.0.3) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 209617453..952fea572 100644 --- a/pom.xml +++ b/pom.xml @@ -672,7 +672,7 @@ com.zaxxer HikariCP - 4.0.2 + 4.0.3 org.jooq From 6285e6f484f823f55a86054425372c3f1be2b19c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 6 Mar 2021 05:01:14 +0000 Subject: [PATCH 139/548] Bump flyway-maven-plugin from 7.5.4 to 7.6.0 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.5.4 to 7.6.0. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.5.4...flyway-7.6.0) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 209617453..d50494b71 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.5.4 + 7.6.0 From 058708cb407857ea5c45aa07d91317bd983c2612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 7 Mar 2021 23:36:10 +0100 Subject: [PATCH 140/548] fix jooq version bump issues --- pom.xml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index dac98ecba..944607418 100644 --- a/pom.xml +++ b/pom.xml @@ -393,28 +393,29 @@ BOOLEAN - - (?i:TINYINT(\s*\(\d+\))?(\s*UNSIGNED)?) - - - BOOLEAN - (IN_TRANSACTION|BLOCKED) + + (?i:(TINY|SMALL|MEDIUM|BIG)?INT(UNSIGNED)?\(1\)) org.joda.time.DateTime de.rwth.idsg.steve.utils.DateTimeConverter - (TIMESTAMP|DATETIME) + .* + .*(TIMESTAMP|DATETIME).* org.joda.time.LocalDate de.rwth.idsg.steve.utils.DateConverter - .*\.BIRTH_DAY - .*(DATE).* + .*\.BIRTH_DAY + .*(DATE).* true + + false From e6a76ee0d94e2cbb33e7b48f7448d48bda7b0ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Mon, 8 Mar 2021 00:20:45 +0100 Subject: [PATCH 141/548] remove redundant explicit javax dependencies --- pom.xml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/pom.xml b/pom.xml index d3e6ac93b..6444aac56 100644 --- a/pom.xml +++ b/pom.xml @@ -474,28 +474,6 @@ javax.mail 1.6.2 - - - - javax.annotation - javax.annotation-api - 1.3.2 - - - javax.xml.ws - jaxws-api - 2.3.1 - - - javax.jws - jsr181-api - 1.0-MR1 - - - org.glassfish.jaxb - jaxb-runtime - 2.3.3 - org.jetbrains annotations From 4c3298c00d5dafb9cdf4199cf5cd75b1ec85fdc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Mon, 8 Mar 2021 00:29:34 +0100 Subject: [PATCH 142/548] switch from javax.mail to jakarta.mail --- pom.xml | 4 ++-- .../de/rwth/idsg/steve/service/MailService.java | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 6444aac56..f974c5f71 100644 --- a/pom.xml +++ b/pom.xml @@ -471,8 +471,8 @@ com.sun.mail - javax.mail - 1.6.2 + jakarta.mail + 2.0.0 org.jetbrains diff --git a/src/main/java/de/rwth/idsg/steve/service/MailService.java b/src/main/java/de/rwth/idsg/steve/service/MailService.java index 1ae54d67c..b4e267a65 100644 --- a/src/main/java/de/rwth/idsg/steve/service/MailService.java +++ b/src/main/java/de/rwth/idsg/steve/service/MailService.java @@ -27,14 +27,14 @@ import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; -import javax.mail.Authenticator; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.PasswordAuthentication; -import javax.mail.Session; -import javax.mail.Transport; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Authenticator; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.PasswordAuthentication; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; import java.util.Properties; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.locks.Lock; From 98ec6dca0da624d3c42dea81dee18315111b0849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Mon, 8 Mar 2021 00:54:33 +0100 Subject: [PATCH 143/548] bump jetty version https://webtide.com/jetty-10-and-11-have-arrived/ --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f974c5f71..039c848cd 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 5.3.4 5.4.5 8.0.23 - 9.4.38.v20210224 + 10.0.1 1.18.18 2.12.2 @@ -638,7 +638,7 @@ org.eclipse.jetty.websocket - websocket-server + websocket-core-server ${jetty.version} From 17e908ea4e85ca406a0e73965a13c5ab30e2861b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Mon, 8 Mar 2021 01:48:03 +0100 Subject: [PATCH 144/548] Revert "bump jetty version" This reverts commit 98ec6dca0da624d3c42dea81dee18315111b0849. reason: a lot of refactoring and re-architecting in websocket section. interplay with spring seems to be not complete. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 039c848cd..f974c5f71 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 5.3.4 5.4.5 8.0.23 - 10.0.1 + 9.4.38.v20210224 1.18.18 2.12.2 @@ -638,7 +638,7 @@ org.eclipse.jetty.websocket - websocket-core-server + websocket-server ${jetty.version} From 3f2b22cfd3de8b355a9e5983f0783ab5038ee081 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Mar 2021 05:00:14 +0000 Subject: [PATCH 145/548] Bump log4j-bom from 2.14.0 to 2.14.1 Bumps log4j-bom from 2.14.0 to 2.14.1. Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f974c5f71..e776771b6 100644 --- a/pom.xml +++ b/pom.xml @@ -451,7 +451,7 @@ org.apache.logging.log4j log4j-bom - 2.14.0 + 2.14.1 import pom From 1f3feca1be27bc22199f5302d75c98c7c6025383 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Mar 2021 05:00:38 +0000 Subject: [PATCH 146/548] Bump flyway-maven-plugin from 7.6.0 to 7.7.0 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.6.0 to 7.7.0. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.6.0...flyway-7.7.0) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f974c5f71..1fe2f5057 100644 --- a/pom.xml +++ b/pom.xml @@ -295,7 +295,7 @@ org.flywaydb flyway-maven-plugin - 7.6.0 + 7.7.0 From 8955cbaff9ae8eff5e5bb3f535a5fd34c395c855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Fri, 19 Mar 2021 22:21:42 +0100 Subject: [PATCH 147/548] re-introduce boolean jooq forced types (#533) --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index da398c81c..20fca395a 100644 --- a/pom.xml +++ b/pom.xml @@ -396,6 +396,10 @@ (?i:(TINY|SMALL|MEDIUM|BIG)?INT(UNSIGNED)?\(1\)) + + BOOLEAN + .*\.OCPP_TAG_ACTIVITY\.(IN_TRANSACTION|BLOCKED) + org.joda.time.DateTime de.rwth.idsg.steve.utils.DateTimeConverter From 5768a7e461832750a775be7d568aa7054162a763 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Mar 2021 05:01:19 +0000 Subject: [PATCH 148/548] Bump guava from 30.1-jre to 30.1.1-jre Bumps [guava](https://github.com/google/guava) from 30.1-jre to 30.1.1-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index da398c81c..75777fb79 100644 --- a/pom.xml +++ b/pom.xml @@ -500,7 +500,7 @@ com.google.guava guava - 30.1-jre + 30.1.1-jre com.fasterxml.jackson.core From e8e8f511d70e7ad829307816dd2b3133bd85527c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Mar 2021 05:01:25 +0000 Subject: [PATCH 149/548] Bump git-commit-id-plugin from 4.0.3 to 4.0.4 Bumps git-commit-id-plugin from 4.0.3 to 4.0.4. Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index da398c81c..36435b778 100644 --- a/pom.xml +++ b/pom.xml @@ -203,7 +203,7 @@ pl.project13.maven git-commit-id-plugin - 4.0.3 + 4.0.4 initialize From 5fa4acf82e0eccc6abfac7274f566427b8a8968d Mon Sep 17 00:00:00 2001 From: Christian Samsel Date: Sat, 20 Mar 2021 11:50:39 +0100 Subject: [PATCH 150/548] travis updates (#539) * added ubuntu focal (includes MySQL 8.0) * added mariaDB 10.5 jobs * adjustments to scripts so they work in all environments --- .travis.yml | 63 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 53 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f68b9955..3ecc727f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,21 @@ -sudo: false language: java -dist: xenial + # install dependencies install: mvn dependency:go-offline -s .travis-maven-settings.xml -B -V before_script: + # Display Versions + - mysqld -V + - java -version + - mvn -version # initalize empty database and privileges - - mysql -uroot -e "CREATE DATABASE stevedb_test_2aa6a783d47d;" -v - - mysql -uroot -e "GRANT ALL PRIVILEGES ON stevedb_test_2aa6a783d47d.* TO 'steve'@'localhost' IDENTIFIED BY 'changeme';" -v - - mysql -uroot -e "GRANT SELECT ON mysql.proc TO 'steve'@'localhost' IDENTIFIED BY 'changeme';" -v + - sudo mysql -uroot -e "CREATE DATABASE stevedb_test_2aa6a783d47d;" -v + - sudo mysql -uroot -e "CREATE USER 'steve'@'localhost' IDENTIFIED BY 'changeme';" -v + - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON stevedb_test_2aa6a783d47d.* TO 'steve'@'localhost';" -v + - sudo mysql -uroot -e "GRANT SELECT ON mysql.proc TO 'steve'@'localhost';" -v || true # grant super privilege required by MariaDB running with log-bin - - mysql -uroot -e "GRANT SUPER ON *.* TO 'steve'@'localhost' IDENTIFIED BY 'changeme';" -v + - sudo mysql -uroot -e "GRANT SUPER ON *.* TO 'steve'@'localhost';" -v || true # start the actual build script: @@ -22,20 +26,59 @@ script: - elinks -dump -no-references http://localhost:8080/steve/manager/signin - killall java + + jobs: include: - - jdk: openjdk11 + - name: OpenJDK11 with MySQL 8.0 (Ubuntu LTS 20.04) + jdk: openjdk11 + dist: focal services: mysql - - jdk: openjdk13 + - name: OpenJDK15 with MySQL 8.0 (Ubuntu LTS 20.04) + jdk: openjdk15 + dist: focal services: mysql - - jdk: openjdk15 + - name: OpenJDK11 with MySQL 5.7 (Ubuntu LTS 16.04) + jdk: openjdk11 + dist: xenial services: mysql - - jdk: openjdk11 + - name: OpenJDK15 with MySQL 5.7 (Ubuntu LTS 16.04) + jdk: openjdk15 + dist: xenial + services: mysql + + - name: OpenJDK11 with MariaDB 10.3 (Ubuntu LTS 20.04) + jdk: openjdk11 + dist: focal + addons: + mariadb: "10.3" + apt: + packages: + - elinks + - name: OpenJDK15 with MariaDB 10.3 (Ubuntu LTS 20.04) + jdk: openjdk15 + dist: focal addons: mariadb: "10.3" apt: packages: - elinks + - name: OpenJDK11 with MariaDB 10.5 (Ubuntu LTS 20.04) + jdk: openjdk11 + dist: focal + addons: + mariadb: "10.5" + apt: + packages: + - elinks + - name: OpenJDK15 with MariaDB 10.5 (Ubuntu LTS 20.04) + jdk: openjdk15 + dist: focal + addons: + mariadb: "10.5" + apt: + packages: + - elinks addons: apt: From cae7b918825aad5a5236ae95a8d00751859ef045 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Mar 2021 13:02:50 +0100 Subject: [PATCH 151/548] Bump spring-framework-bom from 5.3.4 to 5.3.5 (#538) Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.4 to 5.3.5. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.4...v5.3.5) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 479e91bfa..7e93ea931 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.14.8 3.4.2 - 5.3.4 + 5.3.5 5.4.5 8.0.23 9.4.38.v20210224 From ab835080525ed19dd9d3779b83357d265e7a4c46 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Mar 2021 13:03:16 +0100 Subject: [PATCH 152/548] Bump nv-i18n from 1.27 to 1.28 (#535) Bumps [nv-i18n](https://github.com/TakahikoKawasaki/nv-i18n) from 1.27 to 1.28. - [Release notes](https://github.com/TakahikoKawasaki/nv-i18n/releases) - [Changelog](https://github.com/TakahikoKawasaki/nv-i18n/blob/master/CHANGES.md) - [Commits](https://github.com/TakahikoKawasaki/nv-i18n/compare/nv-i18n-1.27...nv-i18n-1.28) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e93ea931..5160323bf 100644 --- a/pom.xml +++ b/pom.xml @@ -688,7 +688,7 @@ com.neovisionaries nv-i18n - 1.27 + 1.28 From 5470c91d60f777aafe83e9dc8a78e4188e62f634 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Mar 2021 12:03:27 +0000 Subject: [PATCH 153/548] Bump cxf.version from 3.4.2 to 3.4.3 Bumps `cxf.version` from 3.4.2 to 3.4.3. Updates `cxf-rt-frontend-jaxws` from 3.4.2 to 3.4.3 Updates `cxf-rt-transports-http` from 3.4.2 to 3.4.3 Updates `cxf-rt-transports-http-hc` from 3.4.2 to 3.4.3 Updates `cxf-rt-features-logging` from 3.4.2 to 3.4.3 Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5160323bf..0f79c2cd3 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ UTF-8 3.14.8 - 3.4.2 + 3.4.3 5.3.5 5.4.5 8.0.23 From 6552cf562ea9a7fb23aba2d2a2c20331f3416862 Mon Sep 17 00:00:00 2001 From: Christian Samsel Date: Sat, 20 Mar 2021 19:07:20 +0100 Subject: [PATCH 154/548] Update README.md --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8f8080f33..3040909f6 100644 --- a/README.md +++ b/README.md @@ -43,11 +43,12 @@ SteVe is designed to run standalone, a java servlet container / web server (e.g. Make sure MySQL is reachable via TCP (e.g., remove `skip-networking` from `my.cnf`). The following MySQL statements can be used as database initialization (adjust database name and credentials according to your setup). - * For MySQL 5.7 (and MariaDB 10.3): + * For MySQL 5.7 (and MariaDB): ``` CREATE DATABASE stevedb CHARACTER SET utf8 COLLATE utf8_unicode_ci; - GRANT ALL PRIVILEGES ON stevedb.* TO 'steve'@'localhost' IDENTIFIED BY 'changeme'; - GRANT SELECT ON mysql.proc TO 'steve'@'localhost' IDENTIFIED BY 'changeme'; + CREATE USER 'steve'@'localhost' IDENTIFIED BY 'changeme'; + GRANT ALL PRIVILEGES ON stevedb.* TO 'steve'@'localhost'; + GRANT SELECT ON mysql.proc TO 'steve'@'localhost'; ``` * For MySQL 8: @@ -57,7 +58,7 @@ SteVe is designed to run standalone, a java servlet container / web server (e.g. GRANT ALL PRIVILEGES ON stevedb.* TO 'steve'@'localhost'; GRANT SUPER ON *.* TO 'steve'@'localhost'; ``` - Note: The statement `GRANT SUPER [...]` is only necessary to execute some of the previous migration files and is only needed for the initial database setup. Afterwards, you can remove this privilage by executing + Note: The statement `GRANT SUPER [...]` is only necessary to execute some of the previous migration files and is only needed for the initial database setup. Afterwards, you can remove this privilege by executing ``` REVOKE SUPER ON *.* FROM 'steve'@'localhost'; ``` From d011d03b29e6b83a661195feb8ae3e480f953ecd Mon Sep 17 00:00:00 2001 From: Christian Samsel Date: Sat, 20 Mar 2021 22:58:43 +0100 Subject: [PATCH 155/548] added codeql configuration --- .github/workflows/codeql-analysis.yml | 67 +++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 000000000..b65730890 --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,67 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ master ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ master ] + schedule: + - cron: '26 12 * * 7' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + language: [ 'java' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] + # Learn more: + # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v1 + + # ℹ️ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl + + # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 From 5539b1222fe7c6502fbbc0e461c824ad6819880e Mon Sep 17 00:00:00 2001 From: Christian Samsel Date: Sat, 20 Mar 2021 23:01:28 +0100 Subject: [PATCH 156/548] Update codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b65730890..79b352224 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -18,7 +18,7 @@ on: # The branches below must be a subset of the branches above branches: [ master ] schedule: - - cron: '26 12 * * 7' + - cron: '26 12 * * 6' jobs: analyze: From bfd6573ba2d07ea11cb384e3adca59d8b85c3bff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 21 Mar 2021 23:23:24 +0100 Subject: [PATCH 157/548] update year in license headers --- pom.xml | 6 +++++- src/main/java/de/rwth/idsg/steve/Application.java | 2 +- src/main/java/de/rwth/idsg/steve/ApplicationProfile.java | 2 +- src/main/java/de/rwth/idsg/steve/ApplicationStarter.java | 2 +- src/main/java/de/rwth/idsg/steve/JettyServer.java | 2 +- src/main/java/de/rwth/idsg/steve/NotificationFeature.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveAppContext.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveConfiguration.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveDevStarter.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveException.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveProdCondition.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveProdStarter.java | 2 +- .../java/de/rwth/idsg/steve/config/BeanConfiguration.java | 2 +- .../java/de/rwth/idsg/steve/config/OcppConfiguration.java | 2 +- .../de/rwth/idsg/steve/config/SecurityConfiguration.java | 2 +- .../de/rwth/idsg/steve/config/WebSocketConfiguration.java | 2 +- .../rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java | 2 +- .../idsg/steve/ocpp/ChargePointService12_InvokerImpl.java | 2 +- .../rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java | 2 +- .../idsg/steve/ocpp/ChargePointService15_InvokerImpl.java | 2 +- .../rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java | 2 +- .../idsg/steve/ocpp/ChargePointService16_InvokerImpl.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/CommunicationTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/converter/Convert.java | 2 +- .../de/rwth/idsg/steve/ocpp/converter/Server12to15.java | 2 +- .../de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java | 2 +- .../de/rwth/idsg/steve/ocpp/converter/Server15to16.java | 2 +- .../de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java | 2 +- .../steve/ocpp/soap/CentralSystemService12_SoapServer.java | 2 +- .../steve/ocpp/soap/CentralSystemService15_SoapServer.java | 2 +- .../steve/ocpp/soap/CentralSystemService16_SoapServer.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java | 2 +- .../rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java | 2 +- .../de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java | 2 +- .../de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java | 2 +- .../rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java | 2 +- .../de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java | 2 +- .../rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java | 2 +- .../rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java | 2 +- .../rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java | 2 +- .../rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java | 2 +- .../rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java | 2 +- .../idsg/steve/ocpp/task/RemoteStartTransactionTask.java | 2 +- .../idsg/steve/ocpp/task/RemoteStopTransactionTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java | 2 +- .../rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java | 2 +- .../rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java | 2 +- .../rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java | 2 +- .../rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java | 2 +- .../rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java | 2 +- .../idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java | 2 +- .../rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java | 2 +- .../idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java | 2 +- .../steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java | 2 +- .../rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java | 2 +- .../rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java | 2 +- .../rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java | 2 +- .../idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java | 2 +- .../rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java | 2 +- .../idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java | 2 +- .../rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java | 2 +- .../idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java | 2 +- .../idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java | 2 +- .../rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java | 2 +- .../idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java | 2 +- .../de/rwth/idsg/steve/repository/AddressRepository.java | 2 +- .../rwth/idsg/steve/repository/ChargePointRepository.java | 2 +- .../idsg/steve/repository/ChargingProfileRepository.java | 2 +- .../de/rwth/idsg/steve/repository/GenericRepository.java | 2 +- .../de/rwth/idsg/steve/repository/OcppServerRepository.java | 2 +- .../de/rwth/idsg/steve/repository/OcppTagRepository.java | 2 +- .../rwth/idsg/steve/repository/ReservationRepository.java | 2 +- .../de/rwth/idsg/steve/repository/ReservationStatus.java | 2 +- .../de/rwth/idsg/steve/repository/SettingsRepository.java | 2 +- src/main/java/de/rwth/idsg/steve/repository/TaskStore.java | 2 +- .../rwth/idsg/steve/repository/TransactionRepository.java | 2 +- .../java/de/rwth/idsg/steve/repository/UserRepository.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/ChargePoint.java | 2 +- .../rwth/idsg/steve/repository/dto/ChargePointSelect.java | 2 +- .../de/rwth/idsg/steve/repository/dto/ChargingProfile.java | 2 +- .../steve/repository/dto/ChargingProfileAssignment.java | 2 +- .../de/rwth/idsg/steve/repository/dto/ConnectorStatus.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/DbVersion.java | 2 +- .../steve/repository/dto/InsertConnectorStatusParams.java | 2 +- .../idsg/steve/repository/dto/InsertReservationParams.java | 2 +- .../idsg/steve/repository/dto/InsertTransactionParams.java | 2 +- .../de/rwth/idsg/steve/repository/dto/MailSettings.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/OcppTag.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/Reservation.java | 2 +- .../de/rwth/idsg/steve/repository/dto/TaskOverview.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/Transaction.java | 2 +- .../rwth/idsg/steve/repository/dto/TransactionDetails.java | 2 +- .../idsg/steve/repository/dto/TransactionStatusUpdate.java | 2 +- .../idsg/steve/repository/dto/UpdateChargeboxParams.java | 2 +- .../idsg/steve/repository/dto/UpdateTransactionParams.java | 2 +- src/main/java/de/rwth/idsg/steve/repository/dto/User.java | 2 +- .../idsg/steve/repository/impl/AddressRepositoryImpl.java | 2 +- .../steve/repository/impl/ChargePointRepositoryImpl.java | 2 +- .../repository/impl/ChargingProfileRepositoryImpl.java | 2 +- .../idsg/steve/repository/impl/GenericRepositoryImpl.java | 2 +- .../steve/repository/impl/OcppServerRepositoryImpl.java | 2 +- .../idsg/steve/repository/impl/OcppTagRepositoryImpl.java | 2 +- .../steve/repository/impl/ReservationRepositoryImpl.java | 2 +- .../idsg/steve/repository/impl/SettingsRepositoryImpl.java | 2 +- .../de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java | 2 +- .../steve/repository/impl/TransactionRepositoryImpl.java | 2 +- .../rwth/idsg/steve/repository/impl/UserRepositoryImpl.java | 2 +- .../java/de/rwth/idsg/steve/service/BackgroundService.java | 2 +- .../idsg/steve/service/CentralSystemService16_Service.java | 2 +- .../rwth/idsg/steve/service/ChargePointHelperService.java | 2 +- .../idsg/steve/service/ChargePointService12_Client.java | 2 +- .../idsg/steve/service/ChargePointService15_Client.java | 2 +- .../idsg/steve/service/ChargePointService16_Client.java | 2 +- .../rwth/idsg/steve/service/DummyReleaseCheckService.java | 2 +- .../rwth/idsg/steve/service/GithubReleaseCheckService.java | 2 +- src/main/java/de/rwth/idsg/steve/service/MailService.java | 2 +- .../de/rwth/idsg/steve/service/NotificationService.java | 2 +- .../java/de/rwth/idsg/steve/service/OcppTagService.java | 2 +- .../de/rwth/idsg/steve/service/ReleaseCheckService.java | 2 +- .../de/rwth/idsg/steve/service/TransactionStopService.java | 2 +- .../steve/service/UnidentifiedIncomingObjectService.java | 2 +- .../idsg/steve/service/dto/EnhancedReserveNowParams.java | 2 +- .../steve/service/dto/EnhancedSetChargingProfileParams.java | 2 +- .../idsg/steve/service/dto/UnidentifiedIncomingObject.java | 2 +- .../rwth/idsg/steve/utils/ConnectorStatusCountFilter.java | 2 +- .../de/rwth/idsg/steve/utils/ConnectorStatusFilter.java | 2 +- .../java/de/rwth/idsg/steve/utils/ControllerHelper.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/DateConverter.java | 2 +- .../java/de/rwth/idsg/steve/utils/DateTimeConverter.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java | 2 +- .../java/de/rwth/idsg/steve/utils/LogFileRetriever.java | 2 +- .../java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/StringUtils.java | 2 +- .../java/de/rwth/idsg/steve/web/BatchInsertConverter.java | 2 +- .../de/rwth/idsg/steve/web/ChargePointSelectEditor.java | 2 +- .../java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java | 2 +- src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java | 2 +- .../java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java | 2 +- .../idsg/steve/web/controller/AboutSettingsController.java | 2 +- .../rwth/idsg/steve/web/controller/AjaxCallController.java | 2 +- .../idsg/steve/web/controller/ChargePointsController.java | 2 +- .../steve/web/controller/ChargingProfilesController.java | 2 +- .../de/rwth/idsg/steve/web/controller/HomeController.java | 2 +- .../de/rwth/idsg/steve/web/controller/LogController.java | 2 +- .../de/rwth/idsg/steve/web/controller/Ocpp12Controller.java | 2 +- .../de/rwth/idsg/steve/web/controller/Ocpp15Controller.java | 2 +- .../de/rwth/idsg/steve/web/controller/Ocpp16Controller.java | 2 +- .../rwth/idsg/steve/web/controller/OcppTagsController.java | 2 +- .../rwth/idsg/steve/web/controller/SignOutController.java | 2 +- .../de/rwth/idsg/steve/web/controller/TaskController.java | 2 +- .../web/controller/TransactionsReservationsController.java | 2 +- .../de/rwth/idsg/steve/web/controller/UsersController.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/Address.java | 2 +- .../rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/ChargePointForm.java | 2 +- .../de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java | 2 +- .../steve/web/dto/ChargingProfileAssignmentQueryForm.java | 2 +- .../de/rwth/idsg/steve/web/dto/ChargingProfileForm.java | 2 +- .../rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java | 2 +- .../de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java | 2 +- .../de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java | 2 +- .../de/rwth/idsg/steve/web/dto/ReservationQueryForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java | 2 +- .../de/rwth/idsg/steve/web/dto/TransactionQueryForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java | 2 +- .../idsg/steve/web/dto/ocpp/CancelReservationParams.java | 2 +- .../idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java | 2 +- .../idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java | 2 +- .../steve/web/dto/ocpp/ClearChargingProfileFilterType.java | 2 +- .../idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java | 2 +- .../steve/web/dto/ocpp/ConfigurationKeyReadWriteEnum.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java | 2 +- .../idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java | 2 +- .../idsg/steve/web/dto/ocpp/GetConfigurationParams.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java | 2 +- .../idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java | 2 +- .../steve/web/dto/ocpp/RemoteStartTransactionParams.java | 2 +- .../steve/web/dto/ocpp/RemoteStopTransactionParams.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java | 2 +- .../idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java | 2 +- .../idsg/steve/web/dto/ocpp/SetChargingProfileParams.java | 2 +- .../idsg/steve/web/dto/ocpp/SingleChargePointSelect.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/TriggerMessageParams.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java | 2 +- .../java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java | 2 +- .../idsg/steve/web/validation/ChargeBoxIdListValidator.java | 2 +- .../idsg/steve/web/validation/ChargeBoxIdValidator.java | 2 +- .../de/rwth/idsg/steve/web/validation/EmailCollection.java | 2 +- .../idsg/steve/web/validation/EmailCollectionValidator.java | 2 +- src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java | 2 +- .../rwth/idsg/steve/web/validation/IdTagListValidator.java | 2 +- .../de/rwth/idsg/steve/web/validation/IdTagValidator.java | 2 +- src/main/resources/webapp/WEB-INF/views/00-context.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/00-cp-multiple.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/00-cp-single.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/00-error.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/00-footer.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/00-header.jsp | 2 +- .../resources/webapp/WEB-INF/views/00-op-bind-errors.jsp | 2 +- .../webapp/WEB-INF/views/GetConfigurationResponse.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/about.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp | 2 +- .../resources/webapp/WEB-INF/views/data-man/00-address.jsp | 2 +- .../webapp/WEB-INF/views/data-man/00-charging-profile.jsp | 2 +- .../resources/webapp/WEB-INF/views/data-man/00-cp-misc.jsp | 2 +- .../resources/webapp/WEB-INF/views/data-man/00-ocppTag.jsp | 2 +- .../webapp/WEB-INF/views/data-man/00-user-ocpp.jsp | 2 +- .../webapp/WEB-INF/views/data-man/00-user-profile.jsp | 2 +- .../webapp/WEB-INF/views/data-man/chargepointAdd.jsp | 2 +- .../webapp/WEB-INF/views/data-man/chargepointDetails.jsp | 2 +- .../webapp/WEB-INF/views/data-man/chargepoints.jsp | 2 +- .../webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp | 2 +- .../WEB-INF/views/data-man/chargingProfileAssignments.jsp | 2 +- .../WEB-INF/views/data-man/chargingProfileDetails.jsp | 2 +- .../webapp/WEB-INF/views/data-man/chargingProfiles.jsp | 2 +- .../resources/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp | 2 +- .../webapp/WEB-INF/views/data-man/ocppTagDetails.jsp | 2 +- .../resources/webapp/WEB-INF/views/data-man/ocppTags.jsp | 2 +- .../webapp/WEB-INF/views/data-man/reservations.jsp | 2 +- .../webapp/WEB-INF/views/data-man/transactionDetails.jsp | 2 +- .../webapp/WEB-INF/views/data-man/transactions.jsp | 2 +- .../resources/webapp/WEB-INF/views/data-man/userAdd.jsp | 2 +- .../resources/webapp/WEB-INF/views/data-man/userDetails.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/data-man/users.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/home.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/ocppJsonStatus.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp | 2 +- .../WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp | 2 +- .../WEB-INF/views/op-forms/ChangeConfigurationForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp | 2 +- .../WEB-INF/views/op-forms/ClearChargingProfileForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/DataTransferForm.jsp | 2 +- .../WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp | 2 +- .../WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp | 2 +- .../WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp | 2 +- .../resources/webapp/WEB-INF/views/op-forms/ResetForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp | 2 +- .../WEB-INF/views/op-forms/SetChargingProfileForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp | 2 +- .../webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp | 2 +- .../webapp/WEB-INF/views/op12/ChangeAvailability.jsp | 2 +- .../webapp/WEB-INF/views/op12/ChangeConfiguration.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op12/ClearCache.jsp | 2 +- .../resources/webapp/WEB-INF/views/op12/GetDiagnostics.jsp | 2 +- .../webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp | 2 +- .../webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op12/Reset.jsp | 2 +- .../resources/webapp/WEB-INF/views/op12/UnlockConnector.jsp | 2 +- .../resources/webapp/WEB-INF/views/op12/UpdateFirmware.jsp | 2 +- .../webapp/WEB-INF/views/op15/CancelReservation.jsp | 2 +- .../webapp/WEB-INF/views/op15/ChangeAvailability.jsp | 2 +- .../webapp/WEB-INF/views/op15/ChangeConfiguration.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op15/ClearCache.jsp | 2 +- .../resources/webapp/WEB-INF/views/op15/DataTransfer.jsp | 2 +- .../webapp/WEB-INF/views/op15/GetConfiguration.jsp | 2 +- .../resources/webapp/WEB-INF/views/op15/GetDiagnostics.jsp | 2 +- .../webapp/WEB-INF/views/op15/GetLocalListVersion.jsp | 2 +- .../webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp | 2 +- .../webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op15/ReserveNow.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op15/Reset.jsp | 2 +- .../resources/webapp/WEB-INF/views/op15/SendLocalList.jsp | 2 +- .../resources/webapp/WEB-INF/views/op15/UnlockConnector.jsp | 2 +- .../resources/webapp/WEB-INF/views/op15/UpdateFirmware.jsp | 2 +- .../webapp/WEB-INF/views/op16/CancelReservation.jsp | 2 +- .../webapp/WEB-INF/views/op16/ChangeAvailability.jsp | 2 +- .../webapp/WEB-INF/views/op16/ChangeConfiguration.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op16/ClearCache.jsp | 2 +- .../webapp/WEB-INF/views/op16/ClearChargingProfile.jsp | 2 +- .../resources/webapp/WEB-INF/views/op16/DataTransfer.jsp | 2 +- .../webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp | 2 +- .../WEB-INF/views/op16/GetCompositeScheduleResponse.jsp | 2 +- .../webapp/WEB-INF/views/op16/GetConfiguration.jsp | 2 +- .../resources/webapp/WEB-INF/views/op16/GetDiagnostics.jsp | 2 +- .../webapp/WEB-INF/views/op16/GetLocalListVersion.jsp | 2 +- .../webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp | 2 +- .../webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op16/ReserveNow.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/op16/Reset.jsp | 2 +- .../resources/webapp/WEB-INF/views/op16/SendLocalList.jsp | 2 +- .../webapp/WEB-INF/views/op16/SetChargingProfile.jsp | 2 +- .../resources/webapp/WEB-INF/views/op16/TriggerMessage.jsp | 2 +- .../resources/webapp/WEB-INF/views/op16/UnlockConnector.jsp | 2 +- .../resources/webapp/WEB-INF/views/op16/UpdateFirmware.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/settings.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/signin.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/taskResult.jsp | 2 +- src/main/resources/webapp/WEB-INF/views/tasks.jsp | 2 +- src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java | 2 +- src/test/java/de/rwth/idsg/steve/ApplicationTest.java | 2 +- .../java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java | 2 +- src/test/java/de/rwth/idsg/steve/StressTest.java | 2 +- src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java | 2 +- src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java | 2 +- src/test/java/de/rwth/idsg/steve/TypeStoreTest.java | 2 +- src/test/java/de/rwth/idsg/steve/issues/Issue72.java | 2 +- .../java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java | 2 +- src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java | 2 +- src/test/java/de/rwth/idsg/steve/issues/Issue81.java | 2 +- src/test/java/de/rwth/idsg/steve/utils/Helpers.java | 2 +- .../java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java | 2 +- src/test/java/de/rwth/idsg/steve/utils/StressTester.java | 2 +- .../java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java | 2 +- 371 files changed, 375 insertions(+), 371 deletions(-) diff --git a/pom.xml b/pom.xml index 0f79c2cd3..54f48fe05 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ ${project.organization.name} ${project.inceptionYear} - 2020 + 2021 **/*.txt @@ -124,6 +124,10 @@ **/*.html **/*.css **/*.js + **/*.yml + **/*.yaml + **/*.PNG + **/Dockerfile diff --git a/src/main/java/de/rwth/idsg/steve/Application.java b/src/main/java/de/rwth/idsg/steve/Application.java index 4b966c310..1343ba81b 100644 --- a/src/main/java/de/rwth/idsg/steve/Application.java +++ b/src/main/java/de/rwth/idsg/steve/Application.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ApplicationProfile.java b/src/main/java/de/rwth/idsg/steve/ApplicationProfile.java index 4099cbea0..6a5923148 100644 --- a/src/main/java/de/rwth/idsg/steve/ApplicationProfile.java +++ b/src/main/java/de/rwth/idsg/steve/ApplicationProfile.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ApplicationStarter.java b/src/main/java/de/rwth/idsg/steve/ApplicationStarter.java index 94138f164..bd6a50f58 100644 --- a/src/main/java/de/rwth/idsg/steve/ApplicationStarter.java +++ b/src/main/java/de/rwth/idsg/steve/ApplicationStarter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/JettyServer.java b/src/main/java/de/rwth/idsg/steve/JettyServer.java index 0b47a0981..8ea3ea48f 100644 --- a/src/main/java/de/rwth/idsg/steve/JettyServer.java +++ b/src/main/java/de/rwth/idsg/steve/JettyServer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/NotificationFeature.java b/src/main/java/de/rwth/idsg/steve/NotificationFeature.java index 6174a037f..eca7971d9 100644 --- a/src/main/java/de/rwth/idsg/steve/NotificationFeature.java +++ b/src/main/java/de/rwth/idsg/steve/NotificationFeature.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveAppContext.java b/src/main/java/de/rwth/idsg/steve/SteveAppContext.java index 875a2fe15..67c2d2b3e 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveAppContext.java +++ b/src/main/java/de/rwth/idsg/steve/SteveAppContext.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveConfiguration.java b/src/main/java/de/rwth/idsg/steve/SteveConfiguration.java index d9f93697e..ad3eca8ef 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/SteveConfiguration.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveDevStarter.java b/src/main/java/de/rwth/idsg/steve/SteveDevStarter.java index 4ee2b6867..9566e41c2 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveDevStarter.java +++ b/src/main/java/de/rwth/idsg/steve/SteveDevStarter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveException.java b/src/main/java/de/rwth/idsg/steve/SteveException.java index 3b89f889e..1db8d012e 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveException.java +++ b/src/main/java/de/rwth/idsg/steve/SteveException.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveProdCondition.java b/src/main/java/de/rwth/idsg/steve/SteveProdCondition.java index 4939557a0..4ae136367 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveProdCondition.java +++ b/src/main/java/de/rwth/idsg/steve/SteveProdCondition.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveProdStarter.java b/src/main/java/de/rwth/idsg/steve/SteveProdStarter.java index d1214fa01..5b7eca89e 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveProdStarter.java +++ b/src/main/java/de/rwth/idsg/steve/SteveProdStarter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java index 0032c7596..5a3fc506c 100644 --- a/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java index 74cc1b612..77c724624 100644 --- a/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/config/SecurityConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/SecurityConfiguration.java index 651e6b570..87503182f 100644 --- a/src/main/java/de/rwth/idsg/steve/config/SecurityConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/SecurityConfiguration.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java index 9d4a2b424..49beaaaf5 100644 --- a/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java index f65a92b1d..2a2259772 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java index a5e8494ad..e9f0c578c 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java index c7ab50399..230fbceb3 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java index 9df6c65e2..5c0ef93f3 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java index d87bd76bf..3b26b1c65 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java index 6245f4d64..c48ae2b0f 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java index f92bb6c7a..ba826e39c 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java index d5a35682e..050ff72da 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java index 8c2f30a33..a10edbc11 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java b/src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java index 0902218be..0fc5add34 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java b/src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java index b91d263ad..73130ba6f 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java b/src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java index 24cbe31b4..d264df42d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java b/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java index fba7a1fbf..610f1a0c2 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java b/src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java index e9430a972..b80463479 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java b/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java index ad7182676..45557edab 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java index 386caf56b..81a6b74ae 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15.java index 8caa69620..3c42989ca 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java index adbe39367..aba6ff27e 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16.java index 54275c774..a32c9b157 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java index fe557e6b1..68fc3af65 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java index 7ce1d2eb6..d2f39518a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java index e3e0828a0..122b219bc 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java index 07661727b..f2f53807a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java index 6020ff51b..96f119a03 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java index 870ac4d7d..fb4c7119f 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java index ddca587ac..35560cc29 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java index 92010d496..d2cd896f0 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java index ef2540b32..e5662459b 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java index e75ffbe09..d07e5de42 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java index 2c2028a6e..366bdae8a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java index 219436d27..8970fd042 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java index c97ee614d..1815fc67f 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java index 4c845522b..5ed366697 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java index 204f2354f..96c001b96 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java index 8368a3a6f..377f511d4 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java index 54e3c2175..b3b8eada5 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java index a075c840a..2c98d09e6 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java index 0886a386e..3010fe1a0 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java index 16219b562..31e116c2f 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java index dd151244e..35a98af88 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java index 2a8950215..8c5f0dc9c 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java index d2ae0e500..f1e3da49d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java index edfb914b2..b2f480571 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java index b03e839b4..34e7c5ca7 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java index 9cdf5f1d8..a4907d8e4 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java index 732375a21..c3b4a6860 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java index 565fcf3d9..ffd1e1406 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java index 37d3ed796..bd7cf0575 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java index 2e14e89dd..5f6323720 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java index ed349cce1..4ca8b24ee 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java index b2f43f2d6..73bdc3afb 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java index d1638edb8..d5040a373 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java index ea5731f9d..deee5edfc 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java index 624a023c6..60e9f8578 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java index 2fca3eef2..a266eaaa5 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java index f5de8e94d..09301ba95 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java index 96e3760ca..542bae6d1 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java index ae13dcf25..c3577327c 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java index 6d4d0e8cc..443a2525a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java index ec3d4db98..cf236f03f 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java index 77928c15d..4b876d9cf 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java index a45531d2f..4ebf44cf1 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java index 2c9d6852f..5e0ca26b2 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java index 7ef271a4e..a948b8ddc 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java index 9b5ecb834..20d8cc9da 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java index f0d3eab07..06cdc6e08 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java index 2dbeb1d12..2a20dc4f9 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java index 0d11142aa..2bb726eeb 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java index f5a0cd057..c90dde925 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java index 0b0f68b71..977b6b122 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java index f43066183..d414fec06 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java index 0d8bad53d..79740b471 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java index 014444d7a..0970dc1b4 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java index caaa36182..c17fd208f 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java index c5ed13172..03ba2419d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java index a31bfdafe..abaa09827 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java index d19d4b62d..3b3d95ad8 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java index 7dfd41f81..20c1261a0 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java index 560341e61..25c264a53 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java index d82443f11..6d5225684 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java index 06237be68..4fc6f0907 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java index ec8ce38c0..a3af7ca73 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java index 285e5aaf5..f3e8cd505 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java index 6935c5b40..3e81983cf 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java index c25be7f82..1cf8fe176 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java index 1d77d8ad3..6d9c96938 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java index 11b451343..efc33d05c 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java index 99e614fac..6cf45e718 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java index 6eb32becd..8866ad8d9 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java index 4acee7e94..ae5deaa7b 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java index d40967351..1bbfe9013 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java index 7146187ed..7ff5fda90 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/AddressRepository.java b/src/main/java/de/rwth/idsg/steve/repository/AddressRepository.java index d86f78c1a..0c978729d 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/AddressRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/AddressRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java b/src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java index 1f2f557da..0a926a0cd 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/ChargingProfileRepository.java b/src/main/java/de/rwth/idsg/steve/repository/ChargingProfileRepository.java index c67a23137..97eae70d2 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/ChargingProfileRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/ChargingProfileRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/GenericRepository.java b/src/main/java/de/rwth/idsg/steve/repository/GenericRepository.java index c9fd2ca16..63fb1fcd6 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/GenericRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/GenericRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java b/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java index 11e3e3817..fac0ad6b2 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/OcppTagRepository.java b/src/main/java/de/rwth/idsg/steve/repository/OcppTagRepository.java index 11b6abc2b..66601e815 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/OcppTagRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/OcppTagRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java b/src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java index 2132e5d03..5708e39d6 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/ReservationStatus.java b/src/main/java/de/rwth/idsg/steve/repository/ReservationStatus.java index a657ed77a..35d9901a4 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/ReservationStatus.java +++ b/src/main/java/de/rwth/idsg/steve/repository/ReservationStatus.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/SettingsRepository.java b/src/main/java/de/rwth/idsg/steve/repository/SettingsRepository.java index 9eaebdef5..5b7f6e6ee 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/SettingsRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/SettingsRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/TaskStore.java b/src/main/java/de/rwth/idsg/steve/repository/TaskStore.java index 2ae5b16eb..38a6594db 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/TaskStore.java +++ b/src/main/java/de/rwth/idsg/steve/repository/TaskStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java b/src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java index 73d73887b..d92215896 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/UserRepository.java b/src/main/java/de/rwth/idsg/steve/repository/UserRepository.java index e298c68ba..72e770c28 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/UserRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/UserRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java index 9d8b442ba..e921058bf 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java index 5cc2cf1f7..598be8a46 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java index 9f9fd4ab4..91af23ba4 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfileAssignment.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfileAssignment.java index 4356cb858..7b50dbb68 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfileAssignment.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfileAssignment.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java index 8e670a2b6..911d760e9 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java b/src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java index 99155997c..47a48c56b 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java index 1ed00a1d6..ce30ca133 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java index b3e6da7bc..b0c958c21 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertTransactionParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertTransactionParams.java index a31baa2cd..7b16ef38e 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertTransactionParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertTransactionParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/MailSettings.java b/src/main/java/de/rwth/idsg/steve/repository/dto/MailSettings.java index 9fae49bba..7b18975c5 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/MailSettings.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/MailSettings.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java b/src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java index 6a53d72a1..0b940abb4 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/Reservation.java b/src/main/java/de/rwth/idsg/steve/repository/dto/Reservation.java index ed010718a..b65fbf7ec 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/Reservation.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/Reservation.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/TaskOverview.java b/src/main/java/de/rwth/idsg/steve/repository/dto/TaskOverview.java index 540401509..6b98a7680 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/TaskOverview.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/TaskOverview.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/Transaction.java b/src/main/java/de/rwth/idsg/steve/repository/dto/Transaction.java index eae2eea85..ce9d07fc8 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/Transaction.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/Transaction.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java b/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java index 11a74b136..a09a225bb 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java b/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java index b159b5f8a..63b406a89 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java index 9a8ebcc79..a44a1da2f 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateTransactionParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateTransactionParams.java index 8af7215dd..3841b9e61 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateTransactionParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateTransactionParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/User.java b/src/main/java/de/rwth/idsg/steve/repository/dto/User.java index 37bb9b51c..a8af201c7 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/User.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/User.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java index 10a487895..074512eac 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java index 73213b76a..a5930eecd 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java index bf7122532..40914db59 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java index 65f99404d..6fe6e6219 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java index b34546735..27f2be9a8 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java index cd6590f31..7ced272a1 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java index 94e772dd7..b51908a63 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java index ab18f9a98..1b86c84a1 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java index 84b399c39..e96dfa22c 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java index fe946a6de..2cbca8b54 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java index 6122d7411..a7a8690b6 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/BackgroundService.java b/src/main/java/de/rwth/idsg/steve/service/BackgroundService.java index 1cf49a621..fc2683e64 100644 --- a/src/main/java/de/rwth/idsg/steve/service/BackgroundService.java +++ b/src/main/java/de/rwth/idsg/steve/service/BackgroundService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java b/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java index 501215991..30add270f 100644 --- a/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java +++ b/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java index 8e5321bc0..3b6005efb 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointService12_Client.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointService12_Client.java index 4fb9098be..9188a61c9 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointService12_Client.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointService12_Client.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointService15_Client.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointService15_Client.java index 357445bba..6a28cf80d 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointService15_Client.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointService15_Client.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java index 2f2196802..952ac9250 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/DummyReleaseCheckService.java b/src/main/java/de/rwth/idsg/steve/service/DummyReleaseCheckService.java index cd9a44169..5974975e4 100644 --- a/src/main/java/de/rwth/idsg/steve/service/DummyReleaseCheckService.java +++ b/src/main/java/de/rwth/idsg/steve/service/DummyReleaseCheckService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java b/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java index 24498f31c..89c409d7d 100644 --- a/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java +++ b/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/MailService.java b/src/main/java/de/rwth/idsg/steve/service/MailService.java index b4e267a65..600570205 100644 --- a/src/main/java/de/rwth/idsg/steve/service/MailService.java +++ b/src/main/java/de/rwth/idsg/steve/service/MailService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java index a3fa310cf..e24caafbc 100644 --- a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java +++ b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java b/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java index a5981ff89..2e47b6b07 100644 --- a/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java +++ b/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/ReleaseCheckService.java b/src/main/java/de/rwth/idsg/steve/service/ReleaseCheckService.java index ac00e2165..5828acf84 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ReleaseCheckService.java +++ b/src/main/java/de/rwth/idsg/steve/service/ReleaseCheckService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java b/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java index 1dbdf10eb..707b81d1c 100644 --- a/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java +++ b/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java b/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java index fa9123547..82331609e 100644 --- a/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java +++ b/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedReserveNowParams.java b/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedReserveNowParams.java index f88411272..b4638c6b4 100644 --- a/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedReserveNowParams.java +++ b/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedReserveNowParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedSetChargingProfileParams.java b/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedSetChargingProfileParams.java index 38d9f0db1..3c630651f 100644 --- a/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedSetChargingProfileParams.java +++ b/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedSetChargingProfileParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java b/src/main/java/de/rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java index 32da5461b..b9c4606bc 100644 --- a/src/main/java/de/rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java +++ b/src/main/java/de/rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java index 5023519a4..8efc8647d 100755 --- a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java index 623593a71..0d95273cf 100755 --- a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java b/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java index 9b28a101d..43a4f634f 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java b/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java index 316ce7940..9d2d3579e 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java +++ b/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/DateConverter.java b/src/main/java/de/rwth/idsg/steve/utils/DateConverter.java index 137335d1b..2349d042f 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/DateConverter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/DateConverter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java b/src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java index 96d9fa8e8..16f314db6 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java b/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java index 2bb07b89b..94713af80 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java +++ b/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java b/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java index 2dae7ab15..3b7964c93 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java +++ b/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java b/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java index edaf46c5f..73f8c0327 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java +++ b/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java b/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java index 8d221326b..2746c5182 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java +++ b/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java b/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java index e2f1d6fb0..19f793e29 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java +++ b/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java b/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java index bff780ca5..212b8e23b 100644 --- a/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java +++ b/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java b/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java index 80e5d5d51..fbd556fc4 100644 --- a/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java +++ b/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java b/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java index 4ff8cfb7b..5fdf2c226 100644 --- a/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java +++ b/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java b/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java index 14e67ac28..73c029da0 100644 --- a/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java +++ b/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java b/src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java index 83d618a23..cc7b0f390 100644 --- a/src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java +++ b/src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java index 41706f266..c110554db 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java b/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java index a5e433b50..799602511 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java index b1b4ba1b4..a01a9bbe1 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java b/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java index 9d4de6f5b..ae3fa4762 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java b/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java index 0c153be22..b2e57b2bf 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java b/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java index 75a9d0fa7..201103f73 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java index e6be6c8ce..30c6a426b 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java index 7c9319bf0..d7e57a90c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java index 163d21aba..c70107d23 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java index 5c5b90d7c..58d094a84 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/SignOutController.java b/src/main/java/de/rwth/idsg/steve/web/controller/SignOutController.java index 0444d27a1..34861faa7 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/SignOutController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/SignOutController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java b/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java index a4d6978c6..b05e7fcf6 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java index 553dcb93b..d4ff6a21d 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java b/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java index 9f51ed36e..cff61d7ac 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/Address.java b/src/main/java/de/rwth/idsg/steve/web/dto/Address.java index 0c6ee0ee7..1c066527a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/Address.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/Address.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java index 6db7b69a0..46cd4b332 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java index b46a0d98c..e30efc79f 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java index 9ba009a5f..26ece9624 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java index 4c25504eb..312062593 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java index 43319ef7d..d0512612f 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java index 9aec21f3d..3167a82b3 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java index f92b4fc89..146e19cb1 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java b/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java index 270ef0bed..0d4e6f15e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java index 82cb85545..d3ce42c21 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java index 6ff1ddb73..efe29e77c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java index 51455c741..4d60a81ac 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java index e3a11a739..460629aed 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java index 99c65e761..f908794e9 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java b/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java index dc7e9e062..474c62639 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java b/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java index 7a45e0479..47fdd062f 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java index a7c8ac5f2..d476bf5fb 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java index 953bcef58..f34da926c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java b/src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java index c7f8b4e70..05311aea1 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java index e2ddeb746..5e44686d6 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java index dfa9bde96..e190326e8 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java index 0bf9c0324..7df079be9 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java b/src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java index a92961952..75243f28e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java index 2f51c0058..3e05b925e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java index 33f7a464c..3024f57c1 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java index da93e6813..6639e106e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java index a726f8a0c..4930b8f8b 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java index ea39b2072..4de580251 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java index ea8c943b9..20aa07b88 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java index 52a289d73..274a6ccc2 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java index d93fa7651..bb466f55a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyReadWriteEnum.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyReadWriteEnum.java index a185a7975..fc435b383 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyReadWriteEnum.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyReadWriteEnum.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java index 8f31e8f8e..84f2c308c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java index 7cfb032e1..1c2e24de8 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java index 1987f63c2..acb11b929 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java index 0f9c91882..50ffc83c2 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java index 71ce01b5e..9a85e1281 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java index f749aa380..c453789f1 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java index 851e5aad4..e735a113e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java index 53b2751ca..4fb669b89 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java index 0e0c8605f..961031e6e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java index 4d54ed435..89356af1b 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java index 2e2618a8c..dd2e13afb 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java index 8d82df338..fc0773dd5 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java index c9065244a..0479ccb3c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java index 2d6aa6f5d..5f53f71d7 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java index 993653fc9..2afb9ba8a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageParams.java index ba3b5f86a..c956fd226 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java index 3bf764226..05e1c7ead 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java index fb59f384f..249c3708d 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java index c49f31ef6..6e547252f 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdListValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdListValidator.java index 0cc0d5c49..46de8c50a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdListValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdListValidator.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java index 847163702..77a13a29d 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollection.java b/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollection.java index e5ead973b..c90a4065a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollection.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollection.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollectionValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollectionValidator.java index f4f8fd0a5..b01eb6f3f 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollectionValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollectionValidator.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java b/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java index d0cf97012..5aca034fa 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagListValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagListValidator.java index 5214f8c59..59479f3a8 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagListValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagListValidator.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java index 1b90250d7..670451679 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-context.jsp b/src/main/resources/webapp/WEB-INF/views/00-context.jsp index b6b6b1dcb..3bd42e18c 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-context.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-context.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-cp-multiple.jsp b/src/main/resources/webapp/WEB-INF/views/00-cp-multiple.jsp index 3ea964fec..0658a2873 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-cp-multiple.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-cp-multiple.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-cp-single.jsp b/src/main/resources/webapp/WEB-INF/views/00-cp-single.jsp index 5822f4cb9..8f4172821 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-cp-single.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-cp-single.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-error.jsp b/src/main/resources/webapp/WEB-INF/views/00-error.jsp index 97474f63e..cbf1c8bcc 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-error.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-error.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-footer.jsp b/src/main/resources/webapp/WEB-INF/views/00-footer.jsp index 59c05ed86..5ec555ded 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-footer.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-footer.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-header.jsp b/src/main/resources/webapp/WEB-INF/views/00-header.jsp index 283033ecf..f8d7bf9b1 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-header.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-header.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-op-bind-errors.jsp b/src/main/resources/webapp/WEB-INF/views/00-op-bind-errors.jsp index 54697d3cf..7f0ebf732 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-op-bind-errors.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-op-bind-errors.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/GetConfigurationResponse.jsp b/src/main/resources/webapp/WEB-INF/views/GetConfigurationResponse.jsp index 9ba59c6ff..74705c793 100644 --- a/src/main/resources/webapp/WEB-INF/views/GetConfigurationResponse.jsp +++ b/src/main/resources/webapp/WEB-INF/views/GetConfigurationResponse.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/about.jsp b/src/main/resources/webapp/WEB-INF/views/about.jsp index a3a41a031..5931157ae 100644 --- a/src/main/resources/webapp/WEB-INF/views/about.jsp +++ b/src/main/resources/webapp/WEB-INF/views/about.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp b/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp index 5dec5d6c7..c5ffe058c 100644 --- a/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp +++ b/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-address.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-address.jsp index 98ebb9749..f252ce7d0 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-address.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-address.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp index 712770681..21c7cd7d4 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-cp-misc.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-cp-misc.jsp index 8a5482000..9bc2fd335 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-cp-misc.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-cp-misc.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-ocppTag.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-ocppTag.jsp index ed4a3e034..954fd6aca 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-ocppTag.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-ocppTag.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-user-ocpp.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-user-ocpp.jsp index 13dc7272c..2e4eec176 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-user-ocpp.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-user-ocpp.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-user-profile.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-user-profile.jsp index 4e6048d91..bb5743dd3 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-user-profile.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-user-profile.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargepointAdd.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargepointAdd.jsp index 0dcf269ec..44853e80f 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargepointAdd.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargepointAdd.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargepointDetails.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargepointDetails.jsp index e1bc91c97..2c5866e84 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargepointDetails.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargepointDetails.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargepoints.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargepoints.jsp index 3ac4951be..7c1d1d28e 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargepoints.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargepoints.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp index 037e980be..69676b092 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAssignments.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAssignments.jsp index 9775e0fb6..e6d3dba79 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAssignments.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAssignments.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileDetails.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileDetails.jsp index 851dfa184..e29ad5b83 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileDetails.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileDetails.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfiles.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfiles.jsp index 26ec25a9d..0b9f10e93 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfiles.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfiles.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp index 1760fa153..5a38dc5d5 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp index 304fe6cae..5c0253148 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp index 34e780eb5..63e0cdb6c 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/reservations.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/reservations.jsp index eeab1c0df..002fcf8bf 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/reservations.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/reservations.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/transactionDetails.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/transactionDetails.jsp index 9b995385e..cd97d4a70 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/transactionDetails.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/transactionDetails.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp index 23cfdcc2e..68b362456 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/userAdd.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/userAdd.jsp index d8738edcc..fc0ee0603 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/userAdd.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/userAdd.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/userDetails.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/userDetails.jsp index 83ad471c3..2268ca606 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/userDetails.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/userDetails.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/users.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/users.jsp index 45f372e6e..d8db6a397 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/users.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/users.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/home.jsp b/src/main/resources/webapp/WEB-INF/views/home.jsp index ff857539c..2b32f9ff6 100644 --- a/src/main/resources/webapp/WEB-INF/views/home.jsp +++ b/src/main/resources/webapp/WEB-INF/views/home.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/ocppJsonStatus.jsp b/src/main/resources/webapp/WEB-INF/views/ocppJsonStatus.jsp index 1bf428d7a..9d95382c0 100644 --- a/src/main/resources/webapp/WEB-INF/views/ocppJsonStatus.jsp +++ b/src/main/resources/webapp/WEB-INF/views/ocppJsonStatus.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp index f9db1de00..1a029b858 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp index 06d9ba6d5..33784f97d 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeConfigurationForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeConfigurationForm.jsp index 089e4b767..a1d7cc676 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeConfigurationForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeConfigurationForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp index bf223c728..493f33b0f 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ClearChargingProfileForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ClearChargingProfileForm.jsp index 02e9f27e8..a0fb66d2d 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ClearChargingProfileForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ClearChargingProfileForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp index 4b98220c5..163b5ba9f 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp index b8151b926..e31ca9926 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp index 9d6d331c3..9e17e83c0 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp index a4a808475..804d07be7 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp index 3535a6922..91e808503 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp index 127383527..59a8db6d7 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp index 2926f01f5..4b9f15f4d 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp index f6af805f3..a29a718d6 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ResetForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ResetForm.jsp index 9c7bd9c27..3843faf7f 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ResetForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ResetForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp index b6c354fc3..571d6d4fd 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp index cf7d0fb27..42289034c 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp index d2555b990..7a3224324 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp index cc216afd8..b493e9e69 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp index a72a85496..26db44fe4 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/ChangeAvailability.jsp b/src/main/resources/webapp/WEB-INF/views/op12/ChangeAvailability.jsp index 8eadcd6d0..09484425e 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/ChangeAvailability.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/ChangeAvailability.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/ChangeConfiguration.jsp b/src/main/resources/webapp/WEB-INF/views/op12/ChangeConfiguration.jsp index a9280ee88..258626b23 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/ChangeConfiguration.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/ChangeConfiguration.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/ClearCache.jsp b/src/main/resources/webapp/WEB-INF/views/op12/ClearCache.jsp index fecc4edf4..50dbb2aa0 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/ClearCache.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/ClearCache.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/GetDiagnostics.jsp b/src/main/resources/webapp/WEB-INF/views/op12/GetDiagnostics.jsp index f8d943ba2..2726dfee8 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/GetDiagnostics.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/GetDiagnostics.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp index 22fb22dc6..2c839fced 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp index 8222e00ce..5aac2f1ec 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/Reset.jsp b/src/main/resources/webapp/WEB-INF/views/op12/Reset.jsp index 236525d3d..d34fd8bc8 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/Reset.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/Reset.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/UnlockConnector.jsp b/src/main/resources/webapp/WEB-INF/views/op12/UnlockConnector.jsp index 126f1908c..fac2278b8 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/UnlockConnector.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/UnlockConnector.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/UpdateFirmware.jsp b/src/main/resources/webapp/WEB-INF/views/op12/UpdateFirmware.jsp index f133b3ec8..535a549a3 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/UpdateFirmware.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/UpdateFirmware.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/CancelReservation.jsp b/src/main/resources/webapp/WEB-INF/views/op15/CancelReservation.jsp index 1f1873413..f9016aaaa 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/CancelReservation.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/CancelReservation.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/ChangeAvailability.jsp b/src/main/resources/webapp/WEB-INF/views/op15/ChangeAvailability.jsp index aed3965a0..680bd1dc0 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/ChangeAvailability.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/ChangeAvailability.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/ChangeConfiguration.jsp b/src/main/resources/webapp/WEB-INF/views/op15/ChangeConfiguration.jsp index 4d47d3cd2..ef73ecd16 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/ChangeConfiguration.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/ChangeConfiguration.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/ClearCache.jsp b/src/main/resources/webapp/WEB-INF/views/op15/ClearCache.jsp index 482659bb7..18628293b 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/ClearCache.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/ClearCache.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/DataTransfer.jsp b/src/main/resources/webapp/WEB-INF/views/op15/DataTransfer.jsp index ec1af16dc..d6c7f5cff 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/DataTransfer.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/DataTransfer.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/GetConfiguration.jsp b/src/main/resources/webapp/WEB-INF/views/op15/GetConfiguration.jsp index 4150b19ca..c4e046be2 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/GetConfiguration.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/GetConfiguration.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/GetDiagnostics.jsp b/src/main/resources/webapp/WEB-INF/views/op15/GetDiagnostics.jsp index c8de83356..98f5be463 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/GetDiagnostics.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/GetDiagnostics.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/GetLocalListVersion.jsp b/src/main/resources/webapp/WEB-INF/views/op15/GetLocalListVersion.jsp index 7930ae351..a59bc20db 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/GetLocalListVersion.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/GetLocalListVersion.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp index 374e40b93..db8c97e5d 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp index 146ef2414..832ce4301 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/ReserveNow.jsp b/src/main/resources/webapp/WEB-INF/views/op15/ReserveNow.jsp index c13782237..225b454a6 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/ReserveNow.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/ReserveNow.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/Reset.jsp b/src/main/resources/webapp/WEB-INF/views/op15/Reset.jsp index d56658a28..a57efab30 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/Reset.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/Reset.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/SendLocalList.jsp b/src/main/resources/webapp/WEB-INF/views/op15/SendLocalList.jsp index a437bdb31..edd6c7cd3 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/SendLocalList.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/SendLocalList.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/UnlockConnector.jsp b/src/main/resources/webapp/WEB-INF/views/op15/UnlockConnector.jsp index a67a6a0aa..7e1d48a15 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/UnlockConnector.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/UnlockConnector.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/UpdateFirmware.jsp b/src/main/resources/webapp/WEB-INF/views/op15/UpdateFirmware.jsp index 6fe0e2f73..ccfb1413b 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/UpdateFirmware.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/UpdateFirmware.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/CancelReservation.jsp b/src/main/resources/webapp/WEB-INF/views/op16/CancelReservation.jsp index ffe343bd7..7b2e02dad 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/CancelReservation.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/CancelReservation.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/ChangeAvailability.jsp b/src/main/resources/webapp/WEB-INF/views/op16/ChangeAvailability.jsp index 6665e6a06..999136037 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/ChangeAvailability.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/ChangeAvailability.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/ChangeConfiguration.jsp b/src/main/resources/webapp/WEB-INF/views/op16/ChangeConfiguration.jsp index e2d7c79a5..162a04a04 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/ChangeConfiguration.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/ChangeConfiguration.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/ClearCache.jsp b/src/main/resources/webapp/WEB-INF/views/op16/ClearCache.jsp index 0b1ee9153..841b6491b 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/ClearCache.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/ClearCache.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/ClearChargingProfile.jsp b/src/main/resources/webapp/WEB-INF/views/op16/ClearChargingProfile.jsp index 9f369ad82..639e62a7f 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/ClearChargingProfile.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/ClearChargingProfile.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/DataTransfer.jsp b/src/main/resources/webapp/WEB-INF/views/op16/DataTransfer.jsp index a3b46e7de..e1e02d12d 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/DataTransfer.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/DataTransfer.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp b/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp index 43b16da5f..d847dabf6 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeScheduleResponse.jsp b/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeScheduleResponse.jsp index a4620e08e..dca660da5 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeScheduleResponse.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeScheduleResponse.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/GetConfiguration.jsp b/src/main/resources/webapp/WEB-INF/views/op16/GetConfiguration.jsp index d2d3acee5..286a67338 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/GetConfiguration.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/GetConfiguration.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/GetDiagnostics.jsp b/src/main/resources/webapp/WEB-INF/views/op16/GetDiagnostics.jsp index 257799842..03ed6193b 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/GetDiagnostics.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/GetDiagnostics.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/GetLocalListVersion.jsp b/src/main/resources/webapp/WEB-INF/views/op16/GetLocalListVersion.jsp index d0cb610a9..238a580be 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/GetLocalListVersion.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/GetLocalListVersion.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp index df5d9e9ff..146a2e929 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp index 5448be96c..4eed67836 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/ReserveNow.jsp b/src/main/resources/webapp/WEB-INF/views/op16/ReserveNow.jsp index c3a945c1d..ef98f33c3 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/ReserveNow.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/ReserveNow.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/Reset.jsp b/src/main/resources/webapp/WEB-INF/views/op16/Reset.jsp index f7c36fa05..91be967cf 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/Reset.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/Reset.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/SendLocalList.jsp b/src/main/resources/webapp/WEB-INF/views/op16/SendLocalList.jsp index 45c5cd2b4..4ff34113b 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/SendLocalList.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/SendLocalList.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/SetChargingProfile.jsp b/src/main/resources/webapp/WEB-INF/views/op16/SetChargingProfile.jsp index 4471de830..9f5657a4e 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/SetChargingProfile.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/SetChargingProfile.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/TriggerMessage.jsp b/src/main/resources/webapp/WEB-INF/views/op16/TriggerMessage.jsp index 8f8a7d84d..6c9f818b9 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/TriggerMessage.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/TriggerMessage.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/UnlockConnector.jsp b/src/main/resources/webapp/WEB-INF/views/op16/UnlockConnector.jsp index 65de2b8be..e917e75f2 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/UnlockConnector.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/UnlockConnector.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/UpdateFirmware.jsp b/src/main/resources/webapp/WEB-INF/views/op16/UpdateFirmware.jsp index a8bcda67e..fd6ed9e32 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/UpdateFirmware.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/UpdateFirmware.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/settings.jsp b/src/main/resources/webapp/WEB-INF/views/settings.jsp index bdf4515a1..7eba2835e 100644 --- a/src/main/resources/webapp/WEB-INF/views/settings.jsp +++ b/src/main/resources/webapp/WEB-INF/views/settings.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/signin.jsp b/src/main/resources/webapp/WEB-INF/views/signin.jsp index 5d1a19869..c4554318f 100644 --- a/src/main/resources/webapp/WEB-INF/views/signin.jsp +++ b/src/main/resources/webapp/WEB-INF/views/signin.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/taskResult.jsp b/src/main/resources/webapp/WEB-INF/views/taskResult.jsp index d958f1e95..4592ba636 100644 --- a/src/main/resources/webapp/WEB-INF/views/taskResult.jsp +++ b/src/main/resources/webapp/WEB-INF/views/taskResult.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/tasks.jsp b/src/main/resources/webapp/WEB-INF/views/tasks.jsp index a3051e70b..34cb08b07 100644 --- a/src/main/resources/webapp/WEB-INF/views/tasks.jsp +++ b/src/main/resources/webapp/WEB-INF/views/tasks.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java index 682299811..c281b2da8 100644 --- a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java +++ b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/ApplicationTest.java b/src/test/java/de/rwth/idsg/steve/ApplicationTest.java index a49b0d8be..99248fec8 100644 --- a/src/test/java/de/rwth/idsg/steve/ApplicationTest.java +++ b/src/test/java/de/rwth/idsg/steve/ApplicationTest.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java b/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java index 51010ed15..281ccc07c 100644 --- a/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java +++ b/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/StressTest.java b/src/test/java/de/rwth/idsg/steve/StressTest.java index d8aee6fae..150624a7a 100644 --- a/src/test/java/de/rwth/idsg/steve/StressTest.java +++ b/src/test/java/de/rwth/idsg/steve/StressTest.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java b/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java index a3864bdc1..f5b090c2a 100644 --- a/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java +++ b/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java b/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java index c45ff4d69..3943fdd69 100644 --- a/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java +++ b/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java b/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java index 8a16b92a7..b7cc442f2 100644 --- a/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java +++ b/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue72.java b/src/test/java/de/rwth/idsg/steve/issues/Issue72.java index 28e90dbe5..6a9bf1d5f 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue72.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue72.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java b/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java index 9c11105d0..da7392911 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java b/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java index 35faa25b9..c862766d8 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue81.java b/src/test/java/de/rwth/idsg/steve/issues/Issue81.java index 72ac435f1..1bc6d8d70 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue81.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue81.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/utils/Helpers.java b/src/test/java/de/rwth/idsg/steve/utils/Helpers.java index 77d665b5b..dad8f6183 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/Helpers.java +++ b/src/test/java/de/rwth/idsg/steve/utils/Helpers.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java b/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java index fa921fb9e..503687f67 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java +++ b/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/utils/StressTester.java b/src/test/java/de/rwth/idsg/steve/utils/StressTester.java index a4b2d3f32..95c7993f5 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/StressTester.java +++ b/src/test/java/de/rwth/idsg/steve/utils/StressTester.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java b/src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java index 480efad69..e555fc3a8 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java +++ b/src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2020 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify From 128d9c3666f1f7887ef4a334302dd1bb218e2d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 21 Mar 2021 23:39:26 +0100 Subject: [PATCH 158/548] remove codeql temporary action to fix master. actions need to be taken to fix codeql integration. --- .github/workflows/codeql-analysis.yml | 67 --------------------------- 1 file changed, 67 deletions(-) delete mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index 79b352224..000000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ master ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ master ] - schedule: - - cron: '26 12 * * 6' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - language: [ 'java' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 - - # ℹ️ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 From b067a34d78bf1eb5f996848bbaa2f3e6844ea73e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Tue, 23 Mar 2021 11:32:50 +0100 Subject: [PATCH 159/548] refactor move mapping logic out of controllers into dedicated classes --- .../mapper/ChargePointDetailsMapper.java | 32 +++++++++++ .../mapper/ChargingProfileDetailsMapper.java | 56 +++++++++++++++++++ .../steve/utils/mapper/OcppTagFormMapper.java | 35 ++++++++++++ .../steve/utils/mapper/UserFormMapper.java | 32 +++++++++++ .../controller/ChargePointsController.java | 15 +---- .../ChargingProfilesController.java | 42 +------------- .../web/controller/OcppTagsController.java | 21 +------ .../steve/web/controller/UsersController.java | 15 +---- 8 files changed, 163 insertions(+), 85 deletions(-) create mode 100644 src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java create mode 100644 src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java create mode 100644 src/main/java/de/rwth/idsg/steve/utils/mapper/OcppTagFormMapper.java create mode 100644 src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java new file mode 100644 index 000000000..d6f5b1687 --- /dev/null +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java @@ -0,0 +1,32 @@ +package de.rwth.idsg.steve.utils.mapper; + +import de.rwth.idsg.steve.repository.dto.ChargePoint; +import de.rwth.idsg.steve.utils.ControllerHelper; +import de.rwth.idsg.steve.web.dto.ChargePointForm; +import jooq.steve.db.tables.records.ChargeBoxRecord; + +/** + * @author Sevket Goekay + * @since 23.03.2021 + */ +public class ChargePointDetailsMapper { + + public static ChargePointForm mapToForm(ChargePoint.Details cp) { + ChargeBoxRecord chargeBox = cp.getChargeBox(); + + ChargePointForm form = new ChargePointForm(); + form.setChargeBoxPk(chargeBox.getChargeBoxPk()); + form.setChargeBoxId(chargeBox.getChargeBoxId()); + form.setNote(chargeBox.getNote()); + form.setDescription(chargeBox.getDescription()); + form.setLocationLatitude(chargeBox.getLocationLatitude()); + form.setLocationLongitude(chargeBox.getLocationLongitude()); + form.setInsertConnectorStatusAfterTransactionMsg(chargeBox.getInsertConnectorStatusAfterTransactionMsg()); + form.setAdminAddress(chargeBox.getAdminAddress()); + form.setRegistrationStatus(chargeBox.getRegistrationStatus()); + form.setAddress(ControllerHelper.recordToDto(cp.getAddress())); + + return form; + } + +} diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java new file mode 100644 index 000000000..14fb862fb --- /dev/null +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java @@ -0,0 +1,56 @@ +package de.rwth.idsg.steve.utils.mapper; + +import de.rwth.idsg.steve.repository.dto.ChargingProfile; +import de.rwth.idsg.steve.utils.DateTimeUtils; +import de.rwth.idsg.steve.web.dto.ChargingProfileForm; +import jooq.steve.db.tables.records.ChargingProfileRecord; +import jooq.steve.db.tables.records.ChargingSchedulePeriodRecord; +import ocpp.cp._2015._10.ChargingProfileKindType; +import ocpp.cp._2015._10.ChargingProfilePurposeType; +import ocpp.cp._2015._10.ChargingRateUnitType; +import ocpp.cp._2015._10.RecurrencyKindType; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +/** + * @author Sevket Goekay + * @since 23.03.2021 + */ +public class ChargingProfileDetailsMapper { + + public static ChargingProfileForm mapToForm(ChargingProfile.Details details) { + ChargingProfileRecord profile = details.getProfile(); + List periods = details.getPeriods(); + + ChargingProfileForm form = new ChargingProfileForm(); + form.setChargingProfilePk(profile.getChargingProfilePk()); + form.setDescription(profile.getDescription()); + form.setNote(profile.getNote()); + form.setStackLevel(profile.getStackLevel()); + form.setChargingProfilePurpose(ChargingProfilePurposeType.fromValue(profile.getChargingProfilePurpose())); + form.setChargingProfileKind(ChargingProfileKindType.fromValue(profile.getChargingProfileKind())); + form.setRecurrencyKind(profile.getRecurrencyKind() == null ? null : RecurrencyKindType.fromValue(profile.getRecurrencyKind())); + form.setValidFrom(DateTimeUtils.toLocalDateTime(profile.getValidFrom())); + form.setValidTo(DateTimeUtils.toLocalDateTime(profile.getValidTo())); + form.setDurationInSeconds(profile.getDurationInSeconds()); + form.setStartSchedule(DateTimeUtils.toLocalDateTime(profile.getStartSchedule())); + form.setChargingRateUnit(ChargingRateUnitType.fromValue(profile.getChargingRateUnit())); + form.setMinChargingRate(profile.getMinChargingRate()); + + Map periodMap = new LinkedHashMap<>(); + for (ChargingSchedulePeriodRecord rec : periods) { + ChargingProfileForm.SchedulePeriod p = new ChargingProfileForm.SchedulePeriod(); + p.setStartPeriodInSeconds(rec.getStartPeriodInSeconds()); + p.setPowerLimitInAmperes(rec.getPowerLimitInAmperes()); + p.setNumberPhases(rec.getNumberPhases()); + + periodMap.put(UUID.randomUUID().toString(), p); + } + form.setSchedulePeriodMap(periodMap); + + return form; + } +} diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/OcppTagFormMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/OcppTagFormMapper.java new file mode 100644 index 000000000..e2c2b5da3 --- /dev/null +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/OcppTagFormMapper.java @@ -0,0 +1,35 @@ +package de.rwth.idsg.steve.utils.mapper; + +import de.rwth.idsg.steve.utils.ControllerHelper; +import de.rwth.idsg.steve.web.dto.OcppTagForm; +import jooq.steve.db.tables.records.OcppTagActivityRecord; +import org.joda.time.DateTime; + +/** + * @author Sevket Goekay + * @since 23.03.2021 + */ +public class OcppTagFormMapper { + + public static OcppTagForm toForm(OcppTagActivityRecord record) { + OcppTagForm form = new OcppTagForm(); + form.setOcppTagPk(record.getOcppTagPk()); + form.setIdTag(record.getIdTag()); + + DateTime expiryDate = record.getExpiryDate(); + if (expiryDate != null) { + form.setExpiration(expiryDate.toLocalDateTime()); + } + + form.setMaxActiveTransactionCount(record.getMaxActiveTransactionCount()); + form.setNote(record.getNote()); + + String parentIdTag = record.getParentIdTag(); + if (parentIdTag == null) { + parentIdTag = ControllerHelper.EMPTY_OPTION; + } + form.setParentIdTag(parentIdTag); + + return form; + } +} diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java new file mode 100644 index 000000000..a2ad9de64 --- /dev/null +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java @@ -0,0 +1,32 @@ +package de.rwth.idsg.steve.utils.mapper; + +import de.rwth.idsg.steve.repository.dto.User; +import de.rwth.idsg.steve.utils.ControllerHelper; +import de.rwth.idsg.steve.web.dto.UserForm; +import de.rwth.idsg.steve.web.dto.UserSex; +import jooq.steve.db.tables.records.UserRecord; + +/** + * @author Sevket Goekay + * @since 23.03.2021 + */ +public class UserFormMapper { + + public static UserForm toForm(User.Details details) { + UserRecord userRecord = details.getUserRecord(); + + UserForm form = new UserForm(); + form.setUserPk(userRecord.getUserPk()); + form.setFirstName(userRecord.getFirstName()); + form.setLastName(userRecord.getLastName()); + form.setBirthDay(userRecord.getBirthDay()); + form.setPhone(userRecord.getPhone()); + form.setSex(UserSex.fromDatabaseValue(userRecord.getSex())); + form.setEMail(userRecord.getEMail()); + form.setNote(userRecord.getNote()); + form.setAddress(ControllerHelper.recordToDto(details.getAddress())); + form.setOcppIdTag(details.getOcppIdTag().orElse(ControllerHelper.EMPTY_OPTION)); + + return form; + } +} diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java index a01a9bbe1..eb89d5b53 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java @@ -23,6 +23,7 @@ import de.rwth.idsg.steve.repository.dto.ChargePoint; import de.rwth.idsg.steve.service.ChargePointHelperService; import de.rwth.idsg.steve.utils.ControllerHelper; +import de.rwth.idsg.steve.utils.mapper.ChargePointDetailsMapper; import de.rwth.idsg.steve.web.dto.ChargePointBatchInsertForm; import de.rwth.idsg.steve.web.dto.ChargePointForm; import de.rwth.idsg.steve.web.dto.ChargePointQueryForm; @@ -109,19 +110,7 @@ private void initList(Model model, ChargePointQueryForm params) { @RequestMapping(value = DETAILS_PATH, method = RequestMethod.GET) public String getDetails(@PathVariable("chargeBoxPk") int chargeBoxPk, Model model) { ChargePoint.Details cp = chargePointRepository.getDetails(chargeBoxPk); - - ChargePointForm form = new ChargePointForm(); - form.setChargeBoxPk(cp.getChargeBox().getChargeBoxPk()); - form.setChargeBoxId(cp.getChargeBox().getChargeBoxId()); - form.setNote(cp.getChargeBox().getNote()); - form.setDescription(cp.getChargeBox().getDescription()); - form.setLocationLatitude(cp.getChargeBox().getLocationLatitude()); - form.setLocationLongitude(cp.getChargeBox().getLocationLongitude()); - form.setInsertConnectorStatusAfterTransactionMsg(cp.getChargeBox().getInsertConnectorStatusAfterTransactionMsg()); - form.setAdminAddress(cp.getChargeBox().getAdminAddress()); - form.setRegistrationStatus(cp.getChargeBox().getRegistrationStatus()); - - form.setAddress(ControllerHelper.recordToDto(cp.getAddress())); + ChargePointForm form = ChargePointDetailsMapper.mapToForm(cp); model.addAttribute("chargePointForm", form); model.addAttribute("cp", cp); diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java b/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java index ae3fa4762..447bca8f7 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java @@ -21,16 +21,10 @@ import de.rwth.idsg.steve.repository.ChargePointRepository; import de.rwth.idsg.steve.repository.ChargingProfileRepository; import de.rwth.idsg.steve.repository.dto.ChargingProfile; -import de.rwth.idsg.steve.utils.DateTimeUtils; +import de.rwth.idsg.steve.utils.mapper.ChargingProfileDetailsMapper; import de.rwth.idsg.steve.web.dto.ChargingProfileAssignmentQueryForm; import de.rwth.idsg.steve.web.dto.ChargingProfileForm; import de.rwth.idsg.steve.web.dto.ChargingProfileQueryForm; -import jooq.steve.db.tables.records.ChargingProfileRecord; -import jooq.steve.db.tables.records.ChargingSchedulePeriodRecord; -import ocpp.cp._2015._10.ChargingProfileKindType; -import ocpp.cp._2015._10.ChargingProfilePurposeType; -import ocpp.cp._2015._10.ChargingRateUnitType; -import ocpp.cp._2015._10.RecurrencyKindType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -41,10 +35,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import javax.validation.Valid; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; /** * @author Sevket Goekay @@ -137,35 +127,7 @@ public String delete(@PathVariable("chargingProfilePk") int chargingProfilePk) { @RequestMapping(value = DETAILS_PATH, method = RequestMethod.GET) public String getDetails(@PathVariable("chargingProfilePk") int chargingProfilePk, Model model) { ChargingProfile.Details details = repository.getDetails(chargingProfilePk); - - ChargingProfileRecord profile = details.getProfile(); - List periods = details.getPeriods(); - - ChargingProfileForm form = new ChargingProfileForm(); - form.setChargingProfilePk(profile.getChargingProfilePk()); - form.setDescription(profile.getDescription()); - form.setNote(profile.getNote()); - form.setStackLevel(profile.getStackLevel()); - form.setChargingProfilePurpose(ChargingProfilePurposeType.fromValue(profile.getChargingProfilePurpose())); - form.setChargingProfileKind(ChargingProfileKindType.fromValue(profile.getChargingProfileKind())); - form.setRecurrencyKind(profile.getRecurrencyKind() == null ? null : RecurrencyKindType.fromValue(profile.getRecurrencyKind())); - form.setValidFrom(DateTimeUtils.toLocalDateTime(profile.getValidFrom())); - form.setValidTo(DateTimeUtils.toLocalDateTime(profile.getValidTo())); - form.setDurationInSeconds(profile.getDurationInSeconds()); - form.setStartSchedule(DateTimeUtils.toLocalDateTime(profile.getStartSchedule())); - form.setChargingRateUnit(ChargingRateUnitType.fromValue(profile.getChargingRateUnit())); - form.setMinChargingRate(profile.getMinChargingRate()); - - Map periodMap = new LinkedHashMap<>(); - for (ChargingSchedulePeriodRecord rec : periods) { - ChargingProfileForm.SchedulePeriod p = new ChargingProfileForm.SchedulePeriod(); - p.setStartPeriodInSeconds(rec.getStartPeriodInSeconds()); - p.setPowerLimitInAmperes(rec.getPowerLimitInAmperes()); - p.setNumberPhases(rec.getNumberPhases()); - - periodMap.put(UUID.randomUUID().toString(), p); - } - form.setSchedulePeriodMap(periodMap); + ChargingProfileForm form = ChargingProfileDetailsMapper.mapToForm(details); model.addAttribute("form", form); return "data-man/chargingProfileDetails"; diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java index 58d094a84..a26b0ac95 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java @@ -21,11 +21,11 @@ import de.rwth.idsg.steve.repository.OcppTagRepository; import de.rwth.idsg.steve.service.OcppTagService; import de.rwth.idsg.steve.utils.ControllerHelper; +import de.rwth.idsg.steve.utils.mapper.OcppTagFormMapper; import de.rwth.idsg.steve.web.dto.OcppTagBatchInsertForm; import de.rwth.idsg.steve.web.dto.OcppTagForm; import de.rwth.idsg.steve.web.dto.OcppTagQueryForm; import jooq.steve.db.tables.records.OcppTagActivityRecord; -import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -88,24 +88,7 @@ public String getQuery(@ModelAttribute(PARAMS) OcppTagQueryForm params, Model mo @RequestMapping(value = DETAILS_PATH, method = RequestMethod.GET) public String getDetails(@PathVariable("ocppTagPk") int ocppTagPk, Model model) { OcppTagActivityRecord record = ocppTagRepository.getRecord(ocppTagPk); - - OcppTagForm form = new OcppTagForm(); - form.setOcppTagPk(record.getOcppTagPk()); - form.setIdTag(record.getIdTag()); - - DateTime expiryDate = record.getExpiryDate(); - if (expiryDate != null) { - form.setExpiration(expiryDate.toLocalDateTime()); - } - - form.setMaxActiveTransactionCount(record.getMaxActiveTransactionCount()); - form.setNote(record.getNote()); - - String parentIdTag = record.getParentIdTag(); - if (parentIdTag == null) { - parentIdTag = ControllerHelper.EMPTY_OPTION; - } - form.setParentIdTag(parentIdTag); + OcppTagForm form = OcppTagFormMapper.toForm(record); model.addAttribute("activeTransactionCount", record.getActiveTransactionCount()); model.addAttribute("ocppTagForm", form); diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java b/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java index cff61d7ac..7bbcd0062 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java @@ -22,9 +22,9 @@ import de.rwth.idsg.steve.repository.UserRepository; import de.rwth.idsg.steve.repository.dto.User; import de.rwth.idsg.steve.utils.ControllerHelper; +import de.rwth.idsg.steve.utils.mapper.UserFormMapper; import de.rwth.idsg.steve.web.dto.UserForm; import de.rwth.idsg.steve.web.dto.UserQueryForm; -import de.rwth.idsg.steve.web.dto.UserSex; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -84,18 +84,7 @@ private void initList(Model model, UserQueryForm params) { @RequestMapping(value = DETAILS_PATH, method = RequestMethod.GET) public String getDetails(@PathVariable("userPk") int userPk, Model model) { User.Details details = userRepository.getDetails(userPk); - - UserForm form = new UserForm(); - form.setUserPk(details.getUserRecord().getUserPk()); - form.setFirstName(details.getUserRecord().getFirstName()); - form.setLastName(details.getUserRecord().getLastName()); - form.setBirthDay(details.getUserRecord().getBirthDay()); - form.setPhone(details.getUserRecord().getPhone()); - form.setSex(UserSex.fromDatabaseValue(details.getUserRecord().getSex())); - form.setEMail(details.getUserRecord().getEMail()); - form.setNote(details.getUserRecord().getNote()); - form.setAddress(ControllerHelper.recordToDto(details.getAddress())); - form.setOcppIdTag(details.getOcppIdTag().orElse(ControllerHelper.EMPTY_OPTION)); + UserForm form = UserFormMapper.toForm(details); model.addAttribute("userForm", form); setTags(model); From 30e654aef06b1a2eaeec03118c1739c8c151d5e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Tue, 23 Mar 2021 11:35:08 +0100 Subject: [PATCH 160/548] refactor move address mapping logic into standalone class --- .../idsg/steve/utils/ControllerHelper.java | 15 ----------- .../steve/utils/mapper/AddressMapper.java | 25 +++++++++++++++++++ .../mapper/ChargePointDetailsMapper.java | 3 ++- .../steve/utils/mapper/UserFormMapper.java | 2 +- 4 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 src/main/java/de/rwth/idsg/steve/utils/mapper/AddressMapper.java diff --git a/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java b/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java index 43a4f634f..98ce86bc5 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java @@ -19,8 +19,6 @@ package de.rwth.idsg.steve.utils; import com.neovisionaries.i18n.CountryCode; -import de.rwth.idsg.steve.web.dto.Address; -import jooq.steve.db.tables.records.AddressRecord; import java.util.Arrays; import java.util.Comparator; @@ -40,19 +38,6 @@ private ControllerHelper() { } public static final Map COUNTRY_DROPDOWN = populateCountryCodes(); - public static Address recordToDto(AddressRecord record) { - Address address = new Address(); - if (record != null) { - address.setAddressPk(record.getAddressPk()); - address.setStreet(record.getStreet()); - address.setHouseNumber(record.getHouseNumber()); - address.setZipCode(record.getZipCode()); - address.setCity(record.getCity()); - address.setCountry(CountryCode.getByCode(record.getCountry())); - } - return address; - } - public static Map idTagEnhancer(List idTagList) { Map map = new HashMap<>(idTagList.size() + 1); map.put("", EMPTY_OPTION); diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/AddressMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/AddressMapper.java new file mode 100644 index 000000000..df45c1543 --- /dev/null +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/AddressMapper.java @@ -0,0 +1,25 @@ +package de.rwth.idsg.steve.utils.mapper; + +import com.neovisionaries.i18n.CountryCode; +import de.rwth.idsg.steve.web.dto.Address; +import jooq.steve.db.tables.records.AddressRecord; + +/** + * @author Sevket Goekay + * @since 23.03.2021 + */ +public class AddressMapper { + + public static Address recordToDto(AddressRecord record) { + Address address = new Address(); + if (record != null) { + address.setAddressPk(record.getAddressPk()); + address.setStreet(record.getStreet()); + address.setHouseNumber(record.getHouseNumber()); + address.setZipCode(record.getZipCode()); + address.setCity(record.getCity()); + address.setCountry(CountryCode.getByCode(record.getCountry())); + } + return address; + } +} diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java index d6f5b1687..7ac352315 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java @@ -2,6 +2,7 @@ import de.rwth.idsg.steve.repository.dto.ChargePoint; import de.rwth.idsg.steve.utils.ControllerHelper; +import de.rwth.idsg.steve.web.dto.Address; import de.rwth.idsg.steve.web.dto.ChargePointForm; import jooq.steve.db.tables.records.ChargeBoxRecord; @@ -24,7 +25,7 @@ public static ChargePointForm mapToForm(ChargePoint.Details cp) { form.setInsertConnectorStatusAfterTransactionMsg(chargeBox.getInsertConnectorStatusAfterTransactionMsg()); form.setAdminAddress(chargeBox.getAdminAddress()); form.setRegistrationStatus(chargeBox.getRegistrationStatus()); - form.setAddress(ControllerHelper.recordToDto(cp.getAddress())); + form.setAddress(AddressMapper.recordToDto(cp.getAddress())); return form; } diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java index a2ad9de64..6c4aff4b0 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java @@ -24,7 +24,7 @@ public static UserForm toForm(User.Details details) { form.setSex(UserSex.fromDatabaseValue(userRecord.getSex())); form.setEMail(userRecord.getEMail()); form.setNote(userRecord.getNote()); - form.setAddress(ControllerHelper.recordToDto(details.getAddress())); + form.setAddress(AddressMapper.recordToDto(details.getAddress())); form.setOcppIdTag(details.getOcppIdTag().orElse(ControllerHelper.EMPTY_OPTION)); return form; From 90abeef2b9a80c538c9eea90953836d2a9ee10f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Tue, 23 Mar 2021 11:38:02 +0100 Subject: [PATCH 161/548] refactor move countryCode logic into standalone class --- .../idsg/steve/utils/ControllerHelper.java | 31 ++------------ .../steve/utils/CountryCodesProvider.java | 41 +++++++++++++++++++ 2 files changed, 44 insertions(+), 28 deletions(-) create mode 100644 src/main/java/de/rwth/idsg/steve/utils/CountryCodesProvider.java diff --git a/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java b/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java index 98ce86bc5..9f3caf2c9 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java @@ -18,15 +18,12 @@ */ package de.rwth.idsg.steve.utils; -import com.neovisionaries.i18n.CountryCode; - -import java.util.Arrays; -import java.util.Comparator; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import static de.rwth.idsg.steve.utils.CountryCodesProvider.getCountryCodes; + /** * @author Sevket Goekay * @since 25.11.2015 @@ -36,7 +33,7 @@ private ControllerHelper() { } public static final String EMPTY_OPTION = "-- Empty --"; - public static final Map COUNTRY_DROPDOWN = populateCountryCodes(); + public static final Map COUNTRY_DROPDOWN = getCountryCodes(); public static Map idTagEnhancer(List idTagList) { Map map = new HashMap<>(idTagList.size() + 1); @@ -48,27 +45,5 @@ public static Map idTagEnhancer(List idTagList) { return map; } - private static Map populateCountryCodes() { - CountryCode[] codes = CountryCode.values(); - Arrays.sort(codes, Comparator.comparing(CountryCode::getName)); - Map map = new LinkedHashMap<>(codes.length + 1); - map.put("", EMPTY_OPTION); - - for (CountryCode c : codes) { - if (shouldInclude(c)) { - map.put(c.getAlpha2(), c.getName()); - } - } - return map; - } - - /** - * There are some invalid codes like {@link CountryCode#UNDEFINED} and {@link CountryCode#EU}, - * or some countries are listed twice {@link CountryCode#FI} - {@link CountryCode#SF} and - * {@link CountryCode#GB} - {@link CountryCode#UK} which are confusing. We filter these out. - */ - private static boolean shouldInclude(CountryCode c) { - return c.getAssignment() == CountryCode.Assignment.OFFICIALLY_ASSIGNED; - } } diff --git a/src/main/java/de/rwth/idsg/steve/utils/CountryCodesProvider.java b/src/main/java/de/rwth/idsg/steve/utils/CountryCodesProvider.java new file mode 100644 index 000000000..297fde5c1 --- /dev/null +++ b/src/main/java/de/rwth/idsg/steve/utils/CountryCodesProvider.java @@ -0,0 +1,41 @@ +package de.rwth.idsg.steve.utils; + +import com.neovisionaries.i18n.CountryCode; + +import java.util.Arrays; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.Map; + +import static de.rwth.idsg.steve.utils.ControllerHelper.EMPTY_OPTION; + +/** + * @author Sevket Goekay + * @since 23.03.2021 + */ +public class CountryCodesProvider { + + public static Map getCountryCodes() { + CountryCode[] codes = CountryCode.values(); + Arrays.sort(codes, Comparator.comparing(CountryCode::getName)); + + Map map = new LinkedHashMap<>(codes.length + 1); + map.put("", EMPTY_OPTION); + + for (CountryCode c : codes) { + if (shouldInclude(c)) { + map.put(c.getAlpha2(), c.getName()); + } + } + return map; + } + + /** + * There are some invalid codes like {@link CountryCode#UNDEFINED} and {@link CountryCode#EU}, + * or some countries are listed twice {@link CountryCode#FI} - {@link CountryCode#SF} and + * {@link CountryCode#GB} - {@link CountryCode#UK} which are confusing. We filter these out. + */ + private static boolean shouldInclude(CountryCode c) { + return c.getAssignment() == CountryCode.Assignment.OFFICIALLY_ASSIGNED; + } +} From 0f0a3bdc29e995dc668e50a84e4ace4cd39505c4 Mon Sep 17 00:00:00 2001 From: Christian Samsel Date: Tue, 23 Mar 2021 23:45:37 +0100 Subject: [PATCH 162/548] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3040909f6..e5f680d64 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ https://github.com/RWTH-i5-IDSG/steve/wiki/Charging-Station-Compatibility SteVe requires * JDK 11 (both Oracle JDK and OpenJDK are supported) * Maven -* At least MySQL 5.7.7 (MariaDB 10.2.1 or later works as well) as database +* MariaDB 10.2.1 or later. MySQL 5.7.7 or later works as well, but especially MySQL 8 introduces more hassle. We suggest MariaDB 10.3. to build and run. @@ -43,7 +43,7 @@ SteVe is designed to run standalone, a java servlet container / web server (e.g. Make sure MySQL is reachable via TCP (e.g., remove `skip-networking` from `my.cnf`). The following MySQL statements can be used as database initialization (adjust database name and credentials according to your setup). - * For MySQL 5.7 (and MariaDB): + * For MariaDB (all versions) and MySQL 5.7: ``` CREATE DATABASE stevedb CHARACTER SET utf8 COLLATE utf8_unicode_ci; CREATE USER 'steve'@'localhost' IDENTIFIED BY 'changeme'; From 42da33ea1ff6ae7ac6d059751065d3697d199a44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Fri, 26 Mar 2021 14:47:36 +0100 Subject: [PATCH 163/548] replace go-offline command reason: the command cannot find dependencies outside the maven central (our case: jitpack). it seems to be a common understanding that this command is broken. - same problem different context: https://www.mail-archive.com/issues@maven.apache.org/msg161649.html - alternative plugin that presents go-offline's shortcomings: https://github.com/qaware/go-offline-maven-plugin --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3ecc727f9..0f852d0d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: java # install dependencies -install: mvn dependency:go-offline -s .travis-maven-settings.xml -B -V +install: mvn dependency:resolve dependency:resolve-plugins -s .travis-maven-settings.xml -B -V before_script: # Display Versions From 6c19177194421106f13ad2dbd1a31530cd192045 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Mar 2021 14:12:25 +0000 Subject: [PATCH 164/548] Bump maven-dependency-plugin from 3.1.1 to 3.1.2 Bumps [maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.1.1...maven-dependency-plugin-3.1.2) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 54f48fe05..b11338077 100644 --- a/pom.xml +++ b/pom.xml @@ -245,7 +245,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.1 + 3.1.2 copy-dependencies From 8a78670871f21913da106788ba788f4653198576 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 27 Mar 2021 16:19:06 +0100 Subject: [PATCH 165/548] Bump flyway-maven-plugin from 7.7.0 to 7.7.1 (#544) Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.7.0 to 7.7.1. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.7.0...flyway-7.7.1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b11338077..68cc8df2e 100644 --- a/pom.xml +++ b/pom.xml @@ -299,7 +299,7 @@ org.flywaydb flyway-maven-plugin - 7.7.0 + 7.7.1 From 1550570327c4fd4c2c9d5057ae3dec2021a8a6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Tue, 30 Mar 2021 20:10:44 +0200 Subject: [PATCH 166/548] allow colon to be used in idtags (#475) --- .../rwth/idsg/steve/web/validation/IdTag.java | 2 +- .../steve/web/validation/IdTagValidator.java | 4 +- .../web/validation/IdTagValidatorTest.java | 80 +++++++++++++++++++ 3 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 src/test/java/de/rwth/idsg/steve/web/validation/IdTagValidatorTest.java diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java b/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java index 5aca034fa..81aa21643 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java @@ -36,7 +36,7 @@ @Constraint(validatedBy = {IdTagValidator.class, IdTagListValidator.class}) public @interface IdTag { - String message() default "ID Tag can only contain upper or lower case letters, numbers and dot, dash, underscore symbols"; + String message() default "ID Tag can only contain upper or lower case letters, numbers and dot, colon, dash, underscore symbols"; // Required by validation runtime Class[] groups() default {}; diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java index 670451679..651de5d09 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java @@ -24,14 +24,14 @@ /** * Allowed characters are: - * Upper or lower case letters, numbers and dot, dash, underscore symbols. + * Upper or lower case letters, numbers and dot, colon, dash, underscore symbols. * * @author Sevket Goekay * @since 15.08.2014 */ public class IdTagValidator implements ConstraintValidator { - private static final String IDTAG_PATTERN = "^[a-zA-Z0-9._-]{1,20}$"; + private static final String IDTAG_PATTERN = "^[a-zA-Z0-9.:_-]{1,20}$"; private static final Pattern PATTERN = Pattern.compile(IDTAG_PATTERN); @Override diff --git a/src/test/java/de/rwth/idsg/steve/web/validation/IdTagValidatorTest.java b/src/test/java/de/rwth/idsg/steve/web/validation/IdTagValidatorTest.java new file mode 100644 index 000000000..cd356f336 --- /dev/null +++ b/src/test/java/de/rwth/idsg/steve/web/validation/IdTagValidatorTest.java @@ -0,0 +1,80 @@ +package de.rwth.idsg.steve.web.validation; + +import org.junit.Assert; +import org.junit.Test; + +/** + * @author Sevket Goekay + * @since 22.03.2021 + */ +public class IdTagValidatorTest { + + IdTagValidator validator = new IdTagValidator(); + + @Test + public void testNull() { + Assert.assertTrue(validator.isValid(null, null)); + } + + @Test + public void testAllLowercaseLetters() { + Assert.assertTrue(validator.isValid("test", null)); + } + + @Test + public void testAllUppercaseLetters() { + Assert.assertTrue(validator.isValid("TEST", null)); + } + + @Test + public void testMixedCaseLetters() { + Assert.assertTrue(validator.isValid("TesT", null)); + Assert.assertTrue(validator.isValid("tEst", null)); + } + + @Test + public void testLettersAndNumbers() { + Assert.assertTrue(validator.isValid("test12", null)); + Assert.assertTrue(validator.isValid("89test", null)); + Assert.assertTrue(validator.isValid("te9s0t", null)); + } + + @Test + public void testDot() { + Assert.assertTrue(validator.isValid(".test", null)); + Assert.assertTrue(validator.isValid("test.", null)); + Assert.assertTrue(validator.isValid("te..st", null)); + } + + @Test + public void testDash() { + Assert.assertTrue(validator.isValid("-test", null)); + Assert.assertTrue(validator.isValid("test-", null)); + Assert.assertTrue(validator.isValid("te--st", null)); + } + + @Test + public void testUnderscore() { + Assert.assertTrue(validator.isValid("_test", null)); + Assert.assertTrue(validator.isValid("test_", null)); + Assert.assertTrue(validator.isValid("te__st", null)); + } + + /** + * https://github.com/RWTH-i5-IDSG/steve/issues/475 + */ + @Test + public void testColon() { + Assert.assertTrue(validator.isValid(":test", null)); + Assert.assertTrue(validator.isValid("test:", null)); + Assert.assertTrue(validator.isValid("te::st", null)); + + Assert.assertTrue(validator.isValid("VID:00XXXXXXXXXX", null)); + } + + @Test + public void testCombined() { + Assert.assertTrue(validator.isValid("1t.E-S_:t20", null)); + } + +} From 004f81666377e4a53d512733a75aec0021f2a646 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Apr 2021 10:27:09 +0200 Subject: [PATCH 167/548] Bump jetty.version from 9.4.38.v20210224 to 9.4.39.v20210325 (#548) Bumps `jetty.version` from 9.4.38.v20210224 to 9.4.39.v20210325. Updates `jetty-server` from 9.4.38.v20210224 to 9.4.39.v20210325 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.38.v20210224...jetty-9.4.39.v20210325) Updates `jetty-webapp` from 9.4.38.v20210224 to 9.4.39.v20210325 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.38.v20210224...jetty-9.4.39.v20210325) Updates `jetty-annotations` from 9.4.38.v20210224 to 9.4.39.v20210325 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.38.v20210224...jetty-9.4.39.v20210325) Updates `apache-jsp` from 9.4.38.v20210224 to 9.4.39.v20210325 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.38.v20210224...jetty-9.4.39.v20210325) Updates `apache-jstl` from 9.4.38.v20210224 to 9.4.39.v20210325 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.38.v20210224...jetty-9.4.39.v20210325) Updates `jetty-rewrite` from 9.4.38.v20210224 to 9.4.39.v20210325 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.38.v20210224...jetty-9.4.39.v20210325) Updates `websocket-server` from 9.4.38.v20210224 to 9.4.39.v20210325 Updates `jetty-jspc-maven-plugin` from 9.4.38.v20210224 to 9.4.39.v20210325 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.38.v20210224...jetty-9.4.39.v20210325) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68cc8df2e..bd808346d 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 5.3.5 5.4.5 8.0.23 - 9.4.38.v20210224 + 9.4.39.v20210325 1.18.18 2.12.2 From 9632df356996a290d176679c0c6985b58f627188 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Apr 2021 10:27:59 +0200 Subject: [PATCH 168/548] Bump flyway-maven-plugin from 7.7.1 to 7.7.2 (#546) Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.7.1 to 7.7.2. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.7.1...flyway-7.7.2) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bd808346d..0f6c12be7 100644 --- a/pom.xml +++ b/pom.xml @@ -299,7 +299,7 @@ org.flywaydb flyway-maven-plugin - 7.7.1 + 7.7.2 From 1fba2358f7c1fa15615e27d993180f0488c646c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Apr 2021 10:28:15 +0200 Subject: [PATCH 169/548] Bump lombok from 1.18.18 to 1.18.20 (#547) Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.18 to 1.18.20. - [Release notes](https://github.com/rzwitserloot/lombok/releases) - [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.18...v1.18.20) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0f6c12be7..7304f29aa 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 5.4.5 8.0.23 9.4.39.v20210325 - 1.18.18 + 1.18.20 2.12.2 From 80523a16d18a0c2a059eb525ab89cb0a91244528 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Apr 2021 11:12:25 +0200 Subject: [PATCH 170/548] Bump license-maven-plugin from 3.0 to 4.0 (#545) Bumps license-maven-plugin from 3.0 to 4.0. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7304f29aa..ed321fcb3 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ com.mycila license-maven-plugin - 3.0 + 4.0
LICENSE-HEADER.txt
From 6a3b90c9df3a97f20389a2117e0e940f6980fce8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 10 Apr 2021 09:55:08 +0200 Subject: [PATCH 171/548] Bump jakarta.mail from 2.0.0 to 2.0.1 (#550) Bumps [jakarta.mail](https://github.com/eclipse-ee4j/mail) from 2.0.0 to 2.0.1. - [Release notes](https://github.com/eclipse-ee4j/mail/releases) - [Commits](https://github.com/eclipse-ee4j/mail/compare/2.0.0...2.0.1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ed321fcb3..50a8c9908 100644 --- a/pom.xml +++ b/pom.xml @@ -480,7 +480,7 @@ com.sun.mail jakarta.mail - 2.0.0 + 2.0.1 org.jetbrains From eee34854375890e45a6f968145a1395c00f2c9a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 10 Apr 2021 11:54:46 +0200 Subject: [PATCH 172/548] Bump flyway-maven-plugin from 7.7.2 to 7.7.3 (#551) Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.7.2 to 7.7.3. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.7.2...flyway-7.7.3) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 50a8c9908..6d0febcc5 100644 --- a/pom.xml +++ b/pom.xml @@ -299,7 +299,7 @@ org.flywaydb flyway-maven-plugin - 7.7.2 + 7.7.3 From 5f8842280488702161acc1227ac77ae683c7300e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Wed, 14 Apr 2021 21:31:05 +0200 Subject: [PATCH 173/548] fix: power limit must not be in Amperes (issue #310) --- .../de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java | 2 +- .../steve/repository/impl/ChargingProfileRepositoryImpl.java | 2 +- .../idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java | 2 +- src/main/resources/db/migration/V1_0_3__update.sql | 3 +++ .../webapp/WEB-INF/views/data-man/00-charging-profile.jsp | 4 ++-- .../webapp/WEB-INF/views/snippets/schedulePeriodsTable.js | 4 ++-- 7 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/db/migration/V1_0_3__update.sql diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java index a4907d8e4..84b5db1f0 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java @@ -78,7 +78,7 @@ public ocpp.cp._2015._10.SetChargingProfileRequest getOcpp16Request() { .map(k -> { ChargingSchedulePeriod p = new ChargingSchedulePeriod(); p.setStartPeriod(k.getStartPeriodInSeconds()); - p.setLimit(k.getPowerLimitInAmperes()); + p.setLimit(k.getPowerLimit()); p.setNumberPhases(k.getNumberPhases()); return p; }) diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java index 40914db59..f9881c507 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java @@ -369,7 +369,7 @@ private static void insertPeriods(DSLContext ctx, ChargingProfileForm form) { .map(k -> ctx.newRecord(CHARGING_SCHEDULE_PERIOD) .setChargingProfilePk(form.getChargingProfilePk()) .setStartPeriodInSeconds(k.getStartPeriodInSeconds()) - .setPowerLimitInAmperes(k.getPowerLimitInAmperes()) + .setPowerLimit(k.getPowerLimit()) .setNumberPhases(k.getNumberPhases())) .collect(Collectors.toList()); diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java index 14fb862fb..94276e8af 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java @@ -44,7 +44,7 @@ public static ChargingProfileForm mapToForm(ChargingProfile.Details details) { for (ChargingSchedulePeriodRecord rec : periods) { ChargingProfileForm.SchedulePeriod p = new ChargingProfileForm.SchedulePeriod(); p.setStartPeriodInSeconds(rec.getStartPeriodInSeconds()); - p.setPowerLimitInAmperes(rec.getPowerLimitInAmperes()); + p.setPowerLimit(rec.getPowerLimit()); p.setNumberPhases(rec.getNumberPhases()); periodMap.put(UUID.randomUUID().toString(), p); diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java index d0512612f..0348a0592 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java @@ -125,7 +125,7 @@ public static class SchedulePeriod { private Integer startPeriodInSeconds; // from the startSchedule @NotNull(message = "Power Limit has to be set") - private BigDecimal powerLimitInAmperes; + private BigDecimal powerLimit; private Integer numberPhases; diff --git a/src/main/resources/db/migration/V1_0_3__update.sql b/src/main/resources/db/migration/V1_0_3__update.sql new file mode 100644 index 000000000..d9ec76f1f --- /dev/null +++ b/src/main/resources/db/migration/V1_0_3__update.sql @@ -0,0 +1,3 @@ +-- came with https://github.com/RWTH-i5-IDSG/steve/issues/310 +ALTER TABLE `charging_schedule_period` + CHANGE COLUMN `power_limit_in_amperes` `power_limit` DECIMAL(15, 1) NOT NULL; diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp index 21c7cd7d4..f69c07f0c 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp @@ -66,7 +66,7 @@ Start Period (in sec) - Power Limit (in amperes) + Power Limit (in Charging Rate Unit selected above) Number Phases @@ -77,7 +77,7 @@ - + diff --git a/src/main/resources/webapp/WEB-INF/views/snippets/schedulePeriodsTable.js b/src/main/resources/webapp/WEB-INF/views/snippets/schedulePeriodsTable.js index 16024ca61..d92531eed 100644 --- a/src/main/resources/webapp/WEB-INF/views/snippets/schedulePeriodsTable.js +++ b/src/main/resources/webapp/WEB-INF/views/snippets/schedulePeriodsTable.js @@ -7,10 +7,10 @@ $('#addRow').click(function () { // use prefix for new rows to be at the end when ordered var id = "zz" + Date.now(); var startPeriodInSeconds = ""; - var powerLimitInAmperes = ""; + var powerLimit = ""; var numberPhases = ""; var deleteButton = ""; - var row = "" + startPeriodInSeconds + powerLimitInAmperes + numberPhases + deleteButton + ""; + var row = "" + startPeriodInSeconds + powerLimit + numberPhases + deleteButton + ""; $('#periodsTable tbody').append(row); }); \ No newline at end of file From 17df72b09ddb03e769ed26fa987c6e11627b8e75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Apr 2021 05:00:39 +0000 Subject: [PATCH 174/548] Bump spring.security.version from 5.4.5 to 5.4.6 Bumps `spring.security.version` from 5.4.5 to 5.4.6. Updates `spring-security-web` from 5.4.5 to 5.4.6 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/master/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.4.5...5.4.6) Updates `spring-security-config` from 5.4.5 to 5.4.6 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/master/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.4.5...5.4.6) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d0febcc5..df5a6c1f9 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.14.8 3.4.3 5.3.5 - 5.4.5 + 5.4.6 8.0.23 9.4.39.v20210325 1.18.20 From 337b878060a65ab9ecdf56c2fa41bf7a851796dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Apr 2021 05:01:25 +0000 Subject: [PATCH 175/548] Bump jetty.version from 9.4.39.v20210325 to 9.4.40.v20210413 Bumps `jetty.version` from 9.4.39.v20210325 to 9.4.40.v20210413. Updates `jetty-server` from 9.4.39.v20210325 to 9.4.40.v20210413 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.39.v20210325...jetty-9.4.40.v20210413) Updates `jetty-webapp` from 9.4.39.v20210325 to 9.4.40.v20210413 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.39.v20210325...jetty-9.4.40.v20210413) Updates `jetty-annotations` from 9.4.39.v20210325 to 9.4.40.v20210413 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.39.v20210325...jetty-9.4.40.v20210413) Updates `apache-jsp` from 9.4.39.v20210325 to 9.4.40.v20210413 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.39.v20210325...jetty-9.4.40.v20210413) Updates `apache-jstl` from 9.4.39.v20210325 to 9.4.40.v20210413 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.39.v20210325...jetty-9.4.40.v20210413) Updates `jetty-rewrite` from 9.4.39.v20210325 to 9.4.40.v20210413 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.39.v20210325...jetty-9.4.40.v20210413) Updates `websocket-server` from 9.4.39.v20210325 to 9.4.40.v20210413 Updates `jetty-jspc-maven-plugin` from 9.4.39.v20210325 to 9.4.40.v20210413 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.39.v20210325...jetty-9.4.40.v20210413) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d0febcc5..05cb67088 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 5.3.5 5.4.5 8.0.23 - 9.4.39.v20210325 + 9.4.40.v20210413 1.18.20 2.12.2 From 719ffea86cc3065da8c7459de3568bef39663eb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Apr 2021 05:01:35 +0000 Subject: [PATCH 176/548] Bump jackson.version from 2.12.2 to 2.12.3 Bumps `jackson.version` from 2.12.2 to 2.12.3. Updates `jackson-databind` from 2.12.2 to 2.12.3 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-module-jaxb-annotations` from 2.12.2 to 2.12.3 - [Release notes](https://github.com/FasterXML/jackson-modules-base/releases) - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.12.2...jackson-modules-base-2.12.3) Updates `jackson-annotations` from 2.12.2 to 2.12.3 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d0febcc5..c5796575b 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 8.0.23 9.4.39.v20210325 1.18.20 - 2.12.2 + 2.12.3 jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true&serverTimezone=UTC From 1b37df9a6c04422714340320ecc0dd9acc0f637d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Apr 2021 05:01:49 +0000 Subject: [PATCH 177/548] Bump disruptor from 3.4.2 to 3.4.3 Bumps [disruptor](https://github.com/LMAX-Exchange/disruptor) from 3.4.2 to 3.4.3. - [Release notes](https://github.com/LMAX-Exchange/disruptor/releases) - [Changelog](https://github.com/LMAX-Exchange/disruptor/blob/master/CHANGELOG.md) - [Commits](https://github.com/LMAX-Exchange/disruptor/compare/3.4.2...3.4.3) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d0febcc5..763422518 100644 --- a/pom.xml +++ b/pom.xml @@ -588,7 +588,7 @@ com.lmax disruptor - 3.4.2 + 3.4.3 From aef7a644d4d3d75b1c1d9086ebc77cde7640728b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Apr 2021 05:02:09 +0000 Subject: [PATCH 178/548] Bump flyway-maven-plugin from 7.7.3 to 7.8.1 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.7.3 to 7.8.1. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.7.3...flyway-7.8.1) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d0febcc5..9dc031d66 100644 --- a/pom.xml +++ b/pom.xml @@ -299,7 +299,7 @@ org.flywaydb flyway-maven-plugin - 7.7.3 + 7.8.1 From 3e27ad4d31732ecc52d8bf49d118ea5c6d25e1ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Apr 2021 06:52:47 +0000 Subject: [PATCH 179/548] Bump spring-framework-bom from 5.3.5 to 5.3.6 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.5 to 5.3.6. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.5...v5.3.6) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f4adfa1eb..ae0c928d3 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.14.8 3.4.3 - 5.3.5 + 5.3.6 5.4.6 8.0.23 9.4.40.v20210413 From 876b763b4d628eda05fc107fd2f84492238dd6c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 24 Apr 2021 05:00:52 +0000 Subject: [PATCH 180/548] Bump jooq.version from 3.14.8 to 3.14.9 Bumps `jooq.version` from 3.14.8 to 3.14.9. Updates `jooq-meta` from 3.14.8 to 3.14.9 Updates `jooq-codegen` from 3.14.8 to 3.14.9 Updates `jooq` from 3.14.8 to 3.14.9 Updates `jooq-codegen-maven` from 3.14.8 to 3.14.9 Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ae0c928d3..df3acdcca 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 11 UTF-8 - 3.14.8 + 3.14.9 3.4.3 5.3.6 5.4.6 From 84867092d68eda6b4beb8135b9cd81df142f4fd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 24 Apr 2021 11:04:28 +0200 Subject: [PATCH 181/548] Bump mysql-connector-java from 8.0.23 to 8.0.24 (#568) Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.23 to 8.0.24. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.23...8.0.24) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ae0c928d3..64f0aa754 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 3.4.3 5.3.6 5.4.6 - 8.0.23 + 8.0.24 9.4.40.v20210413 1.18.20 2.12.3 From 0de9a148d25370b58faad298724dc7438b1f7270 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 24 Apr 2021 11:04:50 +0200 Subject: [PATCH 182/548] Bump license-maven-plugin from 4.0 to 4.1 (#566) Bumps license-maven-plugin from 4.0 to 4.1. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 64f0aa754..dec5f308a 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ com.mycila license-maven-plugin - 4.0 + 4.1
LICENSE-HEADER.txt
From d2fdd0e0bc8dfa731f54b2e461a51fec780393f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Mon, 26 Apr 2021 00:37:46 +0200 Subject: [PATCH 183/548] make Data field in DataTransferForm a textarea (closes #569) --- .../webapp/WEB-INF/views/op-forms/DataTransferForm.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp index 163b5ba9f..d0859c13d 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp @@ -25,7 +25,7 @@ - +
Vendor ID (String):
Message ID (String):
Data (Text):
Data (Text):
\ No newline at end of file From 0f8ed3e9f02332cd1cc68d3ed2679012ea73687b Mon Sep 17 00:00:00 2001 From: Alexander Weickmann Date: Mon, 26 Apr 2021 17:12:50 +0200 Subject: [PATCH 184/548] respect X-Forwarded-For headers if present --- src/main/java/de/rwth/idsg/steve/JettyServer.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/JettyServer.java b/src/main/java/de/rwth/idsg/steve/JettyServer.java index 0b47a0981..a0b2c94d4 100644 --- a/src/main/java/de/rwth/idsg/steve/JettyServer.java +++ b/src/main/java/de/rwth/idsg/steve/JettyServer.java @@ -22,13 +22,7 @@ import lombok.extern.slf4j.Slf4j; import org.eclipse.jetty.http.HttpScheme; import org.eclipse.jetty.http.HttpVersion; -import org.eclipse.jetty.server.Connector; -import org.eclipse.jetty.server.HttpConfiguration; -import org.eclipse.jetty.server.HttpConnectionFactory; -import org.eclipse.jetty.server.SecureRequestCustomizer; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.SslConnectionFactory; +import org.eclipse.jetty.server.*; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; @@ -95,6 +89,9 @@ private void prepare() { httpConfig.setSendDateHeader(false); httpConfig.setSendXPoweredBy(false); + // make sure X-Forwarded-For headers are picked up if set (e.g. by a load balancer) + httpConfig.addCustomizer(new ForwardedRequestCustomizer()); + // Extra options server.setDumpAfterStart(false); server.setDumpBeforeStop(false); From 52ad2b1495550f9ace63d67183f93bd725f4f39d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 05:00:38 +0000 Subject: [PATCH 185/548] Bump flyway-maven-plugin from 7.8.1 to 7.8.2 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.8.1 to 7.8.2. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.8.1...flyway-7.8.2) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 660938f1f..75d43164c 100644 --- a/pom.xml +++ b/pom.xml @@ -299,7 +299,7 @@ org.flywaydb flyway-maven-plugin - 7.8.1 + 7.8.2 From 276239c6dd0ec88821884d749c6a7ec6d9060427 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 05:01:07 +0000 Subject: [PATCH 186/548] Bump disruptor from 3.4.3 to 3.4.4 Bumps [disruptor](https://github.com/LMAX-Exchange/disruptor) from 3.4.3 to 3.4.4. - [Release notes](https://github.com/LMAX-Exchange/disruptor/releases) - [Changelog](https://github.com/LMAX-Exchange/disruptor/blob/master/CHANGELOG.md) - [Commits](https://github.com/LMAX-Exchange/disruptor/compare/3.4.3...3.4.4) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 660938f1f..9a26fc2ae 100644 --- a/pom.xml +++ b/pom.xml @@ -588,7 +588,7 @@ com.lmax disruptor - 3.4.3 + 3.4.4 From 61c27622c194a8d0b19cb9b29bd5f7b9ca3af849 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 May 2021 05:00:24 +0000 Subject: [PATCH 187/548] Bump flyway-maven-plugin from 7.8.2 to 7.9.0 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.8.2 to 7.9.0. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.8.2...flyway-7.9.0) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68f26d136..3d6824669 100644 --- a/pom.xml +++ b/pom.xml @@ -299,7 +299,7 @@ org.flywaydb flyway-maven-plugin - 7.8.2 + 7.9.0 From 1670024160f69af2129a0fe2bc41b15272e22e54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 May 2021 05:00:28 +0000 Subject: [PATCH 188/548] Bump mysql-connector-java from 8.0.24 to 8.0.25 Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.24 to 8.0.25. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.24...8.0.25) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68f26d136..ec7422cbb 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 3.4.3 5.3.6 5.4.6 - 8.0.24 + 8.0.25 9.4.40.v20210413 1.18.20 2.12.3 From fbb20b41a51e78248519b9dc0ac1a72efa2364df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 May 2021 05:00:39 +0000 Subject: [PATCH 189/548] Bump spring-framework-bom from 5.3.6 to 5.3.7 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.6 to 5.3.7. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.6...v5.3.7) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68f26d136..17b379946 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.14.9 3.4.3 - 5.3.6 + 5.3.7 5.4.6 8.0.24 9.4.40.v20210413 From 86f56bba4031e7d2c88547262fe413cf2a659d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Thu, 20 May 2021 22:21:05 +0200 Subject: [PATCH 190/548] remove mariadb 10.3 from travis build matrix reason: because ubuntu fails to install it --- .travis.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f852d0d4..6ece781b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,23 +46,6 @@ jobs: jdk: openjdk15 dist: xenial services: mysql - - - name: OpenJDK11 with MariaDB 10.3 (Ubuntu LTS 20.04) - jdk: openjdk11 - dist: focal - addons: - mariadb: "10.3" - apt: - packages: - - elinks - - name: OpenJDK15 with MariaDB 10.3 (Ubuntu LTS 20.04) - jdk: openjdk15 - dist: focal - addons: - mariadb: "10.3" - apt: - packages: - - elinks - name: OpenJDK11 with MariaDB 10.5 (Ubuntu LTS 20.04) jdk: openjdk11 dist: focal From ff26f49d5a23770a5385e0358d319a35bd6176a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Thu, 20 May 2021 21:36:40 +0200 Subject: [PATCH 191/548] add more validation messages (#580) --- .../idsg/steve/web/dto/ChargingProfileForm.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java index 0348a0592..933da4639 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java @@ -51,14 +51,14 @@ public class ChargingProfileForm { private String description; private String note; - @NotNull - @PositiveOrZero + @NotNull(message = "Stack Level has to be set") + @PositiveOrZero(message = "Stack Level has to be a positive number or 0") private Integer stackLevel; - @NotNull + @NotNull(message = "Charging Profile Purpose has to be set") private ChargingProfilePurposeType chargingProfilePurpose; - @NotNull + @NotNull(message = "Charging Profile Kind has to be set") private ChargingProfileKindType chargingProfileKind; private RecurrencyKindType recurrencyKind; @@ -68,17 +68,17 @@ public class ChargingProfileForm { @Future(message = "Valid To must be in future") private LocalDateTime validTo; - @Positive + @Positive(message = "Duration has to be a positive number") private Integer durationInSeconds; private LocalDateTime startSchedule; - @NotNull + @NotNull(message = "Charging Rate Unit has to be set") private ChargingRateUnitType chargingRateUnit; private BigDecimal minChargingRate; - @NotEmpty + @NotEmpty(message = "Schedule Periods cannot be empty") @Valid private Map schedulePeriodMap; From a125a4a49716a7a2dbe640a7d9199c73203db602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Thu, 20 May 2021 21:41:27 +0200 Subject: [PATCH 192/548] rename button name (#580) --- .../webapp/WEB-INF/views/data-man/00-charging-profile.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp index f69c07f0c..fb5d47519 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp @@ -69,7 +69,7 @@ Power Limit (in Charging Rate Unit selected above) Number Phases - + From e09b8942796cb4bbec9135b6785ad5ffaa942420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Thu, 20 May 2021 21:49:08 +0200 Subject: [PATCH 193/548] rename validation messages (#580) --- .../java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java index 933da4639..c3bf9b1c4 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java @@ -121,10 +121,10 @@ public static class SchedulePeriod { private static final int defaultNumberPhases = 3; - @NotNull(message = "Start Period has to be set") + @NotNull(message = "Schedule period: Start Period has to be set") private Integer startPeriodInSeconds; // from the startSchedule - @NotNull(message = "Power Limit has to be set") + @NotNull(message = "Schedule period: Power Limit has to be set") private BigDecimal powerLimit; private Integer numberPhases; From 8952808f0851302bf0ff8c288ebbb5d991356249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Thu, 20 May 2021 22:40:25 +0200 Subject: [PATCH 194/548] add mariadb 10.3 to travis build matrix This reverts commit 86f56bba4031e7d2c88547262fe413cf2a659d82. https://github.com/RWTH-i5-IDSG/steve/pull/582 --- .travis.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6ece781b5..dca1236e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,6 +46,22 @@ jobs: jdk: openjdk15 dist: xenial services: mysql + - name: OpenJDK11 with MariaDB 10.3 (Ubuntu LTS 20.04) + jdk: openjdk11 + dist: focal + addons: + mariadb: "10.3" + apt: + packages: + - elinks + - name: OpenJDK15 with MariaDB 10.3 (Ubuntu LTS 20.04) + jdk: openjdk15 + dist: focal + addons: + mariadb: "10.3" + apt: + packages: + - elinks - name: OpenJDK11 with MariaDB 10.5 (Ubuntu LTS 20.04) jdk: openjdk11 dist: focal From 3fd51777ab6edc3473e15dcf41c26b67e975aed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Fri, 21 May 2021 11:04:32 +0200 Subject: [PATCH 195/548] refactor --- .../impl/SettingsRepositoryImpl.java | 41 ++++--------------- .../de/rwth/idsg/steve/utils/StringUtils.java | 30 ++++++++++++++ 2 files changed, 39 insertions(+), 32 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java index 1b86c84a1..1f0c4f6b2 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java @@ -18,15 +18,12 @@ */ package de.rwth.idsg.steve.repository.impl; -import com.google.common.base.Joiner; -import com.google.common.base.Splitter; import de.rwth.idsg.steve.NotificationFeature; import de.rwth.idsg.steve.SteveException; import de.rwth.idsg.steve.repository.SettingsRepository; import de.rwth.idsg.steve.repository.dto.MailSettings; import de.rwth.idsg.steve.web.dto.SettingsForm; import jooq.steve.db.tables.records.SettingsRecord; -import org.jetbrains.annotations.Nullable; import org.jooq.DSLContext; import org.jooq.exception.DataAccessException; import org.springframework.beans.factory.annotation.Autowired; @@ -34,13 +31,12 @@ import java.nio.charset.StandardCharsets; import java.util.Base64; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import static de.rwth.idsg.steve.utils.StringUtils.joinByComma; +import static de.rwth.idsg.steve.utils.StringUtils.splitByComma; import static jooq.steve.db.tables.Settings.SETTINGS; /** @@ -57,16 +53,13 @@ public class SettingsRepositoryImpl implements SettingsRepository { StandardCharsets.UTF_8 ); - private static final Splitter SPLITTER = Splitter.on(",").trimResults().omitEmptyStrings(); - private static final Joiner JOINER = Joiner.on(",").skipNulls(); - @Autowired private DSLContext ctx; @Override public SettingsForm getForm() { SettingsRecord r = getInternal(); - List eMails = split(r.getMailRecipients()); + List eMails = splitByComma(r.getMailRecipients()); List features = splitFeatures(r.getNotificationFeatures()); return SettingsForm.builder() @@ -89,7 +82,7 @@ public SettingsForm getForm() { public MailSettings getMailSettings() { SettingsRecord r = getInternal(); - List eMails = split(r.getMailRecipients()); + List eMails = splitByComma(r.getMailRecipients()); List features = splitFeatures(r.getNotificationFeatures()); return MailSettings.builder() @@ -117,8 +110,8 @@ public int getHoursToExpire() { @Override public void update(SettingsForm form) { - String eMails = join(form.getRecipients()); - String features = join(form.getEnabledFeatures()); + String eMails = joinByComma(form.getRecipients()); + String features = joinByComma(form.getEnabledFeatures()); try { ctx.update(SETTINGS) @@ -155,27 +148,11 @@ private static int toSec(int minutes) { return (int) TimeUnit.MINUTES.toSeconds(minutes); } - @Nullable - private String join(Collection col) { - if (col == null || col.isEmpty()) { - return null; - } else { - // Use HashSet to trim duplicates before inserting into DB - return JOINER.join(new HashSet<>(col)); - } - } - private List split(String str) { - if (str == null || str.isEmpty()) { - return Collections.emptyList(); - } else { - return SPLITTER.splitToList(str); - } - } private List splitFeatures(String str) { - return split(str).stream() - .map(NotificationFeature::fromName) - .collect(Collectors.toList()); + return splitByComma(str).stream() + .map(NotificationFeature::fromName) + .collect(Collectors.toList()); } } diff --git a/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java b/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java index 19f793e29..0d11652d3 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java +++ b/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java @@ -18,13 +18,25 @@ */ package de.rwth.idsg.steve.utils; +import com.google.common.base.Joiner; +import com.google.common.base.Splitter; import de.rwth.idsg.steve.ocpp.CommunicationTask; +import org.jetbrains.annotations.Nullable; + +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; /** * @author Sevket Goekay * @since 12.01.2015 */ public final class StringUtils { + + private static final Splitter SPLITTER = Splitter.on(",").trimResults().omitEmptyStrings(); + private static final Joiner JOINER = Joiner.on(",").skipNulls(); + private StringUtils() { } /** @@ -47,4 +59,22 @@ public static String getOperationName(CommunicationTask task) { return s; } + + @Nullable + public static String joinByComma(Collection col) { + if (col == null || col.isEmpty()) { + return null; + } else { + // Use HashSet to trim duplicates + return JOINER.join(new HashSet<>(col)); + } + } + + public static List splitByComma(String str) { + if (str == null || str.isEmpty()) { + return Collections.emptyList(); + } else { + return SPLITTER.splitToList(str); + } + } } From 03ddfaee33d9f2e7e3f4a63fefa1edc0072e7d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Fri, 21 May 2021 11:23:34 +0200 Subject: [PATCH 196/548] enable custom GetConfiguration parameters (#363) --- .../steve/ocpp/task/GetConfigurationTask.java | 12 ++---------- .../web/dto/ocpp/GetConfigurationParams.java | 18 ++++++++++++++++-- .../views/op-forms/GetConfigurationForm.jsp | 4 +++- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java index 2c98d09e6..8f931c552 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java @@ -60,20 +60,12 @@ public void success(String chargeBoxId, ResponseWrapper response) { @Override public ocpp.cp._2012._06.GetConfigurationRequest getOcpp15Request() { - if (params.isSetConfKeyList()) { - return new GetConfigurationRequest().withKey(params.getConfKeyList()); - } else { - return new GetConfigurationRequest(); - } + return new GetConfigurationRequest().withKey(params.getAllKeys()); } @Override public ocpp.cp._2015._10.GetConfigurationRequest getOcpp16Request() { - if (params.isSetConfKeyList()) { - return new ocpp.cp._2015._10.GetConfigurationRequest().withKey(params.getConfKeyList()); - } else { - return new ocpp.cp._2015._10.GetConfigurationRequest(); - } + return new ocpp.cp._2015._10.GetConfigurationRequest().withKey(params.getAllKeys()); } @Override diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java index acb11b929..d1e05aa9c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java @@ -21,7 +21,14 @@ import lombok.Getter; import lombok.Setter; +import java.util.Collection; +import java.util.Collections; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static de.rwth.idsg.steve.utils.StringUtils.splitByComma; /** * @author Sevket Goekay @@ -33,7 +40,14 @@ public class GetConfigurationParams extends MultipleChargePointSelect { private List confKeyList; - public boolean isSetConfKeyList() { - return confKeyList != null && !confKeyList.isEmpty(); + private String commaSeparatedCustomConfKeys; + + public List getAllKeys() { + List fromPredefined = Objects.requireNonNullElse(confKeyList, Collections.emptyList()); + List fromCustom = splitByComma(commaSeparatedCustomConfKeys); + + return Stream.of(fromPredefined, fromCustom) + .flatMap(Collection::stream) + .collect(Collectors.toList()); } } diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp index 9e17e83c0..4121eebb8 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp @@ -30,7 +30,9 @@ - + + + Custom Configuration Keys:
\ No newline at end of file From aa5f477db5dc64fafab77c26f3a70d33b5767c7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 22 May 2021 05:00:47 +0000 Subject: [PATCH 197/548] Bump jooq.version from 3.14.9 to 3.14.11 Bumps `jooq.version` from 3.14.9 to 3.14.11. Updates `jooq-meta` from 3.14.9 to 3.14.11 Updates `jooq-codegen` from 3.14.9 to 3.14.11 Updates `jooq` from 3.14.9 to 3.14.11 Updates `jooq-codegen-maven` from 3.14.9 to 3.14.11 Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd9abf778..1d4757e4c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 11 UTF-8 - 3.14.9 + 3.14.11 3.4.3 5.3.7 5.4.6 From b5bf75400e8fa95b6cadac325989f96981803218 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 22 May 2021 05:00:57 +0000 Subject: [PATCH 198/548] Bump flyway-maven-plugin from 7.9.0 to 7.9.1 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.9.0 to 7.9.1. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.9.0...flyway-7.9.1) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd9abf778..a214ddd2b 100644 --- a/pom.xml +++ b/pom.xml @@ -299,7 +299,7 @@ org.flywaydb flyway-maven-plugin - 7.9.0 + 7.9.1 From b34f79ffc61c3a7db49a4458a6bbb9f6b29195b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 22 May 2021 05:01:08 +0000 Subject: [PATCH 199/548] Bump spring.security.version from 5.4.6 to 5.5.0 Bumps `spring.security.version` from 5.4.6 to 5.5.0. Updates `spring-security-web` from 5.4.6 to 5.5.0 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.4.6...5.5.0) Updates `spring-security-config` from 5.4.6 to 5.5.0 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.4.6...5.5.0) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd9abf778..d452d83ab 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.14.9 3.4.3 5.3.7 - 5.4.6 + 5.5.0 8.0.25 9.4.40.v20210413 1.18.20 From d001e7eaf8935c0383f35f6ab0602851e04e7bbe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 22 May 2021 05:01:35 +0000 Subject: [PATCH 200/548] Bump annotations from 20.1.0 to 21.0.0 Bumps [annotations](https://github.com/JetBrains/java-annotations) from 20.1.0 to 21.0.0. - [Release notes](https://github.com/JetBrains/java-annotations/releases) - [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/java-annotations/compare/20.1.0...21.0.0) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd9abf778..13c15ebf5 100644 --- a/pom.xml +++ b/pom.xml @@ -485,7 +485,7 @@ org.jetbrains annotations - 20.1.0 + 21.0.0 compile From a2bb189ffc8a9ac21dca810acacc3dbd204d2244 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 22 May 2021 05:02:23 +0000 Subject: [PATCH 201/548] Bump jetty.version from 9.4.40.v20210413 to 9.4.41.v20210516 Bumps `jetty.version` from 9.4.40.v20210413 to 9.4.41.v20210516. Updates `jetty-server` from 9.4.40.v20210413 to 9.4.41.v20210516 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.40.v20210413...jetty-9.4.41.v20210516) Updates `jetty-webapp` from 9.4.40.v20210413 to 9.4.41.v20210516 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.40.v20210413...jetty-9.4.41.v20210516) Updates `jetty-annotations` from 9.4.40.v20210413 to 9.4.41.v20210516 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.40.v20210413...jetty-9.4.41.v20210516) Updates `apache-jsp` from 9.4.40.v20210413 to 9.4.41.v20210516 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.40.v20210413...jetty-9.4.41.v20210516) Updates `apache-jstl` from 9.4.40.v20210413 to 9.4.41.v20210516 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.40.v20210413...jetty-9.4.41.v20210516) Updates `jetty-rewrite` from 9.4.40.v20210413 to 9.4.41.v20210516 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.40.v20210413...jetty-9.4.41.v20210516) Updates `websocket-server` from 9.4.40.v20210413 to 9.4.41.v20210516 Updates `jetty-jspc-maven-plugin` from 9.4.40.v20210413 to 9.4.41.v20210516 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.40.v20210413...jetty-9.4.41.v20210516) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd9abf778..d6aada286 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 5.3.7 5.4.6 8.0.25 - 9.4.40.v20210413 + 9.4.41.v20210516 1.18.20 2.12.3 From 7afda5323c06f5d7aeb648d1e02893e9b38aa9d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 23 May 2021 16:07:29 +0200 Subject: [PATCH 202/548] use SslContextFactory.Server() (closes #592) reason: SslContextFactory() is deprecated --- src/main/java/de/rwth/idsg/steve/JettyServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/rwth/idsg/steve/JettyServer.java b/src/main/java/de/rwth/idsg/steve/JettyServer.java index 8ea3ea48f..4cf0ad751 100644 --- a/src/main/java/de/rwth/idsg/steve/JettyServer.java +++ b/src/main/java/de/rwth/idsg/steve/JettyServer.java @@ -125,7 +125,7 @@ private ServerConnector httpConnector(HttpConfiguration httpConfig) { private ServerConnector httpsConnector(HttpConfiguration httpConfig) { // === jetty-https.xml === // SSL Context Factory - SslContextFactory sslContextFactory = new SslContextFactory(); + SslContextFactory sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(CONFIG.getJetty().getKeyStorePath()); sslContextFactory.setKeyStorePassword(CONFIG.getJetty().getKeyStorePassword()); sslContextFactory.setKeyManagerPassword(CONFIG.getJetty().getKeyStorePassword()); From 252337af01128d5e805fbff798be6deed76a1511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 23 May 2021 16:51:02 +0200 Subject: [PATCH 203/548] version bump [skip travis] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 90e0d5774..b6c3864b6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 de.rwth.idsg steve - 3.4.4 + 3.4.5 jar From 6fee2f2df84e4f905ec0f514129743de83f8839d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 29 May 2021 05:01:14 +0000 Subject: [PATCH 204/548] Bump annotations from 21.0.0 to 21.0.1 Bumps [annotations](https://github.com/JetBrains/java-annotations) from 21.0.0 to 21.0.1. - [Release notes](https://github.com/JetBrains/java-annotations/releases) - [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/java-annotations/compare/21.0.0...21.0.1) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b6c3864b6..fe899624f 100644 --- a/pom.xml +++ b/pom.xml @@ -485,7 +485,7 @@ org.jetbrains annotations - 21.0.0 + 21.0.1 compile From 07d31ff70f3ceb422f67b5b80bdbc5eb6ef0e33f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 5 Jun 2021 05:00:27 +0000 Subject: [PATCH 205/548] Bump flyway-maven-plugin from 7.9.1 to 7.9.2 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.9.1 to 7.9.2. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.9.1...flyway-7.9.2) --- updated-dependencies: - dependency-name: org.flywaydb:flyway-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fe899624f..23ac4804e 100644 --- a/pom.xml +++ b/pom.xml @@ -299,7 +299,7 @@ org.flywaydb flyway-maven-plugin - 7.9.1 + 7.9.2 From af381db07493c3e6ca700ec6e9a67342f78666fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Jun 2021 05:00:29 +0000 Subject: [PATCH 206/548] Bump spring-framework-bom from 5.3.7 to 5.3.8 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.7 to 5.3.8. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.7...v5.3.8) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 23ac4804e..65cd8a12e 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.14.11 3.4.3 - 5.3.7 + 5.3.8 5.5.0 8.0.25 9.4.41.v20210516 From 9ab0690da96f96914d319b9f673118b05c612d5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Jun 2021 05:00:59 +0000 Subject: [PATCH 207/548] Bump git-commit-id-plugin from 4.0.4 to 4.0.5 Bumps git-commit-id-plugin from 4.0.4 to 4.0.5. --- updated-dependencies: - dependency-name: pl.project13.maven:git-commit-id-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 23ac4804e..522540927 100644 --- a/pom.xml +++ b/pom.xml @@ -207,7 +207,7 @@ pl.project13.maven git-commit-id-plugin - 4.0.4 + 4.0.5 initialize From 1b88152255089b09e0d2044a0c931499cc7ac105 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Jun 2021 05:01:09 +0000 Subject: [PATCH 208/548] Bump flyway-maven-plugin from 7.9.2 to 7.10.0 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.9.2 to 7.10.0. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.9.2...flyway-7.10.0) --- updated-dependencies: - dependency-name: org.flywaydb:flyway-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 23ac4804e..6121c704b 100644 --- a/pom.xml +++ b/pom.xml @@ -299,7 +299,7 @@ org.flywaydb flyway-maven-plugin - 7.9.2 + 7.10.0 From d58162e1c16014f7ab01118f6ff4fe3b9d8da3b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Jun 2021 05:01:48 +0000 Subject: [PATCH 209/548] Bump jetty.version from 9.4.41.v20210516 to 9.4.42.v20210604 Bumps `jetty.version` from 9.4.41.v20210516 to 9.4.42.v20210604. Updates `jetty-server` from 9.4.41.v20210516 to 9.4.42.v20210604 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.41.v20210516...jetty-9.4.42.v20210604) Updates `jetty-webapp` from 9.4.41.v20210516 to 9.4.42.v20210604 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.41.v20210516...jetty-9.4.42.v20210604) Updates `jetty-annotations` from 9.4.41.v20210516 to 9.4.42.v20210604 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.41.v20210516...jetty-9.4.42.v20210604) Updates `apache-jsp` from 9.4.41.v20210516 to 9.4.42.v20210604 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.41.v20210516...jetty-9.4.42.v20210604) Updates `apache-jstl` from 9.4.41.v20210516 to 9.4.42.v20210604 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.41.v20210516...jetty-9.4.42.v20210604) Updates `jetty-rewrite` from 9.4.41.v20210516 to 9.4.42.v20210604 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.41.v20210516...jetty-9.4.42.v20210604) Updates `websocket-server` from 9.4.41.v20210516 to 9.4.42.v20210604 Updates `jetty-jspc-maven-plugin` from 9.4.41.v20210516 to 9.4.42.v20210604 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.41.v20210516...jetty-9.4.42.v20210604) --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-webapp dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:apache-jsp dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:apache-jstl dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-rewrite dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty.websocket:websocket-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-jspc-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 23ac4804e..e1f0d4db3 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 5.3.7 5.5.0 8.0.25 - 9.4.41.v20210516 + 9.4.42.v20210604 1.18.20 2.12.3 From 2b440d01624f89ad10bf3ff5a987cc917d397475 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Jun 2021 09:12:41 +0000 Subject: [PATCH 210/548] Bump cxf.version from 3.4.3 to 3.4.4 Bumps `cxf.version` from 3.4.3 to 3.4.4. Updates `cxf-rt-frontend-jaxws` from 3.4.3 to 3.4.4 Updates `cxf-rt-transports-http` from 3.4.3 to 3.4.4 Updates `cxf-rt-transports-http-hc` from 3.4.3 to 3.4.4 Updates `cxf-rt-features-logging` from 3.4.3 to 3.4.4 --- updated-dependencies: - dependency-name: org.apache.cxf:cxf-rt-frontend-jaxws dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-transports-http dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-transports-http-hc dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-features-logging dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2defc996b..65bfd5780 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ UTF-8 3.14.11 - 3.4.3 + 3.4.4 5.3.8 5.5.0 8.0.25 From 52ee214ff145e35585b2cdad4d56a8e7100ff8b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 19 Jun 2021 18:00:17 +0000 Subject: [PATCH 211/548] Bump maven-dependency-plugin from 3.1.2 to 3.2.0 Bumps [maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.1.2 to 3.2.0. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.1.2...maven-dependency-plugin-3.2.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 65bfd5780..bee7e5a85 100644 --- a/pom.xml +++ b/pom.xml @@ -245,7 +245,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.2 + 3.2.0 copy-dependencies From 14695f249ed2ffef0045effe24971153bc9596e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 19 Jun 2021 18:00:29 +0000 Subject: [PATCH 212/548] Bump jcl-over-slf4j from 1.7.30 to 1.7.31 Bumps [jcl-over-slf4j](https://github.com/qos-ch/slf4j) from 1.7.30 to 1.7.31. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/commits) --- updated-dependencies: - dependency-name: org.slf4j:jcl-over-slf4j dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 65bfd5780..f95dbda65 100644 --- a/pom.xml +++ b/pom.xml @@ -583,7 +583,7 @@ org.slf4j jcl-over-slf4j - 1.7.30 + 1.7.31 com.lmax From 3ad88920ba8bd452b9494c961f7951259f70d3e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 19 Jun 2021 18:00:33 +0000 Subject: [PATCH 213/548] Bump slf4j-api from 1.7.30 to 1.7.31 Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.30 to 1.7.31. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/commits) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 65bfd5780..955d50542 100644 --- a/pom.xml +++ b/pom.xml @@ -578,7 +578,7 @@ org.slf4j slf4j-api - 1.7.30 + 1.7.31 org.slf4j From 81800c953c9e97428669c619c69b37d909187842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Thu, 1 Jul 2021 21:42:56 +0200 Subject: [PATCH 214/548] refactor --- .../steve/ocpp/converter/Server15to16Impl.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java index 68fc3af65..8a48de87a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java @@ -243,12 +243,10 @@ public DataTransferResponse convertResponse(ocpp.cs._2015._10.DataTransferRespon * but something else might make more sense at this place */ private static ChargePointStatus customMapStatus(ocpp.cs._2012._06.ChargePointStatus status) { - switch (status) { - case OCCUPIED: - return ChargePointStatus.CHARGING; - default: - return ChargePointStatus.fromValue(status.value()); + if (status == ocpp.cs._2012._06.ChargePointStatus.OCCUPIED) { + return ChargePointStatus.CHARGING; } + return ChargePointStatus.fromValue(status.value()); } /** @@ -256,12 +254,10 @@ private static ChargePointStatus customMapStatus(ocpp.cs._2012._06.ChargePointSt * Update: According to the 1.6 specification, MODE_3_ERROR was simply renamed to EV_COMMUNICATION_ERROR */ private static ChargePointErrorCode customMapErrorCode(ocpp.cs._2012._06.ChargePointErrorCode errorCode15) { - switch (errorCode15) { - case MODE_3_ERROR: - return ChargePointErrorCode.EV_COMMUNICATION_ERROR; - default: - return ChargePointErrorCode.fromValue(errorCode15.value()); + if (errorCode15 == ocpp.cs._2012._06.ChargePointErrorCode.MODE_3_ERROR) { + return ChargePointErrorCode.EV_COMMUNICATION_ERROR; } + return ChargePointErrorCode.fromValue(errorCode15.value()); } /** From 97f56a36ddae55c79d5e4eb750db2f269008e329 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Jul 2021 18:07:12 +0000 Subject: [PATCH 215/548] Bump spring.security.version from 5.5.0 to 5.5.1 Bumps `spring.security.version` from 5.5.0 to 5.5.1. Updates `spring-security-web` from 5.5.0 to 5.5.1 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.5.0...5.5.1) Updates `spring-security-config` from 5.5.0 to 5.5.1 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.5.0...5.5.1) --- updated-dependencies: - dependency-name: org.springframework.security:spring-security-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.security:spring-security-config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0d5e9da0a..b8ac278c0 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.14.11 3.4.4 5.3.8 - 5.5.0 + 5.5.1 8.0.25 9.4.42.v20210604 1.18.20 From 75d1d2eff13ba309408c01bf911ca2003b51ce1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Jul 2021 18:07:43 +0000 Subject: [PATCH 216/548] Bump jooq.version from 3.14.11 to 3.14.12 Bumps `jooq.version` from 3.14.11 to 3.14.12. Updates `jooq-meta` from 3.14.11 to 3.14.12 Updates `jooq-codegen` from 3.14.11 to 3.14.12 Updates `jooq` from 3.14.11 to 3.14.12 Updates `jooq-codegen-maven` from 3.14.11 to 3.14.12 --- updated-dependencies: - dependency-name: org.jooq:jooq-meta dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0d5e9da0a..b7526eef0 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 11 UTF-8 - 3.14.11 + 3.14.12 3.4.4 5.3.8 5.5.0 From 53331f089b1cc4c4f3efa25627b76fe96303c340 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Jul 2021 18:08:06 +0000 Subject: [PATCH 217/548] Bump flyway-maven-plugin from 7.10.0 to 7.11.0 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.10.0 to 7.11.0. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.10.0...flyway-7.11.0) --- updated-dependencies: - dependency-name: org.flywaydb:flyway-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0d5e9da0a..e5dad2558 100644 --- a/pom.xml +++ b/pom.xml @@ -299,7 +299,7 @@ org.flywaydb flyway-maven-plugin - 7.10.0 + 7.11.0 From fe41d081bf960ecda28734e323149400bd0aa34a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 10 Jul 2021 18:00:56 +0000 Subject: [PATCH 218/548] Bump jetty.version from 9.4.42.v20210604 to 9.4.43.v20210629 Bumps `jetty.version` from 9.4.42.v20210604 to 9.4.43.v20210629. Updates `jetty-server` from 9.4.42.v20210604 to 9.4.43.v20210629 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.42.v20210604...jetty-9.4.43.v20210629) Updates `jetty-webapp` from 9.4.42.v20210604 to 9.4.43.v20210629 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.42.v20210604...jetty-9.4.43.v20210629) Updates `jetty-annotations` from 9.4.42.v20210604 to 9.4.43.v20210629 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.42.v20210604...jetty-9.4.43.v20210629) Updates `apache-jsp` from 9.4.42.v20210604 to 9.4.43.v20210629 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.42.v20210604...jetty-9.4.43.v20210629) Updates `apache-jstl` from 9.4.42.v20210604 to 9.4.43.v20210629 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.42.v20210604...jetty-9.4.43.v20210629) Updates `jetty-rewrite` from 9.4.42.v20210604 to 9.4.43.v20210629 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.42.v20210604...jetty-9.4.43.v20210629) Updates `websocket-server` from 9.4.42.v20210604 to 9.4.43.v20210629 Updates `jetty-jspc-maven-plugin` from 9.4.42.v20210604 to 9.4.43.v20210629 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.42.v20210604...jetty-9.4.43.v20210629) --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-webapp dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:apache-jsp dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:apache-jstl dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-rewrite dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty.websocket:websocket-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-jspc-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b072a1735..bfb491b96 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 5.3.8 5.5.1 8.0.25 - 9.4.42.v20210604 + 9.4.43.v20210629 1.18.20 2.12.3 From 3b21075204b77f7cf2f4044e69b418558619900e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 10 Jul 2021 18:01:04 +0000 Subject: [PATCH 219/548] Bump jackson.version from 2.12.3 to 2.12.4 Bumps `jackson.version` from 2.12.3 to 2.12.4. Updates `jackson-databind` from 2.12.3 to 2.12.4 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-module-jaxb-annotations` from 2.12.3 to 2.12.4 - [Release notes](https://github.com/FasterXML/jackson-modules-base/releases) - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.12.3...jackson-modules-base-2.12.4) Updates `jackson-annotations` from 2.12.3 to 2.12.4 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.module:jackson-module-jaxb-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b072a1735..e863fe284 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 8.0.25 9.4.42.v20210604 1.18.20 - 2.12.3 + 2.12.4 jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true&serverTimezone=UTC From f64d3b94f17235f2496216cd1a36c2c9bd8dba2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Jul 2021 18:00:24 +0000 Subject: [PATCH 220/548] Bump jooq.version from 3.14.12 to 3.15.1 Bumps `jooq.version` from 3.14.12 to 3.15.1. Updates `jooq-meta` from 3.14.12 to 3.15.1 Updates `jooq-codegen` from 3.14.12 to 3.15.1 Updates `jooq` from 3.14.12 to 3.15.1 Updates `jooq-codegen-maven` from 3.14.12 to 3.15.1 --- updated-dependencies: - dependency-name: org.jooq:jooq-meta dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jooq:jooq-codegen dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jooq:jooq dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jooq:jooq-codegen-maven dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b072a1735..97e6a3e58 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 11 UTF-8 - 3.14.12 + 3.15.1 3.4.4 5.3.8 5.5.1 From 811e30e2149108fa1fff7dda23c5f0ead184a520 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Jul 2021 18:00:31 +0000 Subject: [PATCH 221/548] Bump spring-framework-bom from 5.3.8 to 5.3.9 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.8 to 5.3.9. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.8...v5.3.9) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b072a1735..3e2ef3ce3 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.14.12 3.4.4 - 5.3.8 + 5.3.9 5.5.1 8.0.25 9.4.42.v20210604 From 853971ee58ebf0c9bee4d7f0ea5ff993764faa77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Jul 2021 18:00:50 +0000 Subject: [PATCH 222/548] Bump HikariCP from 4.0.3 to 5.0.0 Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 4.0.3 to 5.0.0. - [Release notes](https://github.com/brettwooldridge/HikariCP/releases) - [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES) - [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-4.0.3...HikariCP-5.0.0) --- updated-dependencies: - dependency-name: com.zaxxer:HikariCP dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b072a1735..8e33697d6 100644 --- a/pom.xml +++ b/pom.xml @@ -659,7 +659,7 @@ com.zaxxer HikariCP - 4.0.3 + 5.0.0 org.jooq From 2c5e3e9c4b850dcf7489e4c28ddc56837f1ec16d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Jul 2021 15:16:47 +0000 Subject: [PATCH 223/548] Bump jetty-webapp from 9.4.42.v20210604 to 9.4.43.v20210629 Bumps [jetty-webapp](https://github.com/eclipse/jetty.project) from 9.4.42.v20210604 to 9.4.43.v20210629. - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.42.v20210604...jetty-9.4.43.v20210629) --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-webapp dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b072a1735..bfb491b96 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 5.3.8 5.5.1 8.0.25 - 9.4.42.v20210604 + 9.4.43.v20210629 1.18.20 2.12.3 From 89d7264c78b690e9a0a24def35724ce2636a0a7c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 24 Jul 2021 18:00:30 +0000 Subject: [PATCH 224/548] Bump jcl-over-slf4j from 1.7.31 to 1.7.32 Bumps [jcl-over-slf4j](https://github.com/qos-ch/slf4j) from 1.7.31 to 1.7.32. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/commits) --- updated-dependencies: - dependency-name: org.slf4j:jcl-over-slf4j dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b072a1735..29a6910da 100644 --- a/pom.xml +++ b/pom.xml @@ -583,7 +583,7 @@ org.slf4j jcl-over-slf4j - 1.7.31 + 1.7.32 com.lmax From 3f667c561abe99c42abcafe2f9c405f9a938ae6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 24 Jul 2021 18:00:54 +0000 Subject: [PATCH 225/548] Bump flyway-maven-plugin from 7.11.0 to 7.11.3 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.11.0 to 7.11.3. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.11.0...flyway-7.11.3) --- updated-dependencies: - dependency-name: org.flywaydb:flyway-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b072a1735..4c9c33005 100644 --- a/pom.xml +++ b/pom.xml @@ -299,7 +299,7 @@ org.flywaydb flyway-maven-plugin - 7.11.0 + 7.11.3 From 705d4b6d26cfa17a470319f7b82014855c1573ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 24 Jul 2021 18:01:02 +0000 Subject: [PATCH 226/548] Bump slf4j-api from 1.7.31 to 1.7.32 Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.31 to 1.7.32. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/commits) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b072a1735..3b0ed1eb2 100644 --- a/pom.xml +++ b/pom.xml @@ -578,7 +578,7 @@ org.slf4j slf4j-api - 1.7.31 + 1.7.32 org.slf4j From 18d8b463641da919391f483f6d7b5145b7b8b48e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 25 Jul 2021 14:26:26 +0000 Subject: [PATCH 227/548] Bump mysql-connector-java from 8.0.25 to 8.0.26 Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.25 to 8.0.26. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.25...8.0.26) --- updated-dependencies: - dependency-name: mysql:mysql-connector-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 61af9d7ea..5f705c563 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 3.4.4 5.3.9 5.5.1 - 8.0.25 + 8.0.26 9.4.43.v20210629 1.18.20 2.12.4 From 57bd41f6288d4cc6e5d08651cf936bd4844a767e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 31 Jul 2021 18:00:36 +0000 Subject: [PATCH 228/548] Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0 Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.0.0-M3 to 3.0.0. - [Release notes](https://github.com/apache/maven-enforcer/releases) - [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.0.0-M3...enforcer-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-enforcer-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bac8851dd..8272960e8 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.0.0 enforce-java From 9e033058699bd52ef58822452ee5b7e361e33f84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 7 Aug 2021 18:00:45 +0000 Subject: [PATCH 229/548] Bump git-commit-id-plugin from 4.0.5 to 4.9.10 Bumps git-commit-id-plugin from 4.0.5 to 4.9.10. --- updated-dependencies: - dependency-name: pl.project13.maven:git-commit-id-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bac8851dd..a9eb2a1bf 100644 --- a/pom.xml +++ b/pom.xml @@ -207,7 +207,7 @@ pl.project13.maven git-commit-id-plugin - 4.0.5 + 4.9.10 initialize From 753d70e621079a8ef43796a416d6dd5032d688e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 Aug 2021 18:00:32 +0000 Subject: [PATCH 230/548] Bump annotations from 21.0.1 to 22.0.0 Bumps [annotations](https://github.com/JetBrains/java-annotations) from 21.0.1 to 22.0.0. - [Release notes](https://github.com/JetBrains/java-annotations/releases) - [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/java-annotations/compare/21.0.1...22.0.0) --- updated-dependencies: - dependency-name: org.jetbrains:annotations dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd4e01b21..ece8ba7ba 100644 --- a/pom.xml +++ b/pom.xml @@ -485,7 +485,7 @@ org.jetbrains annotations - 21.0.1 + 22.0.0 compile From 5c91a50045528f30fef2a730395fd765958d0173 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 21 Aug 2021 18:00:35 +0000 Subject: [PATCH 231/548] Bump spring.security.version from 5.5.1 to 5.5.2 Bumps `spring.security.version` from 5.5.1 to 5.5.2. Updates `spring-security-web` from 5.5.1 to 5.5.2 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.5.1...5.5.2) Updates `spring-security-config` from 5.5.1 to 5.5.2 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.5.1...5.5.2) --- updated-dependencies: - dependency-name: org.springframework.security:spring-security-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.security:spring-security-config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd4e01b21..a7418047e 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.15.1 3.4.4 5.3.9 - 5.5.1 + 5.5.2 8.0.26 9.4.43.v20210629 1.18.20 From 3f19909b8cf57b5122eca2af2ad16663b4411f4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 28 Aug 2021 18:00:27 +0000 Subject: [PATCH 232/548] Bump nv-i18n from 1.28 to 1.29 Bumps [nv-i18n](https://github.com/TakahikoKawasaki/nv-i18n) from 1.28 to 1.29. - [Release notes](https://github.com/TakahikoKawasaki/nv-i18n/releases) - [Changelog](https://github.com/TakahikoKawasaki/nv-i18n/blob/master/CHANGES.md) - [Commits](https://github.com/TakahikoKawasaki/nv-i18n/compare/nv-i18n-1.28...nv-i18n-1.29) --- updated-dependencies: - dependency-name: com.neovisionaries:nv-i18n dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd4e01b21..49db25def 100644 --- a/pom.xml +++ b/pom.xml @@ -692,7 +692,7 @@ com.neovisionaries nv-i18n - 1.28 + 1.29 From d41feaa53bc3f0114a4ddf6319d615ff37a5d6d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 28 Aug 2021 18:00:40 +0000 Subject: [PATCH 233/548] Bump jackson.version from 2.12.4 to 2.12.5 Bumps `jackson.version` from 2.12.4 to 2.12.5. Updates `jackson-databind` from 2.12.4 to 2.12.5 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-module-jaxb-annotations` from 2.12.4 to 2.12.5 - [Release notes](https://github.com/FasterXML/jackson-modules-base/releases) - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.12.4...jackson-modules-base-2.12.5) Updates `jackson-annotations` from 2.12.4 to 2.12.5 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.module:jackson-module-jaxb-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd4e01b21..77b3d7de8 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 8.0.26 9.4.43.v20210629 1.18.20 - 2.12.4 + 2.12.5 jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true&serverTimezone=UTC From 27bbd3b2f4c4200d25e41cc8152ef2a0ba1eac33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Sep 2021 18:00:49 +0000 Subject: [PATCH 234/548] Bump maven-pmd-plugin from 3.14.0 to 3.15.0 Bumps [maven-pmd-plugin](https://github.com/apache/maven-pmd-plugin) from 3.14.0 to 3.15.0. - [Release notes](https://github.com/apache/maven-pmd-plugin/releases) - [Commits](https://github.com/apache/maven-pmd-plugin/compare/maven-pmd-plugin-3.14.0...maven-pmd-plugin-3.15.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-pmd-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 30006f6af..1eb3c2ad3 100644 --- a/pom.xml +++ b/pom.xml @@ -177,7 +177,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.14.0 + 3.15.0 org.codehaus.mojo From bd08aae3ae1a3e2d44dc15c6eff265fed442da40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 19 Sep 2021 18:18:21 +0200 Subject: [PATCH 235/548] add github action --- .github/workflows/main.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 000000000..302c7747e --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,32 @@ +name: SteVe build with Java 11 +on: [push] + +jobs: + build: + runs-on: ubuntu-18.04 + services: + mysql: + image: mysql:5.7.35 + env: + MYSQL_ROOT_PASSWORD: root + MYSQL_DATABASE: root + options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + cache: maven + - name: Set up MySQL + run: | + sudo systemctl start mysql.service + mysql -h 127.0.0.1 -uroot -proot -e "CREATE DATABASE stevedb_test_2aa6a783d47d;" + mysql -h 127.0.0.1 -uroot -proot -e "CREATE USER 'steve'@'localhost' IDENTIFIED BY 'changeme';" + mysql -h 127.0.0.1 -uroot -proot -e "GRANT ALL PRIVILEGES ON stevedb_test_2aa6a783d47d.* TO 'steve'@'localhost';" + mysql -h 127.0.0.1 -uroot -proot -e "GRANT SELECT ON mysql.proc TO 'steve'@'localhost';" + mysql -h 127.0.0.1 -uroot -proot -e "GRANT SUPER ON *.* TO 'steve'@'localhost';" + - name: Build with Maven + run: mvn -B -V -Dmaven.javadoc.skip=true -Ptest clean package --file pom.xml From d84dd251344e1a167a6242c9f19037013b46e9d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 19 Sep 2021 18:43:47 +0200 Subject: [PATCH 236/548] switch to job matrix for java versions --- .github/workflows/main.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 302c7747e..3456a4b33 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,6 +4,10 @@ on: [push] jobs: build: runs-on: ubuntu-18.04 + strategy: + fail-fast: false + matrix: + java: ['11', '15'] services: mysql: image: mysql:5.7.35 @@ -14,10 +18,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up Java ${{ matrix.Java }} uses: actions/setup-java@v2 with: - java-version: '11' + java-version: ${{ matrix.java }} distribution: 'adopt' cache: maven - name: Set up MySQL From 7170f9fe5d81d9452fcca1f46da45e0116f23a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 19 Sep 2021 18:51:55 +0200 Subject: [PATCH 237/548] switch to job matrix for db flavours --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3456a4b33..fb4f0369c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -name: SteVe build with Java 11 +name: build and run tests on: [push] jobs: @@ -8,9 +8,10 @@ jobs: fail-fast: false matrix: java: ['11', '15'] + db: ['mysql:5.7.35', 'mysql:8.0', 'mariadb:10.3', 'mariadb:10.5'] services: mysql: - image: mysql:5.7.35 + image: ${{ matrix.db }} env: MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: root From 7103c4630368a435dffc9a4511237c477dbfe5fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 19 Sep 2021 19:04:03 +0200 Subject: [PATCH 238/548] update status badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e5f680d64..a226f64de 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![SteVe](src/main/resources/webapp/static/images/logo.png) -[![Build Status](https://travis-ci.org/RWTH-i5-IDSG/steve.svg?branch=master)](https://travis-ci.org/RWTH-i5-IDSG/steve) +[![build and run tests](https://github.com/RWTH-i5-IDSG/steve/actions/workflows/main.yml/badge.svg)](https://github.com/RWTH-i5-IDSG/steve/actions/workflows/main.yml) # Introduction From 3a5b465a6442e5ecc4c728835a3bdee6045d7224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 19 Sep 2021 19:18:04 +0200 Subject: [PATCH 239/548] switch to job matrix for os versions --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fb4f0369c..5eb13175c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,12 +3,13 @@ on: [push] jobs: build: - runs-on: ubuntu-18.04 strategy: fail-fast: false matrix: + os: [ubuntu-18.04, ubuntu-20.04] java: ['11', '15'] db: ['mysql:5.7.35', 'mysql:8.0', 'mariadb:10.3', 'mariadb:10.5'] + runs-on: ${{ matrix.os }} services: mysql: image: ${{ matrix.db }} From a658bc16c9a82e1134814670c1156e52cb425e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 19 Sep 2021 22:02:29 +0200 Subject: [PATCH 240/548] fix database issues --- .github/workflows/main.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5eb13175c..fc0d289c1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,14 +1,14 @@ name: build and run tests -on: [push] +on: [ push ] jobs: build: strategy: fail-fast: false matrix: - os: [ubuntu-18.04, ubuntu-20.04] - java: ['11', '15'] - db: ['mysql:5.7.35', 'mysql:8.0', 'mariadb:10.3', 'mariadb:10.5'] + os: [ ubuntu-18.04, ubuntu-20.04 ] + java: [ '11', '15' ] + db: [ 'mysql:5.7.35', 'mysql:8.0', 'mariadb:10.3', 'mariadb:10.5' ] runs-on: ${{ matrix.os }} services: mysql: @@ -16,6 +16,8 @@ jobs: env: MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: root + ports: + - 3306:3306 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 steps: @@ -26,13 +28,15 @@ jobs: java-version: ${{ matrix.java }} distribution: 'adopt' cache: maven + - name: Set up MySQL run: | - sudo systemctl start mysql.service - mysql -h 127.0.0.1 -uroot -proot -e "CREATE DATABASE stevedb_test_2aa6a783d47d;" - mysql -h 127.0.0.1 -uroot -proot -e "CREATE USER 'steve'@'localhost' IDENTIFIED BY 'changeme';" - mysql -h 127.0.0.1 -uroot -proot -e "GRANT ALL PRIVILEGES ON stevedb_test_2aa6a783d47d.* TO 'steve'@'localhost';" - mysql -h 127.0.0.1 -uroot -proot -e "GRANT SELECT ON mysql.proc TO 'steve'@'localhost';" - mysql -h 127.0.0.1 -uroot -proot -e "GRANT SUPER ON *.* TO 'steve'@'localhost';" + mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "SELECT @@VERSION;" + mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "CREATE DATABASE stevedb_test_2aa6a783d47d;" -v + mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "CREATE USER 'steve'@'%' IDENTIFIED BY 'changeme';" -v + mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "GRANT ALL PRIVILEGES ON stevedb_test_2aa6a783d47d.* TO 'steve'@'%';" -v + mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "GRANT SELECT ON mysql.proc TO 'steve'@'%';" -v || true + mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "GRANT SUPER ON *.* TO 'steve'@'%';" -v || true + - name: Build with Maven run: mvn -B -V -Dmaven.javadoc.skip=true -Ptest clean package --file pom.xml From 894c808effc642b0f22c1f1405df969fc1a55ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 19 Sep 2021 22:23:29 +0200 Subject: [PATCH 241/548] start the java app and test web page --- .github/workflows/main.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc0d289c1..66c0c3671 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,3 +40,11 @@ jobs: - name: Build with Maven run: mvn -B -V -Dmaven.javadoc.skip=true -Ptest clean package --file pom.xml + + - name: Start the app and visit signin web page + run: | + sudo apt-get install -y elinks + java -Djava.net.preferIPv4Stack=true -jar target/steve.jar & + sleep 30 + elinks -dump -no-references http://localhost:8080/steve/manager/signin + killall java \ No newline at end of file From bfd2d7abd613ce648d5adeb57bdf024d5ef6066e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 19 Sep 2021 22:26:12 +0200 Subject: [PATCH 242/548] nits --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 66c0c3671..201145400 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,4 +47,4 @@ jobs: java -Djava.net.preferIPv4Stack=true -jar target/steve.jar & sleep 30 elinks -dump -no-references http://localhost:8080/steve/manager/signin - killall java \ No newline at end of file + killall java From 0718114ef47b4d0a0877e039313b79851a3d0167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 19 Sep 2021 22:33:57 +0200 Subject: [PATCH 243/548] remove files related to travis ci --- .travis-maven-settings.xml | 26 ----------- .travis.yml | 89 -------------------------------------- 2 files changed, 115 deletions(-) delete mode 100644 .travis-maven-settings.xml delete mode 100644 .travis.yml diff --git a/.travis-maven-settings.xml b/.travis-maven-settings.xml deleted file mode 100644 index c129549cd..000000000 --- a/.travis-maven-settings.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - maven-central - Maven Central - https://repo1.maven.org/maven2 - central - - - - - default-profile - - true - - - - diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index dca1236e9..000000000 --- a/.travis.yml +++ /dev/null @@ -1,89 +0,0 @@ -language: java - - -# install dependencies -install: mvn dependency:resolve dependency:resolve-plugins -s .travis-maven-settings.xml -B -V - -before_script: - # Display Versions - - mysqld -V - - java -version - - mvn -version - # initalize empty database and privileges - - sudo mysql -uroot -e "CREATE DATABASE stevedb_test_2aa6a783d47d;" -v - - sudo mysql -uroot -e "CREATE USER 'steve'@'localhost' IDENTIFIED BY 'changeme';" -v - - sudo mysql -uroot -e "GRANT ALL PRIVILEGES ON stevedb_test_2aa6a783d47d.* TO 'steve'@'localhost';" -v - - sudo mysql -uroot -e "GRANT SELECT ON mysql.proc TO 'steve'@'localhost';" -v || true - # grant super privilege required by MariaDB running with log-bin - - sudo mysql -uroot -e "GRANT SUPER ON *.* TO 'steve'@'localhost';" -v || true - -# start the actual build -script: - - mvn -s .travis-maven-settings.xml -Dmaven.javadoc.skip=true clean package -Ptest -B -V || travis_terminate 1 - - java -Djava.net.preferIPv4Stack=true -jar target/steve.jar & - - sleep 30 - - 'grep -C 50 -e "Exception: " ~/logs/steve.log && exit 255 || true' - - elinks -dump -no-references http://localhost:8080/steve/manager/signin - - killall java - - - -jobs: - include: - - name: OpenJDK11 with MySQL 8.0 (Ubuntu LTS 20.04) - jdk: openjdk11 - dist: focal - services: mysql - - name: OpenJDK15 with MySQL 8.0 (Ubuntu LTS 20.04) - jdk: openjdk15 - dist: focal - services: mysql - - name: OpenJDK11 with MySQL 5.7 (Ubuntu LTS 16.04) - jdk: openjdk11 - dist: xenial - services: mysql - - name: OpenJDK15 with MySQL 5.7 (Ubuntu LTS 16.04) - jdk: openjdk15 - dist: xenial - services: mysql - - name: OpenJDK11 with MariaDB 10.3 (Ubuntu LTS 20.04) - jdk: openjdk11 - dist: focal - addons: - mariadb: "10.3" - apt: - packages: - - elinks - - name: OpenJDK15 with MariaDB 10.3 (Ubuntu LTS 20.04) - jdk: openjdk15 - dist: focal - addons: - mariadb: "10.3" - apt: - packages: - - elinks - - name: OpenJDK11 with MariaDB 10.5 (Ubuntu LTS 20.04) - jdk: openjdk11 - dist: focal - addons: - mariadb: "10.5" - apt: - packages: - - elinks - - name: OpenJDK15 with MariaDB 10.5 (Ubuntu LTS 20.04) - jdk: openjdk15 - dist: focal - addons: - mariadb: "10.5" - apt: - packages: - - elinks - -addons: - apt: - packages: - - elinks - -cache: - directories: - - $HOME/.m2 From 9b274ba760856129a6849c6e5261290258b7b04b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Sep 2021 20:49:42 +0000 Subject: [PATCH 244/548] Bump flyway-maven-plugin from 7.11.3 to 7.15.0 Bumps [flyway-maven-plugin](https://github.com/flyway/flyway) from 7.11.3 to 7.15.0. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-7.11.3...flyway-7.15.0) --- updated-dependencies: - dependency-name: org.flywaydb:flyway-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1eb3c2ad3..5c1faf186 100644 --- a/pom.xml +++ b/pom.xml @@ -299,7 +299,7 @@ org.flywaydb flyway-maven-plugin - 7.11.3 + 7.15.0 From c174f4a5c81c5f8d95ad352fe297e852565dc0a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Sep 2021 20:55:43 +0000 Subject: [PATCH 245/548] Bump spring-framework-bom from 5.3.9 to 5.3.10 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.9 to 5.3.10. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.9...v5.3.10) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5c1faf186..607f6522e 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.15.1 3.4.4 - 5.3.9 + 5.3.10 5.5.2 8.0.26 9.4.43.v20210629 From 78f13347b39be1a0f8ecf024acd5ebc9f3592ad7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Sep 2021 21:08:17 +0000 Subject: [PATCH 246/548] Bump jooq.version from 3.15.1 to 3.15.3 Bumps `jooq.version` from 3.15.1 to 3.15.3. Updates `jooq-meta` from 3.15.1 to 3.15.3 Updates `jooq-codegen` from 3.15.1 to 3.15.3 Updates `jooq` from 3.15.1 to 3.15.3 Updates `jooq-codegen-maven` from 3.15.1 to 3.15.3 --- updated-dependencies: - dependency-name: org.jooq:jooq-meta dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 607f6522e..7a767329a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 11 UTF-8 - 3.15.1 + 3.15.3 3.4.4 5.3.10 5.5.2 From 804dc84b44333047e4cfdbdc01bbcc681b67be97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 Sep 2021 18:00:34 +0000 Subject: [PATCH 247/548] Bump joda-time from 2.10.10 to 2.10.11 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.10 to 2.10.11. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.10...v2.10.11) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7a767329a..a178bfc40 100644 --- a/pom.xml +++ b/pom.xml @@ -498,7 +498,7 @@ joda-time joda-time - 2.10.10 + 2.10.11 org.hibernate.validator From 7f21f30d6c03c5a8f3f6404b794dc0e0eef587b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 Sep 2021 18:00:38 +0000 Subject: [PATCH 248/548] Bump guava from 30.1.1-jre to 31.0-jre Bumps [guava](https://github.com/google/guava) from 30.1.1-jre to 31.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7a767329a..ffb05ab1f 100644 --- a/pom.xml +++ b/pom.xml @@ -508,7 +508,7 @@ com.google.guava guava - 30.1.1-jre + 31.0-jre com.fasterxml.jackson.core From cb05b3ccbf821536117dcbbbfda69a2d1e91be45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Oct 2021 18:00:26 +0000 Subject: [PATCH 249/548] Bump guava from 31.0-jre to 31.0.1-jre Bumps [guava](https://github.com/google/guava) from 31.0-jre to 31.0.1-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 344f8b899..8ed2722bf 100644 --- a/pom.xml +++ b/pom.xml @@ -508,7 +508,7 @@ com.google.guava guava - 31.0-jre + 31.0.1-jre com.fasterxml.jackson.core From 13059281d8e464bb64c7fc02236bdb61acaac421 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Oct 2021 18:00:32 +0000 Subject: [PATCH 250/548] Bump jackson.version from 2.12.5 to 2.13.0 Bumps `jackson.version` from 2.12.5 to 2.13.0. Updates `jackson-databind` from 2.12.5 to 2.13.0 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-module-jaxb-annotations` from 2.12.5 to 2.13.0 - [Release notes](https://github.com/FasterXML/jackson-modules-base/releases) - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.12.5...jackson-modules-base-2.13.0) Updates `jackson-annotations` from 2.12.5 to 2.13.0 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.module:jackson-module-jaxb-annotations dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 344f8b899..a9bca2eaf 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 8.0.26 9.4.43.v20210629 1.18.20 - 2.12.5 + 2.13.0 jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true&serverTimezone=UTC From 34d17ed7fbf45d11b35b4845cc124faa193c403c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Oct 2021 18:01:11 +0000 Subject: [PATCH 251/548] Bump jetty.version from 9.4.43.v20210629 to 9.4.44.v20210927 Bumps `jetty.version` from 9.4.43.v20210629 to 9.4.44.v20210927. Updates `jetty-server` from 9.4.43.v20210629 to 9.4.44.v20210927 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.43.v20210629...jetty-9.4.44.v20210927) Updates `jetty-webapp` from 9.4.43.v20210629 to 9.4.44.v20210927 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.43.v20210629...jetty-9.4.44.v20210927) Updates `jetty-annotations` from 9.4.43.v20210629 to 9.4.44.v20210927 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.43.v20210629...jetty-9.4.44.v20210927) Updates `apache-jsp` from 9.4.43.v20210629 to 9.4.44.v20210927 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.43.v20210629...jetty-9.4.44.v20210927) Updates `apache-jstl` from 9.4.43.v20210629 to 9.4.44.v20210927 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.43.v20210629...jetty-9.4.44.v20210927) Updates `jetty-rewrite` from 9.4.43.v20210629 to 9.4.44.v20210927 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.43.v20210629...jetty-9.4.44.v20210927) Updates `websocket-server` from 9.4.43.v20210629 to 9.4.44.v20210927 Updates `jetty-jspc-maven-plugin` from 9.4.43.v20210629 to 9.4.44.v20210927 - [Release notes](https://github.com/eclipse/jetty.project/releases) - [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.43.v20210629...jetty-9.4.44.v20210927) --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-webapp dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:apache-jsp dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:apache-jstl dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-rewrite dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty.websocket:websocket-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-jspc-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 344f8b899..48cee0d62 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 5.3.10 5.5.2 8.0.26 - 9.4.43.v20210629 + 9.4.44.v20210927 1.18.20 2.12.5 From 6e8f5967d106b11eec114d807fdb35ba2ee280f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Oct 2021 18:01:22 +0000 Subject: [PATCH 252/548] Bump joda-time from 2.10.11 to 2.10.12 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.11 to 2.10.12. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.11...v2.10.12) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 344f8b899..1b3c8cc14 100644 --- a/pom.xml +++ b/pom.xml @@ -498,7 +498,7 @@ joda-time joda-time - 2.10.11 + 2.10.12 org.hibernate.validator From 56240eac664e16cad55810377ad87e7fedb4f2f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 3 Oct 2021 21:43:53 +0200 Subject: [PATCH 253/548] move away from deprecated class --- .../de/rwth/idsg/steve/service/GithubReleaseCheckService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java b/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java index 89c409d7d..141cda7ef 100644 --- a/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java +++ b/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.github.zafarkhaja.semver.Version; import de.rwth.idsg.steve.SteveConfiguration; import de.rwth.idsg.steve.web.dto.ReleaseReport; @@ -64,7 +64,7 @@ private void init() { ObjectMapper mapper = new ObjectMapper(); mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); - mapper.setPropertyNamingStrategy(new PropertyNamingStrategy.SnakeCaseStrategy()); + mapper.setPropertyNamingStrategy(new PropertyNamingStrategies.SnakeCaseStrategy()); restTemplate = new RestTemplate(Collections.singletonList(new MappingJackson2HttpMessageConverter(mapper))); restTemplate.setRequestFactory(factory); From 7537b4703081b77ad241865a702ca764357f2d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 3 Oct 2021 21:45:04 +0200 Subject: [PATCH 254/548] remove unused injected instance --- .../de/rwth/idsg/steve/config/WebSocketConfiguration.java | 5 +---- .../de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java index 49beaaaf5..ac1c4f739 100644 --- a/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java @@ -25,7 +25,6 @@ import de.rwth.idsg.steve.ocpp.ws.ocpp15.Ocpp15WebSocketEndpoint; import de.rwth.idsg.steve.ocpp.ws.ocpp16.Ocpp16WebSocketEndpoint; import de.rwth.idsg.steve.service.ChargePointHelperService; -import de.rwth.idsg.steve.service.NotificationService; import lombok.extern.slf4j.Slf4j; import org.eclipse.jetty.websocket.api.WebSocketBehavior; import org.eclipse.jetty.websocket.api.WebSocketPolicy; @@ -48,7 +47,6 @@ @Slf4j public class WebSocketConfiguration implements WebSocketConfigurer { - @Autowired private NotificationService notificationService; @Autowired private ChargePointHelperService chargePointHelperService; @Autowired private Ocpp12WebSocketEndpoint ocpp12WebSocketEndpoint; @@ -69,8 +67,7 @@ public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { List endpoints = getEndpoints(); String[] protocols = endpoints.stream().map(e -> e.getVersion().getValue()).toArray(String[]::new); - OcppWebSocketUpgrader upgradeStrategy = new OcppWebSocketUpgrader( - policy, endpoints, notificationService, chargePointHelperService); + OcppWebSocketUpgrader upgradeStrategy = new OcppWebSocketUpgrader(policy, endpoints, chargePointHelperService); DefaultHandshakeHandler handler = new DefaultHandshakeHandler(upgradeStrategy); handler.setSupportedProtocols(protocols); diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java index 09301ba95..fd9b08e6c 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java @@ -42,15 +42,12 @@ public class OcppWebSocketUpgrader extends JettyRequestUpgradeStrategy { private final List endpoints; - private final NotificationService notificationService; private final ChargePointHelperService chargePointHelperService; public OcppWebSocketUpgrader(WebSocketPolicy policy, List endpoints, - NotificationService notificationService, ChargePointHelperService chargePointHelperService) { super(policy); this.endpoints = endpoints; - this.notificationService = notificationService; this.chargePointHelperService = chargePointHelperService; } From 85037a479311b8c0cc078976441685c7c43b56e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 3 Oct 2021 21:48:56 +0200 Subject: [PATCH 255/548] fix javadoc reference --- .../de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java index e5662459b..a69eaa728 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java @@ -51,7 +51,7 @@ * 2. Intercepts incoming OCPP messages to update the endpoint address ("From" field of the WS-A header) in DB. * And the absence of the field is not a deal breaker anymore. But, as a side effect, the user will not be able * to send commands to the charging station, since the DB call to list the charge points will filter it out. See - * {@link ChargePointRepositoryImpl#getChargePointSelect(OcppProtocol)}. + * {@link ChargePointRepositoryImpl#getChargePointSelect(OcppProtocol, java.util.List)}. * * @author Sevket Goekay * @since 15.06.2015 From 5031ea434b13a90665283dd495b7854c62adf8ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 3 Oct 2021 21:49:53 +0200 Subject: [PATCH 256/548] remove redundant suppress --- .../idsg/steve/repository/impl/TransactionRepositoryImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java index 2cbca8b54..7c7f220c2 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java @@ -66,14 +66,12 @@ public TransactionRepositoryImpl(DSLContext ctx) { } @Override - @SuppressWarnings("unchecked") public List getTransactions(TransactionQueryForm form) { return getInternal(form).fetch() .map(new TransactionMapper()); } @Override - @SuppressWarnings("unchecked") public void writeTransactionsCSV(TransactionQueryForm form, Writer writer) { getInternalCSV(form).fetch() .formatCSV(writer); From 9d2be3f546b3cdb94eb1ef691efbdceaf1f0710e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 3 Oct 2021 21:53:40 +0200 Subject: [PATCH 257/548] make fields final if possible --- src/main/java/de/rwth/idsg/steve/SteveAppContext.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/CommunicationTask.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/SteveAppContext.java b/src/main/java/de/rwth/idsg/steve/SteveAppContext.java index 67c2d2b3e..1675b9d36 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveAppContext.java +++ b/src/main/java/de/rwth/idsg/steve/SteveAppContext.java @@ -56,7 +56,7 @@ */ public class SteveAppContext { - private AnnotationConfigWebApplicationContext springContext; + private final AnnotationConfigWebApplicationContext springContext; public SteveAppContext() { springContext = new AnnotationConfigWebApplicationContext(); diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java index ba826e39c..43361a653 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java @@ -60,14 +60,14 @@ public abstract class CommunicationTask> callbackList = new ArrayList<>(2); + private final ArrayList> callbackList = new ArrayList<>(2); public CommunicationTask(OcppVersion ocppVersion, S params) { this(ocppVersion, params, TaskOrigin.INTERNAL, "SteVe"); From 96ff68714dd949461de01ae79b3f660aa09d9f21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 3 Oct 2021 21:56:02 +0200 Subject: [PATCH 258/548] nits --- src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java | 2 +- .../idsg/steve/repository/impl/OcppTagRepositoryImpl.java | 8 ++------ .../de/rwth/idsg/steve/service/NotificationService.java | 2 +- .../java/de/rwth/idsg/steve/utils/LogFileRetriever.java | 8 ++------ .../steve/web/dto/ocpp/ClearChargingProfileParams.java | 6 +----- 5 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java b/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java index 45557edab..bd75572dc 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java @@ -31,5 +31,5 @@ public enum TaskOrigin { INTERNAL, // When the action was triggered by an external system (e.g. integrated roaming partner) - EXTERNAL; + EXTERNAL } diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java index 7ced272a1..4e3e6c7fa 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java @@ -237,12 +237,8 @@ public void deleteOcppTag(int ocppTagPk) { private void processBooleanType(SelectQuery selectQuery, TableField field, OcppTagQueryForm.BooleanType type) { - switch (type) { - case ALL: - break; - - default: - selectQuery.addConditions(field.eq(type.getBoolValue())); + if (type != OcppTagQueryForm.BooleanType.ALL) { + selectQuery.addConditions(field.eq(type.getBoolValue())); } } diff --git a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java index e24caafbc..68fb8c618 100644 --- a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java +++ b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java @@ -158,7 +158,7 @@ private boolean isDisabled(NotificationFeature f) { } private static String addTimestamp(String body) { - String eventTs = "Timestamp of the event: " + DateTime.now().toString(); + String eventTs = "Timestamp of the event: " + DateTime.now(); String newLine = System.lineSeparator() + System.lineSeparator(); if (Strings.isNullOrEmpty(body)) { diff --git a/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java b/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java index 73f8c0327..4a283411b 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java +++ b/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java @@ -63,12 +63,8 @@ public Optional getPath() { } public String getLogFilePathOrErrorMessage() { - Optional p = getPath(); - if (p.isPresent()) { - return p.get().toAbsolutePath().toString(); - } else { - return getErrorMessage(); - } + return getPath().map(path -> path.toAbsolutePath().toString()) + .orElseGet(this::getErrorMessage); } public String getErrorMessage() { diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java index 274a6ccc2..011780831 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java @@ -52,11 +52,7 @@ public class ClearChargingProfileParams extends MultipleChargePointSelect { @AssertTrue(message = "When filtering by id, charging profile id must be set") public boolean isValidWhenFilterById() { - if (filterType == ClearChargingProfileFilterType.ChargingProfileId - && chargingProfilePk == null) { - return false; - } - return true; + return filterType != ClearChargingProfileFilterType.ChargingProfileId || chargingProfilePk != null; } } From 0dd07185da4edaf537806da7ac615b1f3ea56c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 3 Oct 2021 22:00:28 +0200 Subject: [PATCH 259/548] delete unnecessary imports --- .../java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java | 1 - .../rwth/idsg/steve/service/ChargePointService16_Client.java | 3 --- .../java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java | 1 - .../rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java | 2 -- .../java/de/rwth/idsg/steve/web/controller/HomeController.java | 1 - .../idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java | 1 - 6 files changed, 9 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java index fd9b08e6c..2d7cc00f8 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java @@ -19,7 +19,6 @@ package de.rwth.idsg.steve.ocpp.ws; import de.rwth.idsg.steve.service.ChargePointHelperService; -import de.rwth.idsg.steve.service.NotificationService; import ocpp.cs._2015._10.RegistrationStatus; import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java index 952ac9250..3d769342f 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java @@ -29,7 +29,6 @@ import de.rwth.idsg.steve.ocpp.task.SetChargingProfileTask; import de.rwth.idsg.steve.ocpp.task.TriggerMessageTask; import de.rwth.idsg.steve.repository.ChargingProfileRepository; -import de.rwth.idsg.steve.repository.dto.ChargePointSelect; import de.rwth.idsg.steve.repository.dto.ChargingProfile; import de.rwth.idsg.steve.service.dto.EnhancedSetChargingProfileParams; import de.rwth.idsg.steve.web.dto.ocpp.ClearChargingProfileParams; @@ -42,8 +41,6 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; -import java.util.List; - /** * @author Sevket Goekay * @since 13.03.2018 diff --git a/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java b/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java index 2746c5182..8ff45d41a 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java +++ b/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java @@ -21,7 +21,6 @@ import com.google.common.base.Splitter; import com.google.common.base.Strings; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java index 7ac352315..63178ba8e 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java @@ -1,8 +1,6 @@ package de.rwth.idsg.steve.utils.mapper; import de.rwth.idsg.steve.repository.dto.ChargePoint; -import de.rwth.idsg.steve.utils.ControllerHelper; -import de.rwth.idsg.steve.web.dto.Address; import de.rwth.idsg.steve.web.dto.ChargePointForm; import jooq.steve.db.tables.records.ChargeBoxRecord; diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java b/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java index b2e57b2bf..85e8a6ce1 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java @@ -27,7 +27,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java index 4930b8f8b..c08609b22 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java @@ -25,7 +25,6 @@ import lombok.Setter; import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import java.util.Objects; From dc641881bf2bb4ba3c9fac3c87812119f19dc1e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 3 Oct 2021 22:08:30 +0200 Subject: [PATCH 260/548] resolve parameter hiding --- src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java index 43361a653..5e186304c 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java @@ -180,9 +180,9 @@ public AsyncHandler getHandler(String chargeBoxId) { // Classes // ------------------------------------------------------------------------- - public abstract class DefaultOcppCallback implements OcppCallback { + public abstract class DefaultOcppCallback implements OcppCallback { - public abstract void success(String chargeBoxId, RESPONSE response); + public abstract void success(String chargeBoxId, RES response); @Override public void success(String chargeBoxId, OcppJsonError error) { From 61540a623b0a7aab3ecee9107f64915c1f3cd512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 3 Oct 2021 22:15:15 +0200 Subject: [PATCH 261/548] nits --- .../java/de/rwth/idsg/steve/ocpp/CommunicationTask.java | 4 ---- .../java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java | 7 ++----- .../idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java | 7 ++----- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java index 5e186304c..887f79b07 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java @@ -165,15 +165,11 @@ public AsyncHandler getHandler(String chargeBoxId) { public abstract OcppCallback defaultCallback(); public abstract T getOcpp12Request(); - public abstract T getOcpp15Request(); - public abstract T getOcpp16Request(); public abstract AsyncHandler getOcpp12Handler(String chargeBoxId); - public abstract AsyncHandler getOcpp15Handler(String chargeBoxId); - public abstract AsyncHandler getOcpp16Handler(String chargeBoxId); // ------------------------------------------------------------------------- diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java index f1e3da49d..083b8ab14 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java @@ -43,7 +43,7 @@ public ReserveNowTask(OcppVersion ocppVersion, EnhancedReserveNowParams params, @Override public OcppCallback defaultCallback() { - return new OcppCallback() { + return new StringOcppCallback() { @Override public void success(String chargeBoxId, String responseStatus) { addNewResponse(chargeBoxId, responseStatus); diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java index 4d60a81ac..26d1e6393 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java @@ -25,6 +25,7 @@ import javax.validation.constraints.Future; import javax.validation.constraints.NotEmpty; +import java.util.Objects; /** * @author Sevket Goekay @@ -55,10 +56,6 @@ public class OcppTagForm { * As specified in V0_9_9__update.sql default value is 1. */ public Integer getMaxActiveTransactionCount() { - if (maxActiveTransactionCount == null) { - return 1; - } else { - return maxActiveTransactionCount; - } + return Objects.requireNonNullElse(maxActiveTransactionCount, 1); } } diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java index 6639e106e..653f2880d 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java @@ -23,6 +23,7 @@ import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; +import java.util.Objects; /** * @author Sevket Goekay @@ -41,10 +42,6 @@ public class ChangeAvailabilityParams extends MultipleChargePointSelect { * if empty, 0 = charge point as a whole */ public void setConnectorId(Integer connectorId) { - if (connectorId == null) { - this.connectorId = 0; - } else { - this.connectorId = connectorId; - } + this.connectorId = Objects.requireNonNullElse(connectorId, 0); } } From adb43c98b4e05762dad7e2b5e2e670d944b3d118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 3 Oct 2021 22:44:59 +0200 Subject: [PATCH 262/548] nits in ChargePointServiceInvoker --- .../idsg/steve/ocpp/ws/ChargePointServiceInvoker.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java index 73bdc3afb..a67bc94b4 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java @@ -28,8 +28,7 @@ import de.rwth.idsg.steve.ocpp.ws.pipeline.OutgoingCallPipeline; import de.rwth.idsg.steve.repository.dto.ChargePointSelect; import lombok.RequiredArgsConstructor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; import java.util.UUID; @@ -37,9 +36,9 @@ * @author Sevket Goekay * @since 20.03.2015 */ +@Slf4j @RequiredArgsConstructor public class ChargePointServiceInvoker { - private final Logger log = LoggerFactory.getLogger(getClass()); private final OutgoingCallPipeline outgoingCallPipeline; private final AbstractWebSocketEndpoint endpoint; @@ -65,14 +64,13 @@ public void runPipeline(ChargePointSelect cps, CommunicationTask task) { private void run(String chargeBoxId, CommunicationTask task) { RequestType request = task.getRequest(); - String messageId = UUID.randomUUID().toString(); ActionResponsePair pair = typeStore.findActionResponse(request); if (pair == null) { throw new SteveException("Action name is not found"); } OcppJsonCall call = new OcppJsonCall(); - call.setMessageId(messageId); + call.setMessageId(UUID.randomUUID().toString()); call.setPayload(request); call.setAction(pair.getAction()); From 161e88d69a6f0cff2e45fbb97803c4dffd195c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Tue, 5 Oct 2021 21:39:08 +0200 Subject: [PATCH 263/548] refactor and add tests --- .../de/rwth/idsg/steve/utils/StringUtils.java | 15 +-- .../dto/ocpp/MultipleChargePointSelect.java | 3 +- .../web/dto/ocpp/SingleChargePointSelect.java | 3 +- .../idsg/steve/utils/StringUtilsTest.java | 102 ++++++++++++++++++ 4 files changed, 114 insertions(+), 9 deletions(-) create mode 100644 src/test/java/de/rwth/idsg/steve/utils/StringUtilsTest.java diff --git a/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java b/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java index 0d11652d3..6ac52e216 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java +++ b/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java @@ -20,12 +20,14 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; +import com.google.common.base.Strings; import de.rwth.idsg.steve.ocpp.CommunicationTask; import org.jetbrains.annotations.Nullable; +import org.springframework.util.CollectionUtils; import java.util.Collection; import java.util.Collections; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; /** @@ -40,8 +42,7 @@ public final class StringUtils { private StringUtils() { } /** - * We don't want to hard-code operation names, - * but derive them from the actual request object. + * We don't want to hard-code operation names, but derive them from the actual request object. * * Example for "ChangeAvailabilityTask": * - Remove "Task" at the end -> "ChangeAvailability" @@ -62,16 +63,16 @@ public static String getOperationName(CommunicationTask task) { @Nullable public static String joinByComma(Collection col) { - if (col == null || col.isEmpty()) { + if (CollectionUtils.isEmpty(col)) { return null; } else { - // Use HashSet to trim duplicates - return JOINER.join(new HashSet<>(col)); + // Use set to trim duplicates and keep collection order + return JOINER.join(new LinkedHashSet<>(col)); } } public static List splitByComma(String str) { - if (str == null || str.isEmpty()) { + if (Strings.isNullOrEmpty(str)) { return Collections.emptyList(); } else { return SPLITTER.splitToList(str); diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java index 9a85e1281..9946a358e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java @@ -24,6 +24,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; +import java.util.Collections; import java.util.List; /** @@ -36,5 +37,5 @@ public class MultipleChargePointSelect implements ChargePointSelection { @NotNull(message = "Charge point selection is required") @Size(min = 1, message = "Please select at least {min} charge point") - private List chargePointSelectList; + private List chargePointSelectList = Collections.emptyList(); } diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java index 5f53f71d7..210d34554 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java @@ -24,6 +24,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; +import java.util.Collections; import java.util.List; /** @@ -39,5 +40,5 @@ public class SingleChargePointSelect implements ChargePointSelection { @NotNull(message = "Charge point selection is required") @Size(min = 1, max = 1, message = "It is required to select exactly 1 charge point") - private List chargePointSelectList; + private List chargePointSelectList = Collections.emptyList(); } diff --git a/src/test/java/de/rwth/idsg/steve/utils/StringUtilsTest.java b/src/test/java/de/rwth/idsg/steve/utils/StringUtilsTest.java new file mode 100644 index 000000000..39ade4c2c --- /dev/null +++ b/src/test/java/de/rwth/idsg/steve/utils/StringUtilsTest.java @@ -0,0 +1,102 @@ +package de.rwth.idsg.steve.utils; + +import de.rwth.idsg.steve.ocpp.task.CancelReservationTask; +import de.rwth.idsg.steve.ocpp.task.ClearCacheTask; +import de.rwth.idsg.steve.ocpp.task.GetCompositeScheduleTask; +import de.rwth.idsg.steve.web.dto.ocpp.CancelReservationParams; +import de.rwth.idsg.steve.web.dto.ocpp.GetCompositeScheduleParams; +import de.rwth.idsg.steve.web.dto.ocpp.MultipleChargePointSelect; +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author Sevket Goekay + * @since 05.10.2021 + */ +public class StringUtilsTest { + + @Test + public void testOperationName_ocpp12andMultiple() { + var operationName = StringUtils.getOperationName(new ClearCacheTask(null, new MultipleChargePointSelect())); + Assert.assertEquals("Clear Cache", operationName); + } + + @Test + public void testOperationName_ocpp15andSingle() { + var operationName = StringUtils.getOperationName(new CancelReservationTask(null, new CancelReservationParams(), null)); + Assert.assertEquals("Cancel Reservation", operationName); + } + + @Test + public void testOperationName_ocpp16() { + var operationName = StringUtils.getOperationName(new GetCompositeScheduleTask(null, new GetCompositeScheduleParams())); + Assert.assertEquals("Get Composite Schedule", operationName); + } + + @Test + public void testJoinByComma_inputNull() { + String val = StringUtils.joinByComma(null); + Assert.assertNull(val); + } + + @Test + public void testJoinByComma_inputEmpty() { + String val = StringUtils.joinByComma(new ArrayList<>()); + Assert.assertNull(val); + } + + @Test + public void testJoinByComma_inputOneElement() { + String val = StringUtils.joinByComma(Arrays.asList("hey")); + Assert.assertEquals("hey", val); + } + + @Test + public void testJoinByComma_inputTwoElements() { + String val = StringUtils.joinByComma(Arrays.asList("hey", "ho")); + Assert.assertEquals("hey,ho", val); + } + + @Test + public void testJoinByComma_inputDuplicateElements() { + String val = StringUtils.joinByComma(Arrays.asList("hey", "ho", "hey")); + Assert.assertEquals("hey,ho", val); + } + + + @Test + public void testSplitByComma_inputNull() { + List val = StringUtils.splitByComma(null); + Assert.assertNotNull(val); + Assert.assertTrue(val.isEmpty()); + } + + @Test + public void testSplitByComma_inputEmpty() { + List val = StringUtils.splitByComma(""); + Assert.assertNotNull(val); + Assert.assertTrue(val.isEmpty()); + } + + @Test + public void testSplitByComma_inputOneElement() { + List val = StringUtils.splitByComma("1one"); + Assert.assertTrue(val.size() == 1); + Assert.assertEquals("1one", val.get(0)); + } + + @Test + public void testSplitByComma_inputTwoElements() { + List val = StringUtils.splitByComma("1one,2two"); + Assert.assertTrue(val.size() == 2); + + List sortedVal = val.stream().sorted().collect(Collectors.toList()); + Assert.assertEquals("1one", sortedVal.get(0)); + Assert.assertEquals("2two", sortedVal.get(1)); + } +} From fd6ccfe37471fdb03dacf754de6067abd20549ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 9 Oct 2021 18:00:35 +0000 Subject: [PATCH 264/548] Bump cxf.version from 3.4.4 to 3.4.5 Bumps `cxf.version` from 3.4.4 to 3.4.5. Updates `cxf-rt-frontend-jaxws` from 3.4.4 to 3.4.5 Updates `cxf-rt-transports-http` from 3.4.4 to 3.4.5 Updates `cxf-rt-transports-http-hc` from 3.4.4 to 3.4.5 Updates `cxf-rt-features-logging` from 3.4.4 to 3.4.5 --- updated-dependencies: - dependency-name: org.apache.cxf:cxf-rt-frontend-jaxws dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-transports-http dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-transports-http-hc dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-features-logging dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e3100baf3..bab8f3749 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ UTF-8 3.15.3 - 3.4.4 + 3.4.5 5.3.10 5.5.2 8.0.26 From 3c6b01033d6cbea6dc5a50c18a3d93157e49cf89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 9 Oct 2021 18:00:46 +0000 Subject: [PATCH 265/548] Bump lombok from 1.18.20 to 1.18.22 Bumps [lombok](https://github.com/projectlombok/lombok) from 1.18.20 to 1.18.22. - [Release notes](https://github.com/projectlombok/lombok/releases) - [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/projectlombok/lombok/compare/v1.18.20...v1.18.22) --- updated-dependencies: - dependency-name: org.projectlombok:lombok dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e3100baf3..3b21feda2 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 5.5.2 8.0.26 9.4.44.v20210927 - 1.18.20 + 1.18.22 2.13.0 From 8f80ebca675795743c0dfacf0129c71d536aca17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Oct 2021 18:00:19 +0000 Subject: [PATCH 266/548] Bump spring-framework-bom from 5.3.10 to 5.3.11 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.10 to 5.3.11. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.10...v5.3.11) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4207ad0a7..17081835a 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.15.3 3.4.5 - 5.3.10 + 5.3.11 5.5.2 8.0.26 9.4.44.v20210927 From b56cddfd0c8015fe10ff60687ac1fd8293615397 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Oct 2021 18:00:30 +0000 Subject: [PATCH 267/548] Bump spring.security.version from 5.5.2 to 5.5.3 Bumps `spring.security.version` from 5.5.2 to 5.5.3. Updates `spring-security-web` from 5.5.2 to 5.5.3 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.5.2...5.5.3) Updates `spring-security-config` from 5.5.2 to 5.5.3 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.5.2...5.5.3) --- updated-dependencies: - dependency-name: org.springframework.security:spring-security-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.security:spring-security-config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 17081835a..6ecf7c912 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.15.3 3.4.5 5.3.11 - 5.5.2 + 5.5.3 8.0.26 9.4.44.v20210927 1.18.22 From 6828ae7fe03d3c5cafd5ca476b7dc6faf3ab7b86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Oct 2021 19:39:24 +0000 Subject: [PATCH 268/548] Bump mysql-connector-java from 8.0.26 to 8.0.27 Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.26 to 8.0.27. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.26...8.0.27) --- updated-dependencies: - dependency-name: mysql:mysql-connector-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ecf7c912..797ad2465 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 3.4.5 5.3.11 5.5.3 - 8.0.26 + 8.0.27 9.4.44.v20210927 1.18.22 2.13.0 From f3dedad689214d777460ed56e108cdca93a9be15 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Oct 2021 19:39:25 +0000 Subject: [PATCH 269/548] Bump spring-framework-bom from 5.3.11 to 5.3.12 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.11 to 5.3.12. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.11...v5.3.12) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ecf7c912..bfea745de 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.15.3 3.4.5 - 5.3.11 + 5.3.12 5.5.3 8.0.26 9.4.44.v20210927 From b22efa2e9bc24025132b71d8e445cc5afde0cbff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 30 Oct 2021 18:00:24 +0000 Subject: [PATCH 270/548] Bump jooq.version from 3.15.3 to 3.15.4 Bumps `jooq.version` from 3.15.3 to 3.15.4. Updates `jooq-meta` from 3.15.3 to 3.15.4 Updates `jooq-codegen` from 3.15.3 to 3.15.4 Updates `jooq` from 3.15.3 to 3.15.4 Updates `jooq-codegen-maven` from 3.15.3 to 3.15.4 --- updated-dependencies: - dependency-name: org.jooq:jooq-meta dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 713380c59..364d13f69 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 11 UTF-8 - 3.15.3 + 3.15.4 3.4.5 5.3.12 5.5.3 From 8e28639e09e0c0e33af08ef1965a948617ddc28c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 30 Oct 2021 18:00:54 +0000 Subject: [PATCH 271/548] Bump joda-time from 2.10.12 to 2.10.13 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.12 to 2.10.13. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.12...v2.10.13) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 713380c59..a25cf5bc7 100644 --- a/pom.xml +++ b/pom.xml @@ -498,7 +498,7 @@ joda-time joda-time - 2.10.12 + 2.10.13 org.hibernate.validator From caf997a9d5b40f4c568a5fce84f3a95cad5977f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Fri, 5 Nov 2021 20:14:37 +0100 Subject: [PATCH 272/548] getChargePointConnectorStatus respects only Accepted stations (#691) --- .../repository/impl/ChargePointRepositoryImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java index a5930eecd..907ec97c2 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java @@ -32,6 +32,7 @@ import jooq.steve.db.tables.records.AddressRecord; import jooq.steve.db.tables.records.ChargeBoxRecord; import lombok.extern.slf4j.Slf4j; +import ocpp.cs._2015._10.RegistrationStatus; import org.joda.time.DateTime; import org.jooq.Condition; import org.jooq.DSLContext; @@ -220,11 +221,11 @@ public List getChargePointConnectorStatus(ConnectorStatusForm f .and(CONNECTOR_STATUS.STATUS_TIMESTAMP.equal(t1.field(t1TsMax))) .asTable("t2"); - final Condition chargeBoxCondition; - if (form == null || form.getChargeBoxId() == null) { - chargeBoxCondition = DSL.noCondition(); - } else { - chargeBoxCondition = CHARGE_BOX.CHARGE_BOX_ID.eq(form.getChargeBoxId()); + // https://github.com/RWTH-i5-IDSG/steve/issues/691 + Condition chargeBoxCondition = CHARGE_BOX.REGISTRATION_STATUS.eq(RegistrationStatus.ACCEPTED.value()); + + if (form != null && form.getChargeBoxId() != null) { + chargeBoxCondition = chargeBoxCondition.and(CHARGE_BOX.CHARGE_BOX_ID.eq(form.getChargeBoxId())); } final Condition statusCondition; From 7a70e57860c621963090b3eb1e917c6daf45d6ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Nov 2021 18:00:16 +0000 Subject: [PATCH 273/548] Bump spring-framework-bom from 5.3.12 to 5.3.13 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.12 to 5.3.13. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.12...v5.3.13) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7ce8eb073..bb29e0cd8 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.15.4 3.4.5 - 5.3.12 + 5.3.13 5.5.3 8.0.27 9.4.44.v20210927 From 4c9adff78a866522369127293f31b527838d3b68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Nov 2021 18:00:37 +0000 Subject: [PATCH 274/548] Bump annotations from 22.0.0 to 23.0.0 Bumps [annotations](https://github.com/JetBrains/java-annotations) from 22.0.0 to 23.0.0. - [Release notes](https://github.com/JetBrains/java-annotations/releases) - [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/java-annotations/compare/22.0.0...23.0.0) --- updated-dependencies: - dependency-name: org.jetbrains:annotations dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7ce8eb073..db81bf8c6 100644 --- a/pom.xml +++ b/pom.xml @@ -485,7 +485,7 @@ org.jetbrains annotations - 22.0.0 + 23.0.0 compile From 55f1b82188ff84fb41c39fa8d6a3c5179b610a60 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Nov 2021 18:00:24 +0000 Subject: [PATCH 275/548] Bump spring.security.version from 5.5.3 to 5.6.0 Bumps `spring.security.version` from 5.5.3 to 5.6.0. Updates `spring-security-web` from 5.5.3 to 5.6.0 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.5.3...5.6.0) Updates `spring-security-config` from 5.5.3 to 5.6.0 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.5.3...5.6.0) --- updated-dependencies: - dependency-name: org.springframework.security:spring-security-web dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework.security:spring-security-config dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef40aafb4..31349e56c 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.15.4 3.4.5 5.3.13 - 5.5.3 + 5.6.0 8.0.27 9.4.44.v20210927 1.18.22 From 3387511a041777a0fb861bdf57f9631ef417a8bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 4 Dec 2021 18:00:28 +0000 Subject: [PATCH 276/548] Bump jooq.version from 3.15.4 to 3.15.5 Bumps `jooq.version` from 3.15.4 to 3.15.5. Updates `jooq-meta` from 3.15.4 to 3.15.5 Updates `jooq-codegen` from 3.15.4 to 3.15.5 Updates `jooq` from 3.15.4 to 3.15.5 Updates `jooq-codegen-maven` from 3.15.4 to 3.15.5 --- updated-dependencies: - dependency-name: org.jooq:jooq-meta dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 31349e56c..864bd286e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 11 UTF-8 - 3.15.4 + 3.15.5 3.4.5 5.3.13 5.6.0 From be5fb9fe75ebb9a1a0da52ca0e7feeb13110a218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Fri, 10 Dec 2021 19:02:54 +0100 Subject: [PATCH 277/548] update log4j version (#708) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 864bd286e..e7e755512 100644 --- a/pom.xml +++ b/pom.xml @@ -459,7 +459,7 @@ org.apache.logging.log4j log4j-bom - 2.14.1 + 2.15.0 import pom From c95eccc050e3f348fcb708c0e802697d273d5fe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sat, 11 Dec 2021 17:02:29 +0100 Subject: [PATCH 278/548] version bump --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e7e755512..86ceda145 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 de.rwth.idsg steve - 3.4.5 + 3.4.6 jar From 7db89be73f0532603c5029f4b877fcf52ecb3221 Mon Sep 17 00:00:00 2001 From: Benoit Vianin Date: Wed, 15 Dec 2021 08:48:16 +0100 Subject: [PATCH 279/548] Update log4j to 2.16.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 86ceda145..798eeb690 100644 --- a/pom.xml +++ b/pom.xml @@ -459,7 +459,7 @@ org.apache.logging.log4j log4j-bom - 2.15.0 + 2.16.0 import pom From f05887c95985bfe939669039071d2646deadcb4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Wed, 15 Dec 2021 09:05:14 +0100 Subject: [PATCH 280/548] version bump --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 798eeb690..a0d53145d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 de.rwth.idsg steve - 3.4.6 + 3.4.7 jar From 8cbd76173bffcfee478bb375d30274b1fe8a8cc5 Mon Sep 17 00:00:00 2001 From: Kowsz Date: Sat, 18 Dec 2021 16:05:16 +0200 Subject: [PATCH 281/548] Update log4j2 version to 2.17.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a0d53145d..57fe2a92b 100644 --- a/pom.xml +++ b/pom.xml @@ -459,7 +459,7 @@ org.apache.logging.log4j log4j-bom - 2.16.0 + 2.17.0 import pom From 2689a4294720aee341bf2170bbc20d8bec20aad6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 Dec 2021 18:00:48 +0000 Subject: [PATCH 282/548] Bump spring-framework-bom from 5.3.13 to 5.3.14 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.13 to 5.3.14. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.13...v5.3.14) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 57fe2a92b..eef71fae3 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.15.5 3.4.5 - 5.3.13 + 5.3.14 5.6.0 8.0.27 9.4.44.v20210927 From 7dd838b3c2ebddbc8ec2a4e9e05e60456de0061e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 19 Dec 2021 11:34:09 +0100 Subject: [PATCH 283/548] version bump --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 57fe2a92b..8f8063c3b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 de.rwth.idsg steve - 3.4.7 + 3.4.8 jar From 07410984190c75048a0afa46aca682c0b6ecce31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 Dec 2021 18:00:18 +0000 Subject: [PATCH 284/548] Bump cxf.version from 3.4.5 to 3.5.0 Bumps `cxf.version` from 3.4.5 to 3.5.0. Updates `cxf-rt-frontend-jaxws` from 3.4.5 to 3.5.0 Updates `cxf-rt-transports-http` from 3.4.5 to 3.5.0 Updates `cxf-rt-transports-http-hc` from 3.4.5 to 3.5.0 Updates `cxf-rt-features-logging` from 3.4.5 to 3.5.0 --- updated-dependencies: - dependency-name: org.apache.cxf:cxf-rt-frontend-jaxws dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.cxf:cxf-rt-transports-http dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.cxf:cxf-rt-transports-http-hc dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.cxf:cxf-rt-features-logging dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2a6e9915a..203e467c5 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ UTF-8 3.15.5 - 3.4.5 + 3.5.0 5.3.14 5.6.0 8.0.27 From 3457f9062539e836ee3cb01c02698fcae4c7400f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 Dec 2021 18:00:28 +0000 Subject: [PATCH 285/548] Bump jackson.version from 2.13.0 to 2.13.1 Bumps `jackson.version` from 2.13.0 to 2.13.1. Updates `jackson-databind` from 2.13.0 to 2.13.1 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-module-jaxb-annotations` from 2.13.0 to 2.13.1 - [Release notes](https://github.com/FasterXML/jackson-modules-base/releases) - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.13.0...jackson-modules-base-2.13.1) Updates `jackson-annotations` from 2.13.0 to 2.13.1 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.module:jackson-module-jaxb-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2a6e9915a..f1a2be11d 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 8.0.27 9.4.44.v20210927 1.18.22 - 2.13.0 + 2.13.1 jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true&serverTimezone=UTC From 1bf0d214a491689caecb5414bda69e1826f3681e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 Dec 2021 18:00:51 +0000 Subject: [PATCH 286/548] Bump spring.security.version from 5.6.0 to 5.6.1 Bumps `spring.security.version` from 5.6.0 to 5.6.1. Updates `spring-security-web` from 5.6.0 to 5.6.1 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.6.0...5.6.1) Updates `spring-security-config` from 5.6.0 to 5.6.1 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.6.0...5.6.1) --- updated-dependencies: - dependency-name: org.springframework.security:spring-security-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.security:spring-security-config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2a6e9915a..248e20d61 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.15.5 3.4.5 5.3.14 - 5.6.0 + 5.6.1 8.0.27 9.4.44.v20210927 1.18.22 From 9ab5c1722834d4da4c2bb60427368fa3b3751716 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Jan 2022 18:01:02 +0000 Subject: [PATCH 287/548] Bump log4j-bom from 2.17.0 to 2.17.1 Bumps log4j-bom from 2.17.0 to 2.17.1. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f7ffafde4..2febe54dc 100644 --- a/pom.xml +++ b/pom.xml @@ -459,7 +459,7 @@ org.apache.logging.log4j log4j-bom - 2.17.0 + 2.17.1 import pom From d5f9287aa440142c7eefab6550c804e149e0c2d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 Jan 2022 18:00:40 +0000 Subject: [PATCH 288/548] Bump jooq.version from 3.15.5 to 3.16.1 Bumps `jooq.version` from 3.15.5 to 3.16.1. Updates `jooq-meta` from 3.15.5 to 3.16.1 Updates `jooq-codegen` from 3.15.5 to 3.16.1 Updates `jooq` from 3.15.5 to 3.16.1 Updates `jooq-codegen-maven` from 3.15.5 to 3.16.1 --- updated-dependencies: - dependency-name: org.jooq:jooq-meta dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jooq:jooq-codegen dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jooq:jooq dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jooq:jooq-codegen-maven dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2febe54dc..7864bc89c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 11 UTF-8 - 3.15.5 + 3.16.1 3.5.0 5.3.14 5.6.1 From 65ea6a8972a2013411b1fbe1d28d770acddee9ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Jan 2022 18:00:20 +0000 Subject: [PATCH 289/548] Bump jooq.version from 3.16.1 to 3.16.2 Bumps `jooq.version` from 3.16.1 to 3.16.2. Updates `jooq-meta` from 3.16.1 to 3.16.2 Updates `jooq-codegen` from 3.16.1 to 3.16.2 Updates `jooq` from 3.16.1 to 3.16.2 Updates `jooq-codegen-maven` from 3.16.1 to 3.16.2 --- updated-dependencies: - dependency-name: org.jooq:jooq-meta dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7864bc89c..6112304cf 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 11 UTF-8 - 3.16.1 + 3.16.2 3.5.0 5.3.14 5.6.1 From 01e4203e1cac4172b017065058a1e352ac13f15e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Jan 2022 18:00:40 +0000 Subject: [PATCH 290/548] Bump slf4j-api from 1.7.32 to 1.7.33 Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.32 to 1.7.33. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.32...v_1.7.33) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7864bc89c..d6aa7a80b 100644 --- a/pom.xml +++ b/pom.xml @@ -578,7 +578,7 @@ org.slf4j slf4j-api - 1.7.32 + 1.7.33 org.slf4j From 6672d4c87f7660dc2ded6c41c219e8656f54c298 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Jan 2022 18:00:45 +0000 Subject: [PATCH 291/548] Bump HikariCP from 5.0.0 to 5.0.1 Bumps [HikariCP](https://github.com/brettwooldridge/HikariCP) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/brettwooldridge/HikariCP/releases) - [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES) - [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-5.0.0...HikariCP-5.0.1) --- updated-dependencies: - dependency-name: com.zaxxer:HikariCP dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7864bc89c..116989823 100644 --- a/pom.xml +++ b/pom.xml @@ -659,7 +659,7 @@ com.zaxxer HikariCP - 5.0.0 + 5.0.1 org.jooq From e176d58a9b396c26f0c934f9022bc216713620b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Jan 2022 18:00:48 +0000 Subject: [PATCH 292/548] Bump jcl-over-slf4j from 1.7.32 to 1.7.33 Bumps [jcl-over-slf4j](https://github.com/qos-ch/slf4j) from 1.7.32 to 1.7.33. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.32...v_1.7.33) --- updated-dependencies: - dependency-name: org.slf4j:jcl-over-slf4j dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7864bc89c..a600baf9d 100644 --- a/pom.xml +++ b/pom.xml @@ -583,7 +583,7 @@ org.slf4j jcl-over-slf4j - 1.7.32 + 1.7.33 com.lmax From 42db2e710ebadde2f946e8503fa4492b9efc250c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Jan 2022 18:00:54 +0000 Subject: [PATCH 293/548] Bump spring-framework-bom from 5.3.14 to 5.3.15 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.14 to 5.3.15. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.14...v5.3.15) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7864bc89c..84ba388c8 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.16.1 3.5.0 - 5.3.14 + 5.3.15 5.6.1 8.0.27 9.4.44.v20210927 From b606fd36938004ea5aac099011fc078ed3df2cc7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Jan 2022 18:01:00 +0000 Subject: [PATCH 294/548] Bump maven-compiler-plugin from 3.8.1 to 3.9.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.8.1 to 3.9.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.8.1...maven-compiler-plugin-3.9.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7864bc89c..5ea73adf4 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ maven-compiler-plugin - 3.8.1 + 3.9.0 ${java.version} ${java.version} From 8e196419d426e4fca8018cd1e2a219e5ae17ac29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Jan 2022 18:01:12 +0000 Subject: [PATCH 295/548] Bump maven-jar-plugin from 3.2.0 to 3.2.2 Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.2.0 to 3.2.2. - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.2.0...maven-jar-plugin-3.2.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-jar-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7864bc89c..59eec712e 100644 --- a/pom.xml +++ b/pom.xml @@ -263,7 +263,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.2.2 From 9a91aa02384b0f6b243b0882496e4fc3b1a5efb2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 22 Jan 2022 18:00:51 +0000 Subject: [PATCH 296/548] Bump mysql-connector-java from 8.0.27 to 8.0.28 Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.27 to 8.0.28. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.27...8.0.28) --- updated-dependencies: - dependency-name: mysql:mysql-connector-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3f0426604..821226b85 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 3.5.0 5.3.15 5.6.1 - 8.0.27 + 8.0.28 9.4.44.v20210927 1.18.22 2.13.1 From 43e292203cb9829ad2bc14617029176d829608a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 23 Jan 2022 21:22:22 +0100 Subject: [PATCH 297/548] update license headers --- pom.xml | 2 +- .../java/de/rwth/idsg/steve/Application.java | 2 +- .../de/rwth/idsg/steve/ApplicationProfile.java | 2 +- .../de/rwth/idsg/steve/ApplicationStarter.java | 2 +- .../java/de/rwth/idsg/steve/JettyServer.java | 2 +- .../rwth/idsg/steve/NotificationFeature.java | 2 +- .../de/rwth/idsg/steve/SteveAppContext.java | 2 +- .../de/rwth/idsg/steve/SteveConfiguration.java | 2 +- .../de/rwth/idsg/steve/SteveDevStarter.java | 2 +- .../de/rwth/idsg/steve/SteveException.java | 2 +- .../de/rwth/idsg/steve/SteveProdCondition.java | 2 +- .../de/rwth/idsg/steve/SteveProdStarter.java | 2 +- .../idsg/steve/config/BeanConfiguration.java | 2 +- .../idsg/steve/config/OcppConfiguration.java | 2 +- .../steve/config/SecurityConfiguration.java | 2 +- .../steve/config/WebSocketConfiguration.java | 2 +- .../ocpp/ChargePointService12_Invoker.java | 2 +- .../ocpp/ChargePointService12_InvokerImpl.java | 2 +- .../ocpp/ChargePointService15_Invoker.java | 2 +- .../ocpp/ChargePointService15_InvokerImpl.java | 2 +- .../ocpp/ChargePointService16_Invoker.java | 2 +- .../ocpp/ChargePointService16_InvokerImpl.java | 2 +- .../idsg/steve/ocpp/CommunicationTask.java | 2 +- .../idsg/steve/ocpp/Ocpp15AndAboveTask.java | 2 +- .../idsg/steve/ocpp/Ocpp16AndAboveTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/OcppCallback.java | 2 +- .../de/rwth/idsg/steve/ocpp/OcppProtocol.java | 2 +- .../de/rwth/idsg/steve/ocpp/OcppTransport.java | 2 +- .../de/rwth/idsg/steve/ocpp/OcppVersion.java | 2 +- .../de/rwth/idsg/steve/ocpp/RequestResult.java | 2 +- .../de/rwth/idsg/steve/ocpp/TaskOrigin.java | 2 +- .../idsg/steve/ocpp/converter/Convert.java | 2 +- .../steve/ocpp/converter/Server12to15.java | 2 +- .../steve/ocpp/converter/Server12to15Impl.java | 2 +- .../steve/ocpp/converter/Server15to16.java | 2 +- .../steve/ocpp/converter/Server15to16Impl.java | 2 +- .../CentralSystemService12_SoapServer.java | 2 +- .../CentralSystemService15_SoapServer.java | 2 +- .../CentralSystemService16_SoapServer.java | 2 +- .../idsg/steve/ocpp/soap/ClientProvider.java | 2 +- .../ocpp/soap/ClientProviderWithCache.java | 2 +- .../steve/ocpp/soap/LoggingFeatureProxy.java | 2 +- .../steve/ocpp/soap/MediatorInInterceptor.java | 2 +- .../ocpp/soap/MessageHeaderInterceptor.java | 2 +- .../steve/ocpp/soap/MessageIdInterceptor.java | 2 +- .../steve/ocpp/task/CancelReservationTask.java | 2 +- .../ocpp/task/ChangeAvailabilityTask.java | 2 +- .../ocpp/task/ChangeConfigurationTask.java | 2 +- .../idsg/steve/ocpp/task/ClearCacheTask.java | 2 +- .../ocpp/task/ClearChargingProfileTask.java | 2 +- .../idsg/steve/ocpp/task/DataTransferTask.java | 2 +- .../ocpp/task/GetCompositeScheduleTask.java | 2 +- .../steve/ocpp/task/GetConfigurationTask.java | 2 +- .../steve/ocpp/task/GetDiagnosticsTask.java | 2 +- .../ocpp/task/GetLocalListVersionTask.java | 2 +- .../ocpp/task/RemoteStartTransactionTask.java | 2 +- .../ocpp/task/RemoteStopTransactionTask.java | 2 +- .../idsg/steve/ocpp/task/ReserveNowTask.java | 2 +- .../rwth/idsg/steve/ocpp/task/ResetTask.java | 2 +- .../steve/ocpp/task/SendLocalListTask.java | 2 +- .../ocpp/task/SetChargingProfileTask.java | 2 +- .../steve/ocpp/task/TriggerMessageTask.java | 2 +- .../steve/ocpp/task/UnlockConnectorTask.java | 2 +- .../steve/ocpp/task/UpdateFirmwareTask.java | 2 +- .../idsg/steve/ocpp/ws/AbstractTypeStore.java | 2 +- .../ocpp/ws/AbstractWebSocketEndpoint.java | 2 +- .../ocpp/ws/ChargePointServiceInvoker.java | 2 +- .../ocpp/ws/ConcurrentWebSocketHandler.java | 2 +- .../rwth/idsg/steve/ocpp/ws/ErrorFactory.java | 2 +- .../ocpp/ws/FutureResponseContextStore.java | 2 +- .../idsg/steve/ocpp/ws/JsonObjectMapper.java | 2 +- .../steve/ocpp/ws/OcppWebSocketUpgrader.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/PingTask.java | 2 +- .../steve/ocpp/ws/SessionContextStore.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/TypeStore.java | 2 +- .../idsg/steve/ocpp/ws/WebSocketLogger.java | 2 +- .../idsg/steve/ocpp/ws/custom/EnumMixin.java | 2 +- .../steve/ocpp/ws/custom/EnumProcessor.java | 2 +- .../ws/custom/MeterValue15Deserializer.java | 2 +- .../ocpp/ws/custom/MeterValue15Mixin.java | 2 +- .../ws/custom/WsSessionSelectStrategy.java | 2 +- .../ws/custom/WsSessionSelectStrategyEnum.java | 2 +- .../steve/ocpp/ws/data/ActionResponsePair.java | 2 +- .../ocpp/ws/data/CommunicationContext.java | 2 +- .../idsg/steve/ocpp/ws/data/ErrorCode.java | 2 +- .../ocpp/ws/data/FutureResponseContext.java | 2 +- .../idsg/steve/ocpp/ws/data/MessageType.java | 2 +- .../idsg/steve/ocpp/ws/data/OcppJsonCall.java | 2 +- .../idsg/steve/ocpp/ws/data/OcppJsonError.java | 2 +- .../steve/ocpp/ws/data/OcppJsonMessage.java | 2 +- .../steve/ocpp/ws/data/OcppJsonResponse.java | 2 +- .../steve/ocpp/ws/data/OcppJsonResult.java | 2 +- .../steve/ocpp/ws/data/SessionContext.java | 2 +- .../ocpp/ws/ocpp12/Ocpp12JacksonModule.java | 2 +- .../steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java | 2 +- .../ws/ocpp12/Ocpp12WebSocketEndpoint.java | 2 +- .../ocpp/ws/ocpp15/Ocpp15JacksonModule.java | 2 +- .../steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java | 2 +- .../ws/ocpp15/Ocpp15WebSocketEndpoint.java | 2 +- .../ocpp/ws/ocpp16/Ocpp16JacksonModule.java | 2 +- .../steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java | 2 +- .../ws/ocpp16/Ocpp16WebSocketEndpoint.java | 2 +- .../ocpp/ws/pipeline/AbstractCallHandler.java | 2 +- .../steve/ocpp/ws/pipeline/Deserializer.java | 2 +- .../ocpp/ws/pipeline/IncomingPipeline.java | 2 +- .../ocpp/ws/pipeline/OutgoingCallPipeline.java | 2 +- .../idsg/steve/ocpp/ws/pipeline/Sender.java | 2 +- .../steve/ocpp/ws/pipeline/Serializer.java | 2 +- .../steve/repository/AddressRepository.java | 2 +- .../repository/ChargePointRepository.java | 2 +- .../repository/ChargingProfileRepository.java | 2 +- .../steve/repository/GenericRepository.java | 2 +- .../steve/repository/OcppServerRepository.java | 2 +- .../steve/repository/OcppTagRepository.java | 2 +- .../repository/ReservationRepository.java | 2 +- .../steve/repository/ReservationStatus.java | 2 +- .../steve/repository/SettingsRepository.java | 2 +- .../rwth/idsg/steve/repository/TaskStore.java | 2 +- .../repository/TransactionRepository.java | 2 +- .../idsg/steve/repository/UserRepository.java | 2 +- .../idsg/steve/repository/dto/ChargePoint.java | 2 +- .../repository/dto/ChargePointSelect.java | 2 +- .../steve/repository/dto/ChargingProfile.java | 2 +- .../dto/ChargingProfileAssignment.java | 2 +- .../steve/repository/dto/ConnectorStatus.java | 2 +- .../idsg/steve/repository/dto/DbVersion.java | 2 +- .../dto/InsertConnectorStatusParams.java | 2 +- .../dto/InsertReservationParams.java | 2 +- .../dto/InsertTransactionParams.java | 2 +- .../steve/repository/dto/MailSettings.java | 2 +- .../idsg/steve/repository/dto/OcppTag.java | 2 +- .../idsg/steve/repository/dto/Reservation.java | 2 +- .../steve/repository/dto/TaskOverview.java | 2 +- .../idsg/steve/repository/dto/Transaction.java | 2 +- .../repository/dto/TransactionDetails.java | 2 +- .../dto/TransactionStatusUpdate.java | 2 +- .../repository/dto/UpdateChargeboxParams.java | 2 +- .../dto/UpdateTransactionParams.java | 2 +- .../rwth/idsg/steve/repository/dto/User.java | 2 +- .../repository/impl/AddressRepositoryImpl.java | 2 +- .../impl/ChargePointRepositoryImpl.java | 2 +- .../impl/ChargingProfileRepositoryImpl.java | 2 +- .../repository/impl/GenericRepositoryImpl.java | 2 +- .../impl/OcppServerRepositoryImpl.java | 2 +- .../repository/impl/OcppTagRepositoryImpl.java | 2 +- .../impl/ReservationRepositoryImpl.java | 2 +- .../impl/SettingsRepositoryImpl.java | 2 +- .../steve/repository/impl/TaskStoreImpl.java | 2 +- .../impl/TransactionRepositoryImpl.java | 2 +- .../repository/impl/UserRepositoryImpl.java | 2 +- .../idsg/steve/service/BackgroundService.java | 2 +- .../CentralSystemService16_Service.java | 2 +- .../service/ChargePointHelperService.java | 2 +- .../service/ChargePointService12_Client.java | 2 +- .../service/ChargePointService15_Client.java | 2 +- .../service/ChargePointService16_Client.java | 2 +- .../service/DummyReleaseCheckService.java | 2 +- .../service/GithubReleaseCheckService.java | 2 +- .../rwth/idsg/steve/service/MailService.java | 2 +- .../steve/service/NotificationService.java | 2 +- .../idsg/steve/service/OcppTagService.java | 2 +- .../steve/service/ReleaseCheckService.java | 2 +- .../steve/service/TransactionStopService.java | 2 +- .../UnidentifiedIncomingObjectService.java | 2 +- .../service/dto/EnhancedReserveNowParams.java | 2 +- .../dto/EnhancedSetChargingProfileParams.java | 2 +- .../dto/UnidentifiedIncomingObject.java | 2 +- .../utils/ConnectorStatusCountFilter.java | 2 +- .../steve/utils/ConnectorStatusFilter.java | 2 +- .../idsg/steve/utils/ControllerHelper.java | 2 +- .../idsg/steve/utils/CountryCodesProvider.java | 18 ++++++++++++++++++ .../de/rwth/idsg/steve/utils/CustomDSL.java | 2 +- .../rwth/idsg/steve/utils/DateConverter.java | 2 +- .../idsg/steve/utils/DateTimeConverter.java | 2 +- .../rwth/idsg/steve/utils/DateTimeUtils.java | 2 +- .../rwth/idsg/steve/utils/InternetChecker.java | 2 +- .../idsg/steve/utils/LogFileRetriever.java | 2 +- .../idsg/steve/utils/PropertiesFileLoader.java | 2 +- .../de/rwth/idsg/steve/utils/StringUtils.java | 2 +- .../idsg/steve/utils/mapper/AddressMapper.java | 18 ++++++++++++++++++ .../utils/mapper/ChargePointDetailsMapper.java | 18 ++++++++++++++++++ .../mapper/ChargingProfileDetailsMapper.java | 18 ++++++++++++++++++ .../steve/utils/mapper/OcppTagFormMapper.java | 18 ++++++++++++++++++ .../steve/utils/mapper/UserFormMapper.java | 18 ++++++++++++++++++ .../idsg/steve/web/BatchInsertConverter.java | 2 +- .../steve/web/ChargePointSelectEditor.java | 2 +- .../idsg/steve/web/GlobalControllerAdvice.java | 2 +- .../rwth/idsg/steve/web/LocalDateEditor.java | 2 +- .../idsg/steve/web/LocalDateTimeEditor.java | 2 +- .../controller/AboutSettingsController.java | 2 +- .../web/controller/AjaxCallController.java | 2 +- .../web/controller/ChargePointsController.java | 2 +- .../controller/ChargingProfilesController.java | 2 +- .../steve/web/controller/HomeController.java | 2 +- .../steve/web/controller/LogController.java | 2 +- .../steve/web/controller/Ocpp12Controller.java | 2 +- .../steve/web/controller/Ocpp15Controller.java | 2 +- .../steve/web/controller/Ocpp16Controller.java | 2 +- .../web/controller/OcppTagsController.java | 2 +- .../web/controller/SignOutController.java | 2 +- .../steve/web/controller/TaskController.java | 2 +- .../TransactionsReservationsController.java | 2 +- .../steve/web/controller/UsersController.java | 2 +- .../de/rwth/idsg/steve/web/dto/Address.java | 2 +- .../web/dto/ChargePointBatchInsertForm.java | 2 +- .../idsg/steve/web/dto/ChargePointForm.java | 2 +- .../steve/web/dto/ChargePointQueryForm.java | 2 +- .../ChargingProfileAssignmentQueryForm.java | 2 +- .../steve/web/dto/ChargingProfileForm.java | 2 +- .../web/dto/ChargingProfileQueryForm.java | 2 +- .../steve/web/dto/ConnectorStatusForm.java | 2 +- .../rwth/idsg/steve/web/dto/EndpointInfo.java | 2 +- .../idsg/steve/web/dto/OcppJsonStatus.java | 2 +- .../steve/web/dto/OcppTagBatchInsertForm.java | 2 +- .../rwth/idsg/steve/web/dto/OcppTagForm.java | 2 +- .../idsg/steve/web/dto/OcppTagQueryForm.java | 2 +- .../de/rwth/idsg/steve/web/dto/QueryForm.java | 2 +- .../rwth/idsg/steve/web/dto/ReleaseReport.java | 2 +- .../idsg/steve/web/dto/ReleaseResponse.java | 2 +- .../steve/web/dto/ReservationQueryForm.java | 2 +- .../rwth/idsg/steve/web/dto/SettingsForm.java | 2 +- .../de/rwth/idsg/steve/web/dto/Statistics.java | 2 +- .../steve/web/dto/TransactionQueryForm.java | 2 +- .../de/rwth/idsg/steve/web/dto/UserForm.java | 2 +- .../rwth/idsg/steve/web/dto/UserQueryForm.java | 2 +- .../de/rwth/idsg/steve/web/dto/UserSex.java | 2 +- .../steve/web/dto/ocpp/AvailabilityType.java | 2 +- .../web/dto/ocpp/CancelReservationParams.java | 2 +- .../web/dto/ocpp/ChangeAvailabilityParams.java | 2 +- .../dto/ocpp/ChangeConfigurationParams.java | 2 +- .../web/dto/ocpp/ChargePointSelection.java | 2 +- .../ocpp/ClearChargingProfileFilterType.java | 2 +- .../dto/ocpp/ClearChargingProfileParams.java | 2 +- .../web/dto/ocpp/ConfigurationKeyEnum.java | 2 +- .../ocpp/ConfigurationKeyReadWriteEnum.java | 2 +- .../steve/web/dto/ocpp/DataTransferParams.java | 2 +- .../dto/ocpp/GetCompositeScheduleParams.java | 2 +- .../web/dto/ocpp/GetConfigurationParams.java | 2 +- .../web/dto/ocpp/GetDiagnosticsParams.java | 2 +- .../dto/ocpp/MultipleChargePointSelect.java | 2 +- .../dto/ocpp/RemoteStartTransactionParams.java | 2 +- .../dto/ocpp/RemoteStopTransactionParams.java | 2 +- .../steve/web/dto/ocpp/ReserveNowParams.java | 2 +- .../idsg/steve/web/dto/ocpp/ResetParams.java | 2 +- .../idsg/steve/web/dto/ocpp/ResetType.java | 2 +- .../web/dto/ocpp/SendLocalListParams.java | 2 +- .../web/dto/ocpp/SendLocalListUpdateType.java | 2 +- .../web/dto/ocpp/SetChargingProfileParams.java | 2 +- .../web/dto/ocpp/SingleChargePointSelect.java | 2 +- .../steve/web/dto/ocpp/TriggerMessageEnum.java | 2 +- .../web/dto/ocpp/TriggerMessageParams.java | 2 +- .../web/dto/ocpp/UnlockConnectorParams.java | 2 +- .../web/dto/ocpp/UpdateFirmwareParams.java | 2 +- .../idsg/steve/web/validation/ChargeBoxId.java | 2 +- .../validation/ChargeBoxIdListValidator.java | 2 +- .../web/validation/ChargeBoxIdValidator.java | 2 +- .../steve/web/validation/EmailCollection.java | 2 +- .../validation/EmailCollectionValidator.java | 2 +- .../rwth/idsg/steve/web/validation/IdTag.java | 2 +- .../web/validation/IdTagListValidator.java | 2 +- .../steve/web/validation/IdTagValidator.java | 2 +- .../webapp/WEB-INF/views/00-context.jsp | 2 +- .../webapp/WEB-INF/views/00-cp-multiple.jsp | 2 +- .../webapp/WEB-INF/views/00-cp-single.jsp | 2 +- .../webapp/WEB-INF/views/00-error.jsp | 2 +- .../webapp/WEB-INF/views/00-footer.jsp | 2 +- .../webapp/WEB-INF/views/00-header.jsp | 2 +- .../webapp/WEB-INF/views/00-op-bind-errors.jsp | 2 +- .../WEB-INF/views/GetConfigurationResponse.jsp | 2 +- .../resources/webapp/WEB-INF/views/about.jsp | 2 +- .../webapp/WEB-INF/views/connectorStatus.jsp | 2 +- .../WEB-INF/views/data-man/00-address.jsp | 2 +- .../views/data-man/00-charging-profile.jsp | 2 +- .../WEB-INF/views/data-man/00-cp-misc.jsp | 2 +- .../WEB-INF/views/data-man/00-ocppTag.jsp | 2 +- .../WEB-INF/views/data-man/00-user-ocpp.jsp | 2 +- .../WEB-INF/views/data-man/00-user-profile.jsp | 2 +- .../WEB-INF/views/data-man/chargepointAdd.jsp | 2 +- .../views/data-man/chargepointDetails.jsp | 2 +- .../WEB-INF/views/data-man/chargepoints.jsp | 2 +- .../views/data-man/chargingProfileAdd.jsp | 2 +- .../data-man/chargingProfileAssignments.jsp | 2 +- .../views/data-man/chargingProfileDetails.jsp | 2 +- .../views/data-man/chargingProfiles.jsp | 2 +- .../WEB-INF/views/data-man/ocppTagAdd.jsp | 2 +- .../WEB-INF/views/data-man/ocppTagDetails.jsp | 2 +- .../webapp/WEB-INF/views/data-man/ocppTags.jsp | 2 +- .../WEB-INF/views/data-man/reservations.jsp | 2 +- .../views/data-man/transactionDetails.jsp | 2 +- .../WEB-INF/views/data-man/transactions.jsp | 2 +- .../webapp/WEB-INF/views/data-man/userAdd.jsp | 2 +- .../WEB-INF/views/data-man/userDetails.jsp | 2 +- .../webapp/WEB-INF/views/data-man/users.jsp | 2 +- .../resources/webapp/WEB-INF/views/home.jsp | 2 +- .../webapp/WEB-INF/views/ocppJsonStatus.jsp | 2 +- .../views/op-forms/CancelReservationForm.jsp | 2 +- .../views/op-forms/ChangeAvailabilityForm.jsp | 2 +- .../views/op-forms/ChangeConfigurationForm.jsp | 2 +- .../WEB-INF/views/op-forms/ClearCacheForm.jsp | 2 +- .../op-forms/ClearChargingProfileForm.jsp | 2 +- .../views/op-forms/DataTransferForm.jsp | 2 +- .../op-forms/GetCompositeScheduleForm.jsp | 2 +- .../views/op-forms/GetConfigurationForm.jsp | 2 +- .../views/op-forms/GetDiagnosticsForm.jsp | 2 +- .../views/op-forms/GetLocalListForm.jsp | 2 +- .../op-forms/RemoteStartTransactionForm.jsp | 2 +- .../op-forms/RemoteStopTransactionForm.jsp | 2 +- .../WEB-INF/views/op-forms/ReserveNowForm.jsp | 2 +- .../WEB-INF/views/op-forms/ResetForm.jsp | 2 +- .../views/op-forms/SendLocalListForm.jsp | 2 +- .../views/op-forms/SetChargingProfileForm.jsp | 2 +- .../views/op-forms/TriggerMessageForm.jsp | 2 +- .../views/op-forms/UnlockConnectorForm.jsp | 2 +- .../views/op-forms/UpdateFirmwareForm.jsp | 2 +- .../WEB-INF/views/op12/ChangeAvailability.jsp | 2 +- .../WEB-INF/views/op12/ChangeConfiguration.jsp | 2 +- .../webapp/WEB-INF/views/op12/ClearCache.jsp | 2 +- .../WEB-INF/views/op12/GetDiagnostics.jsp | 2 +- .../views/op12/RemoteStartTransaction.jsp | 2 +- .../views/op12/RemoteStopTransaction.jsp | 2 +- .../webapp/WEB-INF/views/op12/Reset.jsp | 2 +- .../WEB-INF/views/op12/UnlockConnector.jsp | 2 +- .../WEB-INF/views/op12/UpdateFirmware.jsp | 2 +- .../WEB-INF/views/op15/CancelReservation.jsp | 2 +- .../WEB-INF/views/op15/ChangeAvailability.jsp | 2 +- .../WEB-INF/views/op15/ChangeConfiguration.jsp | 2 +- .../webapp/WEB-INF/views/op15/ClearCache.jsp | 2 +- .../webapp/WEB-INF/views/op15/DataTransfer.jsp | 2 +- .../WEB-INF/views/op15/GetConfiguration.jsp | 2 +- .../WEB-INF/views/op15/GetDiagnostics.jsp | 2 +- .../WEB-INF/views/op15/GetLocalListVersion.jsp | 2 +- .../views/op15/RemoteStartTransaction.jsp | 2 +- .../views/op15/RemoteStopTransaction.jsp | 2 +- .../webapp/WEB-INF/views/op15/ReserveNow.jsp | 2 +- .../webapp/WEB-INF/views/op15/Reset.jsp | 2 +- .../WEB-INF/views/op15/SendLocalList.jsp | 2 +- .../WEB-INF/views/op15/UnlockConnector.jsp | 2 +- .../WEB-INF/views/op15/UpdateFirmware.jsp | 2 +- .../WEB-INF/views/op16/CancelReservation.jsp | 2 +- .../WEB-INF/views/op16/ChangeAvailability.jsp | 2 +- .../WEB-INF/views/op16/ChangeConfiguration.jsp | 2 +- .../webapp/WEB-INF/views/op16/ClearCache.jsp | 2 +- .../views/op16/ClearChargingProfile.jsp | 2 +- .../webapp/WEB-INF/views/op16/DataTransfer.jsp | 2 +- .../views/op16/GetCompositeSchedule.jsp | 2 +- .../op16/GetCompositeScheduleResponse.jsp | 2 +- .../WEB-INF/views/op16/GetConfiguration.jsp | 2 +- .../WEB-INF/views/op16/GetDiagnostics.jsp | 2 +- .../WEB-INF/views/op16/GetLocalListVersion.jsp | 2 +- .../views/op16/RemoteStartTransaction.jsp | 2 +- .../views/op16/RemoteStopTransaction.jsp | 2 +- .../webapp/WEB-INF/views/op16/ReserveNow.jsp | 2 +- .../webapp/WEB-INF/views/op16/Reset.jsp | 2 +- .../WEB-INF/views/op16/SendLocalList.jsp | 2 +- .../WEB-INF/views/op16/SetChargingProfile.jsp | 2 +- .../WEB-INF/views/op16/TriggerMessage.jsp | 2 +- .../WEB-INF/views/op16/UnlockConnector.jsp | 2 +- .../WEB-INF/views/op16/UpdateFirmware.jsp | 2 +- .../webapp/WEB-INF/views/settings.jsp | 2 +- .../resources/webapp/WEB-INF/views/signin.jsp | 2 +- .../webapp/WEB-INF/views/taskResult.jsp | 2 +- .../resources/webapp/WEB-INF/views/tasks.jsp | 2 +- .../rwth/idsg/steve/ApplicationJsonTest.java | 2 +- .../de/rwth/idsg/steve/ApplicationTest.java | 2 +- .../idsg/steve/OperationalTestSoapOCPP16.java | 2 +- .../java/de/rwth/idsg/steve/StressTest.java | 2 +- .../rwth/idsg/steve/StressTestJsonOCPP16.java | 2 +- .../rwth/idsg/steve/StressTestSoapOCPP16.java | 2 +- .../java/de/rwth/idsg/steve/TypeStoreTest.java | 2 +- .../de/rwth/idsg/steve/issues/Issue72.java | 2 +- .../idsg/steve/issues/Issue72LowLevelSoap.java | 2 +- .../de/rwth/idsg/steve/issues/Issue73Fix.java | 2 +- .../de/rwth/idsg/steve/issues/Issue81.java | 2 +- .../java/de/rwth/idsg/steve/utils/Helpers.java | 2 +- .../idsg/steve/utils/OcppJsonChargePoint.java | 2 +- .../de/rwth/idsg/steve/utils/StressTester.java | 2 +- .../rwth/idsg/steve/utils/StringUtilsTest.java | 18 ++++++++++++++++++ .../idsg/steve/utils/__DatabasePreparer__.java | 2 +- .../web/validation/IdTagValidatorTest.java | 18 ++++++++++++++++++ 379 files changed, 515 insertions(+), 371 deletions(-) diff --git a/pom.xml b/pom.xml index 821226b85..0eeabb9d5 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ ${project.organization.name} ${project.inceptionYear} - 2021 + 2022 **/*.txt diff --git a/src/main/java/de/rwth/idsg/steve/Application.java b/src/main/java/de/rwth/idsg/steve/Application.java index 1343ba81b..ac161642a 100644 --- a/src/main/java/de/rwth/idsg/steve/Application.java +++ b/src/main/java/de/rwth/idsg/steve/Application.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ApplicationProfile.java b/src/main/java/de/rwth/idsg/steve/ApplicationProfile.java index 6a5923148..51033d247 100644 --- a/src/main/java/de/rwth/idsg/steve/ApplicationProfile.java +++ b/src/main/java/de/rwth/idsg/steve/ApplicationProfile.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ApplicationStarter.java b/src/main/java/de/rwth/idsg/steve/ApplicationStarter.java index bd6a50f58..a19bdfb78 100644 --- a/src/main/java/de/rwth/idsg/steve/ApplicationStarter.java +++ b/src/main/java/de/rwth/idsg/steve/ApplicationStarter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/JettyServer.java b/src/main/java/de/rwth/idsg/steve/JettyServer.java index 4cf0ad751..06130a9c1 100644 --- a/src/main/java/de/rwth/idsg/steve/JettyServer.java +++ b/src/main/java/de/rwth/idsg/steve/JettyServer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/NotificationFeature.java b/src/main/java/de/rwth/idsg/steve/NotificationFeature.java index eca7971d9..f1349704b 100644 --- a/src/main/java/de/rwth/idsg/steve/NotificationFeature.java +++ b/src/main/java/de/rwth/idsg/steve/NotificationFeature.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveAppContext.java b/src/main/java/de/rwth/idsg/steve/SteveAppContext.java index 1675b9d36..13d3681f4 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveAppContext.java +++ b/src/main/java/de/rwth/idsg/steve/SteveAppContext.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveConfiguration.java b/src/main/java/de/rwth/idsg/steve/SteveConfiguration.java index ad3eca8ef..af7389f72 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/SteveConfiguration.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveDevStarter.java b/src/main/java/de/rwth/idsg/steve/SteveDevStarter.java index 9566e41c2..021a34aa8 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveDevStarter.java +++ b/src/main/java/de/rwth/idsg/steve/SteveDevStarter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveException.java b/src/main/java/de/rwth/idsg/steve/SteveException.java index 1db8d012e..8812f138f 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveException.java +++ b/src/main/java/de/rwth/idsg/steve/SteveException.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveProdCondition.java b/src/main/java/de/rwth/idsg/steve/SteveProdCondition.java index 4ae136367..12c8186b1 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveProdCondition.java +++ b/src/main/java/de/rwth/idsg/steve/SteveProdCondition.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/SteveProdStarter.java b/src/main/java/de/rwth/idsg/steve/SteveProdStarter.java index 5b7eca89e..edbf3037c 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveProdStarter.java +++ b/src/main/java/de/rwth/idsg/steve/SteveProdStarter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java index 5a3fc506c..bba757ae6 100644 --- a/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java index 77c724624..ed64e1a16 100644 --- a/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/config/SecurityConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/SecurityConfiguration.java index 87503182f..33ba62340 100644 --- a/src/main/java/de/rwth/idsg/steve/config/SecurityConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/SecurityConfiguration.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java index ac1c4f739..8a4229203 100644 --- a/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java index 2a2259772..1a12d461e 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java index e9f0c578c..53a3329c4 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java index 230fbceb3..ab3847985 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java index 5c0ef93f3..301f1a3d5 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java index 3b26b1c65..de522e8ea 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java index c48ae2b0f..2de6b8a9a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java index 887f79b07..9cd40e7be 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java index 050ff72da..883f138c7 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java index a10edbc11..d700b888b 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java b/src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java index 0fc5add34..af9f33904 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java b/src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java index 73130ba6f..18c046390 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java b/src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java index d264df42d..770466d82 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java b/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java index 610f1a0c2..3013ad8fb 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java b/src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java index b80463479..99585f3e9 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java b/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java index bd75572dc..f66588a5c 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java index 81a6b74ae..861a65bec 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15.java index 3c42989ca..66ebdbf29 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java index aba6ff27e..cb66812a3 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16.java index a32c9b157..10627ae1a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java index 8a48de87a..a3c7bd481 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java index d2f39518a..fe2fd5182 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java index 122b219bc..0887bf2f7 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java index f2f53807a..3a27c0b07 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java index 96f119a03..481512088 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java index fb4c7119f..bca6a03f8 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java index 35560cc29..a86fa2d14 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java index d2cd896f0..203b5c138 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java index a69eaa728..4783160a2 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java index d07e5de42..365ec3c08 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java index 366bdae8a..5f50ebd56 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java index 8970fd042..38ea46a83 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java index 1815fc67f..44bab0984 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java index 5ed366697..b55984b66 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java index 96c001b96..ef93e00d2 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java index 377f511d4..90b482dc5 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java index b3b8eada5..8c45d3740 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java index 8f931c552..805d85600 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java index 3010fe1a0..d1cf1bb5c 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java index 31e116c2f..a9c777758 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java index 35a98af88..a20fdb7a8 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java index 8c5f0dc9c..4ae0caa5d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java index 083b8ab14..fef73fdb1 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java index b2f480571..a39ab3b9d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java index 34e7c5ca7..3a7d17abe 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java index 84b5db1f0..bd62fd369 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java index c3b4a6860..ab10c99e4 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java index ffd1e1406..21fe7286c 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java index bd7cf0575..7ae9bb945 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java index 5f6323720..e50016cdf 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java index 4ca8b24ee..cdea9ecb1 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java index a67bc94b4..ce1636c1b 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java index d5040a373..cb56a8f0c 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java index deee5edfc..4ed01f228 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java index 60e9f8578..5a6e33d92 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java index a266eaaa5..6d8efddec 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java index 2d7cc00f8..9e0b25288 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java index 542bae6d1..55c493f12 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java index c3577327c..b3aadeb1a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java index 443a2525a..833441766 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java index cf236f03f..f0ac4f86e 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java index 4b876d9cf..94d2c6c66 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java index 4ebf44cf1..439426949 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java index 5e0ca26b2..bd93c7318 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java index a948b8ddc..f8ac57254 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java index 20d8cc9da..af58fad6e 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java index 06cdc6e08..437e2c135 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java index 2a20dc4f9..c0748046b 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java index 2bb726eeb..0c70524d7 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java index c90dde925..c53abe934 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java index 977b6b122..ad9178ae7 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java index d414fec06..39d71b2d4 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java index 79740b471..b44eb52e9 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java index 0970dc1b4..e0a2c9163 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java index c17fd208f..c2aba7266 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java index 03ba2419d..f07561570 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java index abaa09827..b6c1715ab 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java index 3b3d95ad8..e5b7570c4 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java index 20c1261a0..a94b0fd03 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java index 25c264a53..f685fceab 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java index 6d5225684..ae7321064 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java index 4fc6f0907..a825ac688 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java index a3af7ca73..df327df92 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java index f3e8cd505..1c08b9517 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java index 3e81983cf..e2bb7b8cd 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java index 1cf8fe176..e2028500a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java index 6d9c96938..6aa995528 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java index efc33d05c..5d0bbad0d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java index 6cf45e718..dadb01389 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java index 8866ad8d9..598a3cc3d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java index ae5deaa7b..cbf516e4b 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java index 1bbfe9013..76874714d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java index 7ff5fda90..50c6bfe2d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/AddressRepository.java b/src/main/java/de/rwth/idsg/steve/repository/AddressRepository.java index 0c978729d..6f0d7b0c1 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/AddressRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/AddressRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java b/src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java index 0a926a0cd..b9d64fb05 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/ChargingProfileRepository.java b/src/main/java/de/rwth/idsg/steve/repository/ChargingProfileRepository.java index 97eae70d2..cd6f080e5 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/ChargingProfileRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/ChargingProfileRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/GenericRepository.java b/src/main/java/de/rwth/idsg/steve/repository/GenericRepository.java index 63fb1fcd6..47250cda8 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/GenericRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/GenericRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java b/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java index fac0ad6b2..b4fb0de05 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/OcppTagRepository.java b/src/main/java/de/rwth/idsg/steve/repository/OcppTagRepository.java index 66601e815..7375e6bb6 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/OcppTagRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/OcppTagRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java b/src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java index 5708e39d6..8f766a464 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/ReservationStatus.java b/src/main/java/de/rwth/idsg/steve/repository/ReservationStatus.java index 35d9901a4..839edfd51 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/ReservationStatus.java +++ b/src/main/java/de/rwth/idsg/steve/repository/ReservationStatus.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/SettingsRepository.java b/src/main/java/de/rwth/idsg/steve/repository/SettingsRepository.java index 5b7f6e6ee..50590379d 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/SettingsRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/SettingsRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/TaskStore.java b/src/main/java/de/rwth/idsg/steve/repository/TaskStore.java index 38a6594db..5b7397df2 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/TaskStore.java +++ b/src/main/java/de/rwth/idsg/steve/repository/TaskStore.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java b/src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java index d92215896..bd1013997 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/UserRepository.java b/src/main/java/de/rwth/idsg/steve/repository/UserRepository.java index 72e770c28..ca31cfe4d 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/UserRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/UserRepository.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java index e921058bf..dc81c3c03 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java index 598be8a46..e0d3f04f1 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java index 91af23ba4..c307e939a 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfileAssignment.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfileAssignment.java index 7b50dbb68..6332be346 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfileAssignment.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfileAssignment.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java index 911d760e9..6e975544b 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java b/src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java index 47a48c56b..b60b14ada 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java index ce30ca133..ab26fff3a 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java index b0c958c21..7fce4bdac 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertTransactionParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertTransactionParams.java index 7b16ef38e..fa50ae755 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertTransactionParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertTransactionParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/MailSettings.java b/src/main/java/de/rwth/idsg/steve/repository/dto/MailSettings.java index 7b18975c5..347145060 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/MailSettings.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/MailSettings.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java b/src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java index 0b940abb4..3ad513805 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/Reservation.java b/src/main/java/de/rwth/idsg/steve/repository/dto/Reservation.java index b65fbf7ec..0403d5c42 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/Reservation.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/Reservation.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/TaskOverview.java b/src/main/java/de/rwth/idsg/steve/repository/dto/TaskOverview.java index 6b98a7680..72b1db82a 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/TaskOverview.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/TaskOverview.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/Transaction.java b/src/main/java/de/rwth/idsg/steve/repository/dto/Transaction.java index ce9d07fc8..32c5f1485 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/Transaction.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/Transaction.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java b/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java index a09a225bb..226ba6f29 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java b/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java index 63b406a89..5351a2ddf 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java index a44a1da2f..9bd38256e 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateTransactionParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateTransactionParams.java index 3841b9e61..621a10843 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateTransactionParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateTransactionParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/User.java b/src/main/java/de/rwth/idsg/steve/repository/dto/User.java index a8af201c7..b97eaa8b2 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/User.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/User.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java index 074512eac..a9a91b0b6 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java index 907ec97c2..da13ef38a 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java index f9881c507..dbefbdc76 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java index 6fe6e6219..1c7937c8f 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java index 27f2be9a8..220844b5b 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java index 4e3e6c7fa..606ba4e5e 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java index b51908a63..32307b103 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java index 1f0c4f6b2..55504bd7c 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java index e96dfa22c..544be7230 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java index 7c7f220c2..9757d5bed 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java index a7a8690b6..ca2d11cb0 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/BackgroundService.java b/src/main/java/de/rwth/idsg/steve/service/BackgroundService.java index fc2683e64..185649f1b 100644 --- a/src/main/java/de/rwth/idsg/steve/service/BackgroundService.java +++ b/src/main/java/de/rwth/idsg/steve/service/BackgroundService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java b/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java index 30add270f..6bdd5d929 100644 --- a/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java +++ b/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java index 3b6005efb..4492c7c96 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointService12_Client.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointService12_Client.java index 9188a61c9..600cf2c7e 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointService12_Client.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointService12_Client.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointService15_Client.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointService15_Client.java index 6a28cf80d..57f5c5c5a 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointService15_Client.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointService15_Client.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java index 3d769342f..66be04313 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/DummyReleaseCheckService.java b/src/main/java/de/rwth/idsg/steve/service/DummyReleaseCheckService.java index 5974975e4..3f687ea45 100644 --- a/src/main/java/de/rwth/idsg/steve/service/DummyReleaseCheckService.java +++ b/src/main/java/de/rwth/idsg/steve/service/DummyReleaseCheckService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java b/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java index 141cda7ef..ea3bcbe0b 100644 --- a/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java +++ b/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/MailService.java b/src/main/java/de/rwth/idsg/steve/service/MailService.java index 600570205..7c4cae657 100644 --- a/src/main/java/de/rwth/idsg/steve/service/MailService.java +++ b/src/main/java/de/rwth/idsg/steve/service/MailService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java index 68fb8c618..13b454343 100644 --- a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java +++ b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java b/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java index 2e47b6b07..6f8d164bd 100644 --- a/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java +++ b/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/ReleaseCheckService.java b/src/main/java/de/rwth/idsg/steve/service/ReleaseCheckService.java index 5828acf84..672aadc3d 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ReleaseCheckService.java +++ b/src/main/java/de/rwth/idsg/steve/service/ReleaseCheckService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java b/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java index 707b81d1c..386b4bc7c 100644 --- a/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java +++ b/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java b/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java index 82331609e..4d0d192ad 100644 --- a/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java +++ b/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedReserveNowParams.java b/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedReserveNowParams.java index b4638c6b4..9a730921f 100644 --- a/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedReserveNowParams.java +++ b/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedReserveNowParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedSetChargingProfileParams.java b/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedSetChargingProfileParams.java index 3c630651f..b65ed4276 100644 --- a/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedSetChargingProfileParams.java +++ b/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedSetChargingProfileParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java b/src/main/java/de/rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java index b9c4606bc..f0f3bb0b5 100644 --- a/src/main/java/de/rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java +++ b/src/main/java/de/rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java index 8efc8647d..7fb22a0cb 100755 --- a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java index 0d95273cf..90a2932b3 100755 --- a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java b/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java index 9f3caf2c9..9853dcc2e 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/CountryCodesProvider.java b/src/main/java/de/rwth/idsg/steve/utils/CountryCodesProvider.java index 297fde5c1..72dc1a122 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/CountryCodesProvider.java +++ b/src/main/java/de/rwth/idsg/steve/utils/CountryCodesProvider.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.utils; import com.neovisionaries.i18n.CountryCode; diff --git a/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java b/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java index 9d2d3579e..1e8d3f46a 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java +++ b/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/DateConverter.java b/src/main/java/de/rwth/idsg/steve/utils/DateConverter.java index 2349d042f..4f1584ccb 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/DateConverter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/DateConverter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java b/src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java index 16f314db6..874521e57 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java b/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java index 94713af80..bcb409f71 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java +++ b/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java b/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java index 3b7964c93..39b7e5bde 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java +++ b/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java b/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java index 4a283411b..a78b8e1b9 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java +++ b/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java b/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java index 8ff45d41a..327960e56 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java +++ b/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java b/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java index 6ac52e216..23ca19553 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java +++ b/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/AddressMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/AddressMapper.java index df45c1543..9e9de7832 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/mapper/AddressMapper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/AddressMapper.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.utils.mapper; import com.neovisionaries.i18n.CountryCode; diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java index 63178ba8e..512ce7557 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.utils.mapper; import de.rwth.idsg.steve.repository.dto.ChargePoint; diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java index 94276e8af..00a0d9add 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.utils.mapper; import de.rwth.idsg.steve.repository.dto.ChargingProfile; diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/OcppTagFormMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/OcppTagFormMapper.java index e2c2b5da3..1f21e504b 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/mapper/OcppTagFormMapper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/OcppTagFormMapper.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.utils.mapper; import de.rwth.idsg.steve.utils.ControllerHelper; diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java index 6c4aff4b0..865c35738 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.utils.mapper; import de.rwth.idsg.steve.repository.dto.User; diff --git a/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java b/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java index 212b8e23b..6599a3494 100644 --- a/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java +++ b/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java b/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java index fbd556fc4..cf28c1ac3 100644 --- a/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java +++ b/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java b/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java index 5fdf2c226..60dcd429b 100644 --- a/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java +++ b/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java b/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java index 73c029da0..f869dcd9a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java +++ b/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java b/src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java index cc7b0f390..e5932166f 100644 --- a/src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java +++ b/src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java index c110554db..8d95a18c4 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java b/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java index 799602511..5ed922886 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java index eb89d5b53..8e79c0321 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java b/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java index 447bca8f7..afd1460a0 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java b/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java index 85e8a6ce1..9f5d1d72d 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java b/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java index 201103f73..291e86c3a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java index 30c6a426b..fe2a658cc 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java index d7e57a90c..274654fbb 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java index c70107d23..b6361b1bc 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java index a26b0ac95..faaa13811 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/SignOutController.java b/src/main/java/de/rwth/idsg/steve/web/controller/SignOutController.java index 34861faa7..354f72977 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/SignOutController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/SignOutController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java b/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java index b05e7fcf6..b321d176c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java index d4ff6a21d..372fd3e70 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java b/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java index 7bbcd0062..0e60948cc 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/Address.java b/src/main/java/de/rwth/idsg/steve/web/dto/Address.java index 1c066527a..4bc02cb3a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/Address.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/Address.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java index 46cd4b332..41801184a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java index e30efc79f..5a92ba445 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java index 26ece9624..b13ab865b 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java index 312062593..2227988df 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java index c3bf9b1c4..7fc46dd3a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java index 3167a82b3..b3410424f 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java index 146e19cb1..16d077742 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java b/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java index 0d4e6f15e..cfd7eef10 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java index d3ce42c21..6ac5c16d2 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java index efe29e77c..4c0805f1d 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java index 26d1e6393..387855c60 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java index 460629aed..fe9a9a4ce 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java index f908794e9..9e9d2be9c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java b/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java index 474c62639..50d3680f8 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java b/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java index 47fdd062f..89023ece8 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java index d476bf5fb..9c3c6bb6f 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java index f34da926c..5655489b0 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java b/src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java index 05311aea1..e81e6098e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java index 5e44686d6..0ac516cc0 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java index e190326e8..c1a97e8d9 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java index 7df079be9..9513729a4 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java b/src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java index 75243f28e..51e96815f 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java index 3e05b925e..2c9313244 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java index 3024f57c1..bae267cf9 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java index 653f2880d..9ef7e0236 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java index c08609b22..7ac0242c0 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java index 4de580251..9f70d24e2 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java index 20aa07b88..c2f134ebb 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java index 011780831..22d247c45 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java index bb466f55a..316e4caf6 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyReadWriteEnum.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyReadWriteEnum.java index fc435b383..e194f5746 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyReadWriteEnum.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyReadWriteEnum.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java index 84f2c308c..c9f8ec3ae 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java index 1c2e24de8..f1fe558fb 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java index d1e05aa9c..8777d6cad 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java index 50ffc83c2..5a3c59f3e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java index 9946a358e..79818c076 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java index c453789f1..f2d43532d 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java index e735a113e..9deeea8db 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java index 4fb669b89..267f5eb91 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java index 961031e6e..dc35b2c69 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java index 89356af1b..3d5e08b3f 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java index dd2e13afb..d98a8f0b2 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java index fc0773dd5..d20d42500 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java index 0479ccb3c..3d76120cd 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java index 210d34554..d425861da 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java index 2afb9ba8a..c9b95b2d4 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageParams.java index c956fd226..dc1385488 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java index 05e1c7ead..f3431091e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java index 249c3708d..3adfbc999 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java index 6e547252f..2f0915b58 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdListValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdListValidator.java index 46de8c50a..1d3d8783e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdListValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdListValidator.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java index 77a13a29d..8c8ab1744 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollection.java b/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollection.java index c90a4065a..f502abf0a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollection.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollection.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollectionValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollectionValidator.java index b01eb6f3f..21e12f591 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollectionValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollectionValidator.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java b/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java index 81aa21643..21806c198 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagListValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagListValidator.java index 59479f3a8..b7efe47c4 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagListValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagListValidator.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java index 651de5d09..da7fddc7e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-context.jsp b/src/main/resources/webapp/WEB-INF/views/00-context.jsp index 3bd42e18c..56ad9592b 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-context.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-context.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-cp-multiple.jsp b/src/main/resources/webapp/WEB-INF/views/00-cp-multiple.jsp index 0658a2873..8a52f4da4 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-cp-multiple.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-cp-multiple.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-cp-single.jsp b/src/main/resources/webapp/WEB-INF/views/00-cp-single.jsp index 8f4172821..746ee54c5 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-cp-single.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-cp-single.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-error.jsp b/src/main/resources/webapp/WEB-INF/views/00-error.jsp index cbf1c8bcc..fa84e6f2f 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-error.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-error.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-footer.jsp b/src/main/resources/webapp/WEB-INF/views/00-footer.jsp index 5ec555ded..9dd556f97 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-footer.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-footer.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-header.jsp b/src/main/resources/webapp/WEB-INF/views/00-header.jsp index f8d7bf9b1..718a7a840 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-header.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-header.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/00-op-bind-errors.jsp b/src/main/resources/webapp/WEB-INF/views/00-op-bind-errors.jsp index 7f0ebf732..48bf4004e 100644 --- a/src/main/resources/webapp/WEB-INF/views/00-op-bind-errors.jsp +++ b/src/main/resources/webapp/WEB-INF/views/00-op-bind-errors.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/GetConfigurationResponse.jsp b/src/main/resources/webapp/WEB-INF/views/GetConfigurationResponse.jsp index 74705c793..bf152f85f 100644 --- a/src/main/resources/webapp/WEB-INF/views/GetConfigurationResponse.jsp +++ b/src/main/resources/webapp/WEB-INF/views/GetConfigurationResponse.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/about.jsp b/src/main/resources/webapp/WEB-INF/views/about.jsp index 5931157ae..7f4e3ede4 100644 --- a/src/main/resources/webapp/WEB-INF/views/about.jsp +++ b/src/main/resources/webapp/WEB-INF/views/about.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp b/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp index c5ffe058c..ff866da50 100644 --- a/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp +++ b/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-address.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-address.jsp index f252ce7d0..790891730 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-address.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-address.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp index fb5d47519..77a7f0bf1 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-charging-profile.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-cp-misc.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-cp-misc.jsp index 9bc2fd335..98c81576d 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-cp-misc.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-cp-misc.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-ocppTag.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-ocppTag.jsp index 954fd6aca..727c47d09 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-ocppTag.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-ocppTag.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-user-ocpp.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-user-ocpp.jsp index 2e4eec176..f1bc02917 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-user-ocpp.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-user-ocpp.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/00-user-profile.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/00-user-profile.jsp index bb5743dd3..c9d7a9f06 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/00-user-profile.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/00-user-profile.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargepointAdd.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargepointAdd.jsp index 44853e80f..2c23aea67 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargepointAdd.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargepointAdd.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargepointDetails.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargepointDetails.jsp index 2c5866e84..5be9c01dd 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargepointDetails.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargepointDetails.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargepoints.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargepoints.jsp index 7c1d1d28e..e005935da 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargepoints.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargepoints.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp index 69676b092..39dbf0167 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAssignments.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAssignments.jsp index e6d3dba79..57caa77db 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAssignments.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileAssignments.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileDetails.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileDetails.jsp index e29ad5b83..2c66cfff3 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileDetails.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfileDetails.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfiles.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfiles.jsp index 0b9f10e93..cb68bf293 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfiles.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/chargingProfiles.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp index 5a38dc5d5..006ee88f0 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp index 5c0253148..be269e319 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp index 63e0cdb6c..5f2e077b3 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/reservations.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/reservations.jsp index 002fcf8bf..34acfb78e 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/reservations.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/reservations.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/transactionDetails.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/transactionDetails.jsp index cd97d4a70..27ab5b778 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/transactionDetails.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/transactionDetails.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp index 68b362456..ed77e370f 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/userAdd.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/userAdd.jsp index fc0ee0603..19182e1e8 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/userAdd.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/userAdd.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/userDetails.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/userDetails.jsp index 2268ca606..9730783a4 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/userDetails.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/userDetails.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/users.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/users.jsp index d8db6a397..8d3de1b21 100644 --- a/src/main/resources/webapp/WEB-INF/views/data-man/users.jsp +++ b/src/main/resources/webapp/WEB-INF/views/data-man/users.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/home.jsp b/src/main/resources/webapp/WEB-INF/views/home.jsp index 2b32f9ff6..381aa332d 100644 --- a/src/main/resources/webapp/WEB-INF/views/home.jsp +++ b/src/main/resources/webapp/WEB-INF/views/home.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/ocppJsonStatus.jsp b/src/main/resources/webapp/WEB-INF/views/ocppJsonStatus.jsp index 9d95382c0..a32fbcaec 100644 --- a/src/main/resources/webapp/WEB-INF/views/ocppJsonStatus.jsp +++ b/src/main/resources/webapp/WEB-INF/views/ocppJsonStatus.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp index 1a029b858..dac5984ec 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp index 33784f97d..a6d7303a6 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeConfigurationForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeConfigurationForm.jsp index a1d7cc676..1e3d74cc4 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeConfigurationForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ChangeConfigurationForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp index 493f33b0f..8ba74201a 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ClearChargingProfileForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ClearChargingProfileForm.jsp index a0fb66d2d..955135d7b 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ClearChargingProfileForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ClearChargingProfileForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp index d0859c13d..cfc370194 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp index e31ca9926..4ed94895f 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp index 4121eebb8..7ec048198 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp index 804d07be7..abb96c968 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp index 91e808503..675e00be0 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp index 59a8db6d7..83c926f4d 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp index 4b9f15f4d..97d9d6719 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp index a29a718d6..94ba1312e 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/ResetForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/ResetForm.jsp index 3843faf7f..4d0a95882 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/ResetForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/ResetForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp index 571d6d4fd..7301fcbb7 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp index 42289034c..b2286b348 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp index 7a3224324..794d3ea0f 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp index b493e9e69..443735416 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp index 26db44fe4..11288d935 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/ChangeAvailability.jsp b/src/main/resources/webapp/WEB-INF/views/op12/ChangeAvailability.jsp index 09484425e..412653c44 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/ChangeAvailability.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/ChangeAvailability.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/ChangeConfiguration.jsp b/src/main/resources/webapp/WEB-INF/views/op12/ChangeConfiguration.jsp index 258626b23..965ca63e1 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/ChangeConfiguration.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/ChangeConfiguration.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/ClearCache.jsp b/src/main/resources/webapp/WEB-INF/views/op12/ClearCache.jsp index 50dbb2aa0..95296adc4 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/ClearCache.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/ClearCache.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/GetDiagnostics.jsp b/src/main/resources/webapp/WEB-INF/views/op12/GetDiagnostics.jsp index 2726dfee8..b904f4925 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/GetDiagnostics.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/GetDiagnostics.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp index 2c839fced..a237db0d8 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp index 5aac2f1ec..82b96bccd 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/Reset.jsp b/src/main/resources/webapp/WEB-INF/views/op12/Reset.jsp index d34fd8bc8..15b7f11f6 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/Reset.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/Reset.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/UnlockConnector.jsp b/src/main/resources/webapp/WEB-INF/views/op12/UnlockConnector.jsp index fac2278b8..d1d19b129 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/UnlockConnector.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/UnlockConnector.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op12/UpdateFirmware.jsp b/src/main/resources/webapp/WEB-INF/views/op12/UpdateFirmware.jsp index 535a549a3..163827a1c 100644 --- a/src/main/resources/webapp/WEB-INF/views/op12/UpdateFirmware.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op12/UpdateFirmware.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/CancelReservation.jsp b/src/main/resources/webapp/WEB-INF/views/op15/CancelReservation.jsp index f9016aaaa..66af967b5 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/CancelReservation.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/CancelReservation.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/ChangeAvailability.jsp b/src/main/resources/webapp/WEB-INF/views/op15/ChangeAvailability.jsp index 680bd1dc0..d11921ec2 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/ChangeAvailability.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/ChangeAvailability.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/ChangeConfiguration.jsp b/src/main/resources/webapp/WEB-INF/views/op15/ChangeConfiguration.jsp index ef73ecd16..9b48f9056 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/ChangeConfiguration.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/ChangeConfiguration.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/ClearCache.jsp b/src/main/resources/webapp/WEB-INF/views/op15/ClearCache.jsp index 18628293b..adb822730 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/ClearCache.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/ClearCache.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/DataTransfer.jsp b/src/main/resources/webapp/WEB-INF/views/op15/DataTransfer.jsp index d6c7f5cff..cbf03bc34 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/DataTransfer.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/DataTransfer.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/GetConfiguration.jsp b/src/main/resources/webapp/WEB-INF/views/op15/GetConfiguration.jsp index c4e046be2..263c2f9b7 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/GetConfiguration.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/GetConfiguration.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/GetDiagnostics.jsp b/src/main/resources/webapp/WEB-INF/views/op15/GetDiagnostics.jsp index 98f5be463..da31551b8 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/GetDiagnostics.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/GetDiagnostics.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/GetLocalListVersion.jsp b/src/main/resources/webapp/WEB-INF/views/op15/GetLocalListVersion.jsp index a59bc20db..9e8b44a2a 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/GetLocalListVersion.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/GetLocalListVersion.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp index db8c97e5d..77ba0b2f2 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp index 832ce4301..3a29d01df 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/ReserveNow.jsp b/src/main/resources/webapp/WEB-INF/views/op15/ReserveNow.jsp index 225b454a6..df3dce5b7 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/ReserveNow.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/ReserveNow.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/Reset.jsp b/src/main/resources/webapp/WEB-INF/views/op15/Reset.jsp index a57efab30..41c935d27 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/Reset.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/Reset.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/SendLocalList.jsp b/src/main/resources/webapp/WEB-INF/views/op15/SendLocalList.jsp index edd6c7cd3..6efb24c57 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/SendLocalList.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/SendLocalList.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/UnlockConnector.jsp b/src/main/resources/webapp/WEB-INF/views/op15/UnlockConnector.jsp index 7e1d48a15..5d40ec9b7 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/UnlockConnector.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/UnlockConnector.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op15/UpdateFirmware.jsp b/src/main/resources/webapp/WEB-INF/views/op15/UpdateFirmware.jsp index ccfb1413b..686c73b4a 100644 --- a/src/main/resources/webapp/WEB-INF/views/op15/UpdateFirmware.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op15/UpdateFirmware.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/CancelReservation.jsp b/src/main/resources/webapp/WEB-INF/views/op16/CancelReservation.jsp index 7b2e02dad..646209dd2 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/CancelReservation.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/CancelReservation.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/ChangeAvailability.jsp b/src/main/resources/webapp/WEB-INF/views/op16/ChangeAvailability.jsp index 999136037..3036b6c7a 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/ChangeAvailability.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/ChangeAvailability.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/ChangeConfiguration.jsp b/src/main/resources/webapp/WEB-INF/views/op16/ChangeConfiguration.jsp index 162a04a04..9ec3335d2 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/ChangeConfiguration.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/ChangeConfiguration.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/ClearCache.jsp b/src/main/resources/webapp/WEB-INF/views/op16/ClearCache.jsp index 841b6491b..dafe445c5 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/ClearCache.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/ClearCache.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/ClearChargingProfile.jsp b/src/main/resources/webapp/WEB-INF/views/op16/ClearChargingProfile.jsp index 639e62a7f..1f9aecd3d 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/ClearChargingProfile.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/ClearChargingProfile.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/DataTransfer.jsp b/src/main/resources/webapp/WEB-INF/views/op16/DataTransfer.jsp index e1e02d12d..d945c7939 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/DataTransfer.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/DataTransfer.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp b/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp index d847dabf6..c34f460b8 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeScheduleResponse.jsp b/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeScheduleResponse.jsp index dca660da5..024c0e51e 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeScheduleResponse.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/GetCompositeScheduleResponse.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/GetConfiguration.jsp b/src/main/resources/webapp/WEB-INF/views/op16/GetConfiguration.jsp index 286a67338..f188116fb 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/GetConfiguration.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/GetConfiguration.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/GetDiagnostics.jsp b/src/main/resources/webapp/WEB-INF/views/op16/GetDiagnostics.jsp index 03ed6193b..37f381777 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/GetDiagnostics.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/GetDiagnostics.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/GetLocalListVersion.jsp b/src/main/resources/webapp/WEB-INF/views/op16/GetLocalListVersion.jsp index 238a580be..280b7bcd0 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/GetLocalListVersion.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/GetLocalListVersion.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp index 146a2e929..77c23e1d2 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp b/src/main/resources/webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp index 4eed67836..d5dd7cba7 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/ReserveNow.jsp b/src/main/resources/webapp/WEB-INF/views/op16/ReserveNow.jsp index ef98f33c3..8e127efe7 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/ReserveNow.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/ReserveNow.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/Reset.jsp b/src/main/resources/webapp/WEB-INF/views/op16/Reset.jsp index 91be967cf..a69b0e921 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/Reset.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/Reset.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/SendLocalList.jsp b/src/main/resources/webapp/WEB-INF/views/op16/SendLocalList.jsp index 4ff34113b..b2af3828d 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/SendLocalList.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/SendLocalList.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/SetChargingProfile.jsp b/src/main/resources/webapp/WEB-INF/views/op16/SetChargingProfile.jsp index 9f5657a4e..1a9469480 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/SetChargingProfile.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/SetChargingProfile.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/TriggerMessage.jsp b/src/main/resources/webapp/WEB-INF/views/op16/TriggerMessage.jsp index 6c9f818b9..7d3fee9e1 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/TriggerMessage.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/TriggerMessage.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/UnlockConnector.jsp b/src/main/resources/webapp/WEB-INF/views/op16/UnlockConnector.jsp index e917e75f2..4328b7024 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/UnlockConnector.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/UnlockConnector.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/op16/UpdateFirmware.jsp b/src/main/resources/webapp/WEB-INF/views/op16/UpdateFirmware.jsp index fd6ed9e32..cab9f1158 100644 --- a/src/main/resources/webapp/WEB-INF/views/op16/UpdateFirmware.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op16/UpdateFirmware.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/settings.jsp b/src/main/resources/webapp/WEB-INF/views/settings.jsp index 7eba2835e..a478476ad 100644 --- a/src/main/resources/webapp/WEB-INF/views/settings.jsp +++ b/src/main/resources/webapp/WEB-INF/views/settings.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/signin.jsp b/src/main/resources/webapp/WEB-INF/views/signin.jsp index c4554318f..7d658b169 100644 --- a/src/main/resources/webapp/WEB-INF/views/signin.jsp +++ b/src/main/resources/webapp/WEB-INF/views/signin.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/taskResult.jsp b/src/main/resources/webapp/WEB-INF/views/taskResult.jsp index 4592ba636..25f941704 100644 --- a/src/main/resources/webapp/WEB-INF/views/taskResult.jsp +++ b/src/main/resources/webapp/WEB-INF/views/taskResult.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/main/resources/webapp/WEB-INF/views/tasks.jsp b/src/main/resources/webapp/WEB-INF/views/tasks.jsp index 34cb08b07..a51f6f6c0 100644 --- a/src/main/resources/webapp/WEB-INF/views/tasks.jsp +++ b/src/main/resources/webapp/WEB-INF/views/tasks.jsp @@ -1,7 +1,7 @@ <%-- SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). All Rights Reserved. This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java index c281b2da8..ede23bebb 100644 --- a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java +++ b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/ApplicationTest.java b/src/test/java/de/rwth/idsg/steve/ApplicationTest.java index 99248fec8..6494c6319 100644 --- a/src/test/java/de/rwth/idsg/steve/ApplicationTest.java +++ b/src/test/java/de/rwth/idsg/steve/ApplicationTest.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java b/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java index 281ccc07c..76cc58968 100644 --- a/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java +++ b/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/StressTest.java b/src/test/java/de/rwth/idsg/steve/StressTest.java index 150624a7a..5ebfc6a11 100644 --- a/src/test/java/de/rwth/idsg/steve/StressTest.java +++ b/src/test/java/de/rwth/idsg/steve/StressTest.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java b/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java index f5b090c2a..21d3c859b 100644 --- a/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java +++ b/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java b/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java index 3943fdd69..9cc0fe8c4 100644 --- a/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java +++ b/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java b/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java index b7cc442f2..e59ea9660 100644 --- a/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java +++ b/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue72.java b/src/test/java/de/rwth/idsg/steve/issues/Issue72.java index 6a9bf1d5f..4cdff53e4 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue72.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue72.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java b/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java index da7392911..478ebe99f 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java b/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java index c862766d8..d10469d02 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue81.java b/src/test/java/de/rwth/idsg/steve/issues/Issue81.java index 1bc6d8d70..5a0386106 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue81.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue81.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/utils/Helpers.java b/src/test/java/de/rwth/idsg/steve/utils/Helpers.java index dad8f6183..425ab5dab 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/Helpers.java +++ b/src/test/java/de/rwth/idsg/steve/utils/Helpers.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java b/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java index 503687f67..977191b9a 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java +++ b/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/utils/StressTester.java b/src/test/java/de/rwth/idsg/steve/utils/StressTester.java index 95c7993f5..595d06ac4 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/StressTester.java +++ b/src/test/java/de/rwth/idsg/steve/utils/StressTester.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/utils/StringUtilsTest.java b/src/test/java/de/rwth/idsg/steve/utils/StringUtilsTest.java index 39ade4c2c..861066d28 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/StringUtilsTest.java +++ b/src/test/java/de/rwth/idsg/steve/utils/StringUtilsTest.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.utils; import de.rwth.idsg.steve.ocpp.task.CancelReservationTask; diff --git a/src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java b/src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java index e555fc3a8..ffbc74365 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java +++ b/src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java @@ -1,6 +1,6 @@ /* * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). * All Rights Reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/test/java/de/rwth/idsg/steve/web/validation/IdTagValidatorTest.java b/src/test/java/de/rwth/idsg/steve/web/validation/IdTagValidatorTest.java index cd356f336..bbec5f6e5 100644 --- a/src/test/java/de/rwth/idsg/steve/web/validation/IdTagValidatorTest.java +++ b/src/test/java/de/rwth/idsg/steve/web/validation/IdTagValidatorTest.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.web.validation; import org.junit.Assert; From 05a76029e85a89bf56c35cf888908048b2a05048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sun, 23 Jan 2022 22:03:45 +0100 Subject: [PATCH 298/548] update author mail in java docs --- src/main/java/de/rwth/idsg/steve/Application.java | 2 +- src/main/java/de/rwth/idsg/steve/ApplicationProfile.java | 2 +- src/main/java/de/rwth/idsg/steve/ApplicationStarter.java | 2 +- src/main/java/de/rwth/idsg/steve/JettyServer.java | 2 +- src/main/java/de/rwth/idsg/steve/NotificationFeature.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveAppContext.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveConfiguration.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveDevStarter.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveException.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveProdCondition.java | 2 +- src/main/java/de/rwth/idsg/steve/SteveProdStarter.java | 2 +- src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java | 2 +- src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java | 2 +- .../java/de/rwth/idsg/steve/config/SecurityConfiguration.java | 2 +- .../java/de/rwth/idsg/steve/config/WebSocketConfiguration.java | 2 +- .../de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java | 2 +- .../rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java | 2 +- .../de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java | 2 +- .../rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java | 2 +- .../de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java | 2 +- .../rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java | 2 +- .../de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java | 2 +- .../idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java | 2 +- .../idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java | 2 +- .../idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java | 2 +- .../de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java | 2 +- .../de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java | 2 +- .../rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java | 2 +- .../de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java | 2 +- .../idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java | 2 +- .../rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java | 2 +- .../idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java | 2 +- .../rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java | 2 +- .../rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java | 2 +- .../rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java | 2 +- .../rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java | 2 +- .../de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java | 2 +- .../rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java | 2 +- src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java | 2 +- .../java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java | 2 +- .../java/de/rwth/idsg/steve/repository/AddressRepository.java | 2 +- .../de/rwth/idsg/steve/repository/ChargePointRepository.java | 2 +- .../rwth/idsg/steve/repository/ChargingProfileRepository.java | 2 +- .../java/de/rwth/idsg/steve/repository/GenericRepository.java | 2 +- .../de/rwth/idsg/steve/repository/OcppServerRepository.java | 2 +- .../java/de/rwth/idsg/steve/repository/OcppTagRepository.java | 2 +- .../de/rwth/idsg/steve/repository/ReservationRepository.java | 2 +- .../java/de/rwth/idsg/steve/repository/ReservationStatus.java | 2 +- .../java/de/rwth/idsg/steve/repository/SettingsRepository.java | 2 +- src/main/java/de/rwth/idsg/steve/repository/TaskStore.java | 2 +- .../de/rwth/idsg/steve/repository/TransactionRepository.java | 2 +- src/main/java/de/rwth/idsg/steve/repository/UserRepository.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/ChargePoint.java | 2 +- .../de/rwth/idsg/steve/repository/dto/ChargePointSelect.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java | 2 +- .../idsg/steve/repository/dto/ChargingProfileAssignment.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java | 2 +- src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java | 2 +- .../idsg/steve/repository/dto/InsertConnectorStatusParams.java | 2 +- .../rwth/idsg/steve/repository/dto/InsertReservationParams.java | 2 +- .../rwth/idsg/steve/repository/dto/InsertTransactionParams.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/MailSettings.java | 2 +- src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/Reservation.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/TaskOverview.java | 2 +- .../java/de/rwth/idsg/steve/repository/dto/Transaction.java | 2 +- .../de/rwth/idsg/steve/repository/dto/TransactionDetails.java | 2 +- .../rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java | 2 +- .../rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java | 2 +- .../rwth/idsg/steve/repository/dto/UpdateTransactionParams.java | 2 +- src/main/java/de/rwth/idsg/steve/repository/dto/User.java | 2 +- .../rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java | 2 +- .../idsg/steve/repository/impl/ChargePointRepositoryImpl.java | 2 +- .../steve/repository/impl/ChargingProfileRepositoryImpl.java | 2 +- .../rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java | 2 +- .../idsg/steve/repository/impl/OcppServerRepositoryImpl.java | 2 +- .../rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java | 2 +- .../idsg/steve/repository/impl/ReservationRepositoryImpl.java | 2 +- .../rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java | 2 +- .../java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java | 2 +- .../idsg/steve/repository/impl/TransactionRepositoryImpl.java | 2 +- .../de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java | 2 +- src/main/java/de/rwth/idsg/steve/service/BackgroundService.java | 2 +- .../rwth/idsg/steve/service/CentralSystemService16_Service.java | 2 +- .../de/rwth/idsg/steve/service/ChargePointHelperService.java | 2 +- .../de/rwth/idsg/steve/service/ChargePointService12_Client.java | 2 +- .../de/rwth/idsg/steve/service/ChargePointService15_Client.java | 2 +- .../de/rwth/idsg/steve/service/ChargePointService16_Client.java | 2 +- .../de/rwth/idsg/steve/service/DummyReleaseCheckService.java | 2 +- .../de/rwth/idsg/steve/service/GithubReleaseCheckService.java | 2 +- src/main/java/de/rwth/idsg/steve/service/MailService.java | 2 +- .../java/de/rwth/idsg/steve/service/NotificationService.java | 2 +- src/main/java/de/rwth/idsg/steve/service/OcppTagService.java | 2 +- .../java/de/rwth/idsg/steve/service/ReleaseCheckService.java | 2 +- .../java/de/rwth/idsg/steve/service/TransactionStopService.java | 2 +- .../idsg/steve/service/UnidentifiedIncomingObjectService.java | 2 +- .../steve/service/dto/EnhancedSetChargingProfileParams.java | 2 +- .../rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java | 2 +- .../de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java | 2 +- .../java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/DateConverter.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java | 2 +- .../java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java | 2 +- src/main/java/de/rwth/idsg/steve/utils/StringUtils.java | 2 +- src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java | 2 +- .../java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java | 2 +- .../java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java | 2 +- src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java | 2 +- src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java | 2 +- .../rwth/idsg/steve/web/controller/AboutSettingsController.java | 2 +- .../de/rwth/idsg/steve/web/controller/AjaxCallController.java | 2 +- .../rwth/idsg/steve/web/controller/ChargePointsController.java | 2 +- .../idsg/steve/web/controller/ChargingProfilesController.java | 2 +- .../java/de/rwth/idsg/steve/web/controller/HomeController.java | 2 +- .../java/de/rwth/idsg/steve/web/controller/LogController.java | 2 +- .../de/rwth/idsg/steve/web/controller/Ocpp12Controller.java | 2 +- .../de/rwth/idsg/steve/web/controller/Ocpp15Controller.java | 2 +- .../de/rwth/idsg/steve/web/controller/Ocpp16Controller.java | 2 +- .../de/rwth/idsg/steve/web/controller/OcppTagsController.java | 2 +- .../de/rwth/idsg/steve/web/controller/SignOutController.java | 2 +- .../java/de/rwth/idsg/steve/web/controller/TaskController.java | 2 +- .../web/controller/TransactionsReservationsController.java | 2 +- .../java/de/rwth/idsg/steve/web/controller/UsersController.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/Address.java | 2 +- .../de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java | 2 +- .../idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java | 2 +- .../de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java | 2 +- .../idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java | 2 +- .../idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java | 2 +- .../idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java | 2 +- .../idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java | 2 +- .../idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java | 2 +- .../java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java | 2 +- src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java | 2 +- .../rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java | 2 +- .../de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java | 2 +- .../java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java | 2 +- .../idsg/steve/web/validation/ChargeBoxIdListValidator.java | 2 +- .../de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java | 2 +- .../java/de/rwth/idsg/steve/web/validation/EmailCollection.java | 2 +- .../idsg/steve/web/validation/EmailCollectionValidator.java | 2 +- src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java | 2 +- .../de/rwth/idsg/steve/web/validation/IdTagListValidator.java | 2 +- .../java/de/rwth/idsg/steve/web/validation/IdTagValidator.java | 2 +- src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java | 2 +- src/test/java/de/rwth/idsg/steve/ApplicationTest.java | 2 +- src/test/java/de/rwth/idsg/steve/StressTest.java | 2 +- src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java | 2 +- src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java | 2 +- src/test/java/de/rwth/idsg/steve/TypeStoreTest.java | 2 +- src/test/java/de/rwth/idsg/steve/issues/Issue72.java | 2 +- .../java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java | 2 +- src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java | 2 +- src/test/java/de/rwth/idsg/steve/issues/Issue81.java | 2 +- src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java | 2 +- src/test/java/de/rwth/idsg/steve/utils/StressTester.java | 2 +- .../java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java | 2 +- 260 files changed, 260 insertions(+), 260 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/Application.java b/src/main/java/de/rwth/idsg/steve/Application.java index ac161642a..948c1c9c3 100644 --- a/src/main/java/de/rwth/idsg/steve/Application.java +++ b/src/main/java/de/rwth/idsg/steve/Application.java @@ -25,7 +25,7 @@ import java.util.TimeZone; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 14.01.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/ApplicationProfile.java b/src/main/java/de/rwth/idsg/steve/ApplicationProfile.java index 51033d247..a17b2ccd1 100644 --- a/src/main/java/de/rwth/idsg/steve/ApplicationProfile.java +++ b/src/main/java/de/rwth/idsg/steve/ApplicationProfile.java @@ -19,7 +19,7 @@ package de.rwth.idsg.steve; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 05.11.2015 */ public enum ApplicationProfile { diff --git a/src/main/java/de/rwth/idsg/steve/ApplicationStarter.java b/src/main/java/de/rwth/idsg/steve/ApplicationStarter.java index a19bdfb78..5b6eca3c8 100644 --- a/src/main/java/de/rwth/idsg/steve/ApplicationStarter.java +++ b/src/main/java/de/rwth/idsg/steve/ApplicationStarter.java @@ -19,7 +19,7 @@ package de.rwth.idsg.steve; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 05.11.2015 */ public interface ApplicationStarter { diff --git a/src/main/java/de/rwth/idsg/steve/JettyServer.java b/src/main/java/de/rwth/idsg/steve/JettyServer.java index 06130a9c1..b71993570 100644 --- a/src/main/java/de/rwth/idsg/steve/JettyServer.java +++ b/src/main/java/de/rwth/idsg/steve/JettyServer.java @@ -53,7 +53,7 @@ import static de.rwth.idsg.steve.SteveConfiguration.CONFIG; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 12.12.2014 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/NotificationFeature.java b/src/main/java/de/rwth/idsg/steve/NotificationFeature.java index f1349704b..7100c4ffd 100644 --- a/src/main/java/de/rwth/idsg/steve/NotificationFeature.java +++ b/src/main/java/de/rwth/idsg/steve/NotificationFeature.java @@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 22.01.2016 */ @RequiredArgsConstructor diff --git a/src/main/java/de/rwth/idsg/steve/SteveAppContext.java b/src/main/java/de/rwth/idsg/steve/SteveAppContext.java index 13d3681f4..20651a23a 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveAppContext.java +++ b/src/main/java/de/rwth/idsg/steve/SteveAppContext.java @@ -51,7 +51,7 @@ import static de.rwth.idsg.steve.SteveConfiguration.CONFIG; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 07.04.2015 */ public class SteveAppContext { diff --git a/src/main/java/de/rwth/idsg/steve/SteveConfiguration.java b/src/main/java/de/rwth/idsg/steve/SteveConfiguration.java index af7389f72..0dcb3254c 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/SteveConfiguration.java @@ -27,7 +27,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 19.08.2014 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/SteveDevStarter.java b/src/main/java/de/rwth/idsg/steve/SteveDevStarter.java index 021a34aa8..626b5459b 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveDevStarter.java +++ b/src/main/java/de/rwth/idsg/steve/SteveDevStarter.java @@ -21,7 +21,7 @@ /** * ApplicationStarter for DEV profile * - * @author Sevket Goekay + * @author Sevket Goekay * @since 05.11.2015 */ public class SteveDevStarter implements ApplicationStarter { diff --git a/src/main/java/de/rwth/idsg/steve/SteveException.java b/src/main/java/de/rwth/idsg/steve/SteveException.java index 8812f138f..b3a60e396 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveException.java +++ b/src/main/java/de/rwth/idsg/steve/SteveException.java @@ -21,7 +21,7 @@ import static java.lang.String.format; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 28.08.2014 */ public class SteveException extends RuntimeException { diff --git a/src/main/java/de/rwth/idsg/steve/SteveProdCondition.java b/src/main/java/de/rwth/idsg/steve/SteveProdCondition.java index 12c8186b1..529e609e0 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveProdCondition.java +++ b/src/main/java/de/rwth/idsg/steve/SteveProdCondition.java @@ -37,7 +37,7 @@ * and then everything falls apart. * * - * @author Sevket Goekay + * @author Sevket Goekay * @since 28.12.2015 */ public class SteveProdCondition implements Condition { diff --git a/src/main/java/de/rwth/idsg/steve/SteveProdStarter.java b/src/main/java/de/rwth/idsg/steve/SteveProdStarter.java index edbf3037c..9882e9902 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveProdStarter.java +++ b/src/main/java/de/rwth/idsg/steve/SteveProdStarter.java @@ -31,7 +31,7 @@ * Since we log everything to a file, it can be confusing for the user to see nothing written to console, when starting * the app. So, this class prints some stuff to console. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 05.11.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java index bba757ae6..f9c781d91 100644 --- a/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java @@ -62,7 +62,7 @@ /** * Configuration and beans of Spring Framework. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 15.08.2014 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java index ed64e1a16..950682abd 100644 --- a/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java @@ -47,7 +47,7 @@ /** * Configuration and beans related to OCPP. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 18.11.2014 */ @Configuration diff --git a/src/main/java/de/rwth/idsg/steve/config/SecurityConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/SecurityConfiguration.java index 33ba62340..2fa03cda8 100644 --- a/src/main/java/de/rwth/idsg/steve/config/SecurityConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/SecurityConfiguration.java @@ -33,7 +33,7 @@ import static de.rwth.idsg.steve.SteveConfiguration.CONFIG; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 07.01.2015 */ @Configuration diff --git a/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java index 8a4229203..5b80e3cb4 100644 --- a/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java @@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 11.03.2015 */ @EnableWebSocket diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java index 1a12d461e..856810f07 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_Invoker.java @@ -30,7 +30,7 @@ import de.rwth.idsg.steve.repository.dto.ChargePointSelect; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 20.03.2015 */ public interface ChargePointService12_Invoker { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java index 53a3329c4..917bbb56a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService12_InvokerImpl.java @@ -39,7 +39,7 @@ import org.springframework.stereotype.Service; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 10.03.2018 */ @Service diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java index ab3847985..043d3cc3b 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_Invoker.java @@ -27,7 +27,7 @@ import de.rwth.idsg.steve.repository.dto.ChargePointSelect; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 20.03.2015 */ public interface ChargePointService15_Invoker extends ChargePointService12_Invoker { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java index 301f1a3d5..44640f112 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService15_InvokerImpl.java @@ -45,7 +45,7 @@ import org.springframework.stereotype.Service; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 10.03.2018 */ @Service diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java index de522e8ea..50c8c06fd 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_Invoker.java @@ -25,7 +25,7 @@ import de.rwth.idsg.steve.repository.dto.ChargePointSelect; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2018 */ public interface ChargePointService16_Invoker extends ChargePointService15_Invoker { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java index 2de6b8a9a..df8675af6 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ChargePointService16_InvokerImpl.java @@ -31,7 +31,7 @@ import org.springframework.stereotype.Service; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2018 */ @Service diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java index 9cd40e7be..553e2b71d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java @@ -40,7 +40,7 @@ /** * Contains the context for a request/response communication and callbacks for handling responses/errors. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.03.2018 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java index 883f138c7..eb62755e0 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java @@ -25,7 +25,7 @@ import javax.xml.ws.AsyncHandler; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 30.10.2018 */ public abstract class Ocpp15AndAboveTask extends CommunicationTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java index d700b888b..d4cded7ce 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java @@ -25,7 +25,7 @@ import javax.xml.ws.AsyncHandler; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 30.10.2018 */ public abstract class Ocpp16AndAboveTask extends Ocpp15AndAboveTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java b/src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java index af9f33904..42fa014e9 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/OcppCallback.java @@ -24,7 +24,7 @@ * We need a mechanism to execute additional arbitrary logic, which _can_ be provided by the call site, * that acts on the response or the error. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 20.11.2015 */ public interface OcppCallback { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java b/src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java index 18c046390..4986b1bd3 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/OcppProtocol.java @@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 24.03.2015 */ @RequiredArgsConstructor diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java b/src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java index 770466d82..e335be38b 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/OcppTransport.java @@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 24.03.2015 */ @RequiredArgsConstructor diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java b/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java index 3013ad8fb..5de6b9c8c 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java @@ -24,7 +24,7 @@ /** * The values are as defined in spec "OCPP implementation guide SOAP - RC1 0.6" and in section "5. OCPP version" * - * @author Sevket Goekay + * @author Sevket Goekay * @since 01.12.2014 */ @RequiredArgsConstructor diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java b/src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java index 99585f3e9..d05298133 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/RequestResult.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.10.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java b/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java index f66588a5c..7df0275e7 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/TaskOrigin.java @@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 23.11.2015 */ @RequiredArgsConstructor diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java index 861a65bec..9788e0a8e 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java @@ -21,7 +21,7 @@ import java.util.function.Function; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 08.03.2018 */ public class Convert { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java index a3c7bd481..a0a40ada5 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java @@ -59,7 +59,7 @@ import java.util.stream.Collectors; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2018 */ public enum Server15to16Impl implements Server15to16 { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java index fe2fd5182..7007a494e 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java @@ -58,7 +58,7 @@ /** * Service implementation of OCPP V1.2 * - * @author Sevket Goekay + * @author Sevket Goekay */ @Slf4j @Service diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java index 0887bf2f7..083538ef7 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java @@ -59,7 +59,7 @@ /** * Service implementation of OCPP V1.5 * - * @author Sevket Goekay + * @author Sevket Goekay */ @Slf4j @Service diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java index 3a27c0b07..a62bb7ee6 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java @@ -55,7 +55,7 @@ import java.util.concurrent.Future; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2018 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java index 481512088..d7139daac 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java @@ -36,7 +36,7 @@ import static de.rwth.idsg.steve.SteveConfiguration.CONFIG; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 21.10.2015 */ @Component diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java index bca6a03f8..6f403294e 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java @@ -27,7 +27,7 @@ /** * http://cxf.apache.org/faq.html#FAQ-AreJAX-WSclientproxiesthreadsafe? * - * @author Sevket Goekay + * @author Sevket Goekay * @since 27.08.2018 */ public class ClientProviderWithCache { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java index a86fa2d14..88d28eead 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/LoggingFeatureProxy.java @@ -27,7 +27,7 @@ * Since {@link Slf4jEventSender} logs only the message and {@link Slf4jVerboseEventSender} logs everything, this * logging feature proxy finds a middle ground by logging the exchange id and the message (the most interesting parts). * - * @author Sevket Goekay + * @author Sevket Goekay * @since 03.04.2018 */ public enum LoggingFeatureProxy { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java index 4783160a2..3998891f6 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java @@ -53,7 +53,7 @@ * to send commands to the charging station, since the DB call to list the charge points will filter it out. See * {@link ChargePointRepositoryImpl#getChargePointSelect(OcppProtocol, java.util.List)}. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 15.06.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java index 365ec3c08..b14dca852 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java @@ -37,7 +37,7 @@ * http://www.w3.org/TR/2006/REC-ws-addr-core-20060509/#formreplymsg * http://comments.gmane.org/gmane.comp.apache.cxf.user/17599 * - * @author Sevket Goekay + * @author Sevket Goekay * @since 17.02.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java index 5f50ebd56..0dbc9e803 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/CancelReservationTask.java @@ -29,7 +29,7 @@ import javax.xml.ws.AsyncHandler; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.03.2018 */ public class CancelReservationTask extends Ocpp15AndAboveTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java index 38ea46a83..62d697257 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeAvailabilityTask.java @@ -26,7 +26,7 @@ import javax.xml.ws.AsyncHandler; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.03.2018 */ public class ChangeAvailabilityTask extends CommunicationTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java index 44bab0984..d809a721f 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ChangeConfigurationTask.java @@ -26,7 +26,7 @@ import javax.xml.ws.AsyncHandler; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.03.2018 */ public class ChangeConfigurationTask extends CommunicationTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java index b55984b66..9653577d9 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearCacheTask.java @@ -26,7 +26,7 @@ import javax.xml.ws.AsyncHandler; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.03.2018 */ public class ClearCacheTask extends CommunicationTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java index ef93e00d2..8db7a3d10 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java @@ -30,7 +30,7 @@ import javax.xml.ws.AsyncHandler; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2018 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java index 90b482dc5..e4f097ab8 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/DataTransferTask.java @@ -29,7 +29,7 @@ import javax.xml.ws.AsyncHandler; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.03.2018 */ public class DataTransferTask extends Ocpp15AndAboveTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java index 8c45d3740..02148430a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetCompositeScheduleTask.java @@ -30,7 +30,7 @@ import javax.xml.ws.AsyncHandler; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2018 */ public class GetCompositeScheduleTask extends Ocpp16AndAboveTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java index 805d85600..c5adb2a9b 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetConfigurationTask.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.03.2018 */ public class GetConfigurationTask extends Ocpp15AndAboveTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java index d1cf1bb5c..64fdccd6c 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java @@ -28,7 +28,7 @@ import static de.rwth.idsg.steve.utils.DateTimeUtils.toDateTime; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.03.2018 */ public class GetDiagnosticsTask extends CommunicationTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java index a9c777758..41eaa95a3 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/GetLocalListVersionTask.java @@ -26,7 +26,7 @@ import javax.xml.ws.AsyncHandler; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.03.2018 */ public class GetLocalListVersionTask extends Ocpp15AndAboveTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java index a20fdb7a8..866b45d14 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStartTransactionTask.java @@ -26,7 +26,7 @@ import javax.xml.ws.AsyncHandler; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.03.2018 */ public class RemoteStartTransactionTask extends CommunicationTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java index 4ae0caa5d..3129c7a4f 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/RemoteStopTransactionTask.java @@ -26,7 +26,7 @@ import javax.xml.ws.AsyncHandler; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.03.2018 */ public class RemoteStopTransactionTask extends CommunicationTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java index fef73fdb1..9744b64c4 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java @@ -28,7 +28,7 @@ import javax.xml.ws.AsyncHandler; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.03.2018 */ public class ReserveNowTask extends Ocpp15AndAboveTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java index a39ab3b9d..253cfd3fe 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/ResetTask.java @@ -26,7 +26,7 @@ import javax.xml.ws.AsyncHandler; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.03.2018 */ public class ResetTask extends CommunicationTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java index 3a7d17abe..bc4ca343d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/SendLocalListTask.java @@ -33,7 +33,7 @@ import java.util.stream.Collectors; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.03.2018 */ public class SendLocalListTask extends Ocpp15AndAboveTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java index bd62fd369..16c280d77 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java @@ -38,7 +38,7 @@ import java.util.stream.Collectors; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2018 */ public class SetChargingProfileTask extends Ocpp16AndAboveTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java index ab10c99e4..dd78f08ff 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/TriggerMessageTask.java @@ -27,7 +27,7 @@ import javax.xml.ws.AsyncHandler; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2018 */ public class TriggerMessageTask extends Ocpp16AndAboveTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java index 21fe7286c..f94077b9d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/UnlockConnectorTask.java @@ -26,7 +26,7 @@ import javax.xml.ws.AsyncHandler; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.03.2018 */ public class UnlockConnectorTask extends CommunicationTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java index 7ae9bb945..78b3d9f04 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java @@ -28,7 +28,7 @@ import static de.rwth.idsg.steve.utils.DateTimeUtils.toDateTime; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.03.2018 */ public class UpdateFirmwareTask extends CommunicationTask { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java index e50016cdf..63911cda7 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java @@ -30,7 +30,7 @@ import java.util.Map; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 14.05.2018 */ public abstract class AbstractTypeStore implements TypeStore { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java index cdea9ecb1..41652e8d0 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java @@ -45,7 +45,7 @@ import java.util.function.Consumer; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 17.03.2015 */ public abstract class AbstractWebSocketEndpoint extends ConcurrentWebSocketHandler { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java index ce1636c1b..1af4ba110 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceInvoker.java @@ -33,7 +33,7 @@ import java.util.UUID; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 20.03.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java index cb56a8f0c..654901be6 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java @@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 07.05.2019 */ public abstract class ConcurrentWebSocketHandler implements WebSocketHandler { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java index 4ed01f228..c0afc3edc 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java @@ -25,7 +25,7 @@ * Error generation should be handled by a central component for better control over the codes and messages. * This class just does that. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 17.03.2015 */ public final class ErrorFactory { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java index 5a6e33d92..1c9e93299 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java @@ -33,7 +33,7 @@ /** * Presumption: The responses must be sent using the same connection as the requests! * - * @author Sevket Goekay + * @author Sevket Goekay * @since 21.03.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java index 6d8efddec..33bb6ffda 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java @@ -33,7 +33,7 @@ /** * Because ObjectMapper can and should be reused, if config does not change after init. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 10.03.2018 */ public enum JsonObjectMapper { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java index 9e0b25288..8de9ce38f 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java @@ -35,7 +35,7 @@ import java.util.Optional; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2015 */ public class OcppWebSocketUpgrader extends JettyRequestUpgradeStrategy { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java index 55c493f12..d5fa7d5c8 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java @@ -29,7 +29,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 17.03.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java index b3aadeb1a..2e243dc48 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java @@ -40,7 +40,7 @@ import static de.rwth.idsg.steve.SteveConfiguration.CONFIG; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 17.03.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java index 833441766..c91deb19f 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java @@ -22,7 +22,7 @@ import de.rwth.idsg.steve.ocpp.ws.data.ActionResponsePair; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 17.03.2015 */ public interface TypeStore { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java index f0ac4f86e..608e3167d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java @@ -23,7 +23,7 @@ import org.springframework.web.socket.WebSocketSession; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 10.05.2018 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java index 94d2c6c66..4c1a9b803 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 27.04.2015 */ public interface EnumMixin { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java index 439426949..4897f6124 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java @@ -26,7 +26,7 @@ import java.util.function.Consumer; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 12.03.2018 */ public final class EnumProcessor { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java index bd93c7318..28ea1bc73 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java @@ -38,7 +38,7 @@ * that set the field name wrongfully to "values" rather than the correct "value". * We handle the situation by looking both fields up in the message. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 01.09.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java index f8ac57254..1f7bc221b 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java @@ -24,7 +24,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 27.04.2015 */ public abstract class MeterValue15Mixin { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java index af58fad6e..0046d301d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java @@ -28,7 +28,7 @@ * mechanism to select one WebSocketSession. Implementations of this interface should use * different mechanisms to realize that. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 30.04.2015 */ public interface WsSessionSelectStrategy { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java index 437e2c135..e42ec179a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java @@ -25,7 +25,7 @@ import java.util.Deque; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 30.04.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java index c0748046b..d5ca5f775 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java @@ -23,7 +23,7 @@ import lombok.RequiredArgsConstructor; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 23.03.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java index 0c70524d7..f137e75f6 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java @@ -34,7 +34,7 @@ /** * Default holder/context of incoming and outgoing messages. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 23.03.2015 */ @RequiredArgsConstructor diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java index c53abe934..7bb85132d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java @@ -19,7 +19,7 @@ package de.rwth.idsg.steve.ocpp.ws.data; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 15.03.2015 */ public enum ErrorCode { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java index ad9178ae7..f2cdc2bc8 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java @@ -25,7 +25,7 @@ import lombok.Setter; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 23.03.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java index 39d71b2d4..860323810 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java @@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2015 */ @RequiredArgsConstructor diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java index b44eb52e9..80a914152 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java @@ -23,7 +23,7 @@ import lombok.Setter; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java index e0a2c9163..23c448fa6 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java @@ -22,7 +22,7 @@ import lombok.Setter; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java index c2aba7266..a81f97c28 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java @@ -34,7 +34,7 @@ * + * +--> OcppJsonError * - * @author Sevket Goekay + * @author Sevket Goekay * @since 12.03.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java index f07561570..8688551e5 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java @@ -19,7 +19,7 @@ package de.rwth.idsg.steve.ocpp.ws.data; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2015 */ public abstract class OcppJsonResponse extends OcppJsonMessage { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java index b6c1715ab..b8b5b59d6 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java @@ -23,7 +23,7 @@ import lombok.Setter; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java index e5b7570c4..7db75321d 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java @@ -26,7 +26,7 @@ import java.util.concurrent.ScheduledFuture; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 25.03.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java index a94b0fd03..824782b71 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java @@ -26,7 +26,7 @@ import java.util.Arrays; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 27.04.2015 */ public class Ocpp12JacksonModule extends SimpleModule { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java index f685fceab..8e48fc857 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java @@ -21,7 +21,7 @@ import de.rwth.idsg.steve.ocpp.ws.AbstractTypeStore; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 17.03.2015 */ public final class Ocpp12TypeStore extends AbstractTypeStore { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java index ae7321064..ac7bba53a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java @@ -45,7 +45,7 @@ import javax.annotation.PostConstruct; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 12.03.2015 */ @Component diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java index a825ac688..0a7034d58 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java @@ -29,7 +29,7 @@ import java.util.Arrays; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 27.04.2015 */ public class Ocpp15JacksonModule extends SimpleModule { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java index df327df92..623327722 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java @@ -21,7 +21,7 @@ import de.rwth.idsg.steve.ocpp.ws.AbstractTypeStore; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 15.03.2015 */ public final class Ocpp15TypeStore extends AbstractTypeStore { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java index 1c08b9517..ec94df952 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java @@ -45,7 +45,7 @@ import javax.annotation.PostConstruct; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 12.03.2015 */ @Component diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java index e2bb7b8cd..2dc3de994 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java @@ -26,7 +26,7 @@ import java.util.Arrays; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 27.04.2015 */ public class Ocpp16JacksonModule extends SimpleModule { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java index e2028500a..ca84822a5 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java @@ -21,7 +21,7 @@ import de.rwth.idsg.steve.ocpp.ws.AbstractTypeStore; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2018 */ public final class Ocpp16TypeStore extends AbstractTypeStore { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java index 6aa995528..eb0aa20f5 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java @@ -45,7 +45,7 @@ import javax.annotation.PostConstruct; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2018 */ @Component diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java index 5d0bbad0d..76053b926 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java @@ -30,7 +30,7 @@ import java.util.function.Consumer; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 17.03.2015 */ public abstract class AbstractCallHandler implements Consumer { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java index dadb01389..91e88e03c 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java @@ -45,7 +45,7 @@ /** * Incoming String --> OcppJsonMessage * - * @author Sevket Goekay + * @author Sevket Goekay * @since 17.03.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java index 598a3cc3d..bc946ced4 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java @@ -31,7 +31,7 @@ /** * For all incoming message types. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 23.03.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java index cbf516e4b..295badfbc 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java @@ -29,7 +29,7 @@ /** * For outgoing CALLs, triggered by the user. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 27.03.2015 */ @Component diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java index 76874714d..cfea24b31 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java @@ -32,7 +32,7 @@ /** * This class should remain stateless. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 12.03.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java index 50c6bfe2d..621282a54 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java @@ -41,7 +41,7 @@ * * This class should remain stateless. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 17.03.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/repository/AddressRepository.java b/src/main/java/de/rwth/idsg/steve/repository/AddressRepository.java index 6f0d7b0c1..cb5bac331 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/AddressRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/AddressRepository.java @@ -26,7 +26,7 @@ import org.jooq.SelectConditionStep; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 24.11.2015 */ public interface AddressRepository { diff --git a/src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java b/src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java index b9d64fb05..d1c9f78f1 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/ChargePointRepository.java @@ -32,7 +32,7 @@ import java.util.Optional; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 19.08.2014 */ public interface ChargePointRepository { diff --git a/src/main/java/de/rwth/idsg/steve/repository/ChargingProfileRepository.java b/src/main/java/de/rwth/idsg/steve/repository/ChargingProfileRepository.java index cd6f080e5..80ead95cf 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/ChargingProfileRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/ChargingProfileRepository.java @@ -30,7 +30,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 12.11.2018 */ public interface ChargingProfileRepository { diff --git a/src/main/java/de/rwth/idsg/steve/repository/GenericRepository.java b/src/main/java/de/rwth/idsg/steve/repository/GenericRepository.java index 47250cda8..2c47c8b8b 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/GenericRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/GenericRepository.java @@ -22,7 +22,7 @@ import de.rwth.idsg.steve.web.dto.Statistics; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 19.08.2014 */ public interface GenericRepository { diff --git a/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java b/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java index b4fb0de05..afef3193e 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java @@ -28,7 +28,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 19.08.2014 */ public interface OcppServerRepository { diff --git a/src/main/java/de/rwth/idsg/steve/repository/OcppTagRepository.java b/src/main/java/de/rwth/idsg/steve/repository/OcppTagRepository.java index 7375e6bb6..5f9a59098 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/OcppTagRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/OcppTagRepository.java @@ -27,7 +27,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 19.08.2014 */ public interface OcppTagRepository { diff --git a/src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java b/src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java index 8f766a464..2ae0c6b02 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java @@ -27,7 +27,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 19.08.2014 */ public interface ReservationRepository { diff --git a/src/main/java/de/rwth/idsg/steve/repository/ReservationStatus.java b/src/main/java/de/rwth/idsg/steve/repository/ReservationStatus.java index 839edfd51..45177d175 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/ReservationStatus.java +++ b/src/main/java/de/rwth/idsg/steve/repository/ReservationStatus.java @@ -22,7 +22,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 31.08.2015 */ public enum ReservationStatus { diff --git a/src/main/java/de/rwth/idsg/steve/repository/SettingsRepository.java b/src/main/java/de/rwth/idsg/steve/repository/SettingsRepository.java index 50590379d..5723aade3 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/SettingsRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/SettingsRepository.java @@ -22,7 +22,7 @@ import de.rwth.idsg.steve.web.dto.SettingsForm; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 06.11.2015 */ public interface SettingsRepository { diff --git a/src/main/java/de/rwth/idsg/steve/repository/TaskStore.java b/src/main/java/de/rwth/idsg/steve/repository/TaskStore.java index 5b7397df2..8c396b3b9 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/TaskStore.java +++ b/src/main/java/de/rwth/idsg/steve/repository/TaskStore.java @@ -24,7 +24,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 29.12.2014 */ public interface TaskStore { diff --git a/src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java b/src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java index bd1013997..4a73a746b 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java @@ -26,7 +26,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 19.08.2014 */ public interface TransactionRepository { diff --git a/src/main/java/de/rwth/idsg/steve/repository/UserRepository.java b/src/main/java/de/rwth/idsg/steve/repository/UserRepository.java index ca31cfe4d..a8de4de6e 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/UserRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/UserRepository.java @@ -25,7 +25,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 25.11.2015 */ public interface UserRepository { diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java index dc81c3c03..b6d6fe4d3 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java @@ -27,7 +27,7 @@ /** * - * @author Sevket Goekay + * @author Sevket Goekay * */ public final class ChargePoint { diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java index e0d3f04f1..d711acfef 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java @@ -22,7 +22,7 @@ import lombok.Getter; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 29.12.2014 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java index c307e939a..b9e4f478f 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java @@ -28,7 +28,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 12.11.2018 */ public class ChargingProfile { diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfileAssignment.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfileAssignment.java index 6332be346..79ee72e39 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfileAssignment.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfileAssignment.java @@ -22,7 +22,7 @@ import lombok.Getter; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 16.11.2018 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java index 6e975544b..fc5ab6a64 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java @@ -24,7 +24,7 @@ /** * - * @author Sevket Goekay + * @author Sevket Goekay * */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java b/src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java index b60b14ada..e2a325faa 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/DbVersion.java @@ -22,7 +22,7 @@ import lombok.Getter; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 19.08.2014 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java index ab26fff3a..f98136aea 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java @@ -23,7 +23,7 @@ import org.joda.time.DateTime; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 17.11.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java index 7fce4bdac..b827260d6 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java @@ -23,7 +23,7 @@ import org.joda.time.DateTime; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 21.03.2016 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertTransactionParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertTransactionParams.java index fa50ae755..4a57c4e1d 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/InsertTransactionParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/InsertTransactionParams.java @@ -23,7 +23,7 @@ import org.joda.time.DateTime; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 17.11.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/MailSettings.java b/src/main/java/de/rwth/idsg/steve/repository/dto/MailSettings.java index 347145060..468b5817a 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/MailSettings.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/MailSettings.java @@ -25,7 +25,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 22.01.2016 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java b/src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java index 3ad513805..bb5fdd537 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/OcppTag.java @@ -24,7 +24,7 @@ /** * - * @author Sevket Goekay + * @author Sevket Goekay * */ public final class OcppTag { diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/Reservation.java b/src/main/java/de/rwth/idsg/steve/repository/dto/Reservation.java index 0403d5c42..03d3e5435 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/Reservation.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/Reservation.java @@ -24,7 +24,7 @@ /** * - * @author Sevket Goekay + * @author Sevket Goekay * */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/TaskOverview.java b/src/main/java/de/rwth/idsg/steve/repository/dto/TaskOverview.java index 72b1db82a..71afa0236 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/TaskOverview.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/TaskOverview.java @@ -25,7 +25,7 @@ import org.joda.time.DateTime; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 29.12.2014 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/Transaction.java b/src/main/java/de/rwth/idsg/steve/repository/dto/Transaction.java index 32c5f1485..dd3076f6c 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/Transaction.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/Transaction.java @@ -26,7 +26,7 @@ /** * - * @author Sevket Goekay + * @author Sevket Goekay * */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java b/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java index 226ba6f29..5745a55a8 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionDetails.java @@ -28,7 +28,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 27.04.2016 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java b/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java index 5351a2ddf..51ff162a9 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/TransactionStatusUpdate.java @@ -25,7 +25,7 @@ /** * Exists only to ensure type safety * - * @author Sevket Goekay + * @author Sevket Goekay * @since 17.03.2016 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java index 9bd38256e..a50788252 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateChargeboxParams.java @@ -24,7 +24,7 @@ import org.joda.time.DateTime; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 17.11.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateTransactionParams.java b/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateTransactionParams.java index 621a10843..914ee0cb4 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateTransactionParams.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateTransactionParams.java @@ -24,7 +24,7 @@ import org.joda.time.DateTime; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 17.03.2016 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/User.java b/src/main/java/de/rwth/idsg/steve/repository/dto/User.java index b97eaa8b2..3fbde80a3 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/User.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/User.java @@ -26,7 +26,7 @@ import java.util.Optional; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 25.11.2015 */ public class User { diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java index a9a91b0b6..284eb3b54 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java @@ -34,7 +34,7 @@ import static jooq.steve.db.tables.Address.ADDRESS; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 24.11.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java index da13ef38a..49343af4f 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java @@ -60,7 +60,7 @@ import static jooq.steve.db.tables.ConnectorStatus.CONNECTOR_STATUS; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 14.08.2014 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java index dbefbdc76..d36971af0 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java @@ -53,7 +53,7 @@ import static jooq.steve.db.tables.ChargeBox.CHARGE_BOX; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 12.11.2018 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java index 1c7937c8f..bc0d55238 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java @@ -43,7 +43,7 @@ import static org.jooq.impl.DSL.select; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 14.08.2014 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java index 220844b5b..708a88852 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java @@ -62,7 +62,7 @@ * * http://www.jooq.org/doc/3.4/manual/sql-execution/transaction-management/ * - * @author Sevket Goekay + * @author Sevket Goekay * */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java index 606ba4e5e..bea3fea71 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java @@ -49,7 +49,7 @@ import static jooq.steve.db.tables.OcppTagActivity.OCPP_TAG_ACTIVITY; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 14.08.2014 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java index 32307b103..2472c9857 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java @@ -47,7 +47,7 @@ import static jooq.steve.db.tables.Reservation.RESERVATION; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 14.08.2014 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java index 55504bd7c..e0599bdd9 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java @@ -40,7 +40,7 @@ import static jooq.steve.db.tables.Settings.SETTINGS; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 06.11.2015 */ @Repository diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java index 544be7230..146c65bcd 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java @@ -31,7 +31,7 @@ import java.util.stream.Collectors; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 29.12.2014 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java index 9757d5bed..5ad277de8 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java @@ -52,7 +52,7 @@ import static jooq.steve.db.tables.TransactionStart.TRANSACTION_START; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 14.08.2014 */ @Repository diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java index ca2d11cb0..e88bf842b 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java @@ -48,7 +48,7 @@ import static jooq.steve.db.tables.User.USER; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 25.11.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/service/BackgroundService.java b/src/main/java/de/rwth/idsg/steve/service/BackgroundService.java index 185649f1b..398829e9c 100644 --- a/src/main/java/de/rwth/idsg/steve/service/BackgroundService.java +++ b/src/main/java/de/rwth/idsg/steve/service/BackgroundService.java @@ -27,7 +27,7 @@ import java.util.function.Consumer; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 08.03.2018 */ @RequiredArgsConstructor diff --git a/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java b/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java index 6bdd5d929..dacbb5320 100644 --- a/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java +++ b/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java @@ -59,7 +59,7 @@ import java.util.Optional; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2018 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java index 4492c7c96..74075e844 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java @@ -56,7 +56,7 @@ import static de.rwth.idsg.steve.SteveConfiguration.CONFIG; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 24.03.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointService12_Client.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointService12_Client.java index 600cf2c7e..728e70feb 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointService12_Client.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointService12_Client.java @@ -48,7 +48,7 @@ import java.util.concurrent.ScheduledExecutorService; /** - * @author Sevket Goekay + * @author Sevket Goekay */ @Slf4j @Service diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointService15_Client.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointService15_Client.java index 57f5c5c5a..156e20569 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointService15_Client.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointService15_Client.java @@ -48,7 +48,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay */ @Slf4j @Service diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java index 66be04313..28c052f31 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java @@ -42,7 +42,7 @@ import org.springframework.stereotype.Service; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2018 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/service/DummyReleaseCheckService.java b/src/main/java/de/rwth/idsg/steve/service/DummyReleaseCheckService.java index 3f687ea45..b44f294c5 100644 --- a/src/main/java/de/rwth/idsg/steve/service/DummyReleaseCheckService.java +++ b/src/main/java/de/rwth/idsg/steve/service/DummyReleaseCheckService.java @@ -21,7 +21,7 @@ import de.rwth.idsg.steve.web.dto.ReleaseReport; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 19.04.2016 */ public class DummyReleaseCheckService implements ReleaseCheckService { diff --git a/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java b/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java index ea3bcbe0b..21759311d 100644 --- a/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java +++ b/src/main/java/de/rwth/idsg/steve/service/GithubReleaseCheckService.java @@ -36,7 +36,7 @@ import java.util.Collections; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 19.04.2016 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/service/MailService.java b/src/main/java/de/rwth/idsg/steve/service/MailService.java index 7c4cae657..42ce1a8c0 100644 --- a/src/main/java/de/rwth/idsg/steve/service/MailService.java +++ b/src/main/java/de/rwth/idsg/steve/service/MailService.java @@ -42,7 +42,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 24.01.2016 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java index 13b454343..3c7aead1e 100644 --- a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java +++ b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java @@ -40,7 +40,7 @@ import static java.lang.String.format; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 22.01.2016 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java b/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java index 6f8d164bd..d6bb128e7 100644 --- a/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java +++ b/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java @@ -40,7 +40,7 @@ import java.util.function.Supplier; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 03.01.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/service/ReleaseCheckService.java b/src/main/java/de/rwth/idsg/steve/service/ReleaseCheckService.java index 672aadc3d..198bef0e9 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ReleaseCheckService.java +++ b/src/main/java/de/rwth/idsg/steve/service/ReleaseCheckService.java @@ -21,7 +21,7 @@ import de.rwth.idsg.steve.web.dto.ReleaseReport; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 19.04.2016 */ public interface ReleaseCheckService { diff --git a/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java b/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java index 386b4bc7c..048d010fd 100644 --- a/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java +++ b/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java @@ -38,7 +38,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.12.2018 */ @Service diff --git a/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java b/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java index 4d0d192ad..b19490efc 100644 --- a/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java +++ b/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java @@ -31,7 +31,7 @@ /** * The name of this class was inspired by UFO (Unidentified flying object) and enterprise software development. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 20.03.2018 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedSetChargingProfileParams.java b/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedSetChargingProfileParams.java index b65ed4276..bb951e6ae 100644 --- a/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedSetChargingProfileParams.java +++ b/src/main/java/de/rwth/idsg/steve/service/dto/EnhancedSetChargingProfileParams.java @@ -28,7 +28,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 12.11.2018 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java b/src/main/java/de/rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java index f0f3bb0b5..6ec931004 100644 --- a/src/main/java/de/rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java +++ b/src/main/java/de/rwth/idsg/steve/service/dto/UnidentifiedIncomingObject.java @@ -23,7 +23,7 @@ import org.joda.time.DateTime; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 20.03.2018 */ @ToString diff --git a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java index 7fb22a0cb..0cc966340 100755 --- a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java @@ -29,7 +29,7 @@ import java.util.TreeSet; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 10.03.2016 */ public final class ConnectorStatusCountFilter { diff --git a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java index 90a2932b3..93c894d8a 100755 --- a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 10.03.2016 */ public final class ConnectorStatusFilter { diff --git a/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java b/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java index 9853dcc2e..ebd34a98e 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java @@ -25,7 +25,7 @@ import static de.rwth.idsg.steve.utils.CountryCodesProvider.getCountryCodes; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 25.11.2015 */ public final class ControllerHelper { diff --git a/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java b/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java index 1e8d3f46a..0673ba332 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java +++ b/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java @@ -30,7 +30,7 @@ import static org.jooq.impl.DSL.field; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 03.09.2015 */ public final class CustomDSL { diff --git a/src/main/java/de/rwth/idsg/steve/utils/DateConverter.java b/src/main/java/de/rwth/idsg/steve/utils/DateConverter.java index 4f1584ccb..0d470d215 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/DateConverter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/DateConverter.java @@ -24,7 +24,7 @@ import java.sql.Date; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 25.11.2015 */ public class DateConverter implements Converter { diff --git a/src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java b/src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java index 874521e57..87022b194 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/DateTimeConverter.java @@ -24,7 +24,7 @@ import java.sql.Timestamp; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 29.09.2015 */ public class DateTimeConverter implements Converter { diff --git a/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java b/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java index bcb409f71..32ab4f98b 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java +++ b/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; /** - * @author Sevket Goekay + * @author Sevket Goekay */ public final class DateTimeUtils { private DateTimeUtils() { } diff --git a/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java b/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java index 39b7e5bde..ccfa7835a 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java +++ b/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java @@ -29,7 +29,7 @@ /** * Inspiration: http://stackoverflow.com/a/30817677 * - * @author Sevket Goekay + * @author Sevket Goekay * @since 19.04.2016 */ public final class InternetChecker { diff --git a/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java b/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java index a78b8e1b9..8bdd51454 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java +++ b/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java @@ -37,7 +37,7 @@ import java.util.concurrent.ThreadLocalRandom; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 05.11.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java b/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java index 327960e56..19e730cd8 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java +++ b/src/main/java/de/rwth/idsg/steve/utils/PropertiesFileLoader.java @@ -33,7 +33,7 @@ /** * Encapsulates java.util.Properties and adds type specific convenience methods * - * @author Sevket Goekay + * @author Sevket Goekay * @since 01.10.2015 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java b/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java index 23ca19553..90915968e 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java +++ b/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java @@ -31,7 +31,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 12.01.2015 */ public final class StringUtils { diff --git a/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java b/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java index 6599a3494..d6b86cb66 100644 --- a/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java +++ b/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java @@ -28,7 +28,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 21.01.2016 */ public class BatchInsertConverter extends PropertyEditorSupport implements Converter> { diff --git a/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java b/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java index cf28c1ac3..92a61eedb 100644 --- a/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java +++ b/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java @@ -24,7 +24,7 @@ import java.beans.PropertyEditorSupport; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 29.12.2014 */ public class ChargePointSelectEditor extends PropertyEditorSupport { diff --git a/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java b/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java index 60dcd429b..69c8ebb88 100644 --- a/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java +++ b/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java @@ -33,7 +33,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 15.08.2014 */ @ControllerAdvice(basePackages = "de.rwth.idsg.steve.web") diff --git a/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java b/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java index f869dcd9a..1ef52b680 100644 --- a/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java +++ b/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java @@ -26,7 +26,7 @@ import java.beans.PropertyEditorSupport; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 25.11.2015 */ public class LocalDateEditor extends PropertyEditorSupport { diff --git a/src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java b/src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java index e5932166f..739f8d63b 100644 --- a/src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java +++ b/src/main/java/de/rwth/idsg/steve/web/LocalDateTimeEditor.java @@ -26,7 +26,7 @@ import java.beans.PropertyEditorSupport; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 04.01.2015 */ public class LocalDateTimeEditor extends PropertyEditorSupport { diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java index 8d95a18c4..5c9214e6b 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java @@ -42,7 +42,7 @@ /** * One controller for about and settings pages * - * @author Sevket Goekay + * @author Sevket Goekay */ @Controller @RequestMapping(value = "/manager") diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java b/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java index 5ed922886..bc5e61e5b 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java @@ -39,7 +39,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 15.08.2014 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java index 8e79c0321..1a1b16dc7 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java @@ -45,7 +45,7 @@ /** * - * @author Sevket Goekay + * @author Sevket Goekay * */ @Controller diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java b/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java index afd1460a0..a8f8ff094 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java @@ -37,7 +37,7 @@ import javax.validation.Valid; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 12.11.2018 */ @Controller diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java b/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java index 9f5d1d72d..1292282aa 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java @@ -35,7 +35,7 @@ /** * - * @author Sevket Goekay + * @author Sevket Goekay * */ @Controller diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java b/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java index 291e86c3a..b5db93c75 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java @@ -33,7 +33,7 @@ import java.util.Optional; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 15.08.2014 */ @Slf4j diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java index fe2a658cc..0ab39a9f7 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java @@ -48,7 +48,7 @@ import static de.rwth.idsg.steve.web.dto.ocpp.ConfigurationKeyReadWriteEnum.RW; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 15.08.2014 */ @Controller diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java index 274654fbb..da8a709b6 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java @@ -44,7 +44,7 @@ import static de.rwth.idsg.steve.web.dto.ocpp.ConfigurationKeyReadWriteEnum.RW; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 07.11.2014 */ @Controller diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java index b6361b1bc..0745659e1 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java @@ -51,7 +51,7 @@ import static de.rwth.idsg.steve.web.dto.ocpp.ConfigurationKeyReadWriteEnum.RW; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 15.03.2018 */ @Controller diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java index faaa13811..14f32c302 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java @@ -40,7 +40,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 26.11.2015 */ @Controller diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/SignOutController.java b/src/main/java/de/rwth/idsg/steve/web/controller/SignOutController.java index 354f72977..16a2e971c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/SignOutController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/SignOutController.java @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletResponse; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 15.08.2014 */ @Controller diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java b/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java index b321d176c..567726163 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/TaskController.java @@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.RequestMethod; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 29.12.2014 */ @Controller diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java index 372fd3e70..662ed77a6 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java @@ -42,7 +42,7 @@ /** * One controller for transactions and reservations pages * - * @author Sevket Goekay + * @author Sevket Goekay * @since 15.08.2014 */ @Controller diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java b/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java index 0e60948cc..f1592a961 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java @@ -37,7 +37,7 @@ import javax.validation.Valid; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 25.11.2015 */ @Controller diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/Address.java b/src/main/java/de/rwth/idsg/steve/web/dto/Address.java index 4bc02cb3a..3df7ed08a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/Address.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/Address.java @@ -23,7 +23,7 @@ import lombok.Setter; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 24.11.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java index 41801184a..d61f56b65 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointBatchInsertForm.java @@ -26,7 +26,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 21.06.2016 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java index 5a92ba445..655b702e8 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointForm.java @@ -29,7 +29,7 @@ import java.math.BigDecimal; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 18.12.2014 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java index b13ab865b..047899dc7 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargePointQueryForm.java @@ -24,7 +24,7 @@ import lombok.Setter; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 26.11.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java index 2227988df..8cb60e298 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileAssignmentQueryForm.java @@ -22,7 +22,7 @@ import lombok.Setter; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 16.11.2018 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java index 7fc46dd3a..f918fdc30 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileForm.java @@ -38,7 +38,7 @@ import java.util.Objects; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 12.11.2018 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java index b3410424f..2f369504a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ChargingProfileQueryForm.java @@ -26,7 +26,7 @@ import org.joda.time.LocalDateTime; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 12.11.2018 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java index 16d077742..46c354b08 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ConnectorStatusForm.java @@ -22,7 +22,7 @@ import lombok.Setter; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 18.09.2018 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java b/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java index cfd7eef10..2f20680ad 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 06.08.2018 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java index 6ac5c16d2..c3ac05672 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/OcppJsonStatus.java @@ -24,7 +24,7 @@ import org.joda.time.DateTime; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 25.03.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java index 4c0805f1d..45843b6fd 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagBatchInsertForm.java @@ -26,7 +26,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 15.08.2014 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java index 387855c60..b73513042 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagForm.java @@ -28,7 +28,7 @@ import java.util.Objects; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 15.08.2014 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java index fe9a9a4ce..41a8ef41f 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/OcppTagQueryForm.java @@ -23,7 +23,7 @@ import lombok.Setter; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 03.09.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java index 9e9d2be9c..9c9dece26 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/QueryForm.java @@ -26,7 +26,7 @@ import javax.validation.constraints.AssertTrue; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 31.08.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java b/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java index 50d3680f8..adc5655b9 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseReport.java @@ -24,7 +24,7 @@ import lombok.ToString; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 19.04.2016 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java b/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java index 89023ece8..082b2a71e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ReleaseResponse.java @@ -27,7 +27,7 @@ * * API doc: https://developer.github.com/v3/repos/releases/#get-the-latest-release * - * @author Sevket Goekay + * @author Sevket Goekay * @since 04.10.2016 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java index 9c3c6bb6f..5ea9f994c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ReservationQueryForm.java @@ -26,7 +26,7 @@ import javax.validation.constraints.AssertTrue; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 31.08.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java index 5655489b0..202e130bd 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/SettingsForm.java @@ -32,7 +32,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 17.09.2014 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java b/src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java index e81e6098e..1ce2cb1c7 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/Statistics.java @@ -26,7 +26,7 @@ /** * - * @author Sevket Goekay + * @author Sevket Goekay * */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java index 0ac516cc0..807d94e97 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java @@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 31.08.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java index c1a97e8d9..5e0d73079 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java @@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 25.11.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java b/src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java index 9513729a4..7de4e78ca 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/UserQueryForm.java @@ -22,7 +22,7 @@ import lombok.Setter; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 26.11.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java b/src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java index 51e96815f..6b26aa8b2 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/UserSex.java @@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 25.11.2015 */ @RequiredArgsConstructor diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java index 2c9313244..888a2abe2 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/AvailabilityType.java @@ -19,7 +19,7 @@ package de.rwth.idsg.steve.web.dto.ocpp; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 08.03.2018 */ public enum AvailabilityType { diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java index bae267cf9..d350e099d 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/CancelReservationParams.java @@ -25,7 +25,7 @@ import javax.validation.constraints.NotNull; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 02.01.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java index 9ef7e0236..1a4e50ed0 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeAvailabilityParams.java @@ -26,7 +26,7 @@ import java.util.Objects; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 08.03.2018 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java index 7ac0242c0..fcfe77ffa 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChangeConfigurationParams.java @@ -30,7 +30,7 @@ import java.util.Objects; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 08.03.2018 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java index 9f70d24e2..3bf79722d 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ChargePointSelection.java @@ -23,7 +23,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.03.2018 */ public interface ChargePointSelection { diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java index c2f134ebb..7d181171c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileFilterType.java @@ -19,7 +19,7 @@ package de.rwth.idsg.steve.web.dto.ocpp; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.11.2018 */ public enum ClearChargingProfileFilterType { diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java index 22d247c45..be9f6d9e5 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ClearChargingProfileParams.java @@ -28,7 +28,7 @@ import javax.validation.constraints.Positive; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.11.2018 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java index 316e4caf6..7e029cd49 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java @@ -31,7 +31,7 @@ import static de.rwth.idsg.steve.web.dto.ocpp.ConfigurationKeyReadWriteEnum.RW; /** - * @author Sevket Goekay + * @author Sevket Goekay * @author David Rerimassie * @since 02.01.2015 */ diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java index c9f8ec3ae..1d05b0051 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/DataTransferParams.java @@ -24,7 +24,7 @@ import javax.validation.constraints.NotNull; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 02.01.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java index f1fe558fb..fb486053c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetCompositeScheduleParams.java @@ -27,7 +27,7 @@ import javax.validation.constraints.Positive; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.11.2018 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java index 8777d6cad..07c55e677 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetConfigurationParams.java @@ -31,7 +31,7 @@ import static de.rwth.idsg.steve.utils.StringUtils.splitByComma; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 02.01.2015 */ @Setter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java index 5a3c59f3e..55abbd840 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/GetDiagnosticsParams.java @@ -29,7 +29,7 @@ import javax.validation.constraints.Pattern; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 30.12.2014 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java index 79818c076..13a0307ae 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/MultipleChargePointSelect.java @@ -28,7 +28,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 29.12.2014 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java index f2d43532d..9813a27da 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStartTransactionParams.java @@ -26,7 +26,7 @@ import javax.validation.constraints.NotBlank; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 01.01.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java index 9deeea8db..491bf4b30 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/RemoteStopTransactionParams.java @@ -24,7 +24,7 @@ import javax.validation.constraints.NotNull; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 01.01.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java index 267f5eb91..729a9486a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ReserveNowParams.java @@ -29,7 +29,7 @@ import javax.validation.constraints.NotNull; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 02.01.2015 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java index dc35b2c69..5f4bd7c1f 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetParams.java @@ -24,7 +24,7 @@ import javax.validation.constraints.NotNull; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 08.03.2018 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java index 3d5e08b3f..dc235eb7e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ResetType.java @@ -19,7 +19,7 @@ package de.rwth.idsg.steve.web.dto.ocpp; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 08.03.2018 */ public enum ResetType { diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java index d98a8f0b2..4925fb54b 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListParams.java @@ -28,7 +28,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 03.01.2015 */ @Setter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java index d20d42500..cd856ea37 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SendLocalListUpdateType.java @@ -19,7 +19,7 @@ package de.rwth.idsg.steve.web.dto.ocpp; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 13.03.2018 */ public enum SendLocalListUpdateType { diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java index 3d76120cd..e729889f8 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SetChargingProfileParams.java @@ -26,7 +26,7 @@ import javax.validation.constraints.Positive; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 12.11.2018 */ @Setter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java index d425861da..269475bf9 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/SingleChargePointSelect.java @@ -31,7 +31,7 @@ * Why a list, if the list size == 1? * To keep the method calls and data types (for ex: tasks api) consistent for both cases. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 29.12.2014 */ @Getter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java index c9b95b2d4..e8c977855 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/TriggerMessageEnum.java @@ -19,7 +19,7 @@ package de.rwth.idsg.steve.web.dto.ocpp; /** - * @author Sevket Goekay + * @author Sevket Goekay * @author David Rerimassie * @since 20.03.2018 */ diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java index f3431091e..4e4a4dceb 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UnlockConnectorParams.java @@ -25,7 +25,7 @@ import javax.validation.constraints.NotNull; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 01.01.2015 */ @Setter diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java index 3adfbc999..ba6f0f9cb 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/UpdateFirmwareParams.java @@ -29,7 +29,7 @@ import javax.validation.constraints.Pattern; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 01.01.2015 */ @Setter diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java index 2f0915b58..b7482875e 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxId.java @@ -28,7 +28,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 21.01.2016 */ @Target({FIELD, METHOD}) diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdListValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdListValidator.java index 1d3d8783e..404ebe20d 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdListValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdListValidator.java @@ -23,7 +23,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 21.01.2016 */ public class ChargeBoxIdListValidator implements ConstraintValidator> { diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java index 8c8ab1744..13fa6cef2 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdValidator.java @@ -23,7 +23,7 @@ import java.util.regex.Pattern; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 21.01.2016 */ public class ChargeBoxIdValidator implements ConstraintValidator { diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollection.java b/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollection.java index f502abf0a..58b7b6702 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollection.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollection.java @@ -28,7 +28,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 21.01.2016 */ @Target({FIELD, METHOD}) diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollectionValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollectionValidator.java index 21e12f591..a4612809a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollectionValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/EmailCollectionValidator.java @@ -25,7 +25,7 @@ import java.util.Collection; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 22.01.2016 */ public class EmailCollectionValidator implements ConstraintValidator> { diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java b/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java index 21806c198..c2bcd890a 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/IdTag.java @@ -28,7 +28,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 15.08.2014 */ @Target({FIELD, METHOD}) diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagListValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagListValidator.java index b7efe47c4..26de8cf5c 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagListValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagListValidator.java @@ -23,7 +23,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 21.01.2016 */ public class IdTagListValidator implements ConstraintValidator> { diff --git a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java index da7fddc7e..c29418dd5 100644 --- a/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java +++ b/src/main/java/de/rwth/idsg/steve/web/validation/IdTagValidator.java @@ -26,7 +26,7 @@ * Allowed characters are: * Upper or lower case letters, numbers and dot, colon, dash, underscore symbols. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 15.08.2014 */ public class IdTagValidator implements ConstraintValidator { diff --git a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java index ede23bebb..499d95514 100644 --- a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java +++ b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java @@ -36,7 +36,7 @@ import static de.rwth.idsg.steve.utils.Helpers.getRandomString; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 21.03.2018 */ @Slf4j diff --git a/src/test/java/de/rwth/idsg/steve/ApplicationTest.java b/src/test/java/de/rwth/idsg/steve/ApplicationTest.java index 6494c6319..2a9b6e0e7 100644 --- a/src/test/java/de/rwth/idsg/steve/ApplicationTest.java +++ b/src/test/java/de/rwth/idsg/steve/ApplicationTest.java @@ -41,7 +41,7 @@ import static de.rwth.idsg.steve.utils.Helpers.getRandomString; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 10.03.2018 */ @Slf4j diff --git a/src/test/java/de/rwth/idsg/steve/StressTest.java b/src/test/java/de/rwth/idsg/steve/StressTest.java index 5ebfc6a11..ab9f29795 100644 --- a/src/test/java/de/rwth/idsg/steve/StressTest.java +++ b/src/test/java/de/rwth/idsg/steve/StressTest.java @@ -29,7 +29,7 @@ import java.util.List; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 10.05.2018 */ public abstract class StressTest { diff --git a/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java b/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java index 21d3c859b..e4c8638fb 100644 --- a/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java +++ b/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java @@ -51,7 +51,7 @@ import static de.rwth.idsg.steve.utils.Helpers.getRandomStrings; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 09.05.2018 */ public class StressTestJsonOCPP16 extends StressTest { diff --git a/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java b/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java index 9cc0fe8c4..d94d95131 100644 --- a/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java +++ b/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java @@ -50,7 +50,7 @@ import static de.rwth.idsg.steve.utils.Helpers.getRandomStrings; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 18.04.2018 */ public class StressTestSoapOCPP16 extends StressTest { diff --git a/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java b/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java index e59ea9660..02d8b6a92 100644 --- a/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java +++ b/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 10.03.2018 */ @Ignore diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue72.java b/src/test/java/de/rwth/idsg/steve/issues/Issue72.java index 4cdff53e4..4e4e1c169 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue72.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue72.java @@ -45,7 +45,7 @@ /** * https://github.com/RWTH-i5-IDSG/steve/issues/72 * - * @author Sevket Goekay + * @author Sevket Goekay * @since 27.06.2018 */ public class Issue72 extends StressTest { diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java b/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java index 478ebe99f..5815d981f 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java @@ -52,7 +52,7 @@ /** * https://github.com/RWTH-i5-IDSG/steve/issues/72 * - * @author Sevket Goekay + * @author Sevket Goekay * @since 27.06.2018 */ public class Issue72LowLevelSoap extends StressTest { diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java b/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java index d10469d02..043033d5c 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java @@ -44,7 +44,7 @@ /** * https://github.com/RWTH-i5-IDSG/steve/issues/73 * - * @author Sevket Goekay + * @author Sevket Goekay * @since 02.07.2018 */ public class Issue73Fix { diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue81.java b/src/test/java/de/rwth/idsg/steve/issues/Issue81.java index 5a0386106..c97e64105 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue81.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue81.java @@ -37,7 +37,7 @@ import static de.rwth.idsg.steve.utils.Helpers.getRandomString; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 19.07.2018 */ public class Issue81 extends StressTest { diff --git a/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java b/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java index 977191b9a..0b918dbc8 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java +++ b/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java @@ -57,7 +57,7 @@ import java.util.function.Consumer; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 21.03.2018 */ @Slf4j diff --git a/src/test/java/de/rwth/idsg/steve/utils/StressTester.java b/src/test/java/de/rwth/idsg/steve/utils/StressTester.java index 595d06ac4..02af3804f 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/StressTester.java +++ b/src/test/java/de/rwth/idsg/steve/utils/StressTester.java @@ -23,7 +23,7 @@ import java.util.concurrent.Executors; /** - * @author Sevket Goekay + * @author Sevket Goekay * @since 18.04.2018 */ public class StressTester { diff --git a/src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java b/src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java index ffbc74365..dd53f111b 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java +++ b/src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java @@ -61,7 +61,7 @@ * inserting data while bypassing normal mechanisms of SteVe. However, for integration testing with reproducible * results we need a clean and isolated database. * - * @author Sevket Goekay + * @author Sevket Goekay * @since 21.03.2018 */ public class __DatabasePreparer__ { From 7a41a3f6b2f270ec3ad58d908e11b053b2564e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Mon, 24 Jan 2022 01:09:35 +0100 Subject: [PATCH 299/548] Migrate to jetty 10 (#747) * update pom * fix JettyServer * fix websocket --- pom.xml | 10 ++++++++-- .../java/de/rwth/idsg/steve/JettyServer.java | 6 ++++-- .../de/rwth/idsg/steve/SteveAppContext.java | 18 +++++++++++++++++- .../steve/config/WebSocketConfiguration.java | 12 +++--------- .../steve/ocpp/ws/OcppWebSocketUpgrader.java | 14 ++++---------- 5 files changed, 36 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 0eeabb9d5..766eac1cc 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 5.3.15 5.6.1 8.0.28 - 9.4.44.v20210927 + 10.0.7 1.18.22 2.13.1 @@ -646,7 +646,7 @@ org.eclipse.jetty.websocket - websocket-server + websocket-jetty-server ${jetty.version} @@ -673,6 +673,12 @@ spring-test test + + org.eclipse.jetty.websocket + websocket-jetty-client + ${jetty.version} + test + junit junit diff --git a/src/main/java/de/rwth/idsg/steve/JettyServer.java b/src/main/java/de/rwth/idsg/steve/JettyServer.java index b71993570..685aad32d 100644 --- a/src/main/java/de/rwth/idsg/steve/JettyServer.java +++ b/src/main/java/de/rwth/idsg/steve/JettyServer.java @@ -60,6 +60,7 @@ public class JettyServer { private Server server; + private SteveAppContext steveAppContext; private static final int MIN_THREADS = 4; private static final int MAX_THREADS = 50; @@ -109,7 +110,7 @@ private void prepare() { server.addConnector(httpsConnector(httpConfig)); } - SteveAppContext steveAppContext = new SteveAppContext(); + steveAppContext = new SteveAppContext(); server.setHandler(steveAppContext.getHandlers()); } @@ -125,7 +126,7 @@ private ServerConnector httpConnector(HttpConfiguration httpConfig) { private ServerConnector httpsConnector(HttpConfiguration httpConfig) { // === jetty-https.xml === // SSL Context Factory - SslContextFactory sslContextFactory = new SslContextFactory.Server(); + SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(CONFIG.getJetty().getKeyStorePath()); sslContextFactory.setKeyStorePassword(CONFIG.getJetty().getKeyStorePassword()); sslContextFactory.setKeyManagerPassword(CONFIG.getJetty().getKeyStorePassword()); @@ -160,6 +161,7 @@ public void start() throws Exception { if (server != null) { server.start(); + steveAppContext.configureWebSocket(); populateEndpointInfo(); } } diff --git a/src/main/java/de/rwth/idsg/steve/SteveAppContext.java b/src/main/java/de/rwth/idsg/steve/SteveAppContext.java index 20651a23a..af55e8e40 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveAppContext.java +++ b/src/main/java/de/rwth/idsg/steve/SteveAppContext.java @@ -33,6 +33,8 @@ import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.webapp.WebAppContext; +import org.eclipse.jetty.websocket.core.WebSocketConstants; +import org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer; import org.springframework.core.io.ClassPathResource; import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer; import org.springframework.web.context.ContextLoaderListener; @@ -49,6 +51,8 @@ import java.util.List; import static de.rwth.idsg.steve.SteveConfiguration.CONFIG; +import static de.rwth.idsg.steve.config.WebSocketConfiguration.IDLE_TIMEOUT; +import static de.rwth.idsg.steve.config.WebSocketConfiguration.MAX_MSG_SIZE; /** * @author Sevket Goekay @@ -57,6 +61,7 @@ public class SteveAppContext { private final AnnotationConfigWebApplicationContext springContext; + private WebAppContext ctx; public SteveAppContext() { springContext = new AnnotationConfigWebApplicationContext(); @@ -73,6 +78,17 @@ public HandlerCollection getHandlers() { return handlerList; } + /** + * Otherwise, defaults come from {@link WebSocketConstants} + */ + public void configureWebSocket() { + JettyWebSocketServerContainer container = JettyWebSocketServerContainer.getContainer(ctx.getServletContext()); + container.setInputBufferSize(MAX_MSG_SIZE); + container.setOutputBufferSize(MAX_MSG_SIZE); + container.setMaxTextMessageSize(MAX_MSG_SIZE); + container.setIdleTimeout(IDLE_TIMEOUT); + } + private Handler getWebApp() { if (CONFIG.getJetty().isGzipEnabled()) { return enableGzip(initWebApp()); @@ -93,7 +109,7 @@ private Handler enableGzip(WebAppContext ctx) { } private WebAppContext initWebApp() { - WebAppContext ctx = new WebAppContext(); + ctx = new WebAppContext(); ctx.setContextPath(CONFIG.getContextPath()); ctx.setResourceBase(getWebAppURIAsString()); diff --git a/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java index 5b80e3cb4..814c71712 100644 --- a/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java @@ -26,8 +26,6 @@ import de.rwth.idsg.steve.ocpp.ws.ocpp16.Ocpp16WebSocketEndpoint; import de.rwth.idsg.steve.service.ChargePointHelperService; import lombok.extern.slf4j.Slf4j; -import org.eclipse.jetty.websocket.api.WebSocketBehavior; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.web.socket.config.annotation.EnableWebSocket; @@ -35,6 +33,7 @@ import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; import org.springframework.web.socket.server.support.DefaultHandshakeHandler; +import java.time.Duration; import java.util.List; import java.util.concurrent.TimeUnit; @@ -54,20 +53,15 @@ public class WebSocketConfiguration implements WebSocketConfigurer { @Autowired private Ocpp16WebSocketEndpoint ocpp16WebSocketEndpoint; public static final long PING_INTERVAL = TimeUnit.MINUTES.toMinutes(15); - private static final long IDLE_TIMEOUT = TimeUnit.HOURS.toMillis(2); + public static final Duration IDLE_TIMEOUT = Duration.ofHours(2); public static final int MAX_MSG_SIZE = 8_388_608; // 8 MB for max message size @Override public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { - WebSocketPolicy policy = new WebSocketPolicy(WebSocketBehavior.SERVER); - policy.setMaxTextMessageBufferSize(MAX_MSG_SIZE); - policy.setMaxTextMessageSize(MAX_MSG_SIZE); - policy.setIdleTimeout(IDLE_TIMEOUT); - List endpoints = getEndpoints(); String[] protocols = endpoints.stream().map(e -> e.getVersion().getValue()).toArray(String[]::new); - OcppWebSocketUpgrader upgradeStrategy = new OcppWebSocketUpgrader(policy, endpoints, chargePointHelperService); + OcppWebSocketUpgrader upgradeStrategy = new OcppWebSocketUpgrader(endpoints, chargePointHelperService); DefaultHandshakeHandler handler = new DefaultHandshakeHandler(upgradeStrategy); handler.setSupportedProtocols(protocols); diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java index 8de9ce38f..42f372837 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java @@ -19,15 +19,15 @@ package de.rwth.idsg.steve.ocpp.ws; import de.rwth.idsg.steve.service.ChargePointHelperService; +import lombok.RequiredArgsConstructor; import ocpp.cs._2015._10.RegistrationStatus; -import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.jetbrains.annotations.Nullable; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.web.socket.WebSocketExtension; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.server.HandshakeFailureException; -import org.springframework.web.socket.server.jetty.JettyRequestUpgradeStrategy; +import org.springframework.web.socket.server.jetty.Jetty10RequestUpgradeStrategy; import java.security.Principal; import java.util.List; @@ -38,18 +38,12 @@ * @author Sevket Goekay * @since 13.03.2015 */ -public class OcppWebSocketUpgrader extends JettyRequestUpgradeStrategy { +@RequiredArgsConstructor +public class OcppWebSocketUpgrader extends Jetty10RequestUpgradeStrategy { private final List endpoints; private final ChargePointHelperService chargePointHelperService; - public OcppWebSocketUpgrader(WebSocketPolicy policy, List endpoints, - ChargePointHelperService chargePointHelperService) { - super(policy); - this.endpoints = endpoints; - this.chargePointHelperService = chargePointHelperService; - } - @Override public void upgrade(ServerHttpRequest request, ServerHttpResponse response, String selectedProtocol, List selectedExtensions, Principal user, From 5619987870c17c3c8c88d6e7ff2faf406272dcde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Mon, 24 Jan 2022 23:54:28 +0100 Subject: [PATCH 300/548] refactor --- .../de/rwth/idsg/steve/SteveAppContext.java | 96 +++++++------------ 1 file changed, 36 insertions(+), 60 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/SteveAppContext.java b/src/main/java/de/rwth/idsg/steve/SteveAppContext.java index af55e8e40..2e194c17c 100644 --- a/src/main/java/de/rwth/idsg/steve/SteveAppContext.java +++ b/src/main/java/de/rwth/idsg/steve/SteveAppContext.java @@ -43,7 +43,6 @@ import org.springframework.web.servlet.DispatcherServlet; import javax.servlet.DispatcherType; -import javax.servlet.Filter; import java.io.IOException; import java.util.ArrayList; import java.util.EnumSet; @@ -61,28 +60,26 @@ public class SteveAppContext { private final AnnotationConfigWebApplicationContext springContext; - private WebAppContext ctx; + private final WebAppContext webAppContext; public SteveAppContext() { springContext = new AnnotationConfigWebApplicationContext(); springContext.scan("de.rwth.idsg.steve.config"); + webAppContext = initWebApp(); } public HandlerCollection getHandlers() { - HandlerList handlerList = new HandlerList(); - handlerList.setHandlers( - new Handler[]{ - getRedirectHandler(), - getWebApp() - }); - return handlerList; + return new HandlerList( + getRedirectHandler(), + getWebApp() + ); } /** * Otherwise, defaults come from {@link WebSocketConstants} */ public void configureWebSocket() { - JettyWebSocketServerContainer container = JettyWebSocketServerContainer.getContainer(ctx.getServletContext()); + JettyWebSocketServerContainer container = JettyWebSocketServerContainer.getContainer(webAppContext.getServletContext()); container.setInputBufferSize(MAX_MSG_SIZE); container.setOutputBufferSize(MAX_MSG_SIZE); container.setMaxTextMessageSize(MAX_MSG_SIZE); @@ -90,26 +87,19 @@ public void configureWebSocket() { } private Handler getWebApp() { - if (CONFIG.getJetty().isGzipEnabled()) { - return enableGzip(initWebApp()); - } else { - return initWebApp(); + if (!CONFIG.getJetty().isGzipEnabled()) { + return webAppContext; } - } - /** - * Wraps the whole web app in a gzip handler to make Jetty return compressed content - * - * http://www.eclipse.org/jetty/documentation/current/gzip-filter.html - */ - private Handler enableGzip(WebAppContext ctx) { + // Wraps the whole web app in a gzip handler to make Jetty return compressed content + // http://www.eclipse.org/jetty/documentation/current/gzip-filter.html GzipHandler gzipHandler = new GzipHandler(); - gzipHandler.setHandler(ctx); + gzipHandler.setHandler(webAppContext); return gzipHandler; } private WebAppContext initWebApp() { - ctx = new WebAppContext(); + WebAppContext ctx = new WebAppContext(); ctx.setContextPath(CONFIG.getContextPath()); ctx.setResourceBase(getWebAppURIAsString()); @@ -127,24 +117,19 @@ private WebAppContext initWebApp() { ctx.addServlet(cxf, CONFIG.getCxfMapping()); if (CONFIG.getProfile().isProd()) { - addSecurityFilter(ctx); + // If PROD, add security filter + ctx.addFilter( + // The bean name is not arbitrary, but is as expected by Spring + new FilterHolder(new DelegatingFilterProxy(AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME)), + CONFIG.getSpringManagerMapping(), + EnumSet.allOf(DispatcherType.class) + ); } initJSP(ctx); return ctx; } - private void addSecurityFilter(WebAppContext ctx) { - // The bean name is not arbitrary, but is as expected by Spring - Filter f = new DelegatingFilterProxy(AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME); - - ctx.addFilter( - new FilterHolder(f), - CONFIG.getSpringManagerMapping(), - EnumSet.allOf(DispatcherType.class) - ); - } - private Handler getRedirectHandler() { RewriteHandler rewrite = new RewriteHandler(); rewrite.setRewriteRequestURI(true); @@ -176,6 +161,22 @@ private HashSet getRedirectSet() { return redirectSet; } + /** + * Help by: + * https://github.com/jetty-project/embedded-jetty-jsp + * https://github.com/jasonish/jetty-springmvc-jsp-template + * http://examples.javacodegeeks.com/enterprise-java/jetty/jetty-jsp-example + */ + private void initJSP(WebAppContext ctx) { + // Ensure the JSP engine is initialized correctly + List initializers = new ArrayList<>(); + initializers.add(new ContainerInitializer(new JettyJasperInitializer(), null)); + + ctx.setAttribute("org.eclipse.jetty.containerInitializers", initializers); + ctx.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager()); + ctx.addBean(new ServletContainerInitializersStarter(ctx), true); + } + private static String getWebAppURIAsString() { try { return new ClassPathResource("webapp").getURI().toString(); @@ -183,29 +184,4 @@ private static String getWebAppURIAsString() { throw new RuntimeException(e); } } - - // ------------------------------------------------------------------------- - // JSP stuff - // - // Help by: - // - // https://github.com/jetty-project/embedded-jetty-jsp - // https://github.com/jasonish/jetty-springmvc-jsp-template - // http://examples.javacodegeeks.com/enterprise-java/jetty/jetty-jsp-example - // ------------------------------------------------------------------------- - - private void initJSP(WebAppContext ctx) { - ctx.setAttribute("org.eclipse.jetty.containerInitializers", jspInitializers()); - ctx.setAttribute(InstanceManager.class.getName(), new SimpleInstanceManager()); - ctx.addBean(new ServletContainerInitializersStarter(ctx), true); - } - - /** - * Ensure the JSP engine is initialized correctly - */ - private List jspInitializers() { - List initializers = new ArrayList<>(); - initializers.add(new ContainerInitializer(new JettyJasperInitializer(), null)); - return initializers; - } } From 758f930884038d0b9852618cb2b74a083947d6dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 29 Jan 2022 18:00:28 +0000 Subject: [PATCH 301/548] Bump jcl-over-slf4j from 1.7.33 to 1.7.35 Bumps [jcl-over-slf4j](https://github.com/qos-ch/slf4j) from 1.7.33 to 1.7.35. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.33...v_1.7.35) --- updated-dependencies: - dependency-name: org.slf4j:jcl-over-slf4j dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 766eac1cc..9534fe9de 100644 --- a/pom.xml +++ b/pom.xml @@ -583,7 +583,7 @@ org.slf4j jcl-over-slf4j - 1.7.33 + 1.7.35 com.lmax From 945c666888d9a816680a633d062237a187e05337 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 29 Jan 2022 18:00:39 +0000 Subject: [PATCH 302/548] Bump slf4j-api from 1.7.33 to 1.7.35 Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.33 to 1.7.35. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.33...v_1.7.35) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 766eac1cc..6b101d039 100644 --- a/pom.xml +++ b/pom.xml @@ -578,7 +578,7 @@ org.slf4j slf4j-api - 1.7.33 + 1.7.35 org.slf4j From 8014dcc643c60eca3442115c3fc811c5150c5e25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 29 Jan 2022 19:07:46 +0100 Subject: [PATCH 303/548] Bump jooq.version from 3.16.2 to 3.16.3 (#752) Bumps `jooq.version` from 3.16.2 to 3.16.3. Updates `jooq-meta` from 3.16.2 to 3.16.3 Updates `jooq-codegen` from 3.16.2 to 3.16.3 Updates `jooq` from 3.16.2 to 3.16.3 Updates `jooq-codegen-maven` from 3.16.2 to 3.16.3 --- updated-dependencies: - dependency-name: org.jooq:jooq-meta dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 766eac1cc..755de5a21 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 11 UTF-8 - 3.16.2 + 3.16.3 3.5.0 5.3.15 5.6.1 From 09e5ea3871909c4b5539f51e4f19a8e8e54d953d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Fri, 11 Feb 2022 01:55:17 +0100 Subject: [PATCH 304/548] Mark not connected JSON charge points as disconnected (#355) SVG from https://uxwing.com/cloud-connection-offline-icon/ --- .../steve/repository/dto/ConnectorStatus.java | 9 +++++++ .../impl/ChargePointRepositoryImpl.java | 4 ++- .../service/ChargePointHelperService.java | 25 +++++++++++++++++++ .../steve/utils/ConnectorStatusFilter.java | 2 ++ .../steve/web/controller/HomeController.java | 2 +- .../webapp/WEB-INF/views/connectorStatus.jsp | 10 +++++++- .../webapp/static/images/offline-icon.svg | 1 + 7 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/webapp/static/images/offline-icon.svg diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java index fc5ab6a64..4e19e5a35 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java @@ -18,8 +18,10 @@ */ package de.rwth.idsg.steve.repository.dto; +import de.rwth.idsg.steve.ocpp.OcppProtocol; import lombok.Builder; import lombok.Getter; +import lombok.Setter; import org.joda.time.DateTime; /** @@ -37,4 +39,11 @@ public final class ConnectorStatus { // String version above, which is for representation on frontend private final DateTime statusTimestamp; + private final OcppProtocol ocppProtocol; + + // This is true, if the chargeBox this connector belongs to is a WS/JSON station + // and it is disconnected at the moment of building this DTO. + @Setter + @Builder.Default + private boolean jsonAndDisconnected = false; } diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java index 49343af4f..a2a719904 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java @@ -241,7 +241,8 @@ public List getChargePointConnectorStatus(ConnectorStatusForm f CONNECTOR.CONNECTOR_ID, t2.field(t2Ts), t2.field(t2Status), - t2.field(t2Error)) + t2.field(t2Error), + CHARGE_BOX.OCPP_PROTOCOL) .from(t2) .join(CONNECTOR) .on(CONNECTOR.CONNECTOR_PK.eq(t2.field(t2Pk))) @@ -258,6 +259,7 @@ public List getChargePointConnectorStatus(ConnectorStatusForm f .statusTimestamp(r.value4()) .status(r.value5()) .errorCode(r.value6()) + .ocppProtocol(r.value7() == null ? null : OcppProtocol.fromCompositeValue(r.value7())) .build() ); } diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java index 74075e844..aeb943a44 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java @@ -34,6 +34,7 @@ import de.rwth.idsg.steve.service.dto.UnidentifiedIncomingObject; import de.rwth.idsg.steve.utils.ConnectorStatusCountFilter; import de.rwth.idsg.steve.utils.DateTimeUtils; +import de.rwth.idsg.steve.web.dto.ConnectorStatusForm; import de.rwth.idsg.steve.web.dto.OcppJsonStatus; import de.rwth.idsg.steve.web.dto.Statistics; import lombok.extern.slf4j.Slf4j; @@ -47,9 +48,11 @@ import java.util.Collection; import java.util.Collections; import java.util.Deque; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.Set; import java.util.concurrent.locks.Lock; import java.util.stream.Collectors; @@ -104,6 +107,28 @@ public Statistics getStats() { return stats; } + public List getChargePointConnectorStatus(ConnectorStatusForm params) { + Map> ocpp12Map = ocpp12WebSocketEndpoint.getACopy(); + Map> ocpp15Map = ocpp15WebSocketEndpoint.getACopy(); + Map> ocpp16Map = ocpp16WebSocketEndpoint.getACopy(); + + Set connectedJsonChargeBoxIds = new HashSet<>(extractIds(Arrays.asList(ocpp12Map, ocpp15Map, ocpp16Map))); + + List latestList = chargePointRepository.getChargePointConnectorStatus(params); + + // iterate over JSON stations and mark disconnected ones + // https://github.com/RWTH-i5-IDSG/steve/issues/355 + // + for (ConnectorStatus status : latestList) { + OcppProtocol protocol = status.getOcppProtocol(); + if (protocol != null && protocol.getTransport() == OcppTransport.JSON) { + status.setJsonAndDisconnected(!connectedJsonChargeBoxIds.contains(status.getChargeBoxId())); + } + } + + return latestList; + } + public List getOcppJsonStatus() { Map> ocpp12Map = ocpp12WebSocketEndpoint.getACopy(); Map> ocpp15Map = ocpp15WebSocketEndpoint.getACopy(); diff --git a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java index 93c894d8a..62fa0531d 100755 --- a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java @@ -137,6 +137,8 @@ public List process(List zero, List latestList = chargePointRepository.getChargePointConnectorStatus(params); + List latestList = chargePointHelperService.getChargePointConnectorStatus(params); List filteredList = ConnectorStatusFilter.filterAndPreferZero(latestList); model.addAttribute("connectorStatusList", filteredList); return "connectorStatus"; diff --git a/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp b/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp index ff866da50..d95cbf4d7 100644 --- a/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp +++ b/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp @@ -74,7 +74,15 @@ Connector Status - ${cs.chargeBoxId} + + ${cs.chargeBoxId} + + + This JSON charge point is currently disconnected. The status information of its + connectors might be not up-to-date. + + + ${cs.connectorId} ${cs.timeStamp} ${cs.status} diff --git a/src/main/resources/webapp/static/images/offline-icon.svg b/src/main/resources/webapp/static/images/offline-icon.svg new file mode 100644 index 000000000..0883ed08f --- /dev/null +++ b/src/main/resources/webapp/static/images/offline-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file From 5410a90e7081e0960910e75d16f1a36c10f2c4b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Feb 2022 18:00:32 +0000 Subject: [PATCH 305/548] Bump jooq.version from 3.16.3 to 3.16.4 Bumps `jooq.version` from 3.16.3 to 3.16.4. Updates `jooq-meta` from 3.16.3 to 3.16.4 Updates `jooq-codegen` from 3.16.3 to 3.16.4 Updates `jooq` from 3.16.3 to 3.16.4 Updates `jooq-codegen-maven` from 3.16.3 to 3.16.4 --- updated-dependencies: - dependency-name: org.jooq:jooq-meta dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62afee869..c60610234 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 11 UTF-8 - 3.16.3 + 3.16.4 3.5.0 5.3.15 5.6.1 From 8ea8c8109446ee0025fd08f4b0a19dea71ea3e85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Feb 2022 18:00:50 +0000 Subject: [PATCH 306/548] Bump slf4j-api from 1.7.35 to 1.7.36 Bumps [slf4j-api](https://github.com/qos-ch/slf4j) from 1.7.35 to 1.7.36. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.35...v_1.7.36) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62afee869..d0300b00e 100644 --- a/pom.xml +++ b/pom.xml @@ -578,7 +578,7 @@ org.slf4j slf4j-api - 1.7.35 + 1.7.36 org.slf4j From c62b7cee7a226c18586c041e1a68213fa05e36e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Feb 2022 18:01:07 +0000 Subject: [PATCH 307/548] Bump jcl-over-slf4j from 1.7.35 to 1.7.36 Bumps [jcl-over-slf4j](https://github.com/qos-ch/slf4j) from 1.7.35 to 1.7.36. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.35...v_1.7.36) --- updated-dependencies: - dependency-name: org.slf4j:jcl-over-slf4j dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62afee869..d8291eda4 100644 --- a/pom.xml +++ b/pom.xml @@ -583,7 +583,7 @@ org.slf4j jcl-over-slf4j - 1.7.35 + 1.7.36 com.lmax From 6794441527c7f05e92fae2fc8d08e1c566319253 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 19 Feb 2022 18:00:22 +0000 Subject: [PATCH 308/548] Bump spring-framework-bom from 5.3.15 to 5.3.16 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.15 to 5.3.16. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.15...v5.3.16) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f1e167b17..ca4ba04bc 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.16.4 3.5.0 - 5.3.15 + 5.3.16 5.6.1 8.0.28 10.0.7 From 333fcb4c2c0474879e0451d06391ea5131aec291 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 19 Feb 2022 18:00:31 +0000 Subject: [PATCH 309/548] Bump maven-pmd-plugin from 3.15.0 to 3.16.0 Bumps [maven-pmd-plugin](https://github.com/apache/maven-pmd-plugin) from 3.15.0 to 3.16.0. - [Release notes](https://github.com/apache/maven-pmd-plugin/releases) - [Commits](https://github.com/apache/maven-pmd-plugin/compare/maven-pmd-plugin-3.15.0...maven-pmd-plugin-3.16.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-pmd-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f1e167b17..7443f6773 100644 --- a/pom.xml +++ b/pom.xml @@ -177,7 +177,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.15.0 + 3.16.0 org.codehaus.mojo From 3be6d1b7f0574df440e44385aad05bf2e41b99bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 19 Feb 2022 18:01:00 +0000 Subject: [PATCH 310/548] Bump maven-compiler-plugin from 3.9.0 to 3.10.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.9.0 to 3.10.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.9.0...maven-compiler-plugin-3.10.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f1e167b17..a22e95dec 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ maven-compiler-plugin - 3.9.0 + 3.10.0 ${java.version} ${java.version} From c815dd8bdae7c93a5f7cb7bf7109d0de8a0d7fd8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Feb 2022 18:01:29 +0000 Subject: [PATCH 311/548] Bump spring.security.version from 5.6.1 to 5.6.2 Bumps `spring.security.version` from 5.6.1 to 5.6.2. Updates `spring-security-web` from 5.6.1 to 5.6.2 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.6.1...5.6.2) Updates `spring-security-config` from 5.6.1 to 5.6.2 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.6.1...5.6.2) --- updated-dependencies: - dependency-name: org.springframework.security:spring-security-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.security:spring-security-config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d56f6d611..405818610 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.16.4 3.5.0 5.3.16 - 5.6.1 + 5.6.2 8.0.28 10.0.7 1.18.22 From edc8f4f3d29301d273ab06ac7a47cfdbc5e7f8a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 08:34:02 +0000 Subject: [PATCH 312/548] Bump guava from 31.0.1-jre to 31.1-jre Bumps [guava](https://github.com/google/guava) from 31.0.1-jre to 31.1-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d56f6d611..f4538736d 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.16.4 3.5.0 5.3.16 - 5.6.1 + 5.6.2 8.0.28 10.0.7 1.18.22 @@ -508,7 +508,7 @@ com.google.guava guava - 31.0.1-jre + 31.1-jre com.fasterxml.jackson.core From f217b24ab7fa7a2b0e5e085c24370223e874e800 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 08:34:54 +0000 Subject: [PATCH 313/548] Bump log4j-bom from 2.17.1 to 2.17.2 Bumps log4j-bom from 2.17.1 to 2.17.2. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d56f6d611..af3a3b536 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.16.4 3.5.0 5.3.16 - 5.6.1 + 5.6.2 8.0.28 10.0.7 1.18.22 @@ -459,7 +459,7 @@ org.apache.logging.log4j log4j-bom - 2.17.1 + 2.17.2 import pom From e9c258139ac344896152c3580edd2a41a54b3fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Fri, 4 Mar 2022 19:37:27 +0100 Subject: [PATCH 314/548] increase hikari's maxLifetime (#736) --- src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java index f9c781d91..77440f766 100644 --- a/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java @@ -97,6 +97,9 @@ private void initDataSource() { hc.addDataSourceProperty(PropertyKey.connectionTimeZone.getKeyName(), CONFIG.getTimeZoneId()); hc.addDataSourceProperty(PropertyKey.useSSL.getKeyName(), true); + // https://github.com/RWTH-i5-IDSG/steve/issues/736 + hc.setMaxLifetime(580_000); + dataSource = new HikariDataSource(hc); } From fd26ced055b37c68000a73767dc229b17f54bece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sat, 5 Mar 2022 00:31:13 +0100 Subject: [PATCH 315/548] migrate tests from junit 4 to 5 --- pom.xml | 13 +- .../rwth/idsg/steve/ApplicationJsonTest.java | 22 +-- .../de/rwth/idsg/steve/ApplicationTest.java | 54 +++--- .../idsg/steve/OperationalTestSoapOCPP16.java | 170 +++++++++--------- .../java/de/rwth/idsg/steve/StressTest.java | 6 +- .../rwth/idsg/steve/StressTestJsonOCPP16.java | 38 ++-- .../rwth/idsg/steve/StressTestSoapOCPP16.java | 20 +-- .../de/rwth/idsg/steve/TypeStoreTest.java | 30 ++-- .../de/rwth/idsg/steve/issues/Issue72.java | 10 +- .../steve/issues/Issue72LowLevelSoap.java | 8 +- .../de/rwth/idsg/steve/issues/Issue73Fix.java | 20 +-- .../de/rwth/idsg/steve/issues/Issue81.java | 8 +- .../idsg/steve/utils/StringUtilsTest.java | 38 ++-- .../web/validation/IdTagValidatorTest.java | 49 ++--- 14 files changed, 248 insertions(+), 238 deletions(-) diff --git a/pom.xml b/pom.xml index cc5ff6a78..fe66dc0f6 100644 --- a/pom.xml +++ b/pom.xml @@ -173,6 +173,13 @@ + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + org.apache.maven.plugins @@ -680,9 +687,9 @@ test - junit - junit - 4.13.2 + org.junit.jupiter + junit-jupiter-engine + 5.8.2 test diff --git a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java index 499d95514..5851287d4 100644 --- a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java +++ b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java @@ -28,10 +28,10 @@ import ocpp.cs._2015._10.BootNotificationRequest; import ocpp.cs._2015._10.BootNotificationResponse; import ocpp.cs._2015._10.RegistrationStatus; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static de.rwth.idsg.steve.utils.Helpers.getRandomString; @@ -50,16 +50,16 @@ public class ApplicationJsonTest { private static Application app; - @BeforeClass + @BeforeAll public static void init() throws Exception { - Assert.assertEquals(ApplicationProfile.TEST, SteveConfiguration.CONFIG.getProfile()); + Assertions.assertEquals(ApplicationProfile.TEST, SteveConfiguration.CONFIG.getProfile()); __DatabasePreparer__.prepare(); app = new Application(); app.start(); } - @AfterClass + @AfterAll public static void destroy() throws Exception { if (app != null) { app.stop(); @@ -77,15 +77,15 @@ public void testOcpp16() { .withChargePointModel(getRandomString()); chargePoint.prepare(boot, BootNotificationResponse.class, - bootResponse -> Assert.assertEquals(RegistrationStatus.ACCEPTED, bootResponse.getStatus()), - error -> Assert.fail() + bootResponse -> Assertions.assertEquals(RegistrationStatus.ACCEPTED, bootResponse.getStatus()), + error -> Assertions.fail() ); AuthorizeRequest auth = new AuthorizeRequest().withIdTag(REGISTERED_OCPP_TAG); chargePoint.prepare(auth, AuthorizeResponse.class, - authResponse -> Assert.assertEquals(AuthorizationStatus.ACCEPTED, authResponse.getIdTagInfo().getStatus()), - error -> Assert.fail() + authResponse -> Assertions.assertEquals(AuthorizationStatus.ACCEPTED, authResponse.getIdTagInfo().getStatus()), + error -> Assertions.fail() ); chargePoint.processAndClose(); diff --git a/src/test/java/de/rwth/idsg/steve/ApplicationTest.java b/src/test/java/de/rwth/idsg/steve/ApplicationTest.java index 2a9b6e0e7..9a516504c 100644 --- a/src/test/java/de/rwth/idsg/steve/ApplicationTest.java +++ b/src/test/java/de/rwth/idsg/steve/ApplicationTest.java @@ -27,10 +27,10 @@ import ocpp.cs._2010._08.BootNotificationResponse; import ocpp.cs._2010._08.RegistrationStatus; import ocpp.cs._2012._06.CentralSystemService; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import javax.xml.ws.WebServiceException; @@ -53,16 +53,16 @@ public class ApplicationTest { private static Application app; - @BeforeClass + @BeforeAll public static void init() throws Exception { - Assert.assertEquals(ApplicationProfile.TEST, SteveConfiguration.CONFIG.getProfile()); + Assertions.assertEquals(ApplicationProfile.TEST, SteveConfiguration.CONFIG.getProfile()); __DatabasePreparer__.prepare(); app = new Application(); app.start(); } - @AfterClass + @AfterAll public static void destroy() throws Exception { if (app != null) { app.stop(); @@ -79,15 +79,15 @@ public void testOcpp12() { .withChargePointVendor(getRandomString()) .withChargePointModel(getRandomString()), REGISTERED_CHARGE_BOX_ID); - Assert.assertNotNull(boot); - Assert.assertEquals(RegistrationStatus.ACCEPTED, boot.getStatus()); + Assertions.assertNotNull(boot); + Assertions.assertEquals(RegistrationStatus.ACCEPTED, boot.getStatus()); AuthorizeResponse auth = client.authorize( new AuthorizeRequest() .withIdTag(REGISTERED_OCPP_TAG), REGISTERED_CHARGE_BOX_ID); - Assert.assertNotNull(auth); - Assert.assertEquals(AuthorizationStatus.ACCEPTED, auth.getIdTagInfo().getStatus()); + Assertions.assertNotNull(auth); + Assertions.assertEquals(AuthorizationStatus.ACCEPTED, auth.getIdTagInfo().getStatus()); } @Test @@ -99,38 +99,40 @@ public void testOcpp15() { .withChargePointVendor(getRandomString()) .withChargePointModel(getRandomString()), REGISTERED_CHARGE_BOX_ID); - Assert.assertNotNull(boot); - Assert.assertEquals(ocpp.cs._2012._06.RegistrationStatus.ACCEPTED, boot.getStatus()); + Assertions.assertNotNull(boot); + Assertions.assertEquals(ocpp.cs._2012._06.RegistrationStatus.ACCEPTED, boot.getStatus()); ocpp.cs._2012._06.AuthorizeResponse auth = client.authorize( new ocpp.cs._2012._06.AuthorizeRequest() .withIdTag(REGISTERED_OCPP_TAG), REGISTERED_CHARGE_BOX_ID); - Assert.assertNotNull(auth); - Assert.assertEquals(ocpp.cs._2012._06.AuthorizationStatus.ACCEPTED, auth.getIdTagInfo().getStatus()); + Assertions.assertNotNull(auth); + Assertions.assertEquals(ocpp.cs._2012._06.AuthorizationStatus.ACCEPTED, auth.getIdTagInfo().getStatus()); } /** * WebServiceException because we are sending an AuthorizeRequest from a random/unknown station. */ - @Test(expected = WebServiceException.class) + @Test public void testOcpp16() { - ocpp.cs._2015._10.CentralSystemService client = getForOcpp16(path); + Assertions.assertThrows(WebServiceException.class, () -> { + ocpp.cs._2015._10.CentralSystemService client = getForOcpp16(path); - ocpp.cs._2015._10.BootNotificationResponse boot = client.bootNotification( + ocpp.cs._2015._10.BootNotificationResponse boot = client.bootNotification( new ocpp.cs._2015._10.BootNotificationRequest() - .withChargePointVendor(getRandomString()) - .withChargePointModel(getRandomString()), + .withChargePointVendor(getRandomString()) + .withChargePointModel(getRandomString()), getRandomString()); - Assert.assertNotNull(boot); - Assert.assertEquals(ocpp.cs._2015._10.RegistrationStatus.REJECTED, boot.getStatus()); + Assertions.assertNotNull(boot); + Assertions.assertEquals(ocpp.cs._2015._10.RegistrationStatus.REJECTED, boot.getStatus()); - ocpp.cs._2015._10.AuthorizeResponse auth = client.authorize( + ocpp.cs._2015._10.AuthorizeResponse auth = client.authorize( new ocpp.cs._2015._10.AuthorizeRequest() - .withIdTag(getRandomString()), + .withIdTag(getRandomString()), getRandomString()); - Assert.assertNotNull(auth); - Assert.assertEquals(ocpp.cs._2015._10.AuthorizationStatus.INVALID, auth.getIdTagInfo().getStatus()); + Assertions.assertNotNull(auth); + Assertions.assertEquals(ocpp.cs._2015._10.AuthorizationStatus.INVALID, auth.getIdTagInfo().getStatus()); + }); } } diff --git a/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java b/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java index 76cc58968..d7fc31212 100644 --- a/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java +++ b/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java @@ -53,12 +53,12 @@ import ocpp.cs._2015._10.StopTransactionRequest; import ocpp.cs._2015._10.StopTransactionResponse; import org.joda.time.DateTime; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.xml.ws.WebServiceException; import java.util.Arrays; @@ -82,32 +82,32 @@ public class OperationalTestSoapOCPP16 { private static final int numConnectors = 5; private static Application app; - @BeforeClass + @BeforeAll public static void initClass() throws Exception { - Assert.assertEquals(ApplicationProfile.TEST, SteveConfiguration.CONFIG.getProfile()); + Assertions.assertEquals(ApplicationProfile.TEST, SteveConfiguration.CONFIG.getProfile()); app = new Application(); app.start(); } - @AfterClass + @AfterAll public static void destroyClass() throws Exception { app.stop(); } - @Before + @BeforeEach public void init() throws Exception { __DatabasePreparer__.prepare(); } - @After + @AfterEach public void destroy() throws Exception { __DatabasePreparer__.cleanUp(); } @Test public void testUnregisteredCP() { - Assert.assertFalse(SteveConfiguration.CONFIG.getOcpp().isAutoRegisterUnknownStations()); + Assertions.assertFalse(SteveConfiguration.CONFIG.getOcpp().isAutoRegisterUnknownStations()); CentralSystemService client = getForOcpp16(path); @@ -117,8 +117,8 @@ public void testUnregisteredCP() { .withChargePointModel(getRandomString()), getRandomString()); - Assert.assertNotNull(boot); - Assert.assertNotEquals(RegistrationStatus.ACCEPTED, boot.getStatus()); + Assertions.assertNotNull(boot); + Assertions.assertNotEquals(RegistrationStatus.ACCEPTED, boot.getStatus()); } /** @@ -132,15 +132,17 @@ public void testUnregisteredCP() { * * WS/JSON stations cannot connect at all if they are not registered, as ensured by {@link OcppWebSocketUpgrader}. */ - @Test(expected = WebServiceException.class) + @Test public void testUnregisteredCPWithInterceptor() { - Assert.assertFalse(SteveConfiguration.CONFIG.getOcpp().isAutoRegisterUnknownStations()); + Assertions.assertThrows(WebServiceException.class, () -> { + Assertions.assertFalse(SteveConfiguration.CONFIG.getOcpp().isAutoRegisterUnknownStations()); - CentralSystemService client = getForOcpp16(path); + CentralSystemService client = getForOcpp16(path); - client.authorize( + client.authorize( new AuthorizeRequest().withIdTag(REGISTERED_OCPP_TAG), getRandomString()); + }); } @Test @@ -150,7 +152,7 @@ public void testRegisteredCP() { initStationWithBootNotification(client); ChargePoint.Details details = __DatabasePreparer__.getCBDetails(REGISTERED_CHARGE_BOX_ID); - Assert.assertTrue(details.getChargeBox().getOcppProtocol().contains("ocpp1.6")); + Assertions.assertTrue(details.getChargeBox().getOcppProtocol().contains("ocpp1.6")); } @Test @@ -161,8 +163,8 @@ public void testRegisteredIdTag() { new AuthorizeRequest().withIdTag(REGISTERED_OCPP_TAG), REGISTERED_CHARGE_BOX_ID); - Assert.assertNotNull(auth); - Assert.assertEquals(AuthorizationStatus.ACCEPTED, auth.getIdTagInfo().getStatus()); + Assertions.assertNotNull(auth); + Assertions.assertEquals(AuthorizationStatus.ACCEPTED, auth.getIdTagInfo().getStatus()); } @Test @@ -173,8 +175,8 @@ public void testUnregisteredIdTag() { new AuthorizeRequest().withIdTag(getRandomString()), REGISTERED_CHARGE_BOX_ID); - Assert.assertNotNull(auth); - Assert.assertEquals(AuthorizationStatus.INVALID, auth.getIdTagInfo().getStatus()); + Assertions.assertNotNull(auth); + Assertions.assertEquals(AuthorizationStatus.INVALID, auth.getIdTagInfo().getStatus()); } @Test @@ -190,9 +192,9 @@ public void testInTransactionStatusOfIdTag() { REGISTERED_CHARGE_BOX_ID ); - Assert.assertNotNull(start); - Assert.assertTrue(start.getTransactionId() > 0); - Assert.assertTrue(__DatabasePreparer__.getOcppTagRecord(REGISTERED_OCPP_TAG).getInTransaction()); + Assertions.assertNotNull(start); + Assertions.assertTrue(start.getTransactionId() > 0); + Assertions.assertTrue(__DatabasePreparer__.getOcppTagRecord(REGISTERED_OCPP_TAG).getInTransaction()); StopTransactionResponse stop = client.stopTransaction( new StopTransactionRequest() @@ -203,8 +205,8 @@ public void testInTransactionStatusOfIdTag() { REGISTERED_CHARGE_BOX_ID ); - Assert.assertNotNull(stop); - Assert.assertFalse(__DatabasePreparer__.getOcppTagRecord(REGISTERED_OCPP_TAG).getInTransaction()); + Assertions.assertNotNull(stop); + Assertions.assertFalse(__DatabasePreparer__.getOcppTagRecord(REGISTERED_OCPP_TAG).getInTransaction()); } /** @@ -219,7 +221,7 @@ public void testAuthorizationStatus() { AuthorizeResponse auth1 = client.authorize( new AuthorizeRequest().withIdTag(REGISTERED_OCPP_TAG), REGISTERED_CHARGE_BOX_ID); - Assert.assertEquals(AuthorizationStatus.ACCEPTED, auth1.getIdTagInfo().getStatus()); + Assertions.assertEquals(AuthorizationStatus.ACCEPTED, auth1.getIdTagInfo().getStatus()); StartTransactionResponse start1 = client.startTransaction( new StartTransactionRequest() @@ -228,20 +230,20 @@ public void testAuthorizationStatus() { .withTimestamp(DateTime.now()) .withMeterStart(0), REGISTERED_CHARGE_BOX_ID); - Assert.assertTrue(start1.getTransactionId() > 0); - Assert.assertEquals(AuthorizationStatus.ACCEPTED, start1.getIdTagInfo().getStatus()); + Assertions.assertTrue(start1.getTransactionId() > 0); + Assertions.assertEquals(AuthorizationStatus.ACCEPTED, start1.getIdTagInfo().getStatus()); AuthorizeResponse auth1Retry = client.authorize( new AuthorizeRequest().withIdTag(REGISTERED_OCPP_TAG), REGISTERED_CHARGE_BOX_ID); - Assert.assertEquals(AuthorizationStatus.ACCEPTED, auth1Retry.getIdTagInfo().getStatus()); + Assertions.assertEquals(AuthorizationStatus.ACCEPTED, auth1Retry.getIdTagInfo().getStatus()); } { AuthorizeResponse auth2 = client.authorize( new AuthorizeRequest().withIdTag(REGISTERED_OCPP_TAG), REGISTERED_CHARGE_BOX_ID_2); - Assert.assertEquals(AuthorizationStatus.ACCEPTED, auth2.getIdTagInfo().getStatus()); + Assertions.assertEquals(AuthorizationStatus.ACCEPTED, auth2.getIdTagInfo().getStatus()); StartTransactionResponse start2 = client.startTransaction( new StartTransactionRequest() @@ -250,13 +252,13 @@ public void testAuthorizationStatus() { .withTimestamp(DateTime.now()) .withMeterStart(0), REGISTERED_CHARGE_BOX_ID_2); - Assert.assertTrue(start2.getTransactionId() > 0); - Assert.assertEquals(AuthorizationStatus.CONCURRENT_TX, start2.getIdTagInfo().getStatus()); + Assertions.assertTrue(start2.getTransactionId() > 0); + Assertions.assertEquals(AuthorizationStatus.CONCURRENT_TX, start2.getIdTagInfo().getStatus()); AuthorizeResponse auth2Retry = client.authorize( new AuthorizeRequest().withIdTag(REGISTERED_OCPP_TAG), REGISTERED_CHARGE_BOX_ID_2); - Assert.assertEquals(AuthorizationStatus.ACCEPTED, auth2Retry.getIdTagInfo().getStatus()); + Assertions.assertEquals(AuthorizationStatus.ACCEPTED, auth2Retry.getIdTagInfo().getStatus()); } } @@ -282,13 +284,13 @@ public void testStatusNotification() { .withTimestamp(DateTime.now()), REGISTERED_CHARGE_BOX_ID ); - Assert.assertNotNull(status); + Assertions.assertNotNull(status); } List connectorStatusList = __DatabasePreparer__.getChargePointConnectorStatus(); for (ConnectorStatus connectorStatus : connectorStatusList) { - Assert.assertEquals(chargePointStatus.value(), connectorStatus.getStatus()); - Assert.assertEquals(ChargePointErrorCode.NO_ERROR.value(), connectorStatus.getErrorCode()); + Assertions.assertEquals(chargePointStatus.value(), connectorStatus.getStatus()); + Assertions.assertEquals(ChargePointErrorCode.NO_ERROR.value(), connectorStatus.getErrorCode()); } } @@ -306,17 +308,17 @@ public void testStatusNotification() { .withTimestamp(DateTime.now()), REGISTERED_CHARGE_BOX_ID ); - Assert.assertNotNull(statusConnectorError); + Assertions.assertNotNull(statusConnectorError); List connectorStatusList = __DatabasePreparer__.getChargePointConnectorStatus(); for (ConnectorStatus connectorStatus : connectorStatusList) { if (connectorStatus.getConnectorId() == faultyConnectorId) { - Assert.assertEquals(ChargePointStatus.FAULTED.value(), connectorStatus.getStatus()); - Assert.assertEquals(ChargePointErrorCode.HIGH_TEMPERATURE.value(), connectorStatus.getErrorCode()); + Assertions.assertEquals(ChargePointStatus.FAULTED.value(), connectorStatus.getStatus()); + Assertions.assertEquals(ChargePointErrorCode.HIGH_TEMPERATURE.value(), connectorStatus.getErrorCode()); } else { - Assert.assertNotEquals(ChargePointStatus.FAULTED.value(), connectorStatus.getStatus()); - Assert.assertNotEquals(ChargePointErrorCode.HIGH_TEMPERATURE.value(), connectorStatus.getErrorCode()); + Assertions.assertNotEquals(ChargePointStatus.FAULTED.value(), connectorStatus.getStatus()); + Assertions.assertNotEquals(ChargePointErrorCode.HIGH_TEMPERATURE.value(), connectorStatus.getErrorCode()); } } } @@ -351,20 +353,20 @@ public void testReservation() { .withReservationId(nonExistingReservationId), REGISTERED_CHARGE_BOX_ID ); - Assert.assertNotNull(startInvalid); + Assertions.assertNotNull(startInvalid); // validate that the transaction is written to db, even though reservation was invalid List transactions = __DatabasePreparer__.getTransactions(); - Assert.assertEquals(1, transactions.size()); - Assert.assertEquals(startInvalid.getTransactionId(), transactions.get(0).getId()); + Assertions.assertEquals(1, transactions.size()); + Assertions.assertEquals(startInvalid.getTransactionId(), transactions.get(0).getId()); // make sure that this invalid reservation had no side effects { List reservations = __DatabasePreparer__.getReservations(); - Assert.assertEquals(1, reservations.size()); + Assertions.assertEquals(1, reservations.size()); Reservation res = reservations.get(0); - Assert.assertEquals(reservationId, res.getId()); - Assert.assertEquals(ReservationStatus.ACCEPTED.value(), res.getStatus()); + Assertions.assertEquals(reservationId, res.getId()); + Assertions.assertEquals(ReservationStatus.ACCEPTED.value(), res.getStatus()); } // ------------------------------------------------------------------------- @@ -380,14 +382,14 @@ public void testReservation() { .withReservationId(reservationId), REGISTERED_CHARGE_BOX_ID ); - Assert.assertNotNull(startWrongTag); + Assertions.assertNotNull(startWrongTag); { List reservations = __DatabasePreparer__.getReservations(); - Assert.assertEquals(1, reservations.size()); + Assertions.assertEquals(1, reservations.size()); Reservation res = reservations.get(0); - Assert.assertEquals(ReservationStatus.ACCEPTED.value(), res.getStatus()); - Assert.assertNull(res.getTransactionId()); + Assertions.assertEquals(ReservationStatus.ACCEPTED.value(), res.getStatus()); + Assertions.assertNull(res.getTransactionId()); } // ------------------------------------------------------------------------- @@ -403,15 +405,15 @@ public void testReservation() { .withReservationId(reservationId), REGISTERED_CHARGE_BOX_ID ); - Assert.assertNotNull(startValidId); + Assertions.assertNotNull(startValidId); Integer transactionIdValid = startValidId.getTransactionId(); { List reservations = __DatabasePreparer__.getReservations(); - Assert.assertEquals(reservations.size(), 1); + Assertions.assertEquals(reservations.size(), 1); Reservation res = reservations.get(0); - Assert.assertEquals(ReservationStatus.USED.value(), res.getStatus()); - Assert.assertEquals(transactionIdValid, res.getTransactionId()); + Assertions.assertEquals(ReservationStatus.USED.value(), res.getStatus()); + Assertions.assertEquals(transactionIdValid, res.getTransactionId()); } // ------------------------------------------------------------------------- @@ -427,14 +429,14 @@ public void testReservation() { .withReservationId(reservationId), REGISTERED_CHARGE_BOX_ID ); - Assert.assertNotNull(startValidIdUsedTwice); + Assertions.assertNotNull(startValidIdUsedTwice); { List reservations = __DatabasePreparer__.getReservations(); - Assert.assertEquals(reservations.size(), 1); + Assertions.assertEquals(reservations.size(), 1); Reservation res = reservations.get(0); - Assert.assertEquals(ReservationStatus.USED.value(), res.getStatus()); - Assert.assertEquals(transactionIdValid, res.getTransactionId()); + Assertions.assertEquals(ReservationStatus.USED.value(), res.getStatus()); + Assertions.assertEquals(transactionIdValid, res.getTransactionId()); } } @@ -471,7 +473,7 @@ private void testBody(List meterValues, List transaction new HeartbeatRequest(), REGISTERED_CHARGE_BOX_ID ); - Assert.assertNotNull(heartbeat); + Assertions.assertNotNull(heartbeat); // Auth AuthorizeResponse auth = client.authorize( @@ -479,8 +481,8 @@ private void testBody(List meterValues, List transaction REGISTERED_CHARGE_BOX_ID ); // Simple request, not much done here - Assert.assertNotNull(auth); - Assert.assertEquals(AuthorizationStatus.ACCEPTED, auth.getIdTagInfo().getStatus()); + Assertions.assertNotNull(auth); + Assertions.assertEquals(AuthorizationStatus.ACCEPTED, auth.getIdTagInfo().getStatus()); // startTransaction @@ -493,21 +495,21 @@ private void testBody(List meterValues, List transaction .withMeterStart(0), REGISTERED_CHARGE_BOX_ID ); - Assert.assertNotNull(start); + Assertions.assertNotNull(start); int transactionID = start.getTransactionId(); List allTransactions = __DatabasePreparer__.getTransactionRecords(); - Assert.assertEquals(1, allTransactions.size()); + Assertions.assertEquals(1, allTransactions.size()); { TransactionRecord t = allTransactions.get(0); - Assert.assertEquals(startTimeStamp, t.getStartTimestamp()); - Assert.assertEquals(0, Integer.parseInt(t.getStartValue())); + Assertions.assertEquals(startTimeStamp, t.getStartTimestamp()); + Assertions.assertEquals(0, Integer.parseInt(t.getStartValue())); - Assert.assertNull(t.getStopTimestamp()); - Assert.assertNull(t.getStopReason()); - Assert.assertNull(t.getStopValue()); + Assertions.assertNull(t.getStopTimestamp()); + Assertions.assertNull(t.getStopReason()); + Assertions.assertNull(t.getStopValue()); } // status @@ -520,7 +522,7 @@ private void testBody(List meterValues, List transaction REGISTERED_CHARGE_BOX_ID ); - Assert.assertNotNull(statusStart); + Assertions.assertNotNull(statusStart); // send meterValues if (meterValues != null) { @@ -531,7 +533,7 @@ private void testBody(List meterValues, List transaction .withMeterValue(meterValues), REGISTERED_CHARGE_BOX_ID ); - Assert.assertNotNull(meter); + Assertions.assertNotNull(meter); checkMeterValues(meterValues, transactionID); } @@ -549,12 +551,12 @@ private void testBody(List meterValues, List transaction ); { - Assert.assertNotNull(stop); + Assertions.assertNotNull(stop); List transactionsStop = __DatabasePreparer__.getTransactionRecords(); - Assert.assertEquals(1, transactionsStop.size()); + Assertions.assertEquals(1, transactionsStop.size()); TransactionRecord t = transactionsStop.get(0); - Assert.assertEquals(stopTimeStamp, t.getStopTimestamp()); - Assert.assertEquals(stopValue, Integer.parseInt(t.getStopValue())); + Assertions.assertEquals(stopTimeStamp, t.getStopTimestamp()); + Assertions.assertEquals(stopValue, Integer.parseInt(t.getStopValue())); if (transactionData != null) { checkMeterValues(transactionData, transactionID); @@ -570,7 +572,7 @@ private void testBody(List meterValues, List transaction .withTimestamp(DateTime.now()), REGISTERED_CHARGE_BOX_ID ); - Assert.assertNotNull(statusStop); + Assertions.assertNotNull(statusStop); } private void initStationWithBootNotification(CentralSystemService client) { @@ -579,8 +581,8 @@ private void initStationWithBootNotification(CentralSystemService client) { .withChargePointVendor(getRandomString()) .withChargePointModel(getRandomString()), REGISTERED_CHARGE_BOX_ID); - Assert.assertNotNull(boot); - Assert.assertEquals(RegistrationStatus.ACCEPTED, boot.getStatus()); + Assertions.assertNotNull(boot); + Assertions.assertEquals(RegistrationStatus.ACCEPTED, boot.getStatus()); } private void initConnectorsWithStatusNotification(CentralSystemService client) { @@ -593,7 +595,7 @@ private void initConnectorsWithStatusNotification(CentralSystemService client) { .withTimestamp(DateTime.now()), REGISTERED_CHARGE_BOX_ID ); - Assert.assertNotNull(statusBoot); + Assertions.assertNotNull(statusBoot); } } @@ -603,7 +605,7 @@ private void checkMeterValues(List meterValues, int transactionPk) { // iterate over all created meter values for (MeterValue meterValue : meterValues) { List sampledValues = meterValue.getSampledValue(); - Assert.assertFalse(sampledValues.isEmpty()); + Assertions.assertFalse(sampledValues.isEmpty()); boolean thisValueFound = false; // and check, if it can be found in the DB for (TransactionDetails.MeterValues values : details.getValues()) { @@ -612,7 +614,7 @@ private void checkMeterValues(List meterValues, int transactionPk) { break; } } - Assert.assertTrue(thisValueFound); + Assertions.assertTrue(thisValueFound); } } diff --git a/src/test/java/de/rwth/idsg/steve/StressTest.java b/src/test/java/de/rwth/idsg/steve/StressTest.java index ab9f29795..74f7d5c03 100644 --- a/src/test/java/de/rwth/idsg/steve/StressTest.java +++ b/src/test/java/de/rwth/idsg/steve/StressTest.java @@ -22,7 +22,7 @@ import ocpp.cs._2015._10.MeterValue; import ocpp.cs._2015._10.SampledValue; import org.joda.time.DateTime; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import java.util.ArrayList; import java.util.Collections; @@ -50,8 +50,8 @@ public abstract class StressTest { protected static final int CONNECTOR_COUNT_PER_CHARGE_BOX = 25; protected void attack() throws Exception { - Assert.assertEquals(ApplicationProfile.TEST, SteveConfiguration.CONFIG.getProfile()); - Assert.assertTrue(SteveConfiguration.CONFIG.getOcpp().isAutoRegisterUnknownStations()); + Assertions.assertEquals(ApplicationProfile.TEST, SteveConfiguration.CONFIG.getProfile()); + Assertions.assertTrue(SteveConfiguration.CONFIG.getOcpp().isAutoRegisterUnknownStations()); __DatabasePreparer__.prepare(); diff --git a/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java b/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java index e4c8638fb..82f303e26 100644 --- a/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java +++ b/src/test/java/de/rwth/idsg/steve/StressTestJsonOCPP16.java @@ -40,7 +40,7 @@ import ocpp.cs._2015._10.StopTransactionRequest; import ocpp.cs._2015._10.StopTransactionResponse; import org.joda.time.DateTime; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import java.util.List; import java.util.concurrent.ThreadLocalRandom; @@ -86,8 +86,8 @@ public void beforeRepeat() { .withChargePointVendor(getRandomString()) .withChargePointModel(getRandomString()), BootNotificationResponse.class, - bootResponse -> Assert.assertEquals(RegistrationStatus.ACCEPTED, bootResponse.getStatus()), - error -> Assert.fail() + bootResponse -> Assertions.assertEquals(RegistrationStatus.ACCEPTED, bootResponse.getStatus()), + error -> Assertions.fail() ); } @@ -104,8 +104,8 @@ public void toRepeat() { chargePoint.prepare( new HeartbeatRequest(), HeartbeatResponse.class, - Assert::assertNotNull, - error -> Assert.fail() + Assertions::assertNotNull, + error -> Assertions.fail() ); for (int i = 0; i <= CONNECTOR_COUNT_PER_CHARGE_BOX; i++) { @@ -116,16 +116,16 @@ public void toRepeat() { .withConnectorId(i) .withTimestamp(DateTime.now()), StatusNotificationResponse.class, - Assert::assertNotNull, - error -> Assert.fail() + Assertions::assertNotNull, + error -> Assertions.fail() ); } chargePoint.prepare( new AuthorizeRequest().withIdTag(idTag), AuthorizeResponse.class, - response -> Assert.assertNotEquals(AuthorizationStatus.ACCEPTED, response.getIdTagInfo().getStatus()), - error -> Assert.fail() + response -> Assertions.assertNotEquals(AuthorizationStatus.ACCEPTED, response.getIdTagInfo().getStatus()), + error -> Assertions.fail() ); final AtomicInteger transactionId = new AtomicInteger(-1); @@ -138,10 +138,10 @@ public void toRepeat() { .withMeterStart(transactionStart), StartTransactionResponse.class, response -> { - Assert.assertNotNull(response); + Assertions.assertNotNull(response); transactionId.set(response.getTransactionId()); }, - error -> Assert.fail() + error -> Assertions.fail() ); // wait for StartTransactionResponse to arrive, since we need the transactionId from now on @@ -154,8 +154,8 @@ public void toRepeat() { .withConnectorId(connectorId) .withTimestamp(DateTime.now()), StatusNotificationResponse.class, - Assert::assertNotNull, - error -> Assert.fail() + Assertions::assertNotNull, + error -> Assertions.fail() ); chargePoint.prepare( @@ -164,8 +164,8 @@ public void toRepeat() { .withTransactionId(transactionId.get()) .withMeterValue(getMeterValues(transactionStart, transactionStop)), MeterValuesResponse.class, - Assert::assertNotNull, - error -> Assert.fail() + Assertions::assertNotNull, + error -> Assertions.fail() ); chargePoint.prepare( @@ -175,8 +175,8 @@ public void toRepeat() { .withIdTag(idTag) .withMeterStop(transactionStop), StopTransactionResponse.class, - Assert::assertNotNull, - error -> Assert.fail() + Assertions::assertNotNull, + error -> Assertions.fail() ); chargePoint.prepare( @@ -186,8 +186,8 @@ public void toRepeat() { .withConnectorId(connectorId) .withTimestamp(DateTime.now()), StatusNotificationResponse.class, - Assert::assertNotNull, - error -> Assert.fail() + Assertions::assertNotNull, + error -> Assertions.fail() ); chargePoint.process(); diff --git a/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java b/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java index d94d95131..6d8ef2382 100644 --- a/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java +++ b/src/test/java/de/rwth/idsg/steve/StressTestSoapOCPP16.java @@ -39,7 +39,7 @@ import ocpp.cs._2015._10.StopTransactionRequest; import ocpp.cs._2015._10.StopTransactionResponse; import org.joda.time.DateTime; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import java.util.List; import java.util.concurrent.ThreadLocalRandom; @@ -84,7 +84,7 @@ public void beforeRepeat() { .withChargePointVendor(getRandomString()) .withChargePointModel(getRandomString()), chargeBoxId); - Assert.assertEquals(RegistrationStatus.ACCEPTED, boot.getStatus()); + Assertions.assertEquals(RegistrationStatus.ACCEPTED, boot.getStatus()); } @Override @@ -103,7 +103,7 @@ public void toRepeat() { new HeartbeatRequest(), chargeBoxId ); - Assert.assertNotNull(heartbeat); + Assertions.assertNotNull(heartbeat); for (int i = 0; i <= CONNECTOR_COUNT_PER_CHARGE_BOX; i++) { StatusNotificationResponse status = client.statusNotification( @@ -114,14 +114,14 @@ public void toRepeat() { .withTimestamp(DateTime.now()), chargeBoxId ); - Assert.assertNotNull(status); + Assertions.assertNotNull(status); } AuthorizeResponse auth = client.authorize( new AuthorizeRequest().withIdTag(idTag), chargeBoxId ); - Assert.assertNotEquals(AuthorizationStatus.ACCEPTED, auth.getIdTagInfo().getStatus()); + Assertions.assertNotEquals(AuthorizationStatus.ACCEPTED, auth.getIdTagInfo().getStatus()); StartTransactionResponse start = client.startTransaction( new StartTransactionRequest() @@ -131,7 +131,7 @@ public void toRepeat() { .withMeterStart(transactionStart), chargeBoxId ); - Assert.assertNotNull(start); + Assertions.assertNotNull(start); StatusNotificationResponse statusStart = client.statusNotification( new StatusNotificationRequest() @@ -141,7 +141,7 @@ public void toRepeat() { .withTimestamp(DateTime.now()), chargeBoxId ); - Assert.assertNotNull(statusStart); + Assertions.assertNotNull(statusStart); MeterValuesResponse meter = client.meterValues( new MeterValuesRequest() @@ -150,7 +150,7 @@ public void toRepeat() { .withMeterValue(getMeterValues(transactionStart, transactionStop)), chargeBoxId ); - Assert.assertNotNull(meter); + Assertions.assertNotNull(meter); StopTransactionResponse stop = client.stopTransaction( new StopTransactionRequest() @@ -160,7 +160,7 @@ public void toRepeat() { .withMeterStop(transactionStop), chargeBoxId ); - Assert.assertNotNull(stop); + Assertions.assertNotNull(stop); StatusNotificationResponse statusStop = client.statusNotification( new StatusNotificationRequest() @@ -170,7 +170,7 @@ public void toRepeat() { .withTimestamp(DateTime.now()), chargeBoxId ); - Assert.assertNotNull(statusStop); + Assertions.assertNotNull(statusStop); } @Override diff --git a/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java b/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java index 02d8b6a92..c3cd7d6b3 100644 --- a/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java +++ b/src/test/java/de/rwth/idsg/steve/TypeStoreTest.java @@ -23,15 +23,13 @@ import de.rwth.idsg.steve.ocpp.ws.ocpp12.Ocpp12TypeStore; import de.rwth.idsg.steve.ocpp.ws.ocpp15.Ocpp15TypeStore; import de.rwth.idsg.steve.ocpp.ws.ocpp16.Ocpp16TypeStore; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Sevket Goekay * @since 10.03.2018 */ -@Ignore public class TypeStoreTest { @Test @@ -39,12 +37,12 @@ public void ocpp12Test() { Ocpp12TypeStore typeStore = Ocpp12TypeStore.INSTANCE; ActionResponsePair actionResponse = typeStore.findActionResponse(new ocpp.cp._2010._08.ResetRequest()); - Assert.assertNotNull(actionResponse); - Assert.assertEquals("Reset", actionResponse.getAction()); - Assert.assertEquals(ocpp.cp._2010._08.ResetResponse.class, actionResponse.getResponseClass()); + Assertions.assertNotNull(actionResponse); + Assertions.assertEquals("Reset", actionResponse.getAction()); + Assertions.assertEquals(ocpp.cp._2010._08.ResetResponse.class, actionResponse.getResponseClass()); Class requestClass = typeStore.findRequestClass("BootNotification"); - Assert.assertSame(ocpp.cs._2010._08.BootNotificationRequest.class, requestClass); + Assertions.assertSame(ocpp.cs._2010._08.BootNotificationRequest.class, requestClass); } @Test @@ -52,12 +50,12 @@ public void ocpp15Test() { Ocpp15TypeStore typeStore = Ocpp15TypeStore.INSTANCE; ActionResponsePair actionResponse = typeStore.findActionResponse(new ocpp.cp._2012._06.UpdateFirmwareRequest()); - Assert.assertNotNull(actionResponse); - Assert.assertEquals("UpdateFirmware", actionResponse.getAction()); - Assert.assertEquals(ocpp.cp._2012._06.UpdateFirmwareResponse.class, actionResponse.getResponseClass()); + Assertions.assertNotNull(actionResponse); + Assertions.assertEquals("UpdateFirmware", actionResponse.getAction()); + Assertions.assertEquals(ocpp.cp._2012._06.UpdateFirmwareResponse.class, actionResponse.getResponseClass()); Class requestClass = typeStore.findRequestClass("BootNotification"); - Assert.assertSame(ocpp.cs._2012._06.BootNotificationRequest.class, requestClass); + Assertions.assertSame(ocpp.cs._2012._06.BootNotificationRequest.class, requestClass); } @Test @@ -65,11 +63,11 @@ public void ocpp16Test() { Ocpp16TypeStore typeStore = Ocpp16TypeStore.INSTANCE; ActionResponsePair actionResponse = typeStore.findActionResponse(new ocpp.cp._2015._10.UpdateFirmwareRequest()); - Assert.assertNotNull(actionResponse); - Assert.assertEquals("UpdateFirmware", actionResponse.getAction()); - Assert.assertEquals(ocpp.cp._2015._10.UpdateFirmwareResponse.class, actionResponse.getResponseClass()); + Assertions.assertNotNull(actionResponse); + Assertions.assertEquals("UpdateFirmware", actionResponse.getAction()); + Assertions.assertEquals(ocpp.cp._2015._10.UpdateFirmwareResponse.class, actionResponse.getResponseClass()); Class requestClass = typeStore.findRequestClass("BootNotification"); - Assert.assertSame(ocpp.cs._2015._10.BootNotificationRequest.class, requestClass); + Assertions.assertSame(ocpp.cs._2015._10.BootNotificationRequest.class, requestClass); } } diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue72.java b/src/test/java/de/rwth/idsg/steve/issues/Issue72.java index 4e4e1c169..5cf29fe27 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue72.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue72.java @@ -36,7 +36,7 @@ import ocpp.cs._2015._10.StopTransactionResponse; import ocpp.cs._2015._10.UnitOfMeasure; import org.joda.time.DateTime; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import static de.rwth.idsg.steve.utils.Helpers.getForOcpp16; import static de.rwth.idsg.steve.utils.Helpers.getPath; @@ -73,7 +73,7 @@ protected void attackInternal() throws Exception { .withChargePointVendor(getRandomString()) .withChargePointModel(getRandomString()), chargeBoxId); - Assert.assertEquals(RegistrationStatus.ACCEPTED, boot.getStatus()); + Assertions.assertEquals(RegistrationStatus.ACCEPTED, boot.getStatus()); StartTransactionResponse start = getForOcpp16(path).startTransaction( new StartTransactionRequest() @@ -83,7 +83,7 @@ protected void attackInternal() throws Exception { .withMeterStart(meterStart), chargeBoxId ); - Assert.assertNotNull(start); + Assertions.assertNotNull(start); int transactionId = start.getTransactionId(); @@ -111,7 +111,7 @@ public void toRepeat() { .withUnit(UnitOfMeasure.WH))), chargeBoxId ); - Assert.assertNotNull(mvr); + Assertions.assertNotNull(mvr); StopTransactionResponse stop = threadLocalClient.get().stopTransaction( new StopTransactionRequest() @@ -121,7 +121,7 @@ public void toRepeat() { .withMeterStop(meterStop), chargeBoxId ); - Assert.assertNotNull(stop); + Assertions.assertNotNull(stop); } @Override diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java b/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java index 5815d981f..f8c48191e 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue72LowLevelSoap.java @@ -43,7 +43,7 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.joda.time.DateTime; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import static de.rwth.idsg.steve.utils.Helpers.getForOcpp16; import static de.rwth.idsg.steve.utils.Helpers.getPath; @@ -80,7 +80,7 @@ protected void attackInternal() throws Exception { .withChargePointVendor(getRandomString()) .withChargePointModel(getRandomString()), chargeBoxId); - Assert.assertEquals(RegistrationStatus.ACCEPTED, boot.getStatus()); + Assertions.assertEquals(RegistrationStatus.ACCEPTED, boot.getStatus()); StartTransactionResponse start = getForOcpp16(path).startTransaction( new StartTransactionRequest() @@ -90,7 +90,7 @@ protected void attackInternal() throws Exception { .withMeterStart(meterStart), chargeBoxId ); - Assert.assertNotNull(start); + Assertions.assertNotNull(start); int transactionId = start.getTransactionId(); @@ -130,7 +130,7 @@ public void toRepeat() { .withUnit(UnitOfMeasure.WH))), chargeBoxId ); - Assert.assertNotNull(mvr); + Assertions.assertNotNull(mvr); try { httpClient.execute(req, httpResponse -> { diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java b/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java index 043033d5c..6e655d02f 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java @@ -33,7 +33,7 @@ import ocpp.cs._2015._10.StartTransactionRequest; import ocpp.cs._2015._10.StartTransactionResponse; import org.joda.time.DateTime; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import java.util.List; @@ -53,8 +53,8 @@ public class Issue73Fix { private static final String path = getPath(); public static void main(String[] args) throws Exception { - Assert.assertEquals(ApplicationProfile.TEST, SteveConfiguration.CONFIG.getProfile()); - Assert.assertTrue(SteveConfiguration.CONFIG.getOcpp().isAutoRegisterUnknownStations()); + Assertions.assertEquals(ApplicationProfile.TEST, SteveConfiguration.CONFIG.getProfile()); + Assertions.assertTrue(SteveConfiguration.CONFIG.getOcpp().isAutoRegisterUnknownStations()); __DatabasePreparer__.prepare(); @@ -95,15 +95,15 @@ private static void sendBoot(CentralSystemService client, List chargeBox .withChargePointVendor(getRandomString()) .withChargePointModel(getRandomString()), chargeBoxId); - Assert.assertNotNull(boot); - Assert.assertEquals(RegistrationStatus.ACCEPTED, boot.getStatus()); + Assertions.assertNotNull(boot); + Assertions.assertEquals(RegistrationStatus.ACCEPTED, boot.getStatus()); } } private static void sendAuth(CentralSystemService client, String chargeBoxId, AuthorizationStatus expected) { AuthorizeResponse auth = client.authorize(new AuthorizeRequest().withIdTag(REGISTERED_OCPP_TAG), chargeBoxId); - Assert.assertNotNull(auth); - Assert.assertEquals(expected, auth.getIdTagInfo().getStatus()); + Assertions.assertNotNull(auth); + Assertions.assertEquals(expected, auth.getIdTagInfo().getStatus()); } private static void sendStartTx(CentralSystemService client, String chargeBoxId) { @@ -115,8 +115,8 @@ private static void sendStartTx(CentralSystemService client, String chargeBoxId) .withMeterStart(0), chargeBoxId ); - Assert.assertNotNull(start); - Assert.assertTrue(start.getTransactionId() > 0); - Assert.assertTrue(__DatabasePreparer__.getOcppTagRecord(REGISTERED_OCPP_TAG).getInTransaction()); + Assertions.assertNotNull(start); + Assertions.assertTrue(start.getTransactionId() > 0); + Assertions.assertTrue(__DatabasePreparer__.getOcppTagRecord(REGISTERED_OCPP_TAG).getInTransaction()); } } diff --git a/src/test/java/de/rwth/idsg/steve/issues/Issue81.java b/src/test/java/de/rwth/idsg/steve/issues/Issue81.java index c97e64105..a35ff449c 100644 --- a/src/test/java/de/rwth/idsg/steve/issues/Issue81.java +++ b/src/test/java/de/rwth/idsg/steve/issues/Issue81.java @@ -28,7 +28,7 @@ import ocpp.cs._2015._10.StartTransactionRequest; import ocpp.cs._2015._10.StartTransactionResponse; import org.joda.time.DateTime; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import java.util.concurrent.ThreadLocalRandom; @@ -66,7 +66,7 @@ public void beforeRepeat() { .withChargePointVendor(getRandomString()) .withChargePointModel(getRandomString()), chargeBoxId.get()); - Assert.assertEquals(RegistrationStatus.ACCEPTED, boot.getStatus()); + Assertions.assertEquals(RegistrationStatus.ACCEPTED, boot.getStatus()); StartTransactionRequest req = new StartTransactionRequest() .withConnectorId(ThreadLocalRandom.current().nextInt()) @@ -82,7 +82,7 @@ public void beforeRepeat() { @Override public void toRepeat() { Integer t2 = sendStartTx(client.get(), txRequest.get(), chargeBoxId.get()); - Assert.assertEquals(txId.get(), t2); + Assertions.assertEquals(txId.get(), t2); } @Override @@ -98,7 +98,7 @@ public void afterRepeat() { private static Integer sendStartTx(CentralSystemService client, StartTransactionRequest req, String chargeBoxId) { StartTransactionResponse start = client.startTransaction(req, chargeBoxId); - Assert.assertNotNull(start); + Assertions.assertNotNull(start); return start.getTransactionId(); } } \ No newline at end of file diff --git a/src/test/java/de/rwth/idsg/steve/utils/StringUtilsTest.java b/src/test/java/de/rwth/idsg/steve/utils/StringUtilsTest.java index 861066d28..47fb25118 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/StringUtilsTest.java +++ b/src/test/java/de/rwth/idsg/steve/utils/StringUtilsTest.java @@ -24,8 +24,8 @@ import de.rwth.idsg.steve.web.dto.ocpp.CancelReservationParams; import de.rwth.idsg.steve.web.dto.ocpp.GetCompositeScheduleParams; import de.rwth.idsg.steve.web.dto.ocpp.MultipleChargePointSelect; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; @@ -41,80 +41,80 @@ public class StringUtilsTest { @Test public void testOperationName_ocpp12andMultiple() { var operationName = StringUtils.getOperationName(new ClearCacheTask(null, new MultipleChargePointSelect())); - Assert.assertEquals("Clear Cache", operationName); + Assertions.assertEquals("Clear Cache", operationName); } @Test public void testOperationName_ocpp15andSingle() { var operationName = StringUtils.getOperationName(new CancelReservationTask(null, new CancelReservationParams(), null)); - Assert.assertEquals("Cancel Reservation", operationName); + Assertions.assertEquals("Cancel Reservation", operationName); } @Test public void testOperationName_ocpp16() { var operationName = StringUtils.getOperationName(new GetCompositeScheduleTask(null, new GetCompositeScheduleParams())); - Assert.assertEquals("Get Composite Schedule", operationName); + Assertions.assertEquals("Get Composite Schedule", operationName); } @Test public void testJoinByComma_inputNull() { String val = StringUtils.joinByComma(null); - Assert.assertNull(val); + Assertions.assertNull(val); } @Test public void testJoinByComma_inputEmpty() { String val = StringUtils.joinByComma(new ArrayList<>()); - Assert.assertNull(val); + Assertions.assertNull(val); } @Test public void testJoinByComma_inputOneElement() { String val = StringUtils.joinByComma(Arrays.asList("hey")); - Assert.assertEquals("hey", val); + Assertions.assertEquals("hey", val); } @Test public void testJoinByComma_inputTwoElements() { String val = StringUtils.joinByComma(Arrays.asList("hey", "ho")); - Assert.assertEquals("hey,ho", val); + Assertions.assertEquals("hey,ho", val); } @Test public void testJoinByComma_inputDuplicateElements() { String val = StringUtils.joinByComma(Arrays.asList("hey", "ho", "hey")); - Assert.assertEquals("hey,ho", val); + Assertions.assertEquals("hey,ho", val); } @Test public void testSplitByComma_inputNull() { List val = StringUtils.splitByComma(null); - Assert.assertNotNull(val); - Assert.assertTrue(val.isEmpty()); + Assertions.assertNotNull(val); + Assertions.assertTrue(val.isEmpty()); } @Test public void testSplitByComma_inputEmpty() { List val = StringUtils.splitByComma(""); - Assert.assertNotNull(val); - Assert.assertTrue(val.isEmpty()); + Assertions.assertNotNull(val); + Assertions.assertTrue(val.isEmpty()); } @Test public void testSplitByComma_inputOneElement() { List val = StringUtils.splitByComma("1one"); - Assert.assertTrue(val.size() == 1); - Assert.assertEquals("1one", val.get(0)); + Assertions.assertTrue(val.size() == 1); + Assertions.assertEquals("1one", val.get(0)); } @Test public void testSplitByComma_inputTwoElements() { List val = StringUtils.splitByComma("1one,2two"); - Assert.assertTrue(val.size() == 2); + Assertions.assertTrue(val.size() == 2); List sortedVal = val.stream().sorted().collect(Collectors.toList()); - Assert.assertEquals("1one", sortedVal.get(0)); - Assert.assertEquals("2two", sortedVal.get(1)); + Assertions.assertEquals("1one", sortedVal.get(0)); + Assertions.assertEquals("2two", sortedVal.get(1)); } } diff --git a/src/test/java/de/rwth/idsg/steve/web/validation/IdTagValidatorTest.java b/src/test/java/de/rwth/idsg/steve/web/validation/IdTagValidatorTest.java index bbec5f6e5..dba19782e 100644 --- a/src/test/java/de/rwth/idsg/steve/web/validation/IdTagValidatorTest.java +++ b/src/test/java/de/rwth/idsg/steve/web/validation/IdTagValidatorTest.java @@ -18,8 +18,9 @@ */ package de.rwth.idsg.steve.web.validation; -import org.junit.Assert; -import org.junit.Test; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Sevket Goekay @@ -31,51 +32,51 @@ public class IdTagValidatorTest { @Test public void testNull() { - Assert.assertTrue(validator.isValid(null, null)); + Assertions.assertTrue(validator.isValid(null, null)); } @Test public void testAllLowercaseLetters() { - Assert.assertTrue(validator.isValid("test", null)); + Assertions.assertTrue(validator.isValid("test", null)); } @Test public void testAllUppercaseLetters() { - Assert.assertTrue(validator.isValid("TEST", null)); + Assertions.assertTrue(validator.isValid("TEST", null)); } @Test public void testMixedCaseLetters() { - Assert.assertTrue(validator.isValid("TesT", null)); - Assert.assertTrue(validator.isValid("tEst", null)); + Assertions.assertTrue(validator.isValid("TesT", null)); + Assertions.assertTrue(validator.isValid("tEst", null)); } @Test public void testLettersAndNumbers() { - Assert.assertTrue(validator.isValid("test12", null)); - Assert.assertTrue(validator.isValid("89test", null)); - Assert.assertTrue(validator.isValid("te9s0t", null)); + Assertions.assertTrue(validator.isValid("test12", null)); + Assertions.assertTrue(validator.isValid("89test", null)); + Assertions.assertTrue(validator.isValid("te9s0t", null)); } @Test public void testDot() { - Assert.assertTrue(validator.isValid(".test", null)); - Assert.assertTrue(validator.isValid("test.", null)); - Assert.assertTrue(validator.isValid("te..st", null)); + Assertions.assertTrue(validator.isValid(".test", null)); + Assertions.assertTrue(validator.isValid("test.", null)); + Assertions.assertTrue(validator.isValid("te..st", null)); } @Test public void testDash() { - Assert.assertTrue(validator.isValid("-test", null)); - Assert.assertTrue(validator.isValid("test-", null)); - Assert.assertTrue(validator.isValid("te--st", null)); + Assertions.assertTrue(validator.isValid("-test", null)); + Assertions.assertTrue(validator.isValid("test-", null)); + Assertions.assertTrue(validator.isValid("te--st", null)); } @Test public void testUnderscore() { - Assert.assertTrue(validator.isValid("_test", null)); - Assert.assertTrue(validator.isValid("test_", null)); - Assert.assertTrue(validator.isValid("te__st", null)); + Assertions.assertTrue(validator.isValid("_test", null)); + Assertions.assertTrue(validator.isValid("test_", null)); + Assertions.assertTrue(validator.isValid("te__st", null)); } /** @@ -83,16 +84,16 @@ public void testUnderscore() { */ @Test public void testColon() { - Assert.assertTrue(validator.isValid(":test", null)); - Assert.assertTrue(validator.isValid("test:", null)); - Assert.assertTrue(validator.isValid("te::st", null)); + Assertions.assertTrue(validator.isValid(":test", null)); + Assertions.assertTrue(validator.isValid("test:", null)); + Assertions.assertTrue(validator.isValid("te::st", null)); - Assert.assertTrue(validator.isValid("VID:00XXXXXXXXXX", null)); + Assertions.assertTrue(validator.isValid("VID:00XXXXXXXXXX", null)); } @Test public void testCombined() { - Assert.assertTrue(validator.isValid("1t.E-S_:t20", null)); + Assertions.assertTrue(validator.isValid("1t.E-S_:t20", null)); } } From 4590cbb511a6ceb85315b2e5030485dffb735467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sat, 5 Mar 2022 00:51:27 +0100 Subject: [PATCH 316/548] add OcppProtocolTest --- pom.xml | 6 ++++++ .../rwth/idsg/steve/ocpp/OcppProtocolTest.java | 16 ++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 src/test/java/de/rwth/idsg/steve/ocpp/OcppProtocolTest.java diff --git a/pom.xml b/pom.xml index fe66dc0f6..225f823a3 100644 --- a/pom.xml +++ b/pom.xml @@ -692,6 +692,12 @@ 5.8.2 test + + org.junit.jupiter + junit-jupiter-params + 5.8.2 + test + diff --git a/src/test/java/de/rwth/idsg/steve/ocpp/OcppProtocolTest.java b/src/test/java/de/rwth/idsg/steve/ocpp/OcppProtocolTest.java new file mode 100644 index 000000000..022b48f1c --- /dev/null +++ b/src/test/java/de/rwth/idsg/steve/ocpp/OcppProtocolTest.java @@ -0,0 +1,16 @@ +package de.rwth.idsg.steve.ocpp; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; + +public class OcppProtocolTest { + + @ParameterizedTest + @EnumSource(OcppProtocol.class) + public void testFromCompositeValue(OcppProtocol input) { + String toTest = input.getCompositeValue(); + OcppProtocol inputBack = OcppProtocol.fromCompositeValue(toTest); + Assertions.assertEquals(input, inputBack); + } +} From 11a646a97f6ae0d599f804880ae9623afac5e6c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Mar 2022 23:52:05 +0000 Subject: [PATCH 317/548] Bump cxf.version from 3.5.0 to 3.5.1 Bumps `cxf.version` from 3.5.0 to 3.5.1. Updates `cxf-rt-frontend-jaxws` from 3.5.0 to 3.5.1 Updates `cxf-rt-transports-http` from 3.5.0 to 3.5.1 Updates `cxf-rt-transports-http-hc` from 3.5.0 to 3.5.1 Updates `cxf-rt-features-logging` from 3.5.0 to 3.5.1 --- updated-dependencies: - dependency-name: org.apache.cxf:cxf-rt-frontend-jaxws dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-transports-http dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-transports-http-hc dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-features-logging dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 225f823a3..d7840fb4d 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ UTF-8 3.16.4 - 3.5.0 + 3.5.1 5.3.16 5.6.2 8.0.28 From 6defb81dc926655c4cd222599031c85adfe11cbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sat, 5 Mar 2022 14:00:06 +0100 Subject: [PATCH 318/548] add missing license to OcppProtocolTest --- .../rwth/idsg/steve/ocpp/OcppProtocolTest.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/test/java/de/rwth/idsg/steve/ocpp/OcppProtocolTest.java b/src/test/java/de/rwth/idsg/steve/ocpp/OcppProtocolTest.java index 022b48f1c..fd9832dd5 100644 --- a/src/test/java/de/rwth/idsg/steve/ocpp/OcppProtocolTest.java +++ b/src/test/java/de/rwth/idsg/steve/ocpp/OcppProtocolTest.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.ocpp; import org.junit.jupiter.api.Assertions; From 053dfc024a387bdffed8d330d64d7bdac35431e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sat, 5 Mar 2022 14:40:40 +0100 Subject: [PATCH 319/548] improve websocket handshake logic --- .../steve/config/WebSocketConfiguration.java | 30 ++++------- .../ocpp/ws/AbstractWebSocketEndpoint.java | 9 +++- ...ava => OcppWebSocketHandshakeHandler.java} | 50 ++++++++++++++----- .../rwth/idsg/steve/ApplicationJsonTest.java | 30 +++++++++++ .../idsg/steve/OperationalTestSoapOCPP16.java | 1 - .../idsg/steve/utils/OcppJsonChargePoint.java | 6 ++- 6 files changed, 88 insertions(+), 38 deletions(-) rename src/main/java/de/rwth/idsg/steve/ocpp/ws/{OcppWebSocketUpgrader.java => OcppWebSocketHandshakeHandler.java} (61%) diff --git a/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java index 814c71712..52badce60 100644 --- a/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java @@ -19,8 +19,7 @@ package de.rwth.idsg.steve.config; import com.google.common.collect.Lists; -import de.rwth.idsg.steve.ocpp.ws.AbstractWebSocketEndpoint; -import de.rwth.idsg.steve.ocpp.ws.OcppWebSocketUpgrader; +import de.rwth.idsg.steve.ocpp.ws.OcppWebSocketHandshakeHandler; import de.rwth.idsg.steve.ocpp.ws.ocpp12.Ocpp12WebSocketEndpoint; import de.rwth.idsg.steve.ocpp.ws.ocpp15.Ocpp15WebSocketEndpoint; import de.rwth.idsg.steve.ocpp.ws.ocpp16.Ocpp16WebSocketEndpoint; @@ -34,7 +33,6 @@ import org.springframework.web.socket.server.support.DefaultHandshakeHandler; import java.time.Duration; -import java.util.List; import java.util.concurrent.TimeUnit; /** @@ -58,25 +56,15 @@ public class WebSocketConfiguration implements WebSocketConfigurer { @Override public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { - List endpoints = getEndpoints(); - String[] protocols = endpoints.stream().map(e -> e.getVersion().getValue()).toArray(String[]::new); - OcppWebSocketUpgrader upgradeStrategy = new OcppWebSocketUpgrader(endpoints, chargePointHelperService); + OcppWebSocketHandshakeHandler handshakeHandler = new OcppWebSocketHandshakeHandler( + new DefaultHandshakeHandler(), + Lists.newArrayList(ocpp16WebSocketEndpoint, ocpp15WebSocketEndpoint, ocpp12WebSocketEndpoint), + chargePointHelperService + ); - DefaultHandshakeHandler handler = new DefaultHandshakeHandler(upgradeStrategy); - handler.setSupportedProtocols(protocols); - - for (AbstractWebSocketEndpoint endpoint : endpoints) { - registry.addHandler(endpoint, "/websocket/CentralSystemService/*") - .setHandshakeHandler(handler) - .setAllowedOrigins("*"); - } - } - - /** - * The order affects the choice! - */ - private List getEndpoints() { - return Lists.newArrayList(ocpp16WebSocketEndpoint, ocpp15WebSocketEndpoint, ocpp12WebSocketEndpoint); + registry.addHandler(handshakeHandler.getDummyWebSocketHandler(), "/websocket/CentralSystemService/*") + .setHandshakeHandler(handshakeHandler) + .setAllowedOrigins("*"); } } diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java index 41652e8d0..e4ef45c80 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java @@ -31,11 +31,13 @@ import org.springframework.web.socket.BinaryMessage; import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.PongMessage; +import org.springframework.web.socket.SubProtocolCapable; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketMessage; import org.springframework.web.socket.WebSocketSession; import java.util.ArrayList; +import java.util.Collections; import java.util.Deque; import java.util.List; import java.util.Map; @@ -48,7 +50,7 @@ * @author Sevket Goekay * @since 17.03.2015 */ -public abstract class AbstractWebSocketEndpoint extends ConcurrentWebSocketHandler { +public abstract class AbstractWebSocketEndpoint extends ConcurrentWebSocketHandler implements SubProtocolCapable { @Autowired private ScheduledExecutorService service; @Autowired private OcppServerRepository ocppServerRepository; @@ -73,6 +75,11 @@ public void init(IncomingPipeline pipeline) { disconnectedCallbackList.add((chargeBoxId) -> notificationService.ocppStationWebSocketDisconnected(chargeBoxId)); } + @Override + public List getSubProtocols() { + return Collections.singletonList(getVersion().getValue()); + } + @Override public void onMessage(WebSocketSession session, WebSocketMessage message) throws Exception { if (message instanceof TextMessage) { diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java similarity index 61% rename from src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java rename to src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java index 42f372837..ed25ae176 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketUpgrader.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java @@ -20,34 +20,48 @@ import de.rwth.idsg.steve.service.ChargePointHelperService; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import ocpp.cs._2015._10.RegistrationStatus; import org.jetbrains.annotations.Nullable; +import org.springframework.http.HttpStatus; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; -import org.springframework.web.socket.WebSocketExtension; +import org.springframework.util.CollectionUtils; import org.springframework.web.socket.WebSocketHandler; +import org.springframework.web.socket.WebSocketHttpHeaders; +import org.springframework.web.socket.handler.TextWebSocketHandler; import org.springframework.web.socket.server.HandshakeFailureException; -import org.springframework.web.socket.server.jetty.Jetty10RequestUpgradeStrategy; +import org.springframework.web.socket.server.HandshakeHandler; +import org.springframework.web.socket.server.support.DefaultHandshakeHandler; -import java.security.Principal; import java.util.List; import java.util.Map; import java.util.Optional; /** * @author Sevket Goekay - * @since 13.03.2015 + * @since 05.03.2022 */ +@Slf4j @RequiredArgsConstructor -public class OcppWebSocketUpgrader extends Jetty10RequestUpgradeStrategy { +public class OcppWebSocketHandshakeHandler implements HandshakeHandler { + private final DefaultHandshakeHandler delegate; private final List endpoints; private final ChargePointHelperService chargePointHelperService; + /** + * We need some WebSocketHandler just for Spring to register it for the path. We will not use it for the actual + * operations. This instance will be passed to doHandshake(..) below. We will find the proper WebSocketEndpoint + * based on the selectedProtocol and replace the dummy one with the proper one in the subsequent call chain. + */ + public WebSocketHandler getDummyWebSocketHandler() { + return new TextWebSocketHandler(); + } + @Override - public void upgrade(ServerHttpRequest request, ServerHttpResponse response, - String selectedProtocol, List selectedExtensions, Principal user, - WebSocketHandler wsHandler, Map attributes) throws HandshakeFailureException { + public boolean doHandshake(ServerHttpRequest request, ServerHttpResponse response, + WebSocketHandler wsHandler, Map attributes) throws HandshakeFailureException { // ------------------------------------------------------------------------- // 1. Check the chargeBoxId @@ -62,26 +76,36 @@ public void upgrade(ServerHttpRequest request, ServerHttpResponse response, if (allowConnection) { attributes.put(AbstractWebSocketEndpoint.CHARGEBOX_ID_KEY, chargeBoxId); } else { - throw new HandshakeFailureException("ChargeBoxId '" + chargeBoxId + "' is not recognized."); + log.error("ChargeBoxId '{}' is not recognized.", chargeBoxId); + response.setStatusCode(HttpStatus.UNAUTHORIZED); + return false; } // ------------------------------------------------------------------------- // 2. Route according to the selected protocol // ------------------------------------------------------------------------- - if (selectedProtocol == null) { - throw new HandshakeFailureException("No protocol (OCPP version) is specified."); + List wantedProtocols = new WebSocketHttpHeaders(request.getHeaders()).getSecWebSocketProtocol(); + + if (CollectionUtils.isEmpty(wantedProtocols)) { + log.error("No protocol (OCPP version) is specified."); + response.setStatusCode(HttpStatus.BAD_REQUEST); + return false; } + String selectedProtocol = wantedProtocols.get(0); AbstractWebSocketEndpoint endpoint = findEndpoint(selectedProtocol); if (endpoint == null) { - throw new HandshakeFailureException("Requested protocol '" + selectedProtocol + "' is not supported"); + log.error("Requested protocol '{}' is not supported", selectedProtocol); + response.setStatusCode(HttpStatus.BAD_REQUEST); + return false; } - super.upgrade(request, response, selectedProtocol, selectedExtensions, user, endpoint, attributes); + return delegate.doHandshake(request, response, endpoint, attributes); } + @Nullable private AbstractWebSocketEndpoint findEndpoint(String selectedProtocol) { for (AbstractWebSocketEndpoint endpoint : endpoints) { diff --git a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java index 5851287d4..95a4fe636 100644 --- a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java +++ b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java @@ -28,10 +28,12 @@ import ocpp.cs._2015._10.BootNotificationRequest; import ocpp.cs._2015._10.BootNotificationResponse; import ocpp.cs._2015._10.RegistrationStatus; +import org.eclipse.jetty.websocket.api.exceptions.UpgradeException; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.springframework.http.HttpStatus; import static de.rwth.idsg.steve.utils.Helpers.getRandomString; @@ -91,4 +93,32 @@ public void testOcpp16() { chargePoint.processAndClose(); } + @Test + public void testWithMissingVersion() { + RuntimeException e = Assertions.assertThrows(RuntimeException.class, () -> { + OcppJsonChargePoint chargePoint = new OcppJsonChargePoint(null, REGISTERED_CHARGE_BOX_ID, PATH); + chargePoint.start(); + }); + + Assertions.assertTrue(e.getCause().getCause() instanceof UpgradeException); + + UpgradeException actualCause = (UpgradeException) e.getCause().getCause(); + + Assertions.assertEquals(HttpStatus.BAD_REQUEST.value(), actualCause.getResponseStatusCode()); + } + + @Test + public void tesWithUnauthorizedStation() { + RuntimeException e = Assertions.assertThrows(RuntimeException.class, () -> { + OcppJsonChargePoint chargePoint = new OcppJsonChargePoint(VERSION, "unauth1234", PATH); + chargePoint.start(); + }); + + Assertions.assertTrue(e.getCause().getCause() instanceof UpgradeException); + + UpgradeException actualCause = (UpgradeException) e.getCause().getCause(); + + Assertions.assertEquals(HttpStatus.UNAUTHORIZED.value(), actualCause.getResponseStatusCode()); + } + } diff --git a/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java b/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java index d7fc31212..40ecd5290 100644 --- a/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java +++ b/src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java @@ -20,7 +20,6 @@ import de.rwth.idsg.steve.ocpp.OcppProtocol; import de.rwth.idsg.steve.ocpp.soap.MessageHeaderInterceptor; -import de.rwth.idsg.steve.ocpp.ws.OcppWebSocketUpgrader; import de.rwth.idsg.steve.repository.ReservationStatus; import de.rwth.idsg.steve.repository.dto.ChargePoint; import de.rwth.idsg.steve.repository.dto.ConnectorStatus; diff --git a/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java b/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java index 0b918dbc8..08ef94903 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java +++ b/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java @@ -124,14 +124,16 @@ public void onMessage(Session session, String msg) { public void start() { try { ClientUpgradeRequest request = new ClientUpgradeRequest(); - request.setSubProtocols(version.getValue()); + if (version != null) { + request.setSubProtocols(version.getValue()); + } client.start(); Future connect = client.connect(this, new URI(connectionPath), request); connect.get(); // block until session is created } catch (Throwable t) { - log.error("Exception", t); + throw new RuntimeException(t); } } From be114e23a90a3b1e417e95fd7abab6273444ba94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sat, 5 Mar 2022 16:47:16 +0100 Subject: [PATCH 320/548] add debug logging --- .../rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java index ed25ae176..a38326f7a 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java @@ -102,6 +102,7 @@ public boolean doHandshake(ServerHttpRequest request, ServerHttpResponse respons return false; } + log.debug("ChargeBoxId '{}' will be using {}", chargeBoxId, endpoint.getClass().getSimpleName()); return delegate.doHandshake(request, response, endpoint, attributes); } From 420749a383349193860d22438537458e229dca29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sat, 5 Mar 2022 16:48:08 +0100 Subject: [PATCH 321/548] add tests for json ocpp 1.2 and 1.5 --- .../rwth/idsg/steve/ApplicationJsonTest.java | 53 +++++++++++++++++-- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java index 95a4fe636..ac4053d09 100644 --- a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java +++ b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java @@ -45,7 +45,6 @@ public class ApplicationJsonTest { private static final String PATH = "ws://localhost:8080/steve/websocket/CentralSystemService/"; - private static final OcppVersion VERSION = OcppVersion.V_16; private static final String REGISTERED_CHARGE_BOX_ID = __DatabasePreparer__.getRegisteredChargeBoxId(); private static final String REGISTERED_OCPP_TAG = __DatabasePreparer__.getRegisteredOcppTag(); @@ -69,9 +68,57 @@ public static void destroy() throws Exception { __DatabasePreparer__.cleanUp(); } + @Test + public void testOcpp12() { + OcppJsonChargePoint chargePoint = new OcppJsonChargePoint(OcppVersion.V_12, REGISTERED_CHARGE_BOX_ID, PATH); + chargePoint.start(); + + ocpp.cs._2010._08.BootNotificationRequest boot = new ocpp.cs._2010._08.BootNotificationRequest() + .withChargePointVendor(getRandomString()) + .withChargePointModel(getRandomString()); + + chargePoint.prepare(boot, ocpp.cs._2010._08.BootNotificationResponse.class, + bootResponse -> Assertions.assertEquals(ocpp.cs._2010._08.RegistrationStatus.ACCEPTED, bootResponse.getStatus()), + error -> Assertions.fail() + ); + + ocpp.cs._2010._08.AuthorizeRequest auth = new ocpp.cs._2010._08.AuthorizeRequest().withIdTag(REGISTERED_OCPP_TAG); + + chargePoint.prepare(auth, ocpp.cs._2010._08.AuthorizeResponse.class, + authResponse -> Assertions.assertEquals(ocpp.cs._2010._08.AuthorizationStatus.ACCEPTED, authResponse.getIdTagInfo().getStatus()), + error -> Assertions.fail() + ); + + chargePoint.processAndClose(); + } + + @Test + public void testOcpp15() { + OcppJsonChargePoint chargePoint = new OcppJsonChargePoint(OcppVersion.V_15, REGISTERED_CHARGE_BOX_ID, PATH); + chargePoint.start(); + + ocpp.cs._2012._06.BootNotificationRequest boot = new ocpp.cs._2012._06.BootNotificationRequest() + .withChargePointVendor(getRandomString()) + .withChargePointModel(getRandomString()); + + chargePoint.prepare(boot, ocpp.cs._2012._06.BootNotificationResponse.class, + bootResponse -> Assertions.assertEquals(ocpp.cs._2012._06.RegistrationStatus.ACCEPTED, bootResponse.getStatus()), + error -> Assertions.fail() + ); + + ocpp.cs._2012._06.AuthorizeRequest auth = new ocpp.cs._2012._06.AuthorizeRequest().withIdTag(REGISTERED_OCPP_TAG); + + chargePoint.prepare(auth, ocpp.cs._2012._06.AuthorizeResponse.class, + authResponse -> Assertions.assertEquals(ocpp.cs._2012._06.AuthorizationStatus.ACCEPTED, authResponse.getIdTagInfo().getStatus()), + error -> Assertions.fail() + ); + + chargePoint.processAndClose(); + } + @Test public void testOcpp16() { - OcppJsonChargePoint chargePoint = new OcppJsonChargePoint(VERSION, REGISTERED_CHARGE_BOX_ID, PATH); + OcppJsonChargePoint chargePoint = new OcppJsonChargePoint(OcppVersion.V_16, REGISTERED_CHARGE_BOX_ID, PATH); chargePoint.start(); BootNotificationRequest boot = new BootNotificationRequest() @@ -110,7 +157,7 @@ public void testWithMissingVersion() { @Test public void tesWithUnauthorizedStation() { RuntimeException e = Assertions.assertThrows(RuntimeException.class, () -> { - OcppJsonChargePoint chargePoint = new OcppJsonChargePoint(VERSION, "unauth1234", PATH); + OcppJsonChargePoint chargePoint = new OcppJsonChargePoint(OcppVersion.V_16, "unauth1234", PATH); chargePoint.start(); }); From 2a7b38e3814b7aee37b2af6df193ef58c22a90a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sat, 5 Mar 2022 16:59:11 +0100 Subject: [PATCH 322/548] return 404 if steve does not support the ws protocol --- .../rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java index a38326f7a..1ae2de0b0 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java @@ -98,7 +98,7 @@ public boolean doHandshake(ServerHttpRequest request, ServerHttpResponse respons if (endpoint == null) { log.error("Requested protocol '{}' is not supported", selectedProtocol); - response.setStatusCode(HttpStatus.BAD_REQUEST); + response.setStatusCode(HttpStatus.NOT_FOUND); return false; } From 56d8c46fb6d03d20f4b12c506863ea77f09d7130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sat, 5 Mar 2022 17:01:27 +0100 Subject: [PATCH 323/548] add test for unsupported ws protocol --- .../de/rwth/idsg/steve/ApplicationJsonTest.java | 16 +++++++++++++++- .../idsg/steve/utils/OcppJsonChargePoint.java | 10 +++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java index ac4053d09..c044fa171 100644 --- a/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java +++ b/src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java @@ -143,7 +143,7 @@ public void testOcpp16() { @Test public void testWithMissingVersion() { RuntimeException e = Assertions.assertThrows(RuntimeException.class, () -> { - OcppJsonChargePoint chargePoint = new OcppJsonChargePoint(null, REGISTERED_CHARGE_BOX_ID, PATH); + OcppJsonChargePoint chargePoint = new OcppJsonChargePoint((String) null, REGISTERED_CHARGE_BOX_ID, PATH); chargePoint.start(); }); @@ -154,6 +154,20 @@ public void testWithMissingVersion() { Assertions.assertEquals(HttpStatus.BAD_REQUEST.value(), actualCause.getResponseStatusCode()); } + @Test + public void testWithWrongVersion() { + RuntimeException e = Assertions.assertThrows(RuntimeException.class, () -> { + OcppJsonChargePoint chargePoint = new OcppJsonChargePoint("ocpp1234", REGISTERED_CHARGE_BOX_ID, PATH); + chargePoint.start(); + }); + + Assertions.assertTrue(e.getCause().getCause() instanceof UpgradeException); + + UpgradeException actualCause = (UpgradeException) e.getCause().getCause(); + + Assertions.assertEquals(HttpStatus.NOT_FOUND.value(), actualCause.getResponseStatusCode()); + } + @Test public void tesWithUnauthorizedStation() { RuntimeException e = Assertions.assertThrows(RuntimeException.class, () -> { diff --git a/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java b/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java index 08ef94903..010f315b1 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java +++ b/src/test/java/de/rwth/idsg/steve/utils/OcppJsonChargePoint.java @@ -64,7 +64,7 @@ @WebSocket public class OcppJsonChargePoint { - private final OcppVersion version; + private final String version; private final String chargeBoxId; private final String connectionPath; private final Map responseContextMap; @@ -76,7 +76,11 @@ public class OcppJsonChargePoint { private Session session; public OcppJsonChargePoint(OcppVersion version, String chargeBoxId, String pathPrefix) { - this.version = version; + this(version.getValue(), chargeBoxId, pathPrefix); + } + + public OcppJsonChargePoint(String ocppVersion, String chargeBoxId, String pathPrefix) { + this.version = ocppVersion; this.chargeBoxId = chargeBoxId; this.connectionPath = pathPrefix + chargeBoxId; this.responseContextMap = new LinkedHashMap<>(); // because we want to keep the insertion order of test cases @@ -125,7 +129,7 @@ public void start() { try { ClientUpgradeRequest request = new ClientUpgradeRequest(); if (version != null) { - request.setSubProtocols(version.getValue()); + request.setSubProtocols(version); } client.start(); From 86447c37440ed14769d42b843570c385802b5a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Sat, 5 Mar 2022 17:13:18 +0100 Subject: [PATCH 324/548] refactor --- .../ws/OcppWebSocketHandshakeHandler.java | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java index 1ae2de0b0..28453b80f 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java @@ -22,7 +22,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import ocpp.cs._2015._10.RegistrationStatus; -import org.jetbrains.annotations.Nullable; import org.springframework.http.HttpStatus; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; @@ -73,31 +72,35 @@ public boolean doHandshake(ServerHttpRequest request, ServerHttpResponse respons // Allow connections, if station is in db (registration_status field from db does not matter) boolean allowConnection = status.isPresent(); - if (allowConnection) { - attributes.put(AbstractWebSocketEndpoint.CHARGEBOX_ID_KEY, chargeBoxId); - } else { + if (!allowConnection) { log.error("ChargeBoxId '{}' is not recognized.", chargeBoxId); response.setStatusCode(HttpStatus.UNAUTHORIZED); return false; } + attributes.put(AbstractWebSocketEndpoint.CHARGEBOX_ID_KEY, chargeBoxId); + // ------------------------------------------------------------------------- // 2. Route according to the selected protocol // ------------------------------------------------------------------------- - List wantedProtocols = new WebSocketHttpHeaders(request.getHeaders()).getSecWebSocketProtocol(); + List requestedProtocols = new WebSocketHttpHeaders(request.getHeaders()).getSecWebSocketProtocol(); - if (CollectionUtils.isEmpty(wantedProtocols)) { + if (CollectionUtils.isEmpty(requestedProtocols)) { log.error("No protocol (OCPP version) is specified."); response.setStatusCode(HttpStatus.BAD_REQUEST); return false; } - String selectedProtocol = wantedProtocols.get(0); - AbstractWebSocketEndpoint endpoint = findEndpoint(selectedProtocol); + String requestedProcotol = requestedProtocols.get(0); + + AbstractWebSocketEndpoint endpoint = endpoints.stream() + .filter(it -> it.getVersion().getValue().equals(requestedProcotol)) + .findAny() + .orElse(null); if (endpoint == null) { - log.error("Requested protocol '{}' is not supported", selectedProtocol); + log.error("Requested protocol '{}' is not supported", requestedProcotol); response.setStatusCode(HttpStatus.NOT_FOUND); return false; } @@ -106,17 +109,6 @@ public boolean doHandshake(ServerHttpRequest request, ServerHttpResponse respons return delegate.doHandshake(request, response, endpoint, attributes); } - - @Nullable - private AbstractWebSocketEndpoint findEndpoint(String selectedProtocol) { - for (AbstractWebSocketEndpoint endpoint : endpoints) { - if (endpoint.getVersion().getValue().equals(selectedProtocol)) { - return endpoint; - } - } - return null; - } - /** * Taken from: http://stackoverflow.com/a/4050276 */ From f5b4a7ebbbc9ed45372cff984dfd7b51b3d70aad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Mon, 7 Mar 2022 22:44:31 +0100 Subject: [PATCH 325/548] refactor --- .../rwth/idsg/steve/repository/dto/ChargePointSelect.java | 8 ++------ .../rwth/idsg/steve/utils/ConnectorStatusCountFilter.java | 5 +++-- .../de/rwth/idsg/steve/utils/ConnectorStatusFilter.java | 5 +++-- .../java/de/rwth/idsg/steve/utils/ControllerHelper.java | 6 +++++- .../de/rwth/idsg/steve/utils/CountryCodesProvider.java | 5 ++++- src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java | 5 +++-- src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java | 4 +++- .../java/de/rwth/idsg/steve/utils/InternetChecker.java | 4 +++- src/main/java/de/rwth/idsg/steve/utils/StringUtils.java | 5 +++-- 9 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java index d711acfef..904c74be2 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java +++ b/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePointSelect.java @@ -20,23 +20,19 @@ import de.rwth.idsg.steve.ocpp.OcppTransport; import lombok.Getter; +import lombok.RequiredArgsConstructor; /** * @author Sevket Goekay * @since 29.12.2014 */ +@RequiredArgsConstructor @Getter public final class ChargePointSelect { private final OcppTransport ocppTransport; private final String chargeBoxId; private final String endpointAddress; - public ChargePointSelect(OcppTransport ocppTransport, String chargeBoxId, String endpointAddress) { - this.ocppTransport = ocppTransport; - this.chargeBoxId = chargeBoxId; - this.endpointAddress = endpointAddress; - } - public ChargePointSelect(OcppTransport ocppTransport, String chargeBoxId) { // Provide a non-null value (or placeholder if you will) to frontend for JSON charge points. // This is clearly a hack. Not my proudest moment. diff --git a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java index 0cc966340..7c3d9e3db 100755 --- a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java @@ -19,6 +19,8 @@ package de.rwth.idsg.steve.utils; import de.rwth.idsg.steve.repository.dto.ConnectorStatus; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import java.util.Comparator; import java.util.EnumSet; @@ -32,12 +34,11 @@ * @author Sevket Goekay * @since 10.03.2016 */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) public final class ConnectorStatusCountFilter { public static final Set ALL_STATUS_VALUES = allStatusValues(); - private ConnectorStatusCountFilter() { } - public static Map getStatusCountMap(List latestList) { return getStatusCountMap(latestList, false); } diff --git a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java index 62fa0531d..0b28d8102 100755 --- a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java @@ -19,6 +19,8 @@ package de.rwth.idsg.steve.utils; import de.rwth.idsg.steve.repository.dto.ConnectorStatus; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import java.util.Collections; import java.util.Comparator; @@ -32,10 +34,9 @@ * @author Sevket Goekay * @since 10.03.2016 */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) public final class ConnectorStatusFilter { - private ConnectorStatusFilter() { } - public static List filterAndPreferZero(List initialList) { return processAndFilterList(initialList, Strategy.PreferZero); } diff --git a/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java b/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java index ebd34a98e..0e301924e 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java @@ -18,6 +18,10 @@ */ package de.rwth.idsg.steve.utils; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import lombok.experimental.UtilityClass; + import java.util.HashMap; import java.util.List; import java.util.Map; @@ -28,8 +32,8 @@ * @author Sevket Goekay * @since 25.11.2015 */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) public final class ControllerHelper { - private ControllerHelper() { } public static final String EMPTY_OPTION = "-- Empty --"; diff --git a/src/main/java/de/rwth/idsg/steve/utils/CountryCodesProvider.java b/src/main/java/de/rwth/idsg/steve/utils/CountryCodesProvider.java index 72dc1a122..e6c307388 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/CountryCodesProvider.java +++ b/src/main/java/de/rwth/idsg/steve/utils/CountryCodesProvider.java @@ -19,6 +19,8 @@ package de.rwth.idsg.steve.utils; import com.neovisionaries.i18n.CountryCode; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import java.util.Arrays; import java.util.Comparator; @@ -31,7 +33,8 @@ * @author Sevket Goekay * @since 23.03.2021 */ -public class CountryCodesProvider { +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class CountryCodesProvider { public static Map getCountryCodes() { CountryCode[] codes = CountryCode.values(); diff --git a/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java b/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java index 0673ba332..d4e89f108 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java +++ b/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java @@ -18,6 +18,8 @@ */ package de.rwth.idsg.steve.utils; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import org.joda.time.DateTime; import org.jooq.Condition; import org.jooq.DSLContext; @@ -33,9 +35,8 @@ * @author Sevket Goekay * @since 03.09.2015 */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) public final class CustomDSL { - private CustomDSL() { - } public static Field date(DateTime dt) { return date(DSL.val(dt, DateTime.class)); diff --git a/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java b/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java index 32ab4f98b..c0981028a 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java +++ b/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java @@ -19,6 +19,8 @@ package de.rwth.idsg.steve.utils; import de.rwth.idsg.steve.SteveException; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.LocalDateTime; @@ -34,8 +36,8 @@ /** * @author Sevket Goekay */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) public final class DateTimeUtils { - private DateTimeUtils() { } private static final DateTimeFormatter HUMAN_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd 'at' HH:mm"); private static final DateTimeFormatter TIME_FORMATTER = DateTimeFormat.forPattern("HH:mm"); diff --git a/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java b/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java index ccfa7835a..d0d232dff 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java +++ b/src/main/java/de/rwth/idsg/steve/utils/InternetChecker.java @@ -19,6 +19,8 @@ package de.rwth.idsg.steve.utils; import de.rwth.idsg.steve.SteveConfiguration; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import java.net.HttpURLConnection; import java.net.MalformedURLException; @@ -32,8 +34,8 @@ * @author Sevket Goekay * @since 19.04.2016 */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) public final class InternetChecker { - private InternetChecker() { } private static final int CONNECT_TIMEOUT = 5_000; diff --git a/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java b/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java index 90915968e..f489b2eba 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java +++ b/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java @@ -22,6 +22,8 @@ import com.google.common.base.Splitter; import com.google.common.base.Strings; import de.rwth.idsg.steve.ocpp.CommunicationTask; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.Nullable; import org.springframework.util.CollectionUtils; @@ -34,13 +36,12 @@ * @author Sevket Goekay * @since 12.01.2015 */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) public final class StringUtils { private static final Splitter SPLITTER = Splitter.on(",").trimResults().omitEmptyStrings(); private static final Joiner JOINER = Joiner.on(",").skipNulls(); - private StringUtils() { } - /** * We don't want to hard-code operation names, but derive them from the actual request object. * From 65447b9e9d14ee0ae42c2d6d0937bee4f865d1ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Mon, 7 Mar 2022 22:54:04 +0100 Subject: [PATCH 326/548] refactor part 2 --- .../java/de/rwth/idsg/steve/utils/mapper/AddressMapper.java | 5 ++++- .../idsg/steve/utils/mapper/ChargePointDetailsMapper.java | 5 ++++- .../steve/utils/mapper/ChargingProfileDetailsMapper.java | 5 ++++- .../de/rwth/idsg/steve/utils/mapper/OcppTagFormMapper.java | 5 ++++- .../java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/AddressMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/AddressMapper.java index 9e9de7832..35b843f01 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/mapper/AddressMapper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/AddressMapper.java @@ -21,12 +21,15 @@ import com.neovisionaries.i18n.CountryCode; import de.rwth.idsg.steve.web.dto.Address; import jooq.steve.db.tables.records.AddressRecord; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; /** * @author Sevket Goekay * @since 23.03.2021 */ -public class AddressMapper { +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class AddressMapper { public static Address recordToDto(AddressRecord record) { Address address = new Address(); diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java index 512ce7557..5a411827c 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java @@ -21,12 +21,15 @@ import de.rwth.idsg.steve.repository.dto.ChargePoint; import de.rwth.idsg.steve.web.dto.ChargePointForm; import jooq.steve.db.tables.records.ChargeBoxRecord; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; /** * @author Sevket Goekay * @since 23.03.2021 */ -public class ChargePointDetailsMapper { +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class ChargePointDetailsMapper { public static ChargePointForm mapToForm(ChargePoint.Details cp) { ChargeBoxRecord chargeBox = cp.getChargeBox(); diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java index 00a0d9add..c6544c4cf 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java @@ -23,6 +23,8 @@ import de.rwth.idsg.steve.web.dto.ChargingProfileForm; import jooq.steve.db.tables.records.ChargingProfileRecord; import jooq.steve.db.tables.records.ChargingSchedulePeriodRecord; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import ocpp.cp._2015._10.ChargingProfileKindType; import ocpp.cp._2015._10.ChargingProfilePurposeType; import ocpp.cp._2015._10.ChargingRateUnitType; @@ -37,7 +39,8 @@ * @author Sevket Goekay * @since 23.03.2021 */ -public class ChargingProfileDetailsMapper { +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class ChargingProfileDetailsMapper { public static ChargingProfileForm mapToForm(ChargingProfile.Details details) { ChargingProfileRecord profile = details.getProfile(); diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/OcppTagFormMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/OcppTagFormMapper.java index 1f21e504b..0d8d36989 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/mapper/OcppTagFormMapper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/OcppTagFormMapper.java @@ -21,13 +21,16 @@ import de.rwth.idsg.steve.utils.ControllerHelper; import de.rwth.idsg.steve.web.dto.OcppTagForm; import jooq.steve.db.tables.records.OcppTagActivityRecord; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import org.joda.time.DateTime; /** * @author Sevket Goekay * @since 23.03.2021 */ -public class OcppTagFormMapper { +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class OcppTagFormMapper { public static OcppTagForm toForm(OcppTagActivityRecord record) { OcppTagForm form = new OcppTagForm(); diff --git a/src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java b/src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java index 865c35738..1076bbd41 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java @@ -23,12 +23,15 @@ import de.rwth.idsg.steve.web.dto.UserForm; import de.rwth.idsg.steve.web.dto.UserSex; import jooq.steve.db.tables.records.UserRecord; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; /** * @author Sevket Goekay * @since 23.03.2021 */ -public class UserFormMapper { +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class UserFormMapper { public static UserForm toForm(User.Details details) { UserRecord userRecord = details.getUserRecord(); From c3dfb9c41ab347d967e22121c51bb9829332034b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Fri, 11 Mar 2022 00:34:32 +0100 Subject: [PATCH 327/548] support a list of ws subprotocols --- .../ws/OcppWebSocketHandshakeHandler.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java index 28453b80f..713faeef7 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java @@ -92,15 +92,10 @@ public boolean doHandshake(ServerHttpRequest request, ServerHttpResponse respons return false; } - String requestedProcotol = requestedProtocols.get(0); - - AbstractWebSocketEndpoint endpoint = endpoints.stream() - .filter(it -> it.getVersion().getValue().equals(requestedProcotol)) - .findAny() - .orElse(null); + AbstractWebSocketEndpoint endpoint = selectEndpoint(requestedProtocols); if (endpoint == null) { - log.error("Requested protocol '{}' is not supported", requestedProcotol); + log.error("None of the requested protocols '{}' is supported", requestedProtocols); response.setStatusCode(HttpStatus.NOT_FOUND); return false; } @@ -115,4 +110,15 @@ public boolean doHandshake(ServerHttpRequest request, ServerHttpResponse respons private static String getLastBitFromUrl(final String url) { return url.replaceFirst(".*/([^/?]+).*", "$1"); } + + private AbstractWebSocketEndpoint selectEndpoint(List requestedProtocols ) { + for (String requestedProcotol : requestedProtocols) { + for (AbstractWebSocketEndpoint item : endpoints) { + if (item.getVersion().getValue().equals(requestedProcotol)) { + return item; + } + } + } + return null; + } } From d1116d5698a8deb286148bcb04d2fc3396761a22 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Mar 2022 18:00:21 +0000 Subject: [PATCH 328/548] Bump jooq.version from 3.16.4 to 3.16.5 Bumps `jooq.version` from 3.16.4 to 3.16.5. Updates `jooq-meta` from 3.16.4 to 3.16.5 Updates `jooq-codegen` from 3.16.4 to 3.16.5 Updates `jooq` from 3.16.4 to 3.16.5 Updates `jooq-codegen-maven` from 3.16.4 to 3.16.5 --- updated-dependencies: - dependency-name: org.jooq:jooq-meta dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d7840fb4d..f4ebb0cd8 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 11 UTF-8 - 3.16.4 + 3.16.5 3.5.1 5.3.16 5.6.2 From c4fd6c3b13e77b1d405f07a60f44e9768a618648 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Mar 2022 18:00:25 +0000 Subject: [PATCH 329/548] Bump maven-dependency-plugin from 3.2.0 to 3.3.0 Bumps [maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.2.0...maven-dependency-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d7840fb4d..aa95aebdf 100644 --- a/pom.xml +++ b/pom.xml @@ -252,7 +252,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + 3.3.0 copy-dependencies From 773a72348b5953673683016a61c3a21b953dfe93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Mar 2022 18:00:39 +0000 Subject: [PATCH 330/548] Bump jackson.version from 2.13.1 to 2.13.2 Bumps `jackson.version` from 2.13.1 to 2.13.2. Updates `jackson-databind` from 2.13.1 to 2.13.2 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-module-jaxb-annotations` from 2.13.1 to 2.13.2 - [Release notes](https://github.com/FasterXML/jackson-modules-base/releases) - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.13.1...jackson-modules-base-2.13.2) Updates `jackson-annotations` from 2.13.1 to 2.13.2 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.module:jackson-module-jaxb-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d7840fb4d..b70eed938 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 8.0.28 10.0.7 1.18.22 - 2.13.1 + 2.13.2 jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true&serverTimezone=UTC From efdf6322a730da6c55210b2dca3ca53e993946d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Mar 2022 18:01:10 +0000 Subject: [PATCH 331/548] Bump maven-compiler-plugin from 3.10.0 to 3.10.1 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.0 to 3.10.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.0...maven-compiler-plugin-3.10.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d7840fb4d..6903964c3 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ maven-compiler-plugin - 3.10.0 + 3.10.1 ${java.version} ${java.version} From d8e78971596d8b9428ecb0fd179e6a44d927eb0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 19 Mar 2022 18:00:27 +0000 Subject: [PATCH 332/548] Bump properties-maven-plugin from 1.0.0 to 1.1.0 Bumps [properties-maven-plugin](https://github.com/mojohaus/properties-maven-plugin) from 1.0.0 to 1.1.0. - [Release notes](https://github.com/mojohaus/properties-maven-plugin/releases) - [Commits](https://github.com/mojohaus/properties-maven-plugin/compare/properties-maven-plugin-1.0.0...properties-maven-plugin-1.1.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:properties-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 78090c039..592d9cc27 100644 --- a/pom.xml +++ b/pom.xml @@ -233,7 +233,7 @@ org.codehaus.mojo properties-maven-plugin - 1.0.0 + 1.1.0 initialize From 02c2cd6adcec07dec23b833491459cfdb13f9346 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 19 Mar 2022 18:00:37 +0000 Subject: [PATCH 333/548] Bump spring-framework-bom from 5.3.16 to 5.3.17 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.16 to 5.3.17. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.16...v5.3.17) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 78090c039..4860b8af8 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.16.5 3.5.1 - 5.3.16 + 5.3.17 5.6.2 8.0.28 10.0.7 From fb894c074842b2e11a3f3a3f248df5dba79f2da6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 18:00:47 +0000 Subject: [PATCH 334/548] Bump joda-time from 2.10.13 to 2.10.14 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.13 to 2.10.14. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.13...v2.10.14) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 49718ebf5..c83abf620 100644 --- a/pom.xml +++ b/pom.xml @@ -505,7 +505,7 @@ joda-time joda-time - 2.10.13 + 2.10.14 org.hibernate.validator From f66d89cdf82fe118ae3ebd74252fc798b09c5377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Thu, 31 Mar 2022 14:19:59 +0200 Subject: [PATCH 335/548] update spring version to address RCE vulnerability --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 49718ebf5..6b0d084a8 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.16.5 3.5.1 - 5.3.17 + 5.3.18 5.6.2 8.0.28 10.0.7 From 699691a4b6cf5faf72dca81149ff9cc00808ebc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Thu, 31 Mar 2022 14:30:05 +0200 Subject: [PATCH 336/548] update jackson databind to address RCE for more info: https://github.com/FasterXML/jackson-databind/issues/2816 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6b0d084a8..99176a634 100644 --- a/pom.xml +++ b/pom.xml @@ -520,7 +520,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.version} + 2.13.2.2 com.fasterxml.jackson.module From 6ee0ad38187b928c9d0f247534a90f6e9fe77c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Thu, 31 Mar 2022 14:40:19 +0200 Subject: [PATCH 337/548] version bump --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 907818e2f..2df28135f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 de.rwth.idsg steve - 3.4.8 + 3.4.9 jar From ef7e6591c7f0074b85965158da4b609ca285c5af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Apr 2022 18:00:21 +0000 Subject: [PATCH 338/548] Bump cxf.version from 3.5.1 to 3.5.2 Bumps `cxf.version` from 3.5.1 to 3.5.2. Updates `cxf-rt-frontend-jaxws` from 3.5.1 to 3.5.2 Updates `cxf-rt-transports-http` from 3.5.1 to 3.5.2 Updates `cxf-rt-transports-http-hc` from 3.5.1 to 3.5.2 Updates `cxf-rt-features-logging` from 3.5.1 to 3.5.2 --- updated-dependencies: - dependency-name: org.apache.cxf:cxf-rt-frontend-jaxws dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-transports-http dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-transports-http-hc dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-features-logging dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2df28135f..a5ac8e01a 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ UTF-8 3.16.5 - 3.5.1 + 3.5.2 5.3.18 5.6.2 8.0.28 From f65e1d0d6e33f2a51cce881568f6d99e4611d066 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Apr 2022 18:11:24 +0000 Subject: [PATCH 339/548] Bump spring-framework-bom from 5.3.18 to 5.3.19 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.18 to 5.3.19. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.18...v5.3.19) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a5ac8e01a..8eefaf4d0 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.16.5 3.5.2 - 5.3.18 + 5.3.19 5.6.2 8.0.28 10.0.7 From fdfc979876235daa70dc82425ff7f134bbf8e08a Mon Sep 17 00:00:00 2001 From: Drotak Date: Tue, 19 Apr 2022 12:56:32 +0200 Subject: [PATCH 340/548] Update Docker section of the README file Clarified and added some information about the docker installation, because I had some troubles to figure everything out by myself. --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a226f64de..81b1f8b11 100644 --- a/README.md +++ b/README.md @@ -100,9 +100,13 @@ SteVe is designed to run standalone, a java servlet container / web server (e.g. # Docker -If you prefer to build and start this project via docker (you can skip the steps 1 and 3, 4, 5 above), this can be done as follows: `docker-compose up -d ` +If you prefer to build and start this project via docker (you can skip the steps 1, 4 and 5 from above), this can be done as follows: `docker-compose up -d` -The web interface will be accessible at: `http://localhost:8180` +Because the docker-compose file is written to build the project for you, you still have to change the project configuration settings from step 3. +Instead of changing the [main.properties in the prod directory](src/main/resources/config/prod/main.properties), you have to change the [main.properties in the docker directory](src/main/resources/config/docker/main.properties). There you have to change all configurations which are described in step 3. +The database password for the user "steve" has to be the same as you have configured it in the docker-compose file. + +With the default docker-compose configuration, the web interface will be accessible at: `http://localhost:8180` # Kubernetes From 78897293cf02aa10949b7b6fc2e8b0e06322eb5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Tue, 19 Apr 2022 16:32:08 +0200 Subject: [PATCH 341/548] update ocpp_protocol in db after a ws/json station connects --- .../de/rwth/idsg/steve/ocpp/OcppVersion.java | 9 +++++++ .../ocpp/ws/AbstractWebSocketEndpoint.java | 2 ++ .../repository/OcppServerRepository.java | 2 ++ .../impl/OcppServerRepositoryImpl.java | 9 +++++++ .../rwth/idsg/steve/ocpp/OcppVersionTest.java | 27 +++++++++++++++++++ 5 files changed, 49 insertions(+) create mode 100644 src/test/java/de/rwth/idsg/steve/ocpp/OcppVersionTest.java diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java b/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java index 5de6b9c8c..5dbc2c633 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/OcppVersion.java @@ -44,4 +44,13 @@ public static OcppVersion fromValue(String v) { } throw new IllegalArgumentException(v); } + + public OcppProtocol toProtocol(OcppTransport transport) { + for (OcppProtocol value : OcppProtocol.values()) { + if (value.getVersion() == this && value.getTransport() == transport) { + return value; + } + } + throw new IllegalArgumentException("Could not find OcppProtocol for " + transport); + } } diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java index e4ef45c80..5e4f72e74 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java @@ -20,6 +20,7 @@ import com.google.common.base.Strings; import de.rwth.idsg.steve.config.WebSocketConfiguration; +import de.rwth.idsg.steve.ocpp.OcppTransport; import de.rwth.idsg.steve.ocpp.OcppVersion; import de.rwth.idsg.steve.ocpp.ws.data.CommunicationContext; import de.rwth.idsg.steve.ocpp.ws.data.SessionContext; @@ -124,6 +125,7 @@ public void onOpen(WebSocketSession session) throws Exception { String chargeBoxId = getChargeBoxId(session); WebSocketLogger.connected(chargeBoxId, session); + ocppServerRepository.updateOcppProtocol(chargeBoxId, getVersion().toProtocol(OcppTransport.JSON)); // Just to keep the connection alive, such that the servers do not close // the connection because of a idle timeout, we ping-pong at fixed intervals. diff --git a/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java b/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java index afef3193e..50ab8a8a9 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java +++ b/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java @@ -18,6 +18,7 @@ */ package de.rwth.idsg.steve.repository; +import de.rwth.idsg.steve.ocpp.OcppProtocol; import de.rwth.idsg.steve.repository.dto.InsertConnectorStatusParams; import de.rwth.idsg.steve.repository.dto.InsertTransactionParams; import de.rwth.idsg.steve.repository.dto.UpdateChargeboxParams; @@ -34,6 +35,7 @@ public interface OcppServerRepository { void updateChargebox(UpdateChargeboxParams params); + void updateOcppProtocol(String chargeBoxId, OcppProtocol protocol); void updateEndpointAddress(String chargeBoxIdentity, String endpointAddress); void updateChargeboxFirmwareStatus(String chargeBoxIdentity, String firmwareStatus); void updateChargeboxDiagnosticsStatus(String chargeBoxIdentity, String status); diff --git a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java index 708a88852..ea2f5d545 100644 --- a/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java +++ b/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java @@ -21,6 +21,7 @@ import com.google.common.base.Throwables; import com.google.common.util.concurrent.Striped; import de.rwth.idsg.steve.SteveException; +import de.rwth.idsg.steve.ocpp.OcppProtocol; import de.rwth.idsg.steve.repository.OcppServerRepository; import de.rwth.idsg.steve.repository.ReservationRepository; import de.rwth.idsg.steve.repository.dto.InsertConnectorStatusParams; @@ -92,6 +93,14 @@ public void updateChargebox(UpdateChargeboxParams p) { .execute(); } + @Override + public void updateOcppProtocol(String chargeBoxIdentity, OcppProtocol protocol) { + ctx.update(CHARGE_BOX) + .set(CHARGE_BOX.OCPP_PROTOCOL, protocol.getCompositeValue()) + .where(CHARGE_BOX.CHARGE_BOX_ID.equal(chargeBoxIdentity)) + .execute(); + } + @Override public void updateEndpointAddress(String chargeBoxIdentity, String endpointAddress) { ctx.update(CHARGE_BOX) diff --git a/src/test/java/de/rwth/idsg/steve/ocpp/OcppVersionTest.java b/src/test/java/de/rwth/idsg/steve/ocpp/OcppVersionTest.java new file mode 100644 index 000000000..89cc08d80 --- /dev/null +++ b/src/test/java/de/rwth/idsg/steve/ocpp/OcppVersionTest.java @@ -0,0 +1,27 @@ +package de.rwth.idsg.steve.ocpp; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; + +public class OcppVersionTest { + + @ParameterizedTest + @EnumSource(OcppVersion.class) + public void testFromValue(OcppVersion input) { + String toTest = input.getValue(); + OcppVersion inputBack = OcppVersion.fromValue(toTest); + Assertions.assertEquals(input, inputBack); + } + + @ParameterizedTest + @EnumSource(OcppTransport.class) + public void testToProtocol(OcppTransport transport) { + for (OcppVersion version : OcppVersion.values()) { + OcppProtocol protocol = version.toProtocol(transport); + + Assertions.assertEquals(transport, protocol.getTransport()); + Assertions.assertEquals(version, protocol.getVersion()); + } + } +} From 1d027f8a54f47c1a0ae42c1480ef53b7f9b51573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Wed, 20 Apr 2022 16:38:57 +0200 Subject: [PATCH 342/548] wrap cell contents in case of table overflow (#803) --- src/main/resources/webapp/static/css/style.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/webapp/static/css/style.css b/src/main/resources/webapp/static/css/style.css index 51b0f83b8..c527c4c47 100644 --- a/src/main/resources/webapp/static/css/style.css +++ b/src/main/resources/webapp/static/css/style.css @@ -40,6 +40,7 @@ table.userInputFullPage td:first-child {width: 50%; text-align: right; padding: table.sll { padding-bottom: 40px; } table.res { border-collapse: collapse; + table-layout:fixed; } table.res th { text-align: center; @@ -60,6 +61,7 @@ table.res td { padding: 5px; text-align: center; width: auto; + word-wrap: break-word; } /*** Table for charge point details ***/ table.cpd { From 204273b64082191437f5e9d6a32e52d0d9d2ac2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Apr 2022 18:00:44 +0000 Subject: [PATCH 343/548] Bump jooq.version from 3.16.5 to 3.16.6 Bumps `jooq.version` from 3.16.5 to 3.16.6. Updates `jooq-meta` from 3.16.5 to 3.16.6 Updates `jooq-codegen` from 3.16.5 to 3.16.6 Updates `jooq` from 3.16.5 to 3.16.6 Updates `jooq-codegen-maven` from 3.16.5 to 3.16.6 --- updated-dependencies: - dependency-name: org.jooq:jooq-meta dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8eefaf4d0..3a1c5cf72 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 11 UTF-8 - 3.16.5 + 3.16.6 3.5.2 5.3.19 5.6.2 From 6ca134399d9305372e815d16996bcea9416c68c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Apr 2022 18:00:57 +0000 Subject: [PATCH 344/548] Bump spring.security.version from 5.6.2 to 5.6.3 Bumps `spring.security.version` from 5.6.2 to 5.6.3. Updates `spring-security-web` from 5.6.2 to 5.6.3 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.6.2...5.6.3) Updates `spring-security-config` from 5.6.2 to 5.6.3 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.6.2...5.6.3) --- updated-dependencies: - dependency-name: org.springframework.security:spring-security-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.security:spring-security-config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8eefaf4d0..1444adc77 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.16.5 3.5.2 5.3.19 - 5.6.2 + 5.6.3 8.0.28 10.0.7 1.18.22 From fdd334cedd8496495092763902f6d731d6a70e4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Apr 2022 18:01:06 +0000 Subject: [PATCH 345/548] Bump lombok from 1.18.22 to 1.18.24 Bumps [lombok](https://github.com/projectlombok/lombok) from 1.18.22 to 1.18.24. - [Release notes](https://github.com/projectlombok/lombok/releases) - [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/projectlombok/lombok/compare/v1.18.22...v1.18.24) --- updated-dependencies: - dependency-name: org.projectlombok:lombok dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8eefaf4d0..1bd0adf5f 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 5.6.2 8.0.28 10.0.7 - 1.18.22 + 1.18.24 2.13.2 From eba2a2fadf62122868898ebea03700cd32c4006b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Mon, 25 Apr 2022 20:55:24 +0200 Subject: [PATCH 346/548] relax extraction of chargebox id (closes #689) --- .../steve/config/WebSocketConfiguration.java | 3 +- .../ws/OcppWebSocketHandshakeHandler.java | 10 +-- .../de/rwth/idsg/steve/utils/StringUtils.java | 16 +++++ .../idsg/steve/utils/StringUtilsTest.java | 70 +++++++++++++++++++ 4 files changed, 91 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java index 52badce60..b6793fc04 100644 --- a/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java +++ b/src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java @@ -50,6 +50,7 @@ public class WebSocketConfiguration implements WebSocketConfigurer { @Autowired private Ocpp15WebSocketEndpoint ocpp15WebSocketEndpoint; @Autowired private Ocpp16WebSocketEndpoint ocpp16WebSocketEndpoint; + public static final String PATH_INFIX = "/websocket/CentralSystemService/"; public static final long PING_INTERVAL = TimeUnit.MINUTES.toMinutes(15); public static final Duration IDLE_TIMEOUT = Duration.ofHours(2); public static final int MAX_MSG_SIZE = 8_388_608; // 8 MB for max message size @@ -63,7 +64,7 @@ public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { chargePointHelperService ); - registry.addHandler(handshakeHandler.getDummyWebSocketHandler(), "/websocket/CentralSystemService/*") + registry.addHandler(handshakeHandler.getDummyWebSocketHandler(), PATH_INFIX + "*") .setHandshakeHandler(handshakeHandler) .setAllowedOrigins("*"); } diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java index 713faeef7..18f21eef9 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java @@ -18,6 +18,7 @@ */ package de.rwth.idsg.steve.ocpp.ws; +import de.rwth.idsg.steve.config.WebSocketConfiguration; import de.rwth.idsg.steve.service.ChargePointHelperService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -37,6 +38,8 @@ import java.util.Map; import java.util.Optional; +import static de.rwth.idsg.steve.utils.StringUtils.getLastBitFromUrl; + /** * @author Sevket Goekay * @since 05.03.2022 @@ -104,13 +107,6 @@ public boolean doHandshake(ServerHttpRequest request, ServerHttpResponse respons return delegate.doHandshake(request, response, endpoint, attributes); } - /** - * Taken from: http://stackoverflow.com/a/4050276 - */ - private static String getLastBitFromUrl(final String url) { - return url.replaceFirst(".*/([^/?]+).*", "$1"); - } - private AbstractWebSocketEndpoint selectEndpoint(List requestedProtocols ) { for (String requestedProcotol : requestedProtocols) { for (AbstractWebSocketEndpoint item : endpoints) { diff --git a/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java b/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java index f489b2eba..2edb81294 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java +++ b/src/main/java/de/rwth/idsg/steve/utils/StringUtils.java @@ -21,6 +21,7 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.base.Strings; +import de.rwth.idsg.steve.config.WebSocketConfiguration; import de.rwth.idsg.steve.ocpp.CommunicationTask; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -79,4 +80,19 @@ public static List splitByComma(String str) { return SPLITTER.splitToList(str); } } + + public static String getLastBitFromUrl(final String input) { + if (Strings.isNullOrEmpty(input)) { + return ""; + } + + final String substring = WebSocketConfiguration.PATH_INFIX; + + int index = input.indexOf(substring); + if (index == -1) { + return ""; + } else { + return input.substring(index + substring.length()); + } + } } diff --git a/src/test/java/de/rwth/idsg/steve/utils/StringUtilsTest.java b/src/test/java/de/rwth/idsg/steve/utils/StringUtilsTest.java index 47fb25118..d01ba936c 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/StringUtilsTest.java +++ b/src/test/java/de/rwth/idsg/steve/utils/StringUtilsTest.java @@ -117,4 +117,74 @@ public void testSplitByComma_inputTwoElements() { Assertions.assertEquals("1one", sortedVal.get(0)); Assertions.assertEquals("2two", sortedVal.get(1)); } + + @Test + public void testGetLastBitFromUrl_empty() { + String in = ""; + String out = StringUtils.getLastBitFromUrl(in); + Assertions.assertEquals("", out); + } + + @Test + public void testGetLastBitFromUrl_null() { + String in = null; + String out = StringUtils.getLastBitFromUrl(in); + Assertions.assertEquals("", out); + } + + @Test + public void testGetLastBitFromUrl_successFull() { + String in = "https://www.google.com/steve/websocket/CentralSystemService/BBEI12"; + String out = StringUtils.getLastBitFromUrl(in); + Assertions.assertEquals("BBEI12", out); + } + + @Test + public void testGetLastBitFromUrl_noPostfix() { + String in = "/steve/websocket/CentralSystemService/"; + String out = StringUtils.getLastBitFromUrl(in); + Assertions.assertEquals("", out); + } + + @Test + public void testGetLastBitFromUrl_successPartial() { + String in = "/steve/websocket/CentralSystemService/BBEI12"; + String out = StringUtils.getLastBitFromUrl(in); + Assertions.assertEquals("BBEI12", out); + } + + @Test + public void testGetLastBitFromUrl_successWithPercent() { + String in = "/steve/websocket/CentralSystemService/BBE%I12"; + String out = StringUtils.getLastBitFromUrl(in); + Assertions.assertEquals("BBE%I12", out); + } + + @Test + public void testGetLastBitFromUrl_successWithDash() { + String in = "/steve/websocket/CentralSystemService/BBE-I12"; + String out = StringUtils.getLastBitFromUrl(in); + Assertions.assertEquals("BBE-I12", out); + } + + @Test + public void testGetLastBitFromUrl_successWithSpace() { + String in = "/steve/websocket/CentralSystemService/BBE I12"; + String out = StringUtils.getLastBitFromUrl(in); + Assertions.assertEquals("BBE I12", out); + } + + @Test + public void testGetLastBitFromUrl_successWithExtraSlash() { + String in = "/steve/websocket/CentralSystemService/889/BBEI12"; + String out = StringUtils.getLastBitFromUrl(in); + Assertions.assertEquals("889/BBEI12", out); + } + + @Test + public void testGetLastBitFromUrl_successComplex() { + String in = "/steve/websocket/CentralSystemService/%889 /BBEI12-"; + String out = StringUtils.getLastBitFromUrl(in); + Assertions.assertEquals("%889 /BBEI12-", out); + } } From ad7ac625d47303cbe6d9f440990d054dc6372b9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Thu, 28 Apr 2022 00:19:16 +0200 Subject: [PATCH 347/548] add acks to readme --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 81b1f8b11..1bd38d3d4 100644 --- a/README.md +++ b/README.md @@ -174,3 +174,8 @@ Are you having issues? ----- See the [FAQ](https://github.com/RWTH-i5-IDSG/steve/wiki/FAQ) +Acknowledgments +----- +[goekay](https://github.com/goekay) thanks to +- [JetBrains](https://jb.gg/OpenSourceSupport) who support this project by providing a free All Products Pack license, and +- ej-technologies GmbH who support this project by providing a free license for their [Java profiler](https://www.ej-technologies.com/products/jprofiler/overview.html). From 511494d6c323bb5c18d82d5ba5ad491315dec9bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 30 Apr 2022 18:00:42 +0000 Subject: [PATCH 348/548] Bump mysql-connector-java from 8.0.28 to 8.0.29 Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.28 to 8.0.29. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.28...8.0.29) --- updated-dependencies: - dependency-name: mysql:mysql-connector-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9af626ef3..7e21f8f4c 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 3.5.2 5.3.19 5.6.3 - 8.0.28 + 8.0.29 10.0.7 1.18.24 2.13.2 From f6fe3b65ae684a9b4cb76f6f238c98c1f6fb57d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Tue, 3 May 2022 23:34:28 +0200 Subject: [PATCH 349/548] consider only Raw meter values in TransactionStopService.findLastMeterValue (#816) --- .../de/rwth/idsg/steve/service/TransactionStopService.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java b/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java index 048d010fd..4d16decff 100644 --- a/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java +++ b/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java @@ -29,6 +29,7 @@ import jooq.steve.db.tables.records.TransactionStartRecord; import lombok.Builder; import ocpp.cs._2012._06.UnitOfMeasure; +import ocpp.cs._2015._10.ValueFormat; import org.jetbrains.annotations.Nullable; import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Autowired; @@ -165,6 +166,12 @@ private static boolean isEnergyValue(TransactionDetails.MeterValues v) { return false; } + // if the format is not "Raw" we cannot make any sense of this entry. we don't know how to decode it. + // https://github.com/RWTH-i5-IDSG/steve/issues/816 + if (ValueFormat.SIGNED_DATA.value().equals(v.getFormat())) { + return false; + } + if (v.getUnit() == null) { return v.getMeasurand() == null || v.getMeasurand().startsWith("Energy.Active.Import"); } else { From 96a62654ad72c0eeea7b53f84f85e5fa76d384e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Wed, 4 May 2022 01:00:38 +0200 Subject: [PATCH 350/548] refactor and tighten isEnergyValue logic (#816) --- .../steve/service/TransactionStopService.java | 23 +---- .../utils/TransactionStopServiceHelper.java | 54 +++++++++++ .../TransactionStopServiceHelperTest.java | 96 +++++++++++++++++++ 3 files changed, 152 insertions(+), 21 deletions(-) create mode 100644 src/main/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelper.java create mode 100644 src/test/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelperTest.java diff --git a/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java b/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java index 4d16decff..4e3810644 100644 --- a/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java +++ b/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java @@ -25,6 +25,7 @@ import de.rwth.idsg.steve.repository.dto.Transaction; import de.rwth.idsg.steve.repository.dto.TransactionDetails; import de.rwth.idsg.steve.repository.dto.UpdateTransactionParams; +import de.rwth.idsg.steve.utils.TransactionStopServiceHelper; import jooq.steve.db.enums.TransactionStopEventActor; import jooq.steve.db.tables.records.TransactionStartRecord; import lombok.Builder; @@ -127,7 +128,7 @@ private static TerminationValues findNeededValues(TransactionDetails thisTxDetai private static TransactionDetails.MeterValues findLastMeterValue(List values) { TransactionDetails.MeterValues v = values.stream() - .filter(TransactionStopService::isEnergyValue) + .filter(TransactionStopServiceHelper::isEnergyValue) .max(Comparator.comparing(TransactionDetails.MeterValues::getValueTimestamp)) .orElse(null); @@ -159,26 +160,6 @@ private static String floatingStringToIntString(String s) { return Integer.toString((int) Math.ceil(Double.parseDouble(s))); } - private static boolean isEnergyValue(TransactionDetails.MeterValues v) { - // should not happen, but check it to be safe. - // https://github.com/RWTH-i5-IDSG/steve/issues/249 - if (Strings.isNullOrEmpty(v.getValue())) { - return false; - } - - // if the format is not "Raw" we cannot make any sense of this entry. we don't know how to decode it. - // https://github.com/RWTH-i5-IDSG/steve/issues/816 - if (ValueFormat.SIGNED_DATA.value().equals(v.getFormat())) { - return false; - } - - if (v.getUnit() == null) { - return v.getMeasurand() == null || v.getMeasurand().startsWith("Energy.Active.Import"); - } else { - return UnitOfMeasure.WH.value().equals(v.getUnit()) || UnitOfMeasure.K_WH.value().equals(v.getUnit()); - } - } - @Builder private static class TerminationValues { private final String stopValue; diff --git a/src/main/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelper.java b/src/main/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelper.java new file mode 100644 index 000000000..13a5acd30 --- /dev/null +++ b/src/main/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelper.java @@ -0,0 +1,54 @@ +package de.rwth.idsg.steve.utils; + +import com.google.common.base.Strings; +import de.rwth.idsg.steve.repository.dto.TransactionDetails; +import ocpp.cs._2015._10.Measurand; +import ocpp.cs._2015._10.UnitOfMeasure; +import ocpp.cs._2015._10.ValueFormat; + +public class TransactionStopServiceHelper { + + public static boolean isEnergyValue(TransactionDetails.MeterValues v) { + // should not happen, but check it to be safe. + // https://github.com/RWTH-i5-IDSG/steve/issues/249 + if (Strings.isNullOrEmpty(v.getValue())) { + return false; + } + + // from 1.6 docs: "To retain backward compatibility, the default values of all of the optional fields on a + // sampledValue element are such that a value without any additional fields will be interpreted, as a register + // reading of active import energy in Wh (Watt-hour) units." + if (Strings.isNullOrEmpty(v.getReadingContext()) + && Strings.isNullOrEmpty(v.getFormat()) + && Strings.isNullOrEmpty(v.getMeasurand()) + && Strings.isNullOrEmpty(v.getLocation()) + && Strings.isNullOrEmpty(v.getUnit()) + && Strings.isNullOrEmpty(v.getPhase())) { + return true; + } + + // if the format is "SignedData", we cannot make any sense of this entry. we don't know how to decode it. + // https://github.com/RWTH-i5-IDSG/steve/issues/816 + if (ValueFormat.SIGNED_DATA.value().equals(v.getFormat())) { + return false; + } + + if (!isWHOrKWH(v.getUnit())) { + return false; + } + + if (!Measurand.ENERGY_ACTIVE_IMPORT_REGISTER.value().equals(v.getMeasurand())) { + return false; + } + + // at this point, we have a value with + // - RAW or null format + // - Wh or kWh unit + // - Energy.Active.Import.Register as the measurand + return true; + } + + private static boolean isWHOrKWH(String str) { + return UnitOfMeasure.WH.value().equals(str) || UnitOfMeasure.K_WH.value().equals(str); + } +} diff --git a/src/test/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelperTest.java b/src/test/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelperTest.java new file mode 100644 index 000000000..be51ae907 --- /dev/null +++ b/src/test/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelperTest.java @@ -0,0 +1,96 @@ +package de.rwth.idsg.steve.utils; + +import de.rwth.idsg.steve.repository.dto.TransactionDetails; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class TransactionStopServiceHelperTest { + + @Test + public void testIsEnergy_empty() { + var value = TransactionDetails.MeterValues.builder() + .build(); + + Assertions.assertFalse(TransactionStopServiceHelper.isEnergyValue(value)); + } + + @Test + public void testIsEnergy_onlyValue() { + var value = TransactionDetails.MeterValues.builder() + .value("22") + .build(); + + Assertions.assertTrue(TransactionStopServiceHelper.isEnergyValue(value)); + } + + @Test + public void testIsEnergy_signedData() { + var value = TransactionDetails.MeterValues.builder() + .value("some gibberish that is not an energy value") + .format("SignedData") + .build(); + + Assertions.assertFalse(TransactionStopServiceHelper.isEnergyValue(value)); + } + + @Test + public void testIsEnergy_notEnergyUnit() { + var value = TransactionDetails.MeterValues.builder() + .value("22") + .format("Raw") + .unit("Celsius") + .build(); + + Assertions.assertFalse(TransactionStopServiceHelper.isEnergyValue(value)); + } + + + @Test + public void testIsEnergy_notActiveImportMeasurand() { + var value = TransactionDetails.MeterValues.builder() + .value("22") + .format("Raw") + .unit("Wh") + .measurand("Current.Export") + .build(); + + Assertions.assertFalse(TransactionStopServiceHelper.isEnergyValue(value)); + } + + @Test + public void testIsEnergy_nullFormat() { + var value = TransactionDetails.MeterValues.builder() + .value("22") + .format(null) + .unit("Wh") + .measurand("Energy.Active.Import.Register") + .build(); + + Assertions.assertTrue(TransactionStopServiceHelper.isEnergyValue(value)); + } + + @Test + public void testIsEnergy_rawFormat() { + var value = TransactionDetails.MeterValues.builder() + .value("22") + .format("Raw") + .unit("Wh") + .measurand("Energy.Active.Import.Register") + .build(); + + Assertions.assertTrue(TransactionStopServiceHelper.isEnergyValue(value)); + } + + @Test + public void testIsEnergy_kWhUnit() { + var value = TransactionDetails.MeterValues.builder() + .value("22") + .format("Raw") + .unit("kWh") + .measurand("Energy.Active.Import.Register") + .build(); + + Assertions.assertTrue(TransactionStopServiceHelper.isEnergyValue(value)); + } + +} From a11c6f01647ea0a6d902668da4e88d3b6360223f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Wed, 4 May 2022 09:16:07 +0200 Subject: [PATCH 351/548] refactor --- .../steve/service/TransactionStopService.java | 13 ++++-------- .../utils/TransactionStopServiceHelper.java | 10 +++++++++ .../TransactionStopServiceHelperTest.java | 21 +++++++++++++++++++ 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java b/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java index 4e3810644..8420d0951 100644 --- a/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java +++ b/src/main/java/de/rwth/idsg/steve/service/TransactionStopService.java @@ -18,7 +18,6 @@ */ package de.rwth.idsg.steve.service; -import com.google.common.base.Strings; import com.google.common.collect.Ordering; import de.rwth.idsg.steve.repository.OcppServerRepository; import de.rwth.idsg.steve.repository.TransactionRepository; @@ -30,7 +29,6 @@ import jooq.steve.db.tables.records.TransactionStartRecord; import lombok.Builder; import ocpp.cs._2012._06.UnitOfMeasure; -import ocpp.cs._2015._10.ValueFormat; import org.jetbrains.annotations.Nullable; import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Autowired; @@ -39,6 +37,9 @@ import java.util.Comparator; import java.util.List; +import static de.rwth.idsg.steve.utils.TransactionStopServiceHelper.floatingStringToIntString; +import static de.rwth.idsg.steve.utils.TransactionStopServiceHelper.kWhStringToWhString; + /** * @author Sevket Goekay * @since 09.12.2018 @@ -139,9 +140,8 @@ private static TransactionDetails.MeterValues findLastMeterValue(List Date: Wed, 4 May 2022 11:59:42 +0200 Subject: [PATCH 352/548] tighten isEnergyValue logic part 2 (#816) --- .../utils/TransactionStopServiceHelper.java | 8 ++++++++ .../TransactionStopServiceHelperTest.java | 20 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/src/main/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelper.java b/src/main/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelper.java index 952ffe104..95ac26fbe 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelper.java @@ -25,6 +25,14 @@ public static boolean isEnergyValue(TransactionDetails.MeterValues v) { return false; } + // is it a proper numeric/decimal value? + try { + Double.parseDouble(v.getValue()); + } catch (Exception e) { + // swallow the exception. we got what we wanted. + return false; + } + // from 1.6 docs: "To retain backward compatibility, the default values of all of the optional fields on a // sampledValue element are such that a value without any additional fields will be interpreted, as a register // reading of active import energy in Wh (Watt-hour) units." diff --git a/src/test/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelperTest.java b/src/test/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelperTest.java index 4aee88807..96f22dc48 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelperTest.java +++ b/src/test/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelperTest.java @@ -44,6 +44,15 @@ public void testIsEnergy_onlyValue() { Assertions.assertTrue(TransactionStopServiceHelper.isEnergyValue(value)); } + @Test + public void testIsEnergy_onlyValueDecimal() { + var value = TransactionDetails.MeterValues.builder() + .value("22.5") + .build(); + + Assertions.assertTrue(TransactionStopServiceHelper.isEnergyValue(value)); + } + @Test public void testIsEnergy_signedData() { var value = TransactionDetails.MeterValues.builder() @@ -114,4 +123,15 @@ public void testIsEnergy_kWhUnit() { Assertions.assertTrue(TransactionStopServiceHelper.isEnergyValue(value)); } + @Test + public void testIsEnergy_nonNumericValue() { + var value = TransactionDetails.MeterValues.builder() + .value("22a819()b") + .format("Raw") + .unit("Wh") + .measurand("Energy.Active.Import.Register") + .build(); + + Assertions.assertFalse(TransactionStopServiceHelper.isEnergyValue(value)); + } } From 1364125e5861e23f69917ffd81694d49ce976aad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Thu, 5 May 2022 17:57:29 +0200 Subject: [PATCH 353/548] run github action on PR as well --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 201145400..b1632f1ca 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,5 +1,5 @@ name: build and run tests -on: [ push ] +on: [ push, pull_request ] jobs: build: From 83767338c31d8c05e81086c478cb104a74418f3a Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Thu, 12 May 2022 20:37:00 +0200 Subject: [PATCH 354/548] Adapt two files to project style (no functional change) This filters the following files with dos2unix and removes executable bit: src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java Signed-off-by: Michael Heimpold --- .../utils/ConnectorStatusCountFilter.java | 158 ++++----- .../steve/utils/ConnectorStatusFilter.java | 306 +++++++++--------- 2 files changed, 232 insertions(+), 232 deletions(-) mode change 100755 => 100644 src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java mode change 100755 => 100644 src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java diff --git a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java old mode 100755 new mode 100644 index 7c3d9e3db..16dff37b5 --- a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusCountFilter.java @@ -1,79 +1,79 @@ -/* - * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). - * All Rights Reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package de.rwth.idsg.steve.utils; - -import de.rwth.idsg.steve.repository.dto.ConnectorStatus; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; - -import java.util.Comparator; -import java.util.EnumSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.TreeSet; - -/** - * @author Sevket Goekay - * @since 10.03.2016 - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public final class ConnectorStatusCountFilter { - - public static final Set ALL_STATUS_VALUES = allStatusValues(); - - public static Map getStatusCountMap(List latestList) { - return getStatusCountMap(latestList, false); - } - - public static Map getStatusCountMap(List latestList, boolean printZero) { - List filteredList = ConnectorStatusFilter.filterAndPreferZero(latestList); - - // TreeMap because we want a consistent order of the listing on the page - TreeMap map = new TreeMap<>(); - for (ConnectorStatus item : filteredList) { - Integer count = map.get(item.getStatus()); - if (count == null) { - count = 1; - } else { - count += 1; - } - map.put(item.getStatus(), count); - } - - if (printZero) { - ALL_STATUS_VALUES.forEach(s -> map.putIfAbsent(s, 0)); - } - - return map; - } - - private static Set allStatusValues() { - // to have a predictable sorting on the web page - TreeSet set = new TreeSet<>(Comparator.naturalOrder()); - - EnumSet.allOf(ocpp.cs._2010._08.ChargePointStatus.class).forEach(k -> set.add(k.value())); - EnumSet.allOf(ocpp.cs._2012._06.ChargePointStatus.class).forEach(k -> set.add(k.value())); - EnumSet.allOf(ocpp.cs._2015._10.ChargePointStatus.class).forEach(k -> set.add(k.value())); - - return set; - } - -} +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package de.rwth.idsg.steve.utils; + +import de.rwth.idsg.steve.repository.dto.ConnectorStatus; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +import java.util.Comparator; +import java.util.EnumSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.TreeSet; + +/** + * @author Sevket Goekay + * @since 10.03.2016 + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class ConnectorStatusCountFilter { + + public static final Set ALL_STATUS_VALUES = allStatusValues(); + + public static Map getStatusCountMap(List latestList) { + return getStatusCountMap(latestList, false); + } + + public static Map getStatusCountMap(List latestList, boolean printZero) { + List filteredList = ConnectorStatusFilter.filterAndPreferZero(latestList); + + // TreeMap because we want a consistent order of the listing on the page + TreeMap map = new TreeMap<>(); + for (ConnectorStatus item : filteredList) { + Integer count = map.get(item.getStatus()); + if (count == null) { + count = 1; + } else { + count += 1; + } + map.put(item.getStatus(), count); + } + + if (printZero) { + ALL_STATUS_VALUES.forEach(s -> map.putIfAbsent(s, 0)); + } + + return map; + } + + private static Set allStatusValues() { + // to have a predictable sorting on the web page + TreeSet set = new TreeSet<>(Comparator.naturalOrder()); + + EnumSet.allOf(ocpp.cs._2010._08.ChargePointStatus.class).forEach(k -> set.add(k.value())); + EnumSet.allOf(ocpp.cs._2012._06.ChargePointStatus.class).forEach(k -> set.add(k.value())); + EnumSet.allOf(ocpp.cs._2015._10.ChargePointStatus.class).forEach(k -> set.add(k.value())); + + return set; + } + +} diff --git a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java old mode 100755 new mode 100644 index 0b28d8102..1cc2ef19e --- a/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java +++ b/src/main/java/de/rwth/idsg/steve/utils/ConnectorStatusFilter.java @@ -1,153 +1,153 @@ -/* - * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve - * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). - * All Rights Reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package de.rwth.idsg.steve.utils; - -import de.rwth.idsg.steve.repository.dto.ConnectorStatus; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; - -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -/** - * @author Sevket Goekay - * @since 10.03.2016 - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public final class ConnectorStatusFilter { - - public static List filterAndPreferZero(List initialList) { - return processAndFilterList(initialList, Strategy.PreferZero); - } - - public static List filterAndPreferOthersWithStatusOfZero(List initialList) { - return processAndFilterList(initialList, Strategy.PreferOthersWithStatusOfZero); - } - - /** - * Problem description: For a station we have regular connectors ids > 0 and connector id 0 (represents whole - * station). Connector id 0 should have upper hand while providing status information if its timestamp is - * more recent than the others and mask status info of other connectors. - * - * Link: https://github.com/RWTH-i5-IDSG/steve/issues/16 - * - * Logic walk-through: - * - * For each station - * 0) group ConnectorStatus items around charge box ids, since input is a flat list (mixed bag with all charge - * box ids and connectors) - * 1) find the latest ConnectorStatus of connector id 0 (actually there can only be at most one) - * 2) find the latest ConnectorStatus within the connectors ids > 0 - * 3) compare the two, which timestamp is more recent: 0 or others? - * 4) depending on the previous step, build the list to return - */ - private static List processAndFilterList(List initialList, Strategy strategy) { - return initialList.stream() - .collect(Collectors.groupingBy(ConnectorStatus::getChargeBoxId)) - .values() - .stream() - .flatMap(val -> processForOneStation(val, strategy).stream()) - .collect(Collectors.toList()); - } - - private static List processForOneStation(List statsList, Strategy strategy) { - Map> partition = - statsList.stream() - .collect(Collectors.partitioningBy(s -> s.getConnectorId() == 0)); - - List zero = partition.get(Boolean.TRUE); - List nonZero = partition.get(Boolean.FALSE); - - Optional maxZero = - zero.stream() - .max(Comparator.comparing(ConnectorStatus::getStatusTimestamp)); - - Optional maxNonZero = - nonZero.stream() - .max(Comparator.comparing(ConnectorStatus::getStatusTimestamp)); - - // decide what to return - // - if (maxZero.isPresent()) { - Predicate pr = o -> o.getStatusTimestamp().isAfter(maxZero.get().getStatusTimestamp()); - - if (maxNonZero.filter(pr).isPresent()) { - return nonZero; - } else { - // this is the special case we need to handle - return strategy.process(zero, nonZero); - } - } else if (maxNonZero.isPresent()) { - return nonZero; - - } else { - return Collections.emptyList(); - } - } - - // ------------------------------------------------------------------------- - // Strategy stuff - // ------------------------------------------------------------------------- - - private enum Strategy implements ZeroMoreRecentStrategy { - - PreferZero { - @Override - public List process(List zero, List nonZero) { - return zero; - } - }, - - /** - * If connector 0 is more recent, copy the status of connector 0 to - * other connector ids, and return ONLY others. - */ - PreferOthersWithStatusOfZero { - @Override - public List process(List zero, List nonZero) { - - ConnectorStatus zeroStat = zero.get(0); // we are sure that there is only one - - return nonZero.stream() - .map(cs -> ConnectorStatus.builder() - .chargeBoxPk(cs.getChargeBoxPk()) - .chargeBoxId(cs.getChargeBoxId()) - .connectorId(cs.getConnectorId()) - .timeStamp(zeroStat.getTimeStamp()) - .statusTimestamp(zeroStat.getStatusTimestamp()) - .status(zeroStat.getStatus()) - .errorCode(zeroStat.getErrorCode()) - .ocppProtocol(cs.getOcppProtocol()) - .jsonAndDisconnected(cs.isJsonAndDisconnected()) - .build()) - .collect(Collectors.toList()); - } - } - } - - private interface ZeroMoreRecentStrategy { - List process(List zero, List nonZero); - } - -} +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package de.rwth.idsg.steve.utils; + +import de.rwth.idsg.steve.repository.dto.ConnectorStatus; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +/** + * @author Sevket Goekay + * @since 10.03.2016 + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class ConnectorStatusFilter { + + public static List filterAndPreferZero(List initialList) { + return processAndFilterList(initialList, Strategy.PreferZero); + } + + public static List filterAndPreferOthersWithStatusOfZero(List initialList) { + return processAndFilterList(initialList, Strategy.PreferOthersWithStatusOfZero); + } + + /** + * Problem description: For a station we have regular connectors ids > 0 and connector id 0 (represents whole + * station). Connector id 0 should have upper hand while providing status information if its timestamp is + * more recent than the others and mask status info of other connectors. + * + * Link: https://github.com/RWTH-i5-IDSG/steve/issues/16 + * + * Logic walk-through: + * + * For each station + * 0) group ConnectorStatus items around charge box ids, since input is a flat list (mixed bag with all charge + * box ids and connectors) + * 1) find the latest ConnectorStatus of connector id 0 (actually there can only be at most one) + * 2) find the latest ConnectorStatus within the connectors ids > 0 + * 3) compare the two, which timestamp is more recent: 0 or others? + * 4) depending on the previous step, build the list to return + */ + private static List processAndFilterList(List initialList, Strategy strategy) { + return initialList.stream() + .collect(Collectors.groupingBy(ConnectorStatus::getChargeBoxId)) + .values() + .stream() + .flatMap(val -> processForOneStation(val, strategy).stream()) + .collect(Collectors.toList()); + } + + private static List processForOneStation(List statsList, Strategy strategy) { + Map> partition = + statsList.stream() + .collect(Collectors.partitioningBy(s -> s.getConnectorId() == 0)); + + List zero = partition.get(Boolean.TRUE); + List nonZero = partition.get(Boolean.FALSE); + + Optional maxZero = + zero.stream() + .max(Comparator.comparing(ConnectorStatus::getStatusTimestamp)); + + Optional maxNonZero = + nonZero.stream() + .max(Comparator.comparing(ConnectorStatus::getStatusTimestamp)); + + // decide what to return + // + if (maxZero.isPresent()) { + Predicate pr = o -> o.getStatusTimestamp().isAfter(maxZero.get().getStatusTimestamp()); + + if (maxNonZero.filter(pr).isPresent()) { + return nonZero; + } else { + // this is the special case we need to handle + return strategy.process(zero, nonZero); + } + } else if (maxNonZero.isPresent()) { + return nonZero; + + } else { + return Collections.emptyList(); + } + } + + // ------------------------------------------------------------------------- + // Strategy stuff + // ------------------------------------------------------------------------- + + private enum Strategy implements ZeroMoreRecentStrategy { + + PreferZero { + @Override + public List process(List zero, List nonZero) { + return zero; + } + }, + + /** + * If connector 0 is more recent, copy the status of connector 0 to + * other connector ids, and return ONLY others. + */ + PreferOthersWithStatusOfZero { + @Override + public List process(List zero, List nonZero) { + + ConnectorStatus zeroStat = zero.get(0); // we are sure that there is only one + + return nonZero.stream() + .map(cs -> ConnectorStatus.builder() + .chargeBoxPk(cs.getChargeBoxPk()) + .chargeBoxId(cs.getChargeBoxId()) + .connectorId(cs.getConnectorId()) + .timeStamp(zeroStat.getTimeStamp()) + .statusTimestamp(zeroStat.getStatusTimestamp()) + .status(zeroStat.getStatus()) + .errorCode(zeroStat.getErrorCode()) + .ocppProtocol(cs.getOcppProtocol()) + .jsonAndDisconnected(cs.isJsonAndDisconnected()) + .build()) + .collect(Collectors.toList()); + } + } + } + + private interface ZeroMoreRecentStrategy { + List process(List zero, List nonZero); + } + +} From 4eb460912b61ed050b32750afdf43389e43873b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 May 2022 18:00:31 +0000 Subject: [PATCH 355/548] Bump jackson-databind from 2.13.2.2 to 2.13.3 Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.13.2.2 to 2.13.3. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e21f8f4c..cdfef9b99 100644 --- a/pom.xml +++ b/pom.xml @@ -520,7 +520,7 @@ com.fasterxml.jackson.core jackson-databind - 2.13.2.2 + 2.13.3 com.fasterxml.jackson.module From 7ff266646653ca1b47164de15b352b6044e3e01b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 May 2022 18:00:38 +0000 Subject: [PATCH 356/548] Bump spring-framework-bom from 5.3.19 to 5.3.20 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.19 to 5.3.20. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.19...v5.3.20) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e21f8f4c..204123591 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.16.6 3.5.2 - 5.3.19 + 5.3.20 5.6.3 8.0.29 10.0.7 From 8bb3f6a78e6b8a9b4441bc5322c9df355d8451ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 May 2022 18:00:47 +0000 Subject: [PATCH 357/548] Bump jackson.version from 2.13.2 to 2.13.3 Bumps `jackson.version` from 2.13.2 to 2.13.3. Updates `jackson-module-jaxb-annotations` from 2.13.2 to 2.13.3 - [Release notes](https://github.com/FasterXML/jackson-modules-base/releases) - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.13.2...jackson-modules-base-2.13.3) Updates `jackson-annotations` from 2.13.2 to 2.13.3 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.module:jackson-module-jaxb-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e21f8f4c..a13245164 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 8.0.29 10.0.7 1.18.24 - 2.13.2 + 2.13.3 jdbc:mysql://${db.ip}:${db.port}/${db.schema}?useSSL=true&serverTimezone=UTC From 4b5d9fa12a4fd50e2357ec2e22b853b396f588a0 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Wed, 4 May 2022 22:20:00 +0200 Subject: [PATCH 358/548] Add recommended, additional configuration keys for OCMF The OCMF specification by SAFE e.V. recommends in the Best Practices part three new configuration keys for OCPP, see https://github.com/SAFE-eV/OCMF-Open-Charge-Metering-Format/blob/master/OCMF-de.md Add these keys to the list, so that users do not need to enter it manually. It should not harm, since OCPP clients which do not know these keys should handle it gracefully. Signed-off-by: Michael Heimpold --- .../steve/web/dto/ocpp/ConfigurationKeyEnum.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java index 7e029cd49..133a1fb88 100644 --- a/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java +++ b/src/main/java/de/rwth/idsg/steve/web/dto/ocpp/ConfigurationKeyEnum.java @@ -104,7 +104,17 @@ public enum ConfigurationKeyEnum { ChargingScheduleAllowedChargingRateUnit("comma separated list", R, newHashSet(V_16)), ChargingScheduleMaxPeriods("integer", R, newHashSet(V_16)), ConnectorSwitch3to1PhaseSupported("boolean", R, newHashSet(V_16)), - MaxChargingProfilesInstalled("integer", R, newHashSet(V_16)); + MaxChargingProfilesInstalled("integer", R, newHashSet(V_16)), + + // ------------------------------------------------------------------------- + // Recommended additional configuration keys for OCMF by SAFE e.V. + // see https://github.com/SAFE-eV/OCMF-Open-Charge-Metering-Format/blob/master/OCMF-de.md + // ------------------------------------------------------------------------- + + // StopTransactionSignatureFormat Read or Read-Write is up to Charge Point implementation so set to RW for now + StopTransactionSignatureFormat("string; specific to OCMF", RW, newHashSet(V_15, V_16)), + StopTransactionSignatureContexts("comma separated list; specific to OCMF", RW, newHashSet(V_15, V_16)), + MeterValuesSignatureContexts("comma separated list; specific to OCMF", RW, newHashSet(V_15, V_16)); private final String value; private final String text; From 397011bae804e079424771f4dcc9bb37fe2edd8a Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Tue, 17 May 2022 21:29:33 +0200 Subject: [PATCH 359/548] Add tooltip to GetConfiguration listbox items For some items, the listbox is too small to disply the long-ish configuration key name plus a type hint/note. So add a html title property for each listbox item, so that browser show the full string also as tooltip. Signed-off-by: Michael Heimpold --- .../webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp b/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp index 7ec048198..7c4015840 100644 --- a/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp +++ b/src/main/resources/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp @@ -28,7 +28,9 @@ - + + From a6737375cf07fb507a4893af85ca4c03ec7d9ff4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 21 May 2022 18:00:48 +0000 Subject: [PATCH 360/548] Bump spring.security.version from 5.6.3 to 5.7.1 Bumps `spring.security.version` from 5.6.3 to 5.7.1. Updates `spring-security-web` from 5.6.3 to 5.7.1 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.6.3...5.7.1) Updates `spring-security-config` from 5.6.3 to 5.7.1 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.6.3...5.7.1) --- updated-dependencies: - dependency-name: org.springframework.security:spring-security-web dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework.security:spring-security-config dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 25a91fb2e..bcaf52f0f 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.16.6 3.5.2 5.3.20 - 5.6.3 + 5.7.1 8.0.29 10.0.7 1.18.24 From 6c256f6c22401c2553fcc3a382c3406c1ba77a4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 4 Jun 2022 18:00:39 +0000 Subject: [PATCH 361/548] Bump maven-pmd-plugin from 3.16.0 to 3.17.0 Bumps [maven-pmd-plugin](https://github.com/apache/maven-pmd-plugin) from 3.16.0 to 3.17.0. - [Release notes](https://github.com/apache/maven-pmd-plugin/releases) - [Commits](https://github.com/apache/maven-pmd-plugin/compare/maven-pmd-plugin-3.16.0...maven-pmd-plugin-3.17.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-pmd-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bcaf52f0f..08b23f8ad 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.16.0 + 3.17.0 org.codehaus.mojo From e86c88573e3c185814001d2acb833e808dcf8fed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Jun 2022 18:00:41 +0000 Subject: [PATCH 362/548] Bump maven-enforcer-plugin from 3.0.0 to 3.1.0 Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/apache/maven-enforcer/releases) - [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.0.0...enforcer-3.1.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-enforcer-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 08b23f8ad..6addb0596 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0 + 3.1.0 enforce-java From 296067e73700e0e8e43a5c458c674344bd81a460 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 21:55:55 +0000 Subject: [PATCH 363/548] Bump jooq.version from 3.16.6 to 3.16.7 Bumps `jooq.version` from 3.16.6 to 3.16.7. Updates `jooq-meta` from 3.16.6 to 3.16.7 Updates `jooq-codegen` from 3.16.6 to 3.16.7 Updates `jooq` from 3.16.6 to 3.16.7 Updates `jooq-codegen-maven` from 3.16.6 to 3.16.7 --- updated-dependencies: - dependency-name: org.jooq:jooq-meta dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 08b23f8ad..33e2a49b7 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 11 UTF-8 - 3.16.6 + 3.16.7 3.5.2 5.3.20 5.7.1 @@ -147,7 +147,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0 + 3.1.0 enforce-java From a7a2a912bb538a8be64160ddf2c4dad066fa0e86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 21:56:14 +0000 Subject: [PATCH 364/548] Bump spring-framework-bom from 5.3.20 to 5.3.21 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.20 to 5.3.21. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.20...v5.3.21) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 08b23f8ad..544939df5 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.16.6 3.5.2 - 5.3.20 + 5.3.21 5.7.1 8.0.29 10.0.7 @@ -147,7 +147,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0 + 3.1.0 enforce-java From e5b6784b46e3ec33197ddefc28822100aa2ee465 Mon Sep 17 00:00:00 2001 From: Julien Herr Date: Sat, 18 Jun 2022 10:18:41 +0200 Subject: [PATCH 365/548] Create notification objects --- .../ocpp/ws/AbstractWebSocketEndpoint.java | 6 ++- .../CentralSystemService16_Service.java | 14 +++--- .../steve/service/NotificationService.java | 45 ++++++++++--------- .../notification/OccpStationBooted.java | 12 +++++ .../OcppStationStatusFailure.java | 11 +++++ .../OcppStationWebSocketConnected.java | 9 ++++ .../OcppStationWebSocketDisconnected.java | 9 ++++ .../notification/OcppTransactionEnded.java | 10 +++++ .../notification/OcppTransactionStarted.java | 11 +++++ 9 files changed, 99 insertions(+), 28 deletions(-) create mode 100644 src/main/java/de/rwth/idsg/steve/service/notification/OccpStationBooted.java create mode 100644 src/main/java/de/rwth/idsg/steve/service/notification/OcppStationStatusFailure.java create mode 100644 src/main/java/de/rwth/idsg/steve/service/notification/OcppStationWebSocketConnected.java create mode 100644 src/main/java/de/rwth/idsg/steve/service/notification/OcppStationWebSocketDisconnected.java create mode 100644 src/main/java/de/rwth/idsg/steve/service/notification/OcppTransactionEnded.java create mode 100644 src/main/java/de/rwth/idsg/steve/service/notification/OcppTransactionStarted.java diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java index 5e4f72e74..d926d9813 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java @@ -27,6 +27,8 @@ import de.rwth.idsg.steve.ocpp.ws.pipeline.IncomingPipeline; import de.rwth.idsg.steve.repository.OcppServerRepository; import de.rwth.idsg.steve.service.NotificationService; +import de.rwth.idsg.steve.service.notification.OcppStationWebSocketConnected; +import de.rwth.idsg.steve.service.notification.OcppStationWebSocketDisconnected; import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.socket.BinaryMessage; @@ -72,8 +74,8 @@ public abstract class AbstractWebSocketEndpoint extends ConcurrentWebSocketHandl public void init(IncomingPipeline pipeline) { this.pipeline = pipeline; - connectedCallbackList.add((chargeBoxId) -> notificationService.ocppStationWebSocketConnected(chargeBoxId)); - disconnectedCallbackList.add((chargeBoxId) -> notificationService.ocppStationWebSocketDisconnected(chargeBoxId)); + connectedCallbackList.add((chargeBoxId) -> notificationService.ocppStationWebSocketConnected(new OcppStationWebSocketConnected(chargeBoxId))); + disconnectedCallbackList.add((chargeBoxId) -> notificationService.ocppStationWebSocketDisconnected(new OcppStationWebSocketDisconnected(chargeBoxId))); } @Override diff --git a/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java b/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java index dacbb5320..c97211f0e 100644 --- a/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java +++ b/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java @@ -25,6 +25,10 @@ import de.rwth.idsg.steve.repository.dto.InsertTransactionParams; import de.rwth.idsg.steve.repository.dto.UpdateChargeboxParams; import de.rwth.idsg.steve.repository.dto.UpdateTransactionParams; +import de.rwth.idsg.steve.service.notification.OccpStationBooted; +import de.rwth.idsg.steve.service.notification.OcppStationStatusFailure; +import de.rwth.idsg.steve.service.notification.OcppTransactionEnded; +import de.rwth.idsg.steve.service.notification.OcppTransactionStarted; import jooq.steve.db.enums.TransactionStopEventActor; import lombok.extern.slf4j.Slf4j; import ocpp.cs._2015._10.AuthorizationStatus; @@ -77,7 +81,7 @@ public BootNotificationResponse bootNotification(BootNotificationRequest paramet OcppProtocol ocppProtocol) { Optional status = chargePointHelperService.getRegistrationStatus(chargeBoxIdentity); - notificationService.ocppStationBooted(chargeBoxIdentity, status); + notificationService.ocppStationBooted(new OccpStationBooted(chargeBoxIdentity, status)); DateTime now = DateTime.now(); if (status.isEmpty()) { @@ -138,8 +142,8 @@ public StatusNotificationResponse statusNotification( ocppServerRepository.insertConnectorStatus(params); if (parameters.getStatus() == ChargePointStatus.FAULTED) { - notificationService.ocppStationStatusFailure( - chargeBoxIdentity, parameters.getConnectorId(), parameters.getErrorCode().value()); + notificationService.ocppStationStatusFailure(new OcppStationStatusFailure( + chargeBoxIdentity, parameters.getConnectorId(), parameters.getErrorCode().value())); } return new StatusNotificationResponse(); @@ -184,7 +188,7 @@ public StartTransactionResponse startTransaction(StartTransactionRequest paramet int transactionId = ocppServerRepository.insertTransaction(params); - notificationService.ocppTransactionStarted(transactionId, params); + notificationService.ocppTransactionStarted(new OcppTransactionStarted(transactionId, params)); return new StartTransactionResponse() .withIdTagInfo(info) @@ -217,7 +221,7 @@ public StopTransactionResponse stopTransaction(StopTransactionRequest parameters ocppServerRepository.insertMeterValues(chargeBoxIdentity, parameters.getTransactionData(), transactionId); - notificationService.ocppTransactionEnded(params); + notificationService.ocppTransactionEnded(new OcppTransactionEnded(params)); return new StopTransactionResponse().withIdTagInfo(idTagInfo); } diff --git a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java index 3c7aead1e..e475b6e00 100644 --- a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java +++ b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java @@ -23,14 +23,17 @@ import de.rwth.idsg.steve.repository.dto.InsertTransactionParams; import de.rwth.idsg.steve.repository.dto.MailSettings; import de.rwth.idsg.steve.repository.dto.UpdateTransactionParams; +import de.rwth.idsg.steve.service.notification.OccpStationBooted; +import de.rwth.idsg.steve.service.notification.OcppStationStatusFailure; +import de.rwth.idsg.steve.service.notification.OcppStationWebSocketConnected; +import de.rwth.idsg.steve.service.notification.OcppStationWebSocketDisconnected; +import de.rwth.idsg.steve.service.notification.OcppTransactionEnded; +import de.rwth.idsg.steve.service.notification.OcppTransactionStarted; import lombok.extern.slf4j.Slf4j; -import ocpp.cs._2015._10.RegistrationStatus; import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Optional; - import static de.rwth.idsg.steve.NotificationFeature.OcppStationBooted; import static de.rwth.idsg.steve.NotificationFeature.OcppStationStatusFailure; import static de.rwth.idsg.steve.NotificationFeature.OcppStationWebSocketConnected; @@ -49,71 +52,71 @@ public class NotificationService { @Autowired private MailService mailService; - public void ocppStationBooted(String chargeBoxId, Optional status) { + public void ocppStationBooted(OccpStationBooted notification) { if (isDisabled(OcppStationBooted)) { return; } - String subject = format("Received boot notification from '%s'", chargeBoxId); + String subject = format("Received boot notification from '%s'", notification.getChargeBoxId()); String body; - if (status.isPresent()) { - body = format("Charging station '%s' is in database and has registration status '%s'.", chargeBoxId, status.get().value()); + if (notification.getStatus().isPresent()) { + body = format("Charging station '%s' is in database and has registration status '%s'.", notification.getChargeBoxId(), notification.getStatus().get().value()); } else { - body = format("Charging station '%s' is NOT in database", chargeBoxId); + body = format("Charging station '%s' is NOT in database", notification.getChargeBoxId()); } mailService.sendAsync(subject, addTimestamp(body)); } - public void ocppStationWebSocketConnected(String chargeBoxId) { + public void ocppStationWebSocketConnected(OcppStationWebSocketConnected notification) { if (isDisabled(OcppStationWebSocketConnected)) { return; } - String subject = format("Connected to JSON charging station '%s'", chargeBoxId); + String subject = format("Connected to JSON charging station '%s'", notification.getChargeBoxId()); mailService.sendAsync(subject, addTimestamp("")); } - public void ocppStationWebSocketDisconnected(String chargeBoxId) { + public void ocppStationWebSocketDisconnected(OcppStationWebSocketDisconnected notification) { if (isDisabled(OcppStationWebSocketDisconnected)) { return; } - String subject = format("Disconnected from JSON charging station '%s'", chargeBoxId); + String subject = format("Disconnected from JSON charging station '%s'", notification.getChargeBoxId()); mailService.sendAsync(subject, addTimestamp("")); } - public void ocppStationStatusFailure(String chargeBoxId, int connectorId, String errorCode) { + public void ocppStationStatusFailure(OcppStationStatusFailure notification) { if (isDisabled(OcppStationStatusFailure)) { return; } - String subject = format("Connector '%s' of charging station '%s' is FAULTED", connectorId, chargeBoxId); - String body = format("Status Error Code: '%s'", errorCode); + String subject = format("Connector '%s' of charging station '%s' is FAULTED", notification.getConnectorId(), notification.getChargeBoxId()); + String body = format("Status Error Code: '%s'", notification.getErrorCode()); mailService.sendAsync(subject, addTimestamp(body)); } - public void ocppTransactionStarted(int transactionId, InsertTransactionParams params) { + public void ocppTransactionStarted(OcppTransactionStarted notification) { if (isDisabled(OcppTransactionStarted)) { return; } - String subject = format("Transaction '%s' has started on charging station '%s' on connector '%s'", transactionId, params.getChargeBoxId(), params.getConnectorId()); + String subject = format("Transaction '%s' has started on charging station '%s' on connector '%s'", notification.getTransactionId(), notification.getParams().getChargeBoxId(), notification.getParams().getConnectorId()); - mailService.sendAsync(subject, addTimestamp(createContent(params))); + mailService.sendAsync(subject, addTimestamp(createContent(notification.getParams()))); } - public void ocppTransactionEnded(UpdateTransactionParams params) { + public void ocppTransactionEnded(OcppTransactionEnded notification) { if (isDisabled(OcppTransactionEnded)) { return; } - String subject = format("Transaction '%s' has ended on charging station '%s'", params.getTransactionId(), params.getChargeBoxId()); + String subject = format("Transaction '%s' has ended on charging station '%s'", notification.getParams().getTransactionId(), notification.getParams().getChargeBoxId()); - mailService.sendAsync(subject, addTimestamp(createContent(params))); + mailService.sendAsync(subject, addTimestamp(createContent(notification.getParams()))); } // ------------------------------------------------------------------------- diff --git a/src/main/java/de/rwth/idsg/steve/service/notification/OccpStationBooted.java b/src/main/java/de/rwth/idsg/steve/service/notification/OccpStationBooted.java new file mode 100644 index 000000000..73e4eea97 --- /dev/null +++ b/src/main/java/de/rwth/idsg/steve/service/notification/OccpStationBooted.java @@ -0,0 +1,12 @@ +package de.rwth.idsg.steve.service.notification; + +import java.util.Optional; +import lombok.Data; +import ocpp.cs._2015._10.RegistrationStatus; + +@Data +public class OccpStationBooted { + + private final String chargeBoxId; + private final Optional status; +} diff --git a/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationStatusFailure.java b/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationStatusFailure.java new file mode 100644 index 000000000..ecb7c78bc --- /dev/null +++ b/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationStatusFailure.java @@ -0,0 +1,11 @@ +package de.rwth.idsg.steve.service.notification; + +import lombok.Data; + +@Data +public class OcppStationStatusFailure { + + private final String chargeBoxId; + private final int connectorId; + private final String errorCode; +} diff --git a/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationWebSocketConnected.java b/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationWebSocketConnected.java new file mode 100644 index 000000000..cfc4aeef7 --- /dev/null +++ b/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationWebSocketConnected.java @@ -0,0 +1,9 @@ +package de.rwth.idsg.steve.service.notification; + +import lombok.Data; + +@Data +public class OcppStationWebSocketConnected { + + private final String chargeBoxId; +} diff --git a/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationWebSocketDisconnected.java b/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationWebSocketDisconnected.java new file mode 100644 index 000000000..4fb51e670 --- /dev/null +++ b/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationWebSocketDisconnected.java @@ -0,0 +1,9 @@ +package de.rwth.idsg.steve.service.notification; + +import lombok.Data; + +@Data +public class OcppStationWebSocketDisconnected { + + private final String chargeBoxId; +} diff --git a/src/main/java/de/rwth/idsg/steve/service/notification/OcppTransactionEnded.java b/src/main/java/de/rwth/idsg/steve/service/notification/OcppTransactionEnded.java new file mode 100644 index 000000000..c3da4a9fc --- /dev/null +++ b/src/main/java/de/rwth/idsg/steve/service/notification/OcppTransactionEnded.java @@ -0,0 +1,10 @@ +package de.rwth.idsg.steve.service.notification; + +import de.rwth.idsg.steve.repository.dto.UpdateTransactionParams; +import lombok.Data; + +@Data +public class OcppTransactionEnded { + + private final UpdateTransactionParams params; +} diff --git a/src/main/java/de/rwth/idsg/steve/service/notification/OcppTransactionStarted.java b/src/main/java/de/rwth/idsg/steve/service/notification/OcppTransactionStarted.java new file mode 100644 index 000000000..331b46904 --- /dev/null +++ b/src/main/java/de/rwth/idsg/steve/service/notification/OcppTransactionStarted.java @@ -0,0 +1,11 @@ +package de.rwth.idsg.steve.service.notification; + +import de.rwth.idsg.steve.repository.dto.InsertTransactionParams; +import lombok.Data; + +@Data +public class OcppTransactionStarted { + + private final int transactionId; + private final InsertTransactionParams params; +} From b6db6afef6fb777c8e57de820db8c69a8cc03f82 Mon Sep 17 00:00:00 2001 From: Julien Herr Date: Sat, 18 Jun 2022 10:27:40 +0200 Subject: [PATCH 366/548] Replace NotificationService direct calls by indirect calls via ApplicationEventPublisher --- .../idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java | 8 ++++---- .../steve/service/CentralSystemService16_Service.java | 11 ++++++----- .../rwth/idsg/steve/service/NotificationService.java | 7 +++++++ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java index d926d9813..1f37774ae 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java @@ -26,11 +26,11 @@ import de.rwth.idsg.steve.ocpp.ws.data.SessionContext; import de.rwth.idsg.steve.ocpp.ws.pipeline.IncomingPipeline; import de.rwth.idsg.steve.repository.OcppServerRepository; -import de.rwth.idsg.steve.service.NotificationService; import de.rwth.idsg.steve.service.notification.OcppStationWebSocketConnected; import de.rwth.idsg.steve.service.notification.OcppStationWebSocketDisconnected; import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationEventPublisher; import org.springframework.web.socket.BinaryMessage; import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.PongMessage; @@ -58,7 +58,7 @@ public abstract class AbstractWebSocketEndpoint extends ConcurrentWebSocketHandl @Autowired private ScheduledExecutorService service; @Autowired private OcppServerRepository ocppServerRepository; @Autowired private FutureResponseContextStore futureResponseContextStore; - @Autowired private NotificationService notificationService; + @Autowired private ApplicationEventPublisher applicationEventPublisher; public static final String CHARGEBOX_ID_KEY = "CHARGEBOX_ID_KEY"; @@ -74,8 +74,8 @@ public abstract class AbstractWebSocketEndpoint extends ConcurrentWebSocketHandl public void init(IncomingPipeline pipeline) { this.pipeline = pipeline; - connectedCallbackList.add((chargeBoxId) -> notificationService.ocppStationWebSocketConnected(new OcppStationWebSocketConnected(chargeBoxId))); - disconnectedCallbackList.add((chargeBoxId) -> notificationService.ocppStationWebSocketDisconnected(new OcppStationWebSocketDisconnected(chargeBoxId))); + connectedCallbackList.add((chargeBoxId) -> applicationEventPublisher.publishEvent(new OcppStationWebSocketConnected(chargeBoxId))); + disconnectedCallbackList.add((chargeBoxId) -> applicationEventPublisher.publishEvent(new OcppStationWebSocketDisconnected(chargeBoxId))); } @Override diff --git a/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java b/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java index c97211f0e..bfb29f4cf 100644 --- a/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java +++ b/src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java @@ -58,6 +58,7 @@ import ocpp.cs._2015._10.StopTransactionResponse; import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import java.util.Optional; @@ -74,14 +75,14 @@ public class CentralSystemService16_Service { @Autowired private SettingsRepository settingsRepository; @Autowired private OcppTagService ocppTagService; - @Autowired private NotificationService notificationService; + @Autowired private ApplicationEventPublisher applicationEventPublisher; @Autowired private ChargePointHelperService chargePointHelperService; public BootNotificationResponse bootNotification(BootNotificationRequest parameters, String chargeBoxIdentity, OcppProtocol ocppProtocol) { Optional status = chargePointHelperService.getRegistrationStatus(chargeBoxIdentity); - notificationService.ocppStationBooted(new OccpStationBooted(chargeBoxIdentity, status)); + applicationEventPublisher.publishEvent(new OccpStationBooted(chargeBoxIdentity, status)); DateTime now = DateTime.now(); if (status.isEmpty()) { @@ -142,7 +143,7 @@ public StatusNotificationResponse statusNotification( ocppServerRepository.insertConnectorStatus(params); if (parameters.getStatus() == ChargePointStatus.FAULTED) { - notificationService.ocppStationStatusFailure(new OcppStationStatusFailure( + applicationEventPublisher.publishEvent(new OcppStationStatusFailure( chargeBoxIdentity, parameters.getConnectorId(), parameters.getErrorCode().value())); } @@ -188,7 +189,7 @@ public StartTransactionResponse startTransaction(StartTransactionRequest paramet int transactionId = ocppServerRepository.insertTransaction(params); - notificationService.ocppTransactionStarted(new OcppTransactionStarted(transactionId, params)); + applicationEventPublisher.publishEvent(new OcppTransactionStarted(transactionId, params)); return new StartTransactionResponse() .withIdTagInfo(info) @@ -221,7 +222,7 @@ public StopTransactionResponse stopTransaction(StopTransactionRequest parameters ocppServerRepository.insertMeterValues(chargeBoxIdentity, parameters.getTransactionData(), transactionId); - notificationService.ocppTransactionEnded(new OcppTransactionEnded(params)); + applicationEventPublisher.publishEvent(new OcppTransactionEnded(params)); return new StopTransactionResponse().withIdTagInfo(idTagInfo); } diff --git a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java index e475b6e00..06292ed79 100644 --- a/src/main/java/de/rwth/idsg/steve/service/NotificationService.java +++ b/src/main/java/de/rwth/idsg/steve/service/NotificationService.java @@ -32,6 +32,7 @@ import lombok.extern.slf4j.Slf4j; import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; import static de.rwth.idsg.steve.NotificationFeature.OcppStationBooted; @@ -52,6 +53,7 @@ public class NotificationService { @Autowired private MailService mailService; + @EventListener public void ocppStationBooted(OccpStationBooted notification) { if (isDisabled(OcppStationBooted)) { return; @@ -68,6 +70,7 @@ public void ocppStationBooted(OccpStationBooted notification) { mailService.sendAsync(subject, addTimestamp(body)); } + @EventListener public void ocppStationWebSocketConnected(OcppStationWebSocketConnected notification) { if (isDisabled(OcppStationWebSocketConnected)) { return; @@ -78,6 +81,7 @@ public void ocppStationWebSocketConnected(OcppStationWebSocketConnected notifica mailService.sendAsync(subject, addTimestamp("")); } + @EventListener public void ocppStationWebSocketDisconnected(OcppStationWebSocketDisconnected notification) { if (isDisabled(OcppStationWebSocketDisconnected)) { return; @@ -88,6 +92,7 @@ public void ocppStationWebSocketDisconnected(OcppStationWebSocketDisconnected no mailService.sendAsync(subject, addTimestamp("")); } + @EventListener public void ocppStationStatusFailure(OcppStationStatusFailure notification) { if (isDisabled(OcppStationStatusFailure)) { return; @@ -99,6 +104,7 @@ public void ocppStationStatusFailure(OcppStationStatusFailure notification) { mailService.sendAsync(subject, addTimestamp(body)); } + @EventListener public void ocppTransactionStarted(OcppTransactionStarted notification) { if (isDisabled(OcppTransactionStarted)) { return; @@ -109,6 +115,7 @@ public void ocppTransactionStarted(OcppTransactionStarted notification) { mailService.sendAsync(subject, addTimestamp(createContent(notification.getParams()))); } + @EventListener public void ocppTransactionEnded(OcppTransactionEnded notification) { if (isDisabled(OcppTransactionEnded)) { return; From 8b4612c4d35b623f5ea2014238604ff9bd34f2bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Mon, 20 Jun 2022 19:12:44 +0200 Subject: [PATCH 367/548] add missing license headers --- .../notification/OccpStationBooted.java | 18 ++++++++++++++++++ .../notification/OcppStationStatusFailure.java | 18 ++++++++++++++++++ .../OcppStationWebSocketConnected.java | 18 ++++++++++++++++++ .../OcppStationWebSocketDisconnected.java | 18 ++++++++++++++++++ .../notification/OcppTransactionEnded.java | 18 ++++++++++++++++++ .../notification/OcppTransactionStarted.java | 18 ++++++++++++++++++ .../utils/TransactionStopServiceHelper.java | 18 ++++++++++++++++++ .../rwth/idsg/steve/ocpp/OcppVersionTest.java | 18 ++++++++++++++++++ .../TransactionStopServiceHelperTest.java | 18 ++++++++++++++++++ 9 files changed, 162 insertions(+) diff --git a/src/main/java/de/rwth/idsg/steve/service/notification/OccpStationBooted.java b/src/main/java/de/rwth/idsg/steve/service/notification/OccpStationBooted.java index 73e4eea97..78b2f1d9d 100644 --- a/src/main/java/de/rwth/idsg/steve/service/notification/OccpStationBooted.java +++ b/src/main/java/de/rwth/idsg/steve/service/notification/OccpStationBooted.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.service.notification; import java.util.Optional; diff --git a/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationStatusFailure.java b/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationStatusFailure.java index ecb7c78bc..b4d9c6a85 100644 --- a/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationStatusFailure.java +++ b/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationStatusFailure.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.service.notification; import lombok.Data; diff --git a/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationWebSocketConnected.java b/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationWebSocketConnected.java index cfc4aeef7..398104186 100644 --- a/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationWebSocketConnected.java +++ b/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationWebSocketConnected.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.service.notification; import lombok.Data; diff --git a/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationWebSocketDisconnected.java b/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationWebSocketDisconnected.java index 4fb51e670..de0ec7cd9 100644 --- a/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationWebSocketDisconnected.java +++ b/src/main/java/de/rwth/idsg/steve/service/notification/OcppStationWebSocketDisconnected.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.service.notification; import lombok.Data; diff --git a/src/main/java/de/rwth/idsg/steve/service/notification/OcppTransactionEnded.java b/src/main/java/de/rwth/idsg/steve/service/notification/OcppTransactionEnded.java index c3da4a9fc..429258936 100644 --- a/src/main/java/de/rwth/idsg/steve/service/notification/OcppTransactionEnded.java +++ b/src/main/java/de/rwth/idsg/steve/service/notification/OcppTransactionEnded.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.service.notification; import de.rwth.idsg.steve.repository.dto.UpdateTransactionParams; diff --git a/src/main/java/de/rwth/idsg/steve/service/notification/OcppTransactionStarted.java b/src/main/java/de/rwth/idsg/steve/service/notification/OcppTransactionStarted.java index 331b46904..753b6bb7f 100644 --- a/src/main/java/de/rwth/idsg/steve/service/notification/OcppTransactionStarted.java +++ b/src/main/java/de/rwth/idsg/steve/service/notification/OcppTransactionStarted.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.service.notification; import de.rwth.idsg.steve.repository.dto.InsertTransactionParams; diff --git a/src/main/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelper.java b/src/main/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelper.java index 95ac26fbe..2d809721c 100644 --- a/src/main/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelper.java +++ b/src/main/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelper.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.utils; import com.google.common.base.Strings; diff --git a/src/test/java/de/rwth/idsg/steve/ocpp/OcppVersionTest.java b/src/test/java/de/rwth/idsg/steve/ocpp/OcppVersionTest.java index 89cc08d80..0b7f64a27 100644 --- a/src/test/java/de/rwth/idsg/steve/ocpp/OcppVersionTest.java +++ b/src/test/java/de/rwth/idsg/steve/ocpp/OcppVersionTest.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.ocpp; import org.junit.jupiter.api.Assertions; diff --git a/src/test/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelperTest.java b/src/test/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelperTest.java index 96f22dc48..6cfa0f107 100644 --- a/src/test/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelperTest.java +++ b/src/test/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelperTest.java @@ -1,3 +1,21 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package de.rwth.idsg.steve.utils; import de.rwth.idsg.steve.repository.dto.TransactionDetails; From e5faf9b5c18a0ab98b9db75d07b6537a1dce8887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Wed, 22 Jun 2022 00:42:38 +0200 Subject: [PATCH 368/548] refactor remove methods with single param if methods with a collection param exists. the former can be realized by calling the latter. --- .../idsg/steve/service/ChargePointHelperService.java | 4 ---- .../de/rwth/idsg/steve/service/OcppTagService.java | 4 ---- .../service/UnidentifiedIncomingObjectService.java | 10 ---------- .../steve/web/controller/ChargePointsController.java | 4 ++-- .../idsg/steve/web/controller/OcppTagsController.java | 4 ++-- 5 files changed, 4 insertions(+), 22 deletions(-) diff --git a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java b/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java index aeb943a44..ed8a69972 100644 --- a/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java +++ b/src/main/java/de/rwth/idsg/steve/service/ChargePointHelperService.java @@ -167,10 +167,6 @@ public List getUnknownChargePoints() { return unknownChargePointService.getObjects(); } - public void removeUnknown(String chargeBoxId) { - unknownChargePointService.remove(chargeBoxId); - } - public void removeUnknown(List chargeBoxIdList) { unknownChargePointService.removeAll(chargeBoxIdList); } diff --git a/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java b/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java index d6bb128e7..4bbce8704 100644 --- a/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java +++ b/src/main/java/de/rwth/idsg/steve/service/OcppTagService.java @@ -66,10 +66,6 @@ public List getUnknownOcppTags() { return invalidOcppTagService.getObjects(); } - public void removeUnknown(String idTag) { - invalidOcppTagService.remove(idTag); - } - public void removeUnknown(List idTagList) { invalidOcppTagService.removeAll(idTagList); } diff --git a/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java b/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java index b19490efc..9adcab0e7 100644 --- a/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java +++ b/src/main/java/de/rwth/idsg/steve/service/UnidentifiedIncomingObjectService.java @@ -66,16 +66,6 @@ public void processNewUnidentified(String key) { } } - public void remove(String key) { - synchronized (changeLock) { - try { - objectsHolder.invalidate(key); - } catch (Exception e) { - log.error("Error occurred", e); - } - } - } - public void removeAll(Iterable keys) { synchronized (changeLock) { try { diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java index 1a1b16dc7..3b51dc5a7 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java @@ -195,7 +195,7 @@ public String addUnknownChargeBoxId(@PathVariable("chargeBoxId") String chargeBo @RequestMapping(value = UNKNOWN_REMOVE_PATH, method = RequestMethod.POST) public String removeUnknownChargeBoxId(@PathVariable("chargeBoxId") String chargeBoxId) { - chargePointHelperService.removeUnknown(chargeBoxId); + chargePointHelperService.removeUnknown(Collections.singletonList(chargeBoxId)); return toOverview(); } @@ -234,7 +234,7 @@ private void setCommonAttributesForSingleAdd(Model model) { private void add(ChargePointForm form) { chargePointRepository.addChargePoint(form); - chargePointHelperService.removeUnknown(form.getChargeBoxId()); + chargePointHelperService.removeUnknown(Collections.singletonList(form.getChargeBoxId())); } private void add(List idList) { diff --git a/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java b/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java index 14f32c302..1228fceee 100644 --- a/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java +++ b/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java @@ -156,7 +156,7 @@ public String addUnknownIdTag(@PathVariable("idTag") String idTag) { @RequestMapping(value = UNKNOWN_REMOVE_PATH, method = RequestMethod.POST) public String removeUnknownIdTag(@PathVariable("idTag") String idTag) { - ocppTagService.removeUnknown(idTag); + ocppTagService.removeUnknown(Collections.singletonList(idTag)); return toOverview(); } @@ -196,7 +196,7 @@ protected String toOverview() { private void add(OcppTagForm form) { ocppTagRepository.addOcppTag(form); - ocppTagService.removeUnknown(form.getIdTag()); + ocppTagService.removeUnknown(Collections.singletonList(form.getIdTag())); } private void add(List idTagList) { From c81823201e924f8556437ce57afcb870ad1f318f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Fri, 24 Jun 2022 22:59:02 +0200 Subject: [PATCH 369/548] refactor #570 --- src/main/java/de/rwth/idsg/steve/JettyServer.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/rwth/idsg/steve/JettyServer.java b/src/main/java/de/rwth/idsg/steve/JettyServer.java index 70976b281..a789b8678 100644 --- a/src/main/java/de/rwth/idsg/steve/JettyServer.java +++ b/src/main/java/de/rwth/idsg/steve/JettyServer.java @@ -22,7 +22,14 @@ import lombok.extern.slf4j.Slf4j; import org.eclipse.jetty.http.HttpScheme; import org.eclipse.jetty.http.HttpVersion; -import org.eclipse.jetty.server.*; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.ForwardedRequestCustomizer; +import org.eclipse.jetty.server.HttpConfiguration; +import org.eclipse.jetty.server.HttpConnectionFactory; +import org.eclipse.jetty.server.SecureRequestCustomizer; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.server.SslConnectionFactory; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; @@ -91,6 +98,7 @@ private void prepare() { httpConfig.setSendXPoweredBy(false); // make sure X-Forwarded-For headers are picked up if set (e.g. by a load balancer) + // https://github.com/RWTH-i5-IDSG/steve/pull/570 httpConfig.addCustomizer(new ForwardedRequestCustomizer()); // Extra options From e186677e893a5766ab4c4221d995de9fa2f28758 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 Jun 2022 18:00:37 +0000 Subject: [PATCH 370/548] Bump spring.security.version from 5.7.1 to 5.7.2 Bumps `spring.security.version` from 5.7.1 to 5.7.2. Updates `spring-security-web` from 5.7.1 to 5.7.2 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.7.1...5.7.2) Updates `spring-security-config` from 5.7.1 to 5.7.2 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.7.1...5.7.2) --- updated-dependencies: - dependency-name: org.springframework.security:spring-security-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.security:spring-security-config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8e9d6413c..9f5fe1695 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 3.16.7 3.5.2 5.3.21 - 5.7.1 + 5.7.2 8.0.29 10.0.7 1.18.24 From 309f987ac3f6b62f2bd3b6941c92faf9f0f06b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Mon, 27 Jun 2022 20:06:17 +0200 Subject: [PATCH 371/548] update jetty version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f5fe1695..e783162e2 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 5.3.21 5.7.2 8.0.29 - 10.0.7 + 10.0.11 1.18.24 2.13.3 From 76187c24dbad6126ac1afb0b23a184822b5ac09c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Jul 2022 18:01:17 +0000 Subject: [PATCH 372/548] Bump log4j-bom from 2.17.2 to 2.18.0 Bumps log4j-bom from 2.17.2 to 2.18.0. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e783162e2..fbb802afc 100644 --- a/pom.xml +++ b/pom.xml @@ -466,7 +466,7 @@ org.apache.logging.log4j log4j-bom - 2.17.2 + 2.18.0 import pom From bf23012ff3f9a0cda33cdf3cd90bab1a766c5ae0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Jul 2022 18:01:24 +0000 Subject: [PATCH 373/548] Bump cxf.version from 3.5.2 to 3.5.3 Bumps `cxf.version` from 3.5.2 to 3.5.3. Updates `cxf-rt-frontend-jaxws` from 3.5.2 to 3.5.3 Updates `cxf-rt-transports-http` from 3.5.2 to 3.5.3 Updates `cxf-rt-transports-http-hc` from 3.5.2 to 3.5.3 Updates `cxf-rt-features-logging` from 3.5.2 to 3.5.3 --- updated-dependencies: - dependency-name: org.apache.cxf:cxf-rt-frontend-jaxws dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-transports-http dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-transports-http-hc dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-features-logging dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e783162e2..d065826e2 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ UTF-8 3.16.7 - 3.5.2 + 3.5.3 5.3.21 5.7.2 8.0.29 From 515b09021cf6a1d79456be702b8b609b03f4623b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Jul 2022 18:00:35 +0000 Subject: [PATCH 374/548] Bump spring-framework-bom from 5.3.21 to 5.3.22 Bumps [spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.21 to 5.3.22. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 710d1afd0..9f7a293cf 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 3.16.7 3.5.3 - 5.3.21 + 5.3.22 5.7.2 8.0.29 10.0.11 From cc401223bb0738a7907dc853ff7965f1914548f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 30 Jul 2022 18:00:36 +0000 Subject: [PATCH 375/548] Bump junit-jupiter-params from 5.8.2 to 5.9.0 Bumps [junit-jupiter-params](https://github.com/junit-team/junit5) from 5.8.2 to 5.9.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f7a293cf..56b3cf2a3 100644 --- a/pom.xml +++ b/pom.xml @@ -695,7 +695,7 @@ org.junit.jupiter junit-jupiter-params - 5.8.2 + 5.9.0 test From a5ba505d09fe8b53adf7aebd386b35d58975fc65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 30 Jul 2022 18:00:46 +0000 Subject: [PATCH 376/548] Bump mysql-connector-java from 8.0.29 to 8.0.30 Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.29 to 8.0.30. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.29...8.0.30) --- updated-dependencies: - dependency-name: mysql:mysql-connector-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f7a293cf..7393d25a0 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 3.5.3 5.3.22 5.7.2 - 8.0.29 + 8.0.30 10.0.11 1.18.24 2.13.3 From b68c2444525329f89b1cc2104abe35067117dacf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 30 Jul 2022 18:01:11 +0000 Subject: [PATCH 377/548] Bump junit-jupiter-engine from 5.8.2 to 5.9.0 Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.8.2 to 5.9.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f7a293cf..4903ba635 100644 --- a/pom.xml +++ b/pom.xml @@ -689,7 +689,7 @@ org.junit.jupiter junit-jupiter-engine - 5.8.2 + 5.9.0 test From c16b726389ee094b8d0ef42f051d4adb064a4c1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 13 Aug 2022 18:00:22 +0000 Subject: [PATCH 378/548] Bump joda-time from 2.10.14 to 2.11.0 Bumps [joda-time](https://github.com/JodaOrg/joda-time) from 2.10.14 to 2.11.0. - [Release notes](https://github.com/JodaOrg/joda-time/releases) - [Changelog](https://github.com/JodaOrg/joda-time/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/JodaOrg/joda-time/compare/v2.10.14...v2.11.0) --- updated-dependencies: - dependency-name: joda-time:joda-time dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ebaf6fcfe..fc82e2879 100644 --- a/pom.xml +++ b/pom.xml @@ -505,7 +505,7 @@ joda-time joda-time - 2.10.14 + 2.11.0 org.hibernate.validator From 630fa18b598d807ebc280fff2320cabe86e58428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevket=20G=C3=B6kay?= Date: Wed, 17 Aug 2022 21:34:10 +0200 Subject: [PATCH 379/548] escape html chars during json ser/deser --- pom.xml | 5 + .../idsg/steve/ocpp/ws/JsonObjectMapper.java | 2 + .../ocpp/ws/custom/CustomStringModule.java | 106 ++++++++++++++++++ .../ws/custom/CustomStringModuleTest.java | 60 ++++++++++ 4 files changed, 173 insertions(+) create mode 100644 src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/CustomStringModule.java create mode 100644 src/test/java/de/rwth/idsg/steve/ocpp/ws/custom/CustomStringModuleTest.java diff --git a/pom.xml b/pom.xml index fc82e2879..104015d1b 100644 --- a/pom.xml +++ b/pom.xml @@ -714,5 +714,10 @@ 1.29 + + org.owasp.encoder + encoder + 1.2.3 + diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java index 33bb6ffda..08551731c 100644 --- a/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java @@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector; import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; +import de.rwth.idsg.steve.ocpp.ws.custom.CustomStringModule; import de.rwth.idsg.steve.ocpp.ws.ocpp12.Ocpp12JacksonModule; import de.rwth.idsg.steve.ocpp.ws.ocpp15.Ocpp15JacksonModule; import de.rwth.idsg.steve.ocpp.ws.ocpp16.Ocpp16JacksonModule; @@ -56,6 +57,7 @@ public enum JsonObjectMapper { mapper.configure(WRITE_BIGDECIMAL_AS_PLAIN, true); + mapper.registerModule(new CustomStringModule()); mapper.registerModule(new Ocpp12JacksonModule()); mapper.registerModule(new Ocpp15JacksonModule()); mapper.registerModule(new Ocpp16JacksonModule()); diff --git a/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/CustomStringModule.java b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/CustomStringModule.java new file mode 100644 index 000000000..684c786e2 --- /dev/null +++ b/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/CustomStringModule.java @@ -0,0 +1,106 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package de.rwth.idsg.steve.ocpp.ws.custom; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.Version; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.deser.std.StringDeserializer; +import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper; +import com.fasterxml.jackson.databind.jsontype.TypeSerializer; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer; +import org.owasp.encoder.Encode; + +import java.io.IOException; +import java.lang.reflect.Type; + +/** + * @author Sevket Goekay + * @since 17.08.2022 + */ +public class CustomStringModule extends SimpleModule { + + public CustomStringModule() { + super("CustomStringModule", new Version(0, 0, 1, null, "de.rwth.idsg", "steve")); + + super.addSerializer(String.class, new CustomStringSerializer()); + super.addDeserializer(String.class, new CustomStringDeserializer()); + } + + /** + * Since {@link com.fasterxml.jackson.databind.ser.std.StringSerializer} is marked as final, its contents are + * copied here (and adjusted as needed). + */ + private static class CustomStringSerializer extends StdScalarSerializer { + + private static final long serialVersionUID = 1L; + + public CustomStringSerializer() { + super(String.class, false); + } + + @Override + public boolean isEmpty(SerializerProvider prov, Object value) { + String str = (String) value; + return str.isEmpty(); + } + + @Override + public void serialize(Object value, JsonGenerator gen, SerializerProvider provider) throws IOException { + gen.writeString(objectToString(value)); + } + + @Override + public final void serializeWithType(Object value, JsonGenerator gen, SerializerProvider provider, + TypeSerializer typeSer) throws IOException { + gen.writeString(objectToString(value)); + } + + @Override + public JsonNode getSchema(SerializerProvider provider, Type typeHint) { + return createSchemaNode("string", true); + } + + @Override + public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint) throws JsonMappingException { + visitStringFormat(visitor, typeHint); + } + + private static String objectToString(Object value) { + return Encode.forHtml((String) value); + } + } + + private static class CustomStringDeserializer extends StringDeserializer { + + private static final long serialVersionUID = 1L; + + @Override + public String deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + String val = super.deserialize(p, ctxt); + return Encode.forHtml(val); + } + } +} diff --git a/src/test/java/de/rwth/idsg/steve/ocpp/ws/custom/CustomStringModuleTest.java b/src/test/java/de/rwth/idsg/steve/ocpp/ws/custom/CustomStringModuleTest.java new file mode 100644 index 000000000..ea6006656 --- /dev/null +++ b/src/test/java/de/rwth/idsg/steve/ocpp/ws/custom/CustomStringModuleTest.java @@ -0,0 +1,60 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve + * Copyright (C) 2013-2022 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG). + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package de.rwth.idsg.steve.ocpp.ws.custom; + +import com.fasterxml.jackson.databind.ObjectMapper; +import de.rwth.idsg.steve.ocpp.ws.JsonObjectMapper; +import lombok.Data; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** + * @author Sevket Goekay + * @since 17.08.2022 + */ +public class CustomStringModuleTest { + + private final ObjectMapper mapper = JsonObjectMapper.INSTANCE.getMapper(); + + @Test + public void testNormalString() throws Exception { + SimpleJsonModel input = new SimpleJsonModel("normal string"); + String output = mapper.writeValueAsString(input); + Assertions.assertEquals("{\"someText\":\"normal string\"}", output); + } + + @Test + public void testLink() throws Exception { + SimpleJsonModel input = new SimpleJsonModel("Some link"); + String output = mapper.writeValueAsString(input); + Assertions.assertEquals("{\"someText\":\"<a href="link">Some link</a>\"}", output); + } + + @Test + public void testScript() throws Exception { + SimpleJsonModel input = new SimpleJsonModel("