fix serialize OffsetDateTime, for issue #1621

alibaba · Jul 8, 2023 · 6c98e50 · 6c98e50
1 parent e981962
commit 6c98e50
Show file tree

Hide file tree

Showing 5 changed files with 132 additions and 0 deletions.
diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONWriterUTF16.java b/core/src/main/java/com/alibaba/fastjson2/JSONWriterUTF16.java
@@ -2300,6 +2300,7 @@ public final void writeOffsetDateTime(OffsetDateTime dateTime) {
             chars[off++] = 'Z';
         } else {
             zoneId.getChars(0, zoneIdLength, chars, off);
+            off += zoneIdLength;
         }
         chars[off] = quote;
         this.off = off + 1;

diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONWriterUTF8.java b/core/src/main/java/com/alibaba/fastjson2/JSONWriterUTF8.java
@@ -2193,6 +2193,7 @@ public final void writeOffsetDateTime(OffsetDateTime dateTime) {
             bytes[off++] = 'Z';
         } else {
             zoneId.getBytes(0, zoneIdLength, bytes, off);
+            off += zoneIdLength;
         }
         bytes[off] = (byte) quote;
         this.off = off + 1;

diff --git a/core/src/main/java/com/alibaba/fastjson2/util/IOUtils.java b/core/src/main/java/com/alibaba/fastjson2/util/IOUtils.java
@@ -707,6 +707,9 @@ public static int writeLocalDate(byte[] bytes, int off, int year, int month, int
             bytes[off + 3] = (byte) v;
             off += 4;
         } else {
+            if (year > 9999) {
+                bytes[off++] = '+';
+            }
             off = IOUtils.writeInt32(bytes, off, year);
         }
 
@@ -747,6 +750,9 @@ public static int writeLocalDate(char[] chars, int off, int year, int month, int
             chars[off + 3] = (char) (byte) v;
             off += 4;
         } else {
+            if (year > 9999) {
+                chars[off++] = '+';
+            }
             off = IOUtils.writeInt32(chars, off, year);
         }
 

diff --git a/core/src/test/java/com/alibaba/fastjson2/date/OffsetDateTimeTest.java b/core/src/test/java/com/alibaba/fastjson2/date/OffsetDateTimeTest.java
@@ -155,4 +155,46 @@ public void test_s9() {
         OffsetDateTime odt2 = JSON.parseObject(str.toCharArray(), OffsetDateTime.class);
         assertEquals(odt, odt2);
     }
+
+    @Test
+    public void test_min() {
+        OffsetDateTime odt = OffsetDateTime.MIN;
+        {
+            String str = JSON.toJSONString(odt);
+            OffsetDateTime odt1 = JSON.parseObject(str, OffsetDateTime.class);
+            assertEquals(odt, odt1);
+
+            OffsetDateTime odt2 = JSON.parseObject(str.toCharArray(), OffsetDateTime.class);
+            assertEquals(odt, odt2);
+
+            OffsetDateTime odt3 = JSON.parseObject(str.getBytes(), OffsetDateTime.class);
+            assertEquals(odt, odt3);
+        }
+        {
+            byte[] strBytes = JSON.toJSONBytes(odt);
+            OffsetDateTime odt1 = JSON.parseObject(strBytes, OffsetDateTime.class);
+            assertEquals(odt, odt1);
+        }
+    }
+
+    @Test
+    public void test_max() {
+        OffsetDateTime odt = OffsetDateTime.MAX;
+        {
+            String str = JSON.toJSONString(odt);
+            OffsetDateTime odt1 = JSON.parseObject(str, OffsetDateTime.class);
+            assertEquals(odt, odt1);
+
+            OffsetDateTime odt2 = JSON.parseObject(str.toCharArray(), OffsetDateTime.class);
+            assertEquals(odt, odt2);
+
+            OffsetDateTime odt3 = JSON.parseObject(str.getBytes(), OffsetDateTime.class);
+            assertEquals(odt, odt3);
+        }
+        {
+            byte[] strBytes = JSON.toJSONBytes(odt);
+            OffsetDateTime odt1 = JSON.parseObject(strBytes, OffsetDateTime.class);
+            assertEquals(odt, odt1);
+        }
+    }
 }
diff --git a/core/src/test/java/com/alibaba/fastjson2/issues_1600/Issue1621.java b/core/src/test/java/com/alibaba/fastjson2/issues_1600/Issue1621.java
@@ -0,0 +1,82 @@
+package com.alibaba.fastjson2.issues_1600;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+import org.junit.jupiter.api.Test;
+
+import java.io.Serializable;
+import java.time.OffsetDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class Issue1621 {
+    @Test
+    public void test() {
+        final OffsetDateTime defaultDateTime = OffsetDateTime.MIN;
+        DemoMetadata demoMetadata = DemoMetadata.builder()
+                .metadataType("TestType")
+                .lastMetadataRefreshTime(defaultDateTime)
+                .build();
+        Map<String, DemoMetadata> map = new HashMap<>();
+        map.put(demoMetadata.getMetadataType(), demoMetadata);
+        DemoRoot demoRoot = DemoRoot.builder()
+                .rootName("Root")
+                .lastMetadataRefreshTime(defaultDateTime)
+                .dmoToDaoTypeMapping(map)
+                .build();
+        JSONObject jsonObject = (JSONObject) JSON.toJSON(demoRoot);
+        DemoRoot updatedRoot = jsonObject.toJavaObject(DemoRoot.class);
+        assertEquals(defaultDateTime, updatedRoot.getLastMetadataRefreshTime());
+    }
+
+    @Data
+    @SuperBuilder
+    @EqualsAndHashCode(callSuper = true)
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    public static class DemoRoot
+            extends DemoAbstract {
+        private static final long serialVersionUID = 1L;
+        private String rootName;
+        private Map<String, DemoMetadata> dmoToDaoTypeMapping;
+
+        @Override
+        public void someFunction() {
+        }
+    }
+
+    @Data
+    @SuperBuilder
+    @Generated
+    @EqualsAndHashCode(callSuper = true)
+    @NoArgsConstructor
+    @ToString
+    public static class DemoMetadata
+            extends DemoAbstract {
+        private static final long serialVersionUID = 1L;
+        private String metadataType;
+
+        @Override
+        public void someFunction() {
+        }
+    }
+
+    @SuperBuilder
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    public abstract static class DemoAbstract
+            implements Serializable {
+        private static final long serialVersionUID = 1L;
+        @EqualsAndHashCode.Exclude
+        private OffsetDateTime lastMetadataRefreshTime;
+
+        public abstract void someFunction();
+    }
+}