support gson dateformat decode

taowen · taowen · commit 9f72f020f6e8 · 2017-06-06T13:21:40.000+08:00
diff --git a/src/main/java/com/jsoniter/extra/GsonCompatibilityMode.java b/src/main/java/com/jsoniter/extra/GsonCompatibilityMode.java
@@ -2,6 +2,7 @@
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+import com.jsoniter.JsonIterator;
 import com.jsoniter.annotation.JsonIgnore;
 import com.jsoniter.annotation.JsonProperty;
 import com.jsoniter.any.Any;
@@ -13,6 +14,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -118,6 +120,24 @@ public void encode(Object obj, JsonStream stream) throws IOException {
         return super.createEncoder(cacheKey, type);
     }
 
+    @Override
+    public Decoder createDecoder(String cacheKey, Type type) {
+        if (Date.class == type) {
+            return new Decoder() {
+                @Override
+                public Object decode(JsonIterator iter) throws IOException {
+                    DateFormat dateFormat = builder().dateFormat.get();
+                    try {
+                        return dateFormat.parse(iter.readString());
+                    } catch (ParseException e) {
+                        throw new JsonException(e);
+                    }
+                }
+            };
+        }
+        return super.createDecoder(cacheKey, type);
+    }
+
     @Override
     public void updateClassDescriptor(ClassDescriptor desc) {
         removeGetterAndSetter(desc);
diff --git a/src/main/java/com/jsoniter/spi/ClassDescriptor.java b/src/main/java/com/jsoniter/spi/ClassDescriptor.java
@@ -32,6 +32,7 @@ public static ClassDescriptor getDecodingClassDescriptor(ClassInfo classInfo, bo
         desc.ctor = getCtor(clazz);
         desc.fields = getFields(lookup, classInfo, includingPrivate);
         desc.setters = getSetters(lookup, classInfo, includingPrivate);
+        desc.getters = new ArrayList<Binding>();
         desc.bindingTypeWrappers = new ArrayList<WrapperDescriptor>();
         desc.keyValueTypeWrappers = new ArrayList<Method>();
         desc.unwrappers = new ArrayList<UnwrapperDescriptor>();
diff --git a/src/test/java/com/jsoniter/TestGson.java b/src/test/java/com/jsoniter/TestGson.java
@@ -5,8 +5,12 @@
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import com.jsoniter.extra.GsonCompatibilityMode;
+import com.jsoniter.output.JsonStream;
 import junit.framework.TestCase;
 
+import java.util.Date;
+import java.util.TimeZone;
+
 public class TestGson extends TestCase {
 
     public static class TestObject1 {
@@ -40,4 +44,37 @@ public void test_Expose() {
                 "{\"field1\":\"hello\"}", TestObject2.class);
         assertNull(obj.field1);
     }
+
+    public void test_setDateFormat_no_op() {
+        TimeZone orig = TimeZone.getDefault();
+        try {
+            TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+            Gson gson = new GsonBuilder().create();
+            Date obj = gson.fromJson("\"Jan 1, 1970, 12:00:00 AM\"", Date.class);
+            assertEquals(0, obj.getTime());
+            GsonCompatibilityMode config = new GsonCompatibilityMode.Builder()
+                    .build();
+            obj = JsonIterator.deserialize(config, "\"Jan 1, 1970, 12:00:00 AM\"", Date.class);
+            assertEquals(0, obj.getTime());
+        } finally {
+            TimeZone.setDefault(orig);
+        }
+    }
+
+    public void test_setDateFormat_format() {
+        TimeZone orig = TimeZone.getDefault();
+        try {
+            TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+            Gson gson = new GsonBuilder().setDateFormat("EEE, MMM d, yyyy hh:mm:ss a z").create();
+            Date obj = gson.fromJson("\"Thu, Jan 1, 1970 12:00:00 AM UTC\"", Date.class);
+            assertEquals(0, obj.getTime());
+            GsonCompatibilityMode config = new GsonCompatibilityMode.Builder()
+                    .setDateFormat("EEE, MMM d, yyyy hh:mm:ss a z")
+                    .build();
+            obj = JsonIterator.deserialize(config, "\"Thu, Jan 1, 1970 12:00:00 AM UTC\"", Date.class);
+            assertEquals(0, obj.getTime());
+        } finally {
+            TimeZone.setDefault(orig);
+        }
+    }
 }
