fix #104, JsonWrapper argument should not be mandatory

Author: taowen

src/main/java/com/jsoniter/ReflectionObjectDecoder.java

@@ -402,7 +402,10 @@ private void applyWrappers(Object[] temp, Object obj) throws Exception {
         for (WrapperDescriptor wrapper : desc.bindingTypeWrappers) {
             Object[] args = new Object[wrapper.parameters.size()];
             for (int i = 0; i < wrapper.parameters.size(); i++) {
-                args[i] = temp[wrapper.parameters.get(i).idx];
+                Object arg = temp[wrapper.parameters.get(i).idx];
+                if (arg != NOT_SET) {
+                    args[i] = arg;
+                }
             }
             wrapper.method.invoke(obj, args);
         }

src/test/java/com/jsoniter/TestAnnotationJsonWrapper.java

@@ -1,5 +1,6 @@
 package com.jsoniter;
 
+import com.jsoniter.annotation.JsonIgnore;
 import com.jsoniter.annotation.JsonProperty;
 import com.jsoniter.annotation.JsonWrapper;
 import com.jsoniter.annotation.JsonWrapperType;
@@ -47,4 +48,30 @@ public void test_key_value() throws IOException {
         TestObject2 obj = iter.read(TestObject2.class);
         assertEquals(100, obj._field1);
     }
+
+    public static class AAA {
+        @JsonProperty("name_1")
+        public String name;
+
+        @JsonIgnore
+        public String partA;
+        @JsonIgnore
+        public String partB;
+
+        @JsonWrapper
+        public void foreignFromJson(@JsonProperty(value = "parts", from ={"p2"}, required = false) String parts) {
+            if(parts == null){
+                return;
+            }
+            String[] ps = parts.split(",");
+            partA = ps[0];
+            partB = ps.length > 1 ? ps[1] : null;
+        }
+    }
+
+    public void test_issue_104() {
+        String jsonStr = "{'name':'aaa', 'name_1':'bbb'}".replace('\'', '\"');
+        AAA aaa = JsonIterator.deserialize(jsonStr, AAA.class);
+        assertEquals("bbb", aaa.name);
+    }
 }

src/test/java/com/jsoniter/TestGenerics.java

@@ -1,9 +1,6 @@
 package com.jsoniter;
 
-import com.jsoniter.spi.Binding;
-import com.jsoniter.spi.ClassDescriptor;
-import com.jsoniter.spi.ClassInfo;
-import com.jsoniter.spi.TypeLiteral;
+import com.jsoniter.spi.*;
 import junit.framework.TestCase;
 
 import java.io.IOException;
@@ -78,12 +75,15 @@ public static class Class1<A, B> {
         public B[] field2;
         public List<B>[] field3;
         public List<A[]> field4;
+
         public List<Map<A, List<B>>> getField6() {
             return null;
         }
+
         public <T> T getField7() {
             return null;
         }
+
         public void setField8(List<A> a) {
         }
     }
@@ -113,4 +113,23 @@ public void test_generic_super_class() throws IOException {
         assertTrue(fieldDecoderCacheKeys.get("field7").endsWith("decoder.java.lang.Object"));
         assertTrue(fieldDecoderCacheKeys.get("field8").endsWith("decoder.java.util.List_java.lang.String"));
     }
+
+    public static class NetRes<T> {
+        public int code;
+        public String desc;
+        public T results;
+    }
+
+    public static class User {
+        public String name;
+        public int age;
+    }
+
+    public void test_issue_103() {
+        String json = "{'code':1, 'desc':'OK', 'results':{'name':'aaa', 'age':18}}".replace('\'', '\"');
+        NetRes res = JsonIterator.deserialize(json, new TypeLiteral<NetRes<User>>() {
+        });
+        assertEquals(User.class, res.results.getClass());
+    }
+
 }