replace ZonedDateTime with Instant (#67)

* replace ZonedDateTime with OffsetDateTime * replace OffsetDateTime with Instant --------- Signed-off-by: TOURI ANIS <[email protected]>
gridsuite · Jun 6, 2024 · 6efc39d · 6efc39d
1 parent bacd5b7
commit 6efc39d
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 19 deletions.
diff --git a/src/main/java/org/gridsuite/voltageinit/server/dto/VoltageInitResult.java b/src/main/java/org/gridsuite/voltageinit/server/dto/VoltageInitResult.java
@@ -11,7 +11,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import java.time.ZonedDateTime;
+import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -27,7 +27,7 @@ public class VoltageInitResult {
 
     private UUID resultUuid;
 
-    private ZonedDateTime writeTimeStamp;
+    private Instant writeTimeStamp;
 
     private Map<String, String> indicators;
 

diff --git a/...main/java/org/gridsuite/voltageinit/server/dto/parameters/VoltageInitParametersInfos.java b/...main/java/org/gridsuite/voltageinit/server/dto/parameters/VoltageInitParametersInfos.java
@@ -9,7 +9,7 @@
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
-import java.time.ZonedDateTime;
+import java.time.Instant;
 import java.util.List;
 import java.util.UUID;
 
@@ -30,7 +30,7 @@ public class VoltageInitParametersInfos {
     private UUID uuid;
 
     @Schema(description = "parameters date")
-    private ZonedDateTime date;
+    private Instant date;
 
     @Schema(description = "parameters name")
     private String name;

diff --git a/src/main/java/org/gridsuite/voltageinit/server/entities/VoltageInitResultEntity.java b/src/main/java/org/gridsuite/voltageinit/server/entities/VoltageInitResultEntity.java
@@ -6,12 +6,11 @@
  */
 package org.gridsuite.voltageinit.server.entities;
 
+import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import java.time.ZonedDateTime;
-
 import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
 import jakarta.persistence.ElementCollection;
@@ -40,8 +39,8 @@ public class VoltageInitResultEntity {
     @Id
     private UUID resultUuid;
 
-    @Column
-    private ZonedDateTime writeTimeStamp;
+    @Column(columnDefinition = "timestamptz")
+    private Instant writeTimeStamp;
 
     @ElementCollection
     @CollectionTable

diff --git a/...ava/org/gridsuite/voltageinit/server/entities/parameters/VoltageInitParametersEntity.java b/...ava/org/gridsuite/voltageinit/server/entities/parameters/VoltageInitParametersEntity.java
@@ -16,8 +16,7 @@
 import org.gridsuite.voltageinit.server.dto.parameters.VoltageLimitInfos;
 import org.gridsuite.voltageinit.server.util.VoltageLimitParameterType;
 
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
+import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
@@ -41,8 +40,8 @@ public class VoltageInitParametersEntity {
     @Column(name = "id")
     private UUID id;
 
-    @Column(name = "date")
-    private ZonedDateTime date;
+    @Column(name = "date", columnDefinition = "timestamptz")
+    private Instant date;
 
     @Column(name = "name")
     private String name;
@@ -82,7 +81,7 @@ public class VoltageInitParametersEntity {
     private boolean updateBusVoltage;
 
     public VoltageInitParametersEntity(@NonNull VoltageInitParametersInfos voltageInitParametersInfos) {
-        this.date = ZonedDateTime.now(ZoneOffset.UTC).truncatedTo(ChronoUnit.MICROS);
+        this.date = Instant.now().truncatedTo(ChronoUnit.MICROS);
         assignAttributes(voltageInitParametersInfos);
     }
 

diff --git a/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultService.java b/src/main/java/org/gridsuite/voltageinit/server/service/VoltageInitResultService.java
@@ -21,7 +21,7 @@
 
 import com.powsybl.openreac.parameters.output.OpenReacResult;
 
-import java.time.ZonedDateTime;
+import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -63,7 +63,7 @@ private static VoltageInitResultEntity toVoltageInitResultEntity(UUID resultUuid
                 }
             }
         ).filter(Objects::nonNull).toList();
-        return new VoltageInitResultEntity(resultUuid, ZonedDateTime.now(), indicators, reactiveSlacks, busVoltages, modificationsGroupUuid,
+        return new VoltageInitResultEntity(resultUuid, Instant.now(), indicators, reactiveSlacks, busVoltages, modificationsGroupUuid,
                                            isReactiveSlacksOverThreshold, reactiveSlacksThreshold);
     }
 
@@ -128,6 +128,6 @@ public void insert(UUID resultUuid, OpenReacResult result, Map<String, Bus> netw
     @Transactional
     public void insertErrorResult(UUID resultUuid, Map<String, String> errorIndicators) {
         Objects.requireNonNull(resultUuid);
-        resultRepository.save(new VoltageInitResultEntity(resultUuid, ZonedDateTime.now(), errorIndicators, List.of(), List.of(), null, false, null));
+        resultRepository.save(new VoltageInitResultEntity(resultUuid, Instant.now(), errorIndicators, List.of(), List.of(), null, false, null));
     }
 }
diff --git a/src/main/resources/db/changelog/changesets/changelog_20240529T153656Z.xml b/src/main/resources/db/changelog/changesets/changelog_20240529T153656Z.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet author="tourian1 (generated)" id="1716997033555-5">
+        <modifyDataType tableName="voltage_init_parameters" columnName="date" newDataType="timestamptz"/>
+    </changeSet>
+    <changeSet author="tourian1 (generated)" id="1716997033555-6">
+        <modifyDataType tableName="voltage_init_result" columnName="write_time_stamp" newDataType="timestamptz"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -26,4 +26,7 @@ databaseChangeLog:
       relativeToChangelogFile: true
   - include:
       file: changesets/changelog_20240407T230420Z.xml
-      relativeToChangelogFile: true
+      relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20240529T153656Z.xml
+      relativeToChangelogFile: true
diff --git a/src/test/java/org/gridsuite/voltageinit/utils/assertions/DTOAssert.java b/src/test/java/org/gridsuite/voltageinit/utils/assertions/DTOAssert.java
@@ -9,7 +9,7 @@
 import org.assertj.core.api.AbstractAssert;
 import org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration;
 
-import java.time.ZonedDateTime;
+import java.time.Instant;
 import java.util.Date;
 import java.util.UUID;
 
@@ -31,7 +31,7 @@ public DTOAssert<T> recursivelyEquals(T other) {
     private RecursiveComparisonConfiguration getRecursiveConfiguration() {
         return RecursiveComparisonConfiguration.builder()
             .withIgnoreAllOverriddenEquals(true)                                    // For equals test, need specific tests
-            .withIgnoredFieldsOfTypes(UUID.class, Date.class, ZonedDateTime.class)  // For these types, need specific tests (uuid from db for example)
+            .withIgnoredFieldsOfTypes(UUID.class, Date.class, Instant.class)  // For these types, need specific tests (uuid from db for example)
             .withIgnoreCollectionOrder(true)                                        // For collection order test, need specific tests
             .build();
     }