LocalDateTime & OffsetDateTime & ZonedDateTime support JSONField#locale, for issue#2328

Author: wenshao

core/src/main/java/com/alibaba/fastjson2/writer/FieldWriterObjectFunc.java

@@ -3,6 +3,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
+import java.util.Locale;
 import java.util.concurrent.atomic.AtomicIntegerArray;
 import java.util.concurrent.atomic.AtomicLongArray;
 import java.util.concurrent.atomic.AtomicReferenceArray;
@@ -18,14 +19,15 @@ final class FieldWriterObjectFunc<T>
             int ordinal,
             long features,
             String format,
+            Locale locale,
             String label,
             Type fieldType,
             Class fieldClass,
             Field field,
             Method method,
             Function function
     ) {
-        super(name, ordinal, features, format, null, label, fieldType, fieldClass, field, method);
+        super(name, ordinal, features, format, locale, label, fieldType, fieldClass, field, method);
         this.function = function;
         isArray = fieldClass == AtomicIntegerArray.class
                 || fieldClass == AtomicLongArray.class

core/src/main/java/com/alibaba/fastjson2/writer/FieldWriterObjectMethod.java

@@ -6,6 +6,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
+import java.util.Locale;
 
 class FieldWriterObjectMethod<T>
         extends FieldWriterObject<T> {
@@ -14,13 +15,14 @@ protected FieldWriterObjectMethod(
             int ordinal,
             long features,
             String format,
+            Locale locale,
             String label,
             Type fieldType,
             Class fieldClass,
             Field field,
             Method method
     ) {
-        super(name, ordinal, features, format, null, label, fieldType, fieldClass, field, method);
+        super(name, ordinal, features, format, locale, label, fieldType, fieldClass, field, method);
     }
 
     @Override

core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterCreator.java

@@ -876,6 +876,31 @@ public <T> FieldWriter<T> createFieldWriter(
             String label,
             Method method,
             ObjectWriter initObjectWriter
+    ) {
+        return createFieldWriter(
+                provider,
+                objectType,
+                fieldName,
+                ordinal,
+                features,
+                format,
+                null,
+                label,
+                method, initObjectWriter
+        );
+    }
+
+    public <T> FieldWriter<T> createFieldWriter(
+            ObjectWriterProvider provider,
+            Class<T> objectType,
+            String fieldName,
+            int ordinal,
+            long features,
+            String format,
+            Locale locale,
+            String label,
+            Method method,
+            ObjectWriter initObjectWriter
     ) {
         method.setAccessible(true);
         Class<?> fieldClass = method.getReturnType();
@@ -886,7 +911,7 @@ public <T> FieldWriter<T> createFieldWriter(
         }
 
         if (initObjectWriter != null) {
-            FieldWriterObjectMethod objMethod = new FieldWriterObjectMethod(fieldName, ordinal, features, format, label, fieldType, fieldClass, null, method);
+            FieldWriterObjectMethod objMethod = new FieldWriterObjectMethod(fieldName, ordinal, features, format, locale, label, fieldType, fieldClass, null, method);
             objMethod.initValueClass = fieldClass;
             if (initObjectWriter != ObjectWriterBaseModule.VoidObjectWriter.INSTANCE) {
                 objMethod.initObjectWriter = initObjectWriter;
@@ -980,7 +1005,7 @@ public <T> FieldWriter<T> createFieldWriter(
             return new FieldWriterObjectArrayMethod(fieldName, fieldClass.getComponentType(), ordinal, features, format, label, fieldType, fieldClass, field, method);
         }
 
-        return new FieldWriterObjectMethod(fieldName, ordinal, features, format, label, fieldType, fieldClass, null, method);
+        return new FieldWriterObjectMethod(fieldName, ordinal, features, format, locale, label, fieldType, fieldClass, null, method);
     }
 
     public <T> FieldWriter createFieldWriter(String fieldName, ToLongFunction<T> function) {
@@ -1065,7 +1090,39 @@ public <T, V> FieldWriter<T> createFieldWriter(
             Method method,
             Function<T, V> function
     ) {
-        return createFieldWriter(provider, objectClass, fieldName, ordinal, features, format, label, fieldType, fieldClass, null, method, function);
+        return createFieldWriter(
+                provider, objectClass, fieldName, ordinal, features, format, null, label, fieldType, fieldClass, null, method, function);
+    }
+
+    public <T, V> FieldWriter<T> createFieldWriter(
+            ObjectWriterProvider provider,
+            Class<T> objectClass,
+            String fieldName,
+            int ordinal,
+            long features,
+            String format,
+            String label,
+            Type fieldType,
+            Class<V> fieldClass,
+            Field field,
+            Method method,
+            Function<T, V> function
+    ) {
+        return createFieldWriter(
+                provider,
+                objectClass,
+                fieldName,
+                ordinal,
+                features,
+                format,
+                null,
+                label,
+                fieldType,
+                fieldClass,
+                field,
+                method,
+                function
+        );
     }
 
     public <T, V> FieldWriter<T> createFieldWriter(
@@ -1075,6 +1132,7 @@ public <T, V> FieldWriter<T> createFieldWriter(
             int ordinal,
             long features,
             String format,
+            Locale locale,
             String label,
             Type fieldType,
             Class<V> fieldClass,
@@ -1173,7 +1231,7 @@ public <T, V> FieldWriter<T> createFieldWriter(
             return new FieldWriterObjectFuncFinal(fieldName, ordinal, features, format, label, fieldType, fieldClass, field, method, function);
         }
 
-        return new FieldWriterObjectFunc(fieldName, ordinal, features, format, label, fieldType, fieldClass, field, method, function);
+        return new FieldWriterObjectFunc(fieldName, ordinal, features, format, locale, label, fieldType, fieldClass, field, method, function);
     }
 
     static class LambdaInfo {

core/src/main/java/com/alibaba/fastjson2/writer/ObjectWriterCreatorASM.java

@@ -331,6 +331,7 @@ boolean record = BeanUtils.isRecord(objectClass);
                                 fieldInfo.ordinal,
                                 fieldInfo.features,
                                 fieldInfo.format,
+                                fieldInfo.locale,
                                 fieldInfo.label,
                                 method,
                                 writeUsingWriter

core/src/test/java/com/alibaba/fastjson2/issues_2300/Issue2328.java

@@ -81,4 +81,30 @@ public static class Bean3 {
         @JSONField(format = "E MMM dd yyyy", locale = "zh_CN")
         public LocalDate createdAt;
     }
+
+    @Test
+    public void test4() throws Exception {
+        LocalDateTime ldt = LocalDateTime.of(2018, 2, 3, 12, 13, 14);
+        Bean4 bean = new Bean4();
+        bean.createdAt = ZonedDateTime.of(ldt, ZoneId.of("Asia/Shanghai"));
+        String str = JSON.toJSONString(bean);
+        assertTrue(str.equals("{\"createdAt\":\"星期六 二月 03 12:13:14 +0800 2018\"}")
+                || str.equals("{\"createdAt\":\"周六 2月 03 12:13:14 +0800 2018\"}"));
+
+        Bean4 bean1 = JSON.parseObject(str, Bean4.class);
+        assertEquals(bean.createdAt, bean1.createdAt);
+    }
+
+    public static class Bean4 {
+        @JSONField(format = "E MMM dd HH:mm:ss Z yyyy", locale = "zh_CN")
+        private ZonedDateTime createdAt;
+
+        public ZonedDateTime getCreatedAt() {
+            return createdAt;
+        }
+
+        public void setCreatedAt(ZonedDateTime createdAt) {
+            this.createdAt = createdAt;
+        }
+    }
 }