ctor support is working

taowen · taowen · commit 5e87258f489f · 2016-12-16T00:18:42.000+08:00
diff --git a/src/main/java/com/jsoniter/Binding.java b/src/main/java/com/jsoniter/Binding.java
@@ -0,0 +1,12 @@
+package com.jsoniter;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Type;
+
+public class Binding {
+    public Class clazz;
+    public Field field; // might be null
+    public String[] fromNames;
+    public String name;
+    public Type valueType;
+}
diff --git a/src/main/java/com/jsoniter/Codegen.java b/src/main/java/com/jsoniter/Codegen.java
diff --git a/src/main/java/com/jsoniter/CodegenAccess.java b/src/main/java/com/jsoniter/CodegenAccess.java
@@ -1,8 +1,6 @@
 package com.jsoniter;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 // only uesd by generated code to access decoder
 public class CodegenAccess {
diff --git a/src/main/java/com/jsoniter/CustomizedConstructor.java b/src/main/java/com/jsoniter/CustomizedConstructor.java
@@ -0,0 +1,19 @@
+package com.jsoniter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CustomizedConstructor {
+    /**
+     * set to null if use constructor
+     * otherwise use static method
+     */
+    public String staticMethodName;
+
+    /**
+     * the parameters to call constructor or static method
+     */
+    public List<Binding> parameters = new ArrayList<Binding>();
+
+    public static CustomizedConstructor DEFAULT_INSTANCE = new CustomizedConstructor();
+}
diff --git a/src/main/java/com/jsoniter/EmptyExtension.java b/src/main/java/com/jsoniter/EmptyExtension.java
@@ -2,21 +2,22 @@
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
+import java.util.List;
 
 public class EmptyExtension implements Extension {
 
     @Override
-    public Decoder createDecoder(Field field) {
+    public Decoder createDecoder(Binding field) {
         return null;
     }
 
     @Override
-    public String[] getAlternativeFieldNames(Field field) {
+    public String[] getAlternativeFieldNames(Binding field) {
         return null;
     }
 
     @Override
-    public String codegenNewInstance(Type type) {
+    public CustomizedConstructor getConstructor(Class clazz) {
         return null;
     }
 }
diff --git a/src/main/java/com/jsoniter/Extension.java b/src/main/java/com/jsoniter/Extension.java
@@ -2,6 +2,7 @@
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
+import java.util.List;
 
 public interface Extension {
     /**
@@ -10,21 +11,20 @@ public interface Extension {
      * @param field the field reflection object
      * @return null, if no special customization needed
      */
-    Decoder createDecoder(Field field);
+    Decoder createDecoder(Binding field);
 
     /**
      * Customize the field map to
      *
      * @param field the field reflection object
      * @return null, if fallback to default behavior
      */
-    String[] getAlternativeFieldNames(Field field);
+    String[] getAlternativeFieldNames(Binding field);
 
     /**
-     * Generate source code for creating new instance
-     *
-     * @param type the type of new object to create
-     * @return generated source code
+     * customize which constructor to call
+     * @param clazz the instance class to create
+     * @return null, if fallback to default behavior
      */
-    String codegenNewInstance(Type type);
+    CustomizedConstructor getConstructor(Class clazz);
 }
diff --git a/src/main/java/com/jsoniter/Jsoniter.java b/src/main/java/com/jsoniter/Jsoniter.java
@@ -353,4 +353,8 @@ public static void registerFieldDecoder(TypeLiteral typeLiteral, String field, D
     public static void registerExtension(Extension extension) {
         Codegen.registerExtension(extension);
     }
+
+    public static void enableStrictMode() {
+        Codegen.enableStrictMode();
+    }
 }
diff --git a/src/main/java/com/jsoniter/annotation/jsoniter/JsoniterAnnotationSupport.java b/src/main/java/com/jsoniter/annotation/jsoniter/JsoniterAnnotationSupport.java
@@ -1,27 +1,26 @@
 package com.jsoniter.annotation.jsoniter;
 
+import com.jsoniter.Binding;
 import com.jsoniter.EmptyExtension;
 import com.jsoniter.Jsoniter;
 
-import java.lang.reflect.Field;
-
 public class JsoniterAnnotationSupport extends EmptyExtension {
 
     public static void enable() {
         Jsoniter.registerExtension(new JsoniterAnnotationSupport());
     }
 
     @Override
-    public String[] getAlternativeFieldNames(Field field) {
-        JsonIgnore jsonIgnore = field.getAnnotation(JsonIgnore.class);
+    public String[] getAlternativeFieldNames(Binding field) {
+        JsonIgnore jsonIgnore = field.field.getAnnotation(JsonIgnore.class);
         if (jsonIgnore != null) {
             return new String[0];
         }
-        JsonProperty jsonProperty = field.getAnnotation(JsonProperty.class);
+        JsonProperty jsonProperty = field.field.getAnnotation(JsonProperty.class);
         if (jsonProperty != null) {
             String alternativeField = jsonProperty.value();
             if (alternativeField.equals(JsonProperty.USE_DEFAULT_NAME)) {
-                alternativeField = field.getName();
+                alternativeField = field.name;
             }
             return new String[]{alternativeField};
         }
diff --git a/src/test/java/com/jsoniter/CtorCustomizedObject.java b/src/test/java/com/jsoniter/CtorCustomizedObject.java
diff --git a/src/test/java/com/jsoniter/TestCtor.java b/src/test/java/com/jsoniter/TestCtor.java
@@ -0,0 +1,39 @@
+package com.jsoniter;
+
+import junit.framework.TestCase;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+public class TestCtor extends TestCase {
+
+    public static class OneArgCtor {
+        String field1;
+
+        public OneArgCtor(String param1) {
+            field1 = param1;
+        }
+    }
+
+    public void test_one_argument() throws IOException {
+        Jsoniter.registerExtension(new EmptyExtension() {
+            @Override
+            public CustomizedConstructor getConstructor(Class clazz) {
+                if (clazz == OneArgCtor.class) {
+                    return new CustomizedConstructor() {{
+                        parameters = (List) Arrays.asList(new Binding() {{
+                            fromNames = new String[]{"param1"};
+                            name="field1";
+                            valueType = String.class;
+                        }});
+                    }};
+                }
+                return null;
+            }
+        });
+        Jsoniter iter = Jsoniter.parse("{'param1': 'hello'}".replace('\'', '"'));
+        OneArgCtor obj = iter.read(OneArgCtor.class);
+        assertEquals("hello", obj.field1);
+    }
+}
diff --git a/src/test/java/com/jsoniter/TestCustomize.java b/src/test/java/com/jsoniter/TestCustomize.java
@@ -36,8 +36,8 @@ public Object decode(Jsoniter iter) throws IOException {
     public void test_customize_all_fields() throws IOException {
         Jsoniter.registerExtension(new EmptyExtension() {
             @Override
-            public Decoder createDecoder(Field field) {
-                if (field.getDeclaringClass() == CustomizedObject.class && field.getName().equals("field1")) {
+            public Decoder createDecoder(Binding field) {
+                if (field.clazz == CustomizedObject.class && field.name.equals("field1")) {
                     return new Decoder() {
 
                         @Override
@@ -57,8 +57,8 @@ public Object decode(Jsoniter iter) throws IOException {
     public void test_change_field_name() throws IOException {
         Jsoniter.registerExtension(new EmptyExtension() {
             @Override
-            public Decoder createDecoder(Field field) {
-                if (field.getDeclaringClass() == CustomizedObject.class && field.getName().equals("field1")) {
+            public Decoder createDecoder(Binding field) {
+                if (field.clazz == CustomizedObject.class && field.name.equals("field1")) {
                     return new Decoder() {
                         @Override
                         public Object decode(Jsoniter iter) throws IOException {
@@ -70,8 +70,8 @@ public Object decode(Jsoniter iter) throws IOException {
             }
 
             @Override
-            public String[] getAlternativeFieldNames(Field field) {
-                if (field.getDeclaringClass() == CustomizedObject.class && field.getName().equals("field1")) {
+            public String[] getAlternativeFieldNames(Binding field) {
+                if (field.clazz == CustomizedObject.class && field.name.equals("field1")) {
                     return new String[]{"field_1", "Field1"};
                 }
                 return null;
@@ -101,19 +101,4 @@ public Object decode(Jsoniter iter) throws IOException {
         CustomizedObject myObject = iter.read(CustomizedObject.class);
         assertEquals(100 * 5, myObject.field3);
     }
-
-    public void test_customized_constructor() throws IOException {
-        Jsoniter.registerExtension(new EmptyExtension(){
-            @Override
-            public String codegenNewInstance(Type type) {
-                if (type == CtorCustomizedObject.class) {
-                    return "new " + CtorCustomizedObject.class.getName() + "(iter.readInt())";
-                }
-                return null;
-            }
-        });
-        Jsoniter iter = Jsoniter.parse("100".replace('\'', '"'));
-        CtorCustomizedObject myObject = iter.read(CtorCustomizedObject.class);
-        assertEquals(100, myObject.getField1());
-    }
 }
diff --git a/src/test/java/com/jsoniter/TestObject.java b/src/test/java/com/jsoniter/TestObject.java
@@ -7,6 +7,10 @@
 
 public class TestObject extends TestCase {
 
+    static {
+//        Jsoniter.enableStrictMode();
+    }
+
     public void test_empty_object() throws IOException {
         Jsoniter iter = Jsoniter.parse("{}");
         assertNull(iter.readObject());
diff --git a/src/test/java/com/jsoniter/TestReflection.java b/src/test/java/com/jsoniter/TestReflection.java

Original file line number	Diff line number	Diff line change
`@@ -2,21 +2,22 @@`
`2`	`2`
`3`	`3`	`import java.lang.reflect.Field;`
`4`	`4`	`import java.lang.reflect.Type;`
	`5`	`+import java.util.List;`
`5`	`6`
`6`	`7`	`public class EmptyExtension implements Extension {`
`7`	`8`
`8`	`9`	`@Override`
`9`		`- public Decoder createDecoder(Field field) {`
	`10`	`+ public Decoder createDecoder(Binding field) {`
`10`	`11`	`return null;`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`@Override`
`14`		`- public String[] getAlternativeFieldNames(Field field) {`
	`15`	`+ public String[] getAlternativeFieldNames(Binding field) {`
`15`	`16`	`return null;`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`@Override`
`19`		`- public String codegenNewInstance(Type type) {`
	`20`	`+ public CustomizedConstructor getConstructor(Class clazz) {`
`20`	`21`	`return null;`
`21`	`22`	`}`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -353,4 +353,8 @@ public static void registerFieldDecoder(TypeLiteral typeLiteral, String field, D`
`353`	`353`	`public static void registerExtension(Extension extension) {`
`354`	`354`	`Codegen.registerExtension(extension);`
`355`	`355`	`}`
	`356`	`+`
	`357`	`+ public static void enableStrictMode() {`
	`358`	`+ Codegen.enableStrictMode();`
	`359`	`+ }`
`356`	`360`	`}`