fix #152 json wrapper should not be recognized as json setter

Author: taowen

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

@@ -247,6 +247,8 @@ private Object decode_(JsonIterator iter) throws Exception {
             for (Binding setter : desc.setters) {
                 Object val = temp[setter.idx];
                 if (val != NOT_SET) {
+                    System.out.println(setter.method);
+                    System.out.println(val.getClass());
                     setter.method.invoke(obj, val);
                 }
             }

src/main/java/com/jsoniter/spi/Config.java

@@ -277,6 +277,12 @@ private void detectWrappers(ClassDescriptor desc, List<Method> allMethods) {
             }
             Annotation[][] annotations = method.getParameterAnnotations();
             String[] paramNames = getParamNames(method, annotations.length);
+            Iterator<Binding> iter = desc.setters.iterator();
+            while(iter.hasNext()) {
+                if (method.equals(iter.next().method)) {
+                    iter.remove();
+                }
+            }
             if (JsonWrapperType.BINDING.equals(jsonWrapper.value())) {
                 WrapperDescriptor wrapper = new WrapperDescriptor();
                 wrapper.method = method;

src/test/java/com/jsoniter/TestAnnotation.java

@@ -14,21 +14,6 @@ public class TestAnnotation extends TestCase {
 //        JsonIterator.setMode(DecodingMode.REFLECTION_MODE);
     }
 
-    public static class TestObject2 {
-        private int field1;
-
-        @JsonCreator
-        public TestObject2(@JsonProperty("field1") int field1) {
-            this.field1 = field1;
-        }
-    }
-
-    public void test_ctor() throws IOException {
-        JsonIterator iter = JsonIterator.parse("{'field1': 100}".replace('\'', '"'));
-        TestObject2 obj = iter.read(TestObject2.class);
-        assertEquals(100, obj.field1);
-    }
-
     public static class TestObject4 {
 
         private int field1;

src/test/java/com/jsoniter/TestAnnotationJsonCreator.java

@@ -0,0 +1,54 @@
+package com.jsoniter;
+
+import com.jsoniter.annotation.JsonCreator;
+import com.jsoniter.annotation.JsonIgnore;
+import com.jsoniter.annotation.JsonProperty;
+import com.jsoniter.annotation.JsonWrapper;
+import com.jsoniter.any.Any;
+import junit.framework.TestCase;
+
+import java.io.IOException;
+import java.util.Properties;
+
+public class TestAnnotationJsonCreator extends TestCase {
+
+
+    public static class TestObject2 {
+        private int field1;
+
+        @JsonCreator
+        public TestObject2(@JsonProperty("field1") int field1) {
+            this.field1 = field1;
+        }
+    }
+
+    public void test_ctor() throws IOException {
+        JsonIterator iter = JsonIterator.parse("{'field1': 100}".replace('\'', '"'));
+        TestObject2 obj = iter.read(TestObject2.class);
+        assertEquals(100, obj.field1);
+    }
+
+    public static class TestObject {
+
+        @JsonIgnore
+        private final String id;
+        @JsonIgnore
+        private final Properties properties;
+
+        @JsonCreator
+        public TestObject(@JsonProperty("name") final String name) {
+            this.id = name;
+            properties = new Properties();
+        }
+
+        @JsonWrapper
+        public void setProperties(@JsonProperty("props") final Any props) {
+            // Set props
+        }
+    }
+
+    public void test_ctor_and_setter_binding() throws IOException {
+        JsonIterator iter = JsonIterator.parse("{\"name\": \"test\", \"props\": {\"val\": \"42\"}}");
+        iter.read(TestObject.class);
+    }
+}

src/test/java/com/jsoniter/suite/AllTestCases.java

@@ -22,6 +22,7 @@
         TestAnnotationJsonWrapper.class,
         TestAnnotationJsonUnwrapper.class,
         TestAnnotation.class,
+        TestAnnotationJsonCreator.class,
         com.jsoniter.output.TestGenerics.class,
         TestCustomizeType.class, TestDemo.class,
         TestExisting.class, TestGenerics.class, TestGenerics.class, TestIO.class,