Skip to content

Commit 4fbedfc

Browse files
authored
replace ZonedDateTime with OffsetDateTime (#572)
* replace LocalDateTime with ZonedDateTime * replace ZonedDateTime with OffsetDateTime * replace OffsetDateTime with Instant --------- Signed-off-by: TOURI ANIS <[email protected]>
1 parent 540c080 commit 4fbedfc

File tree

7 files changed

+23
-11
lines changed

7 files changed

+23
-11
lines changed

src/main/java/org/gridsuite/study/server/dto/modification/ModificationInfos.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import lombok.ToString;
1717
import lombok.experimental.SuperBuilder;
1818

19-
import java.time.ZonedDateTime;
19+
import java.time.Instant;
2020
import java.util.Set;
2121
import java.util.UUID;
2222

@@ -62,7 +62,7 @@ public class ModificationInfos {
6262
private UUID uuid;
6363

6464
@Schema(description = "Modification date")
65-
ZonedDateTime date;
65+
Instant date;
6666

6767
@Schema(description = "Modification type")
6868
ModificationType type;

src/main/java/org/gridsuite/study/server/dto/voltageinit/results/VoltageInitResult.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import lombok.Getter;
1111
import lombok.NoArgsConstructor;
1212

13-
import java.time.ZonedDateTime;
13+
import java.time.Instant;
1414
import java.util.List;
1515
import java.util.Map;
1616
import java.util.UUID;
@@ -25,7 +25,7 @@ public class VoltageInitResult {
2525

2626
private UUID resultUuid;
2727

28-
private ZonedDateTime writeTimeStamp;
28+
private Instant writeTimeStamp;
2929

3030
private Map<String, String> indicators;
3131

src/main/java/org/gridsuite/study/server/networkmodificationtree/entities/NodeEntity.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
import jakarta.persistence.JoinColumn;
2727
import jakarta.persistence.ManyToOne;
2828
import jakarta.persistence.Table;
29-
import java.time.LocalDateTime;
29+
30+
import java.time.Instant;
3031
import java.util.UUID;
3132

3233
/**
@@ -63,7 +64,7 @@ public class NodeEntity {
6364
@Column(name = "stashed")
6465
boolean stashed;
6566

66-
@Column(name = "stash_date")
67-
private LocalDateTime stashDate;
67+
@Column(name = "stash_date", columnDefinition = "timestamptz")
68+
private Instant stashDate;
6869

6970
}

src/main/java/org/gridsuite/study/server/notification/NotificationService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.springframework.messaging.Message;
2121
import org.springframework.stereotype.Service;
2222

23-
import java.time.LocalDateTime;
23+
import java.time.Instant;
2424
import java.util.Collection;
2525
import java.util.Set;
2626
import java.util.UUID;
@@ -384,7 +384,7 @@ public void emitElementUpdated(UUID elementUuid, String modifiedBy) {
384384
sendElementUpdateMessage(MessageBuilder.withPayload("")
385385
.setHeader(HEADER_ELEMENT_UUID, elementUuid)
386386
.setHeader(HEADER_MODIFIED_BY, modifiedBy)
387-
.setHeader(HEADER_MODIFICATION_DATE, LocalDateTime.now())
387+
.setHeader(HEADER_MODIFICATION_DATE, Instant.now())
388388
.build()
389389
);
390390
}

src/main/java/org/gridsuite/study/server/service/NetworkModificationTreeService.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
import org.springframework.transaction.annotation.Transactional;
2727

2828
import jakarta.persistence.EntityNotFoundException;
29-
import java.time.LocalDateTime;
29+
30+
import java.time.Instant;
3031
import java.util.*;
3132
import java.util.stream.Collectors;
3233

@@ -282,7 +283,7 @@ private void stashNodes(UUID id, boolean stashChildren, List<UUID> stashedNodes,
282283
}
283284
stashedNodes.add(id);
284285
nodeToStash.setStashed(true);
285-
nodeToStash.setStashDate(LocalDateTime.now());
286+
nodeToStash.setStashDate(Instant.now());
286287
//We only unlink the first deleted node so the rest of the tree is still connected as it was
287288
if (firstIteration) {
288289
nodeToStash.setParentNode(null);
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
2+
<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">
3+
<changeSet author="tourian1 (generated)" id="1716390506885-18">
4+
<modifyDataType tableName="node" columnName="stash_date" newDataType="timestamptz"/>
5+
</changeSet>
6+
</databaseChangeLog>

src/main/resources/db/changelog/db.changelog-master.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,3 +230,7 @@ databaseChangeLog:
230230
- include:
231231
file: changesets/changelog_20240404T091326Z.xml
232232
relativeToChangelogFile: true
233+
- include:
234+
file: changesets/changelog_20240522T150750Z.xml
235+
relativeToChangelogFile: true
236+

0 commit comments

Comments
 (0)