fix: correct time deserialization format annotation placement

khakers · Sep 19, 2023 · a9e91a3 · a9e91a3
1 parent 7dded40
commit a9e91a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/com/github/khakers/modmailviewer/data/Message.java b/src/main/java/com/github/khakers/modmailviewer/data/Message.java
@@ -13,7 +13,6 @@
 public final class Message implements Comparable<Message> {
     private final String id;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateFormatters.PYTHON_STR_ISO_OFFSET_DATE_TIME_STRING, timezone = "UTC", locale = "en")
     private final Instant creationTime;
     private final String content;
     private final List<Attachment> attachments;
@@ -49,6 +48,7 @@ public final class Message implements Comparable<Message> {
     public Message(
             @JsonProperty("message_id") String id,
             @JsonProperty("timestamp")
+            @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateFormatters.PYTHON_STR_ISO_OFFSET_DATE_TIME_STRING, timezone = "UTC")
             Instant creationTime,
             @JsonProperty("content") String content,
             @JsonProperty("attachments") List<Attachment> attachments,

diff --git a/src/main/java/com/github/khakers/modmailviewer/util/DateFormatters.java b/src/main/java/com/github/khakers/modmailviewer/util/DateFormatters.java
@@ -32,7 +32,7 @@ public class DateFormatters {
           .withChronology(IsoChronology.INSTANCE)
           .withZone(ZoneId.of("UTC"));
 
-    public static final String PYTHON_STR_ISO_OFFSET_DATE_TIME_STRING = "yyyy-MM-dd HH:mm[:ss[.n]][XXX]";
+    public static final String PYTHON_STR_ISO_OFFSET_DATE_TIME_STRING = "uuuu-MM-dd HH:mm[:ss[.n]][XXX]";
     public static final DateTimeFormatter SIMPLE_TIME_FORMAT = new DateTimeFormatterBuilder()
           .appendPattern("HH:mm a")
           .toFormatter()