juherr · juherr · Aug 26, 2025 · Aug 25, 2025 · Aug 25, 2025 · Aug 25, 2025
diff --git a/pom.xml b/pom.xml
@@ -153,6 +153,11 @@
                 <artifactId>annotations</artifactId>
                 <version>26.0.2</version>
             </dependency>
+            <dependency>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-core</artifactId>
+                <version>3.27.3</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -184,7 +189,7 @@
                                         <version>[17,)</version>
                                     </requireJavaVersion>
                                     <requireMavenVersion>
-                                        <version>[3.3.9,)</version>
+                                        <version>[3.9.0,)</version>
                                     </requireMavenVersion>
                                 </rules>
                             </configuration>

diff --git a/steve-api/src/main/java/de/rwth/idsg/steve/web/api/ApiControllerAdvice.java b/steve-api/src/main/java/de/rwth/idsg/steve/web/api/ApiControllerAdvice.java
@@ -24,8 +24,6 @@
 import de.rwth.idsg.steve.web.api.exception.NotFoundException;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.joda.time.DateTime;
-import org.joda.time.LocalDateTime;
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.BindException;
@@ -38,6 +36,8 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 
+import java.time.LocalDateTime;
+
 /**
  * @author Sevket Goekay <sevketgokay@gmail.com>
  * @since 13.09.2022
@@ -103,7 +103,7 @@ public ApiErrorResponse handleException(HttpServletRequest req, Exception except
     public static ApiErrorResponse createResponse(String url, HttpStatus status, String message) {
         ApiErrorResponse result = new ApiErrorResponse();
 
-        result.setTimestamp(DateTime.now());
+        result.setTimestamp(LocalDateTime.now());
         result.setStatus(status.value());
         result.setError(status.getReasonPhrase());
         result.setMessage(message);
@@ -114,7 +114,7 @@ public static ApiErrorResponse createResponse(String url, HttpStatus status, Str
 
     @Data
     public static class ApiErrorResponse {
-        private DateTime timestamp;
+        private LocalDateTime timestamp;
         private int status;
         private String error;
         private String message;

diff --git a/steve-api/src/main/java/de/rwth/idsg/steve/web/api/dto/ApiTaskInfo.java b/steve-api/src/main/java/de/rwth/idsg/steve/web/api/dto/ApiTaskInfo.java
@@ -23,17 +23,17 @@
 import de.rwth.idsg.steve.ocpp.RequestResult;
 import de.rwth.idsg.steve.ocpp.TaskOrigin;
 import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.time.OffsetDateTime;
 import java.util.Map;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.joda.time.DateTime;
 
 /**
  * @author fnkbsi
  * @since 18.10.2023
  */
-
 @Getter
 @Setter
 public class ApiTaskInfo {
@@ -54,9 +54,9 @@ public class ApiTaskInfo {
     private int resultSize;
 
     @Schema(description = "Starttime")
-    private DateTime startTimestamp;
+    private OffsetDateTime startTimestamp;
     @Schema(description = "Endtime")
-    private DateTime endTimestamp;
+    private OffsetDateTime endTimestamp;
 
     @Schema(description = "Error count")
     private int errorCount;

diff --git a/steve-core/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java b/steve-core/src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java
@@ -25,11 +25,12 @@
 import de.rwth.idsg.steve.web.dto.ocpp.ChargePointSelection;
 import lombok.AccessLevel;
 import lombok.Getter;
-import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import jakarta.xml.ws.AsyncHandler;
+
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -56,8 +57,8 @@ public abstract class CommunicationTask<S extends ChargePointSelection, RESPONSE
     private final Map<String, RequestResult> resultMap;
     private final int resultSize;
 
-    private final DateTime startTimestamp = DateTime.now();
-    private DateTime endTimestamp;
+    private final OffsetDateTime startTimestamp = OffsetDateTime.now();
+    private OffsetDateTime endTimestamp;
 
     private final AtomicInteger errorCount = new AtomicInteger(0);
     private final AtomicInteger responseCount = new AtomicInteger(0);
@@ -113,7 +114,7 @@ public void addNewResponse(String chargeBoxId, String response) {
 
         synchronized (lockObject) {
             if (resultSize == (errorCount.get() + responseCount.incrementAndGet())) {
-                endTimestamp = DateTime.now();
+                endTimestamp = OffsetDateTime.now();
             }
         }
     }
@@ -123,7 +124,7 @@ public void addNewError(String chargeBoxId, String errorMessage) {
 
         synchronized (lockObject) {
             if (resultSize == (errorCount.incrementAndGet() + responseCount.get())) {
-                endTimestamp = DateTime.now();
+                endTimestamp = OffsetDateTime.now();
             }
         }
     }

diff --git a/steve-core/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java b/steve-core/src/main/java/de/rwth/idsg/steve/ocpp/task/GetDiagnosticsTask.java
@@ -24,7 +24,7 @@
 
 import jakarta.xml.ws.AsyncHandler;
 
-import static de.rwth.idsg.steve.utils.DateTimeUtils.toDateTime;
+import static de.rwth.idsg.steve.utils.DateTimeUtils.toOffsetDateTime;
 
 /**
  * @author Sevket Goekay <sevketgokay@gmail.com>
@@ -47,8 +47,8 @@ public ocpp.cp._2010._08.GetDiagnosticsRequest getOcpp12Request() {
                 .withLocation(params.getLocation())
                 .withRetries(params.getRetries())
                 .withRetryInterval(params.getRetryInterval())
-                .withStartTime(toDateTime(params.getStart()))
-                .withStopTime(toDateTime(params.getStop()));
+                .withStartTime(toOffsetDateTime(params.getStart()))
+                .withStopTime(toOffsetDateTime(params.getStop()));
     }
 
     @Override
@@ -57,8 +57,8 @@ public ocpp.cp._2012._06.GetDiagnosticsRequest getOcpp15Request() {
                 .withLocation(params.getLocation())
                 .withRetries(params.getRetries())
                 .withRetryInterval(params.getRetryInterval())
-                .withStartTime(toDateTime(params.getStart()))
-                .withStopTime(toDateTime(params.getStop()));
+                .withStartTime(toOffsetDateTime(params.getStart()))
+                .withStopTime(toOffsetDateTime(params.getStop()));
     }
 
     @Override
@@ -67,8 +67,8 @@ public ocpp.cp._2015._10.GetDiagnosticsRequest getOcpp16Request() {
                 .withLocation(params.getLocation())
                 .withRetries(params.getRetries())
                 .withRetryInterval(params.getRetryInterval())
-                .withStartTime(toDateTime(params.getStart()))
-                .withStopTime(toDateTime(params.getStop()));
+                .withStartTime(toOffsetDateTime(params.getStart()))
+                .withStopTime(toOffsetDateTime(params.getStop()));
     }
 
     @Override

diff --git a/steve-core/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java b/steve-core/src/main/java/de/rwth/idsg/steve/ocpp/task/ReserveNowTask.java
@@ -25,6 +25,8 @@
 
 import jakarta.xml.ws.AsyncHandler;
 
+import static de.rwth.idsg.steve.utils.DateTimeUtils.toOffsetDateTime;
+
 /**
  * @author Sevket Goekay <sevketgokay@gmail.com>
  * @since 09.03.2018
@@ -71,7 +73,7 @@ public void failed(String chargeBoxId, Exception e) {
     public ocpp.cp._2012._06.ReserveNowRequest getOcpp15Request() {
         return new ocpp.cp._2012._06.ReserveNowRequest()
                 .withConnectorId(params.getReserveNowParams().getConnectorId())
-                .withExpiryDate(params.getReserveNowParams().getExpiry().toDateTime())
+                .withExpiryDate(toOffsetDateTime(params.getReserveNowParams().getExpiry()))
                 .withIdTag(params.getReserveNowParams().getIdTag())
                 .withReservationId(params.getReservationId())
                 .withParentIdTag(params.getParentIdTag());
@@ -81,7 +83,7 @@ public ocpp.cp._2012._06.ReserveNowRequest getOcpp15Request() {
     public ocpp.cp._2015._10.ReserveNowRequest getOcpp16Request() {
         return new ocpp.cp._2015._10.ReserveNowRequest()
                 .withConnectorId(params.getReserveNowParams().getConnectorId())
-                .withExpiryDate(params.getReserveNowParams().getExpiry().toDateTime())
+                .withExpiryDate(toOffsetDateTime(params.getReserveNowParams().getExpiry()))
                 .withIdTag(params.getReserveNowParams().getIdTag())
                 .withReservationId(params.getReservationId())
                 .withParentIdTag(params.getParentIdTag());

diff --git a/steve-core/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTaskFromDB.java b/steve-core/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTaskFromDB.java
@@ -34,6 +34,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static de.rwth.idsg.steve.utils.DateTimeUtils.toOffsetDateTime;
+
 /**
  * @author Sevket Goekay <sevketgokay@gmail.com>
  * @since 13.03.2018
@@ -86,7 +88,7 @@ public SetChargingProfileRequest getOcpp16Request() {
 
         ChargingSchedule schedule = new ChargingSchedule()
                 .withDuration(profile.getDurationInSeconds())
-                .withStartSchedule(profile.getStartSchedule())
+                .withStartSchedule(toOffsetDateTime(profile.getStartSchedule()))
                 .withChargingRateUnit(ChargingRateUnitType.fromValue(profile.getChargingRateUnit()))
                 .withMinChargingRate(profile.getMinChargingRate())
                 .withChargingSchedulePeriod(schedulePeriods);
@@ -97,8 +99,8 @@ public SetChargingProfileRequest getOcpp16Request() {
                 .withChargingProfilePurpose(ChargingProfilePurposeType.fromValue(profile.getChargingProfilePurpose()))
                 .withChargingProfileKind(ChargingProfileKindType.fromValue(profile.getChargingProfileKind()))
                 .withRecurrencyKind(profile.getRecurrencyKind() == null ? null : RecurrencyKindType.fromValue(profile.getRecurrencyKind()))
-                .withValidFrom(profile.getValidFrom())
-                .withValidTo(profile.getValidTo())
+                .withValidFrom(toOffsetDateTime(profile.getValidFrom()))
+                .withValidTo(toOffsetDateTime(profile.getValidTo()))
                 .withChargingSchedule(schedule);
 
         var request = new SetChargingProfileRequest()

diff --git a/steve-core/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java b/steve-core/src/main/java/de/rwth/idsg/steve/ocpp/task/UpdateFirmwareTask.java
@@ -24,7 +24,7 @@
 
 import jakarta.xml.ws.AsyncHandler;
 
-import static de.rwth.idsg.steve.utils.DateTimeUtils.toDateTime;
+import static de.rwth.idsg.steve.utils.DateTimeUtils.toOffsetDateTime;
 
 /**
  * @author Sevket Goekay <sevketgokay@gmail.com>
@@ -45,7 +45,7 @@ public OcppCallback<String> defaultCallback() {
     public ocpp.cp._2010._08.UpdateFirmwareRequest getOcpp12Request() {
         return new ocpp.cp._2010._08.UpdateFirmwareRequest()
                 .withLocation(params.getLocation())
-                .withRetrieveDate(toDateTime(params.getRetrieve()))
+                .withRetrieveDate(toOffsetDateTime(params.getRetrieve()))
                 .withRetries(params.getRetries())
                 .withRetryInterval(params.getRetryInterval());
     }
@@ -54,7 +54,7 @@ public ocpp.cp._2010._08.UpdateFirmwareRequest getOcpp12Request() {
     public ocpp.cp._2012._06.UpdateFirmwareRequest getOcpp15Request() {
         return new ocpp.cp._2012._06.UpdateFirmwareRequest()
                 .withLocation(params.getLocation())
-                .withRetrieveDate(toDateTime(params.getRetrieve()))
+                .withRetrieveDate(toOffsetDateTime(params.getRetrieve()))
                 .withRetries(params.getRetries())
                 .withRetryInterval(params.getRetryInterval());
     }
@@ -63,7 +63,7 @@ public ocpp.cp._2012._06.UpdateFirmwareRequest getOcpp15Request() {
     public ocpp.cp._2015._10.UpdateFirmwareRequest getOcpp16Request() {
         return new ocpp.cp._2015._10.UpdateFirmwareRequest()
                 .withLocation(params.getLocation())
-                .withRetrieveDate(toDateTime(params.getRetrieve()))
+                .withRetrieveDate(toOffsetDateTime(params.getRetrieve()))
                 .withRetries(params.getRetries())
                 .withRetryInterval(params.getRetryInterval());
     }

diff --git a/steve-core/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java b/steve-core/src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java
@@ -24,8 +24,8 @@
 import de.rwth.idsg.steve.repository.dto.UpdateChargeboxParams;
 import de.rwth.idsg.steve.repository.dto.UpdateTransactionParams;
 import ocpp.cs._2015._10.MeterValue;
-import org.joda.time.DateTime;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -39,7 +39,7 @@ public interface OcppServerRepository {
     void updateEndpointAddress(String chargeBoxIdentity, String endpointAddress);
     void updateChargeboxFirmwareStatus(String chargeBoxIdentity, String firmwareStatus);
     void updateChargeboxDiagnosticsStatus(String chargeBoxIdentity, String status);
-    void updateChargeboxHeartbeat(String chargeBoxIdentity, DateTime ts);
+    void updateChargeboxHeartbeat(String chargeBoxIdentity, LocalDateTime ts);
 
     void insertConnectorStatus(InsertConnectorStatusParams params);
 

diff --git a/steve-core/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java b/steve-core/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java
@@ -23,12 +23,11 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.joda.time.DateTime;
+
+import java.time.LocalDateTime;
 
 /**
- *
  * @author Sevket Goekay <sevketgokay@gmail.com>
- *
  */
 public final class ChargePoint {
 
@@ -37,7 +36,7 @@ public final class ChargePoint {
     public static final class Overview {
         private final int chargeBoxPk;
         private final String chargeBoxId, description, ocppProtocol, lastHeartbeatTimestamp;
-        private final DateTime lastHeartbeatTimestampDT;
+        private final LocalDateTime lastHeartbeatTimestampDT;
     }
 
     @Getter

diff --git a/steve-core/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java b/steve-core/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java
@@ -23,8 +23,8 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.joda.time.DateTime;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -54,7 +54,7 @@ public static final class Overview {
         private final int chargingProfilePk;
         private final int stackLevel;
         private final String description, profilePurpose, profileKind, recurrencyKind;
-        private final DateTime validFrom, validTo;
+        private final LocalDateTime validFrom, validTo;
     }
 
     @Getter

diff --git a/steve-core/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java b/steve-core/src/main/java/de/rwth/idsg/steve/repository/dto/ConnectorStatus.java
@@ -24,12 +24,11 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
-import org.joda.time.DateTime;
+
+import java.time.OffsetDateTime;
 
 /**
- *
  * @author Sevket Goekay <sevketgokay@gmail.com>
- *
  */
 @Getter
 @Builder
@@ -52,7 +51,7 @@ public final class ConnectorStatus {
     // For additional internal processing. Not related to the humanized
     // String version above, which is for representation on frontend
     @Schema(description = "Timestamp of the status")
-    private final DateTime statusTimestamp;
+    private final OffsetDateTime statusTimestamp;
 
     @Schema(description = "OCPP version")
     private final OcppProtocol ocppProtocol;

diff --git a/steve-core/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java b/steve-core/src/main/java/de/rwth/idsg/steve/repository/dto/InsertConnectorStatusParams.java
@@ -20,7 +20,8 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import org.joda.time.DateTime;
+
+import java.time.OffsetDateTime;
 
 /**
  * @author Sevket Goekay <sevketgokay@gmail.com>
@@ -31,7 +32,7 @@
 public class InsertConnectorStatusParams {
     private final String chargeBoxId;
     private final int connectorId;
-    private final DateTime timestamp;
+    private final OffsetDateTime timestamp;
     private final String status;
     private final String errorCode;
 

diff --git a/steve-core/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java b/steve-core/src/main/java/de/rwth/idsg/steve/repository/dto/InsertReservationParams.java
@@ -20,7 +20,8 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import org.joda.time.DateTime;
+
+import java.time.LocalDateTime;
 
 /**
  * @author Sevket Goekay <sevketgokay@gmail.com>
@@ -31,5 +32,5 @@
 public class InsertReservationParams {
     private final String idTag, chargeBoxId;
     private final int connectorId;
-    private final DateTime startTimestamp, expiryTimestamp;
+    private final LocalDateTime startTimestamp, expiryTimestamp;
 }