support gson @SerializedName in decoding

taowen · taowen · commit ae68293e195a · 2017-06-03T14:35:51.000+08:00
diff --git a/src/main/java/com/jsoniter/annotation/GsonAnnotationSupport.java b/src/main/java/com/jsoniter/annotation/GsonAnnotationSupport.java
@@ -40,7 +40,7 @@ public String value() {
 
             @Override
             public String[] from() {
-                return new String[0];
+                return new String[]{gsonObj.value()};
             }
 
             @Override
diff --git a/src/test/java/com/jsoniter/TestGson.java b/src/test/java/com/jsoniter/TestGson.java
@@ -0,0 +1,30 @@
+package com.jsoniter;
+
+import com.google.gson.Gson;
+import com.google.gson.annotations.SerializedName;
+import com.jsoniter.annotation.GsonAnnotationSupport;
+import junit.framework.TestCase;
+
+public class TestGson extends TestCase {
+
+    public void setUp() {
+        GsonAnnotationSupport.enable();
+    }
+
+    public void tearDown() {
+        GsonAnnotationSupport.disable();
+    }
+
+    public static class TestObject1 {
+        @SerializedName("field-1")
+        public String field1;
+    }
+
+    public void test_SerializedName() {
+        Gson gson = new Gson();
+        TestObject1 obj = gson.fromJson("{\"field-1\":\"hello\"}", TestObject1.class);
+        assertEquals("hello", obj.field1);
+        obj = JsonIterator.deserialize("{\"field-1\":\"hello\"}", TestObject1.class);
+        assertEquals("hello", obj.field1);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public String value() {`
`40`	`40`
`41`	`41`	`@Override`
`42`	`42`	`public String[] from() {`
`43`		`- return new String[0];`
	`43`	`+ return new String[]{gsonObj.value()};`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Override`