prefer setter

Author: taowen

src/main/java/com/jsoniter/CodegenImplObjectStrict.java

@@ -191,6 +191,9 @@ private static int assignMaskForRequiredProperties(List<Binding> allBindings) {
     }
 
     private static String updateBindingSetOp(String rendered, Binding binding) {
+        if (binding.fromNames.length == 0) {
+            return rendered;
+        }
         while (true) {
             String marker = "_" + binding.name + "_";
             int start = rendered.indexOf(marker);

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

@@ -103,7 +103,7 @@ public Decoder create() {
             if (desc.bindingTypeWrappers.isEmpty()) {
                 return new OnlyField();
             } else {
-                return new WithSetter();
+                return new WithWrapper();
             }
         } else {
             return new WithCtor();
@@ -249,7 +249,7 @@ private Object decode_(JsonIterator iter) throws Exception {
         }
     }
 
-    public class WithSetter implements Decoder {
+    public class WithWrapper implements Decoder {
 
         @Override
         public Object decode(JsonIterator iter) throws IOException {

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

@@ -113,71 +113,45 @@ public static ClassDescriptor getEncodingClassDescriptor(ClassInfo classInfo, bo
         return desc;
     }
 
-    // TODO: do not remove, set fromNames to []
     private static void decodingDeduplicate(ClassDescriptor desc) {
-        HashMap<String, Binding> byName = new HashMap<String, Binding>();
+        HashMap<String, Binding> byFromName = new HashMap<String, Binding>();
+        HashMap<String, Binding> byFieldName = new HashMap<String, Binding>();
         for (Binding field : desc.fields) {
             for (String fromName : field.fromNames) {
-                if (byName.containsKey(fromName)) {
+                if (byFromName.containsKey(fromName)) {
                     throw new JsonException("field decode from same name: " + fromName);
                 }
-                byName.put(fromName, field);
+                byFromName.put(fromName, field);
             }
+            byFieldName.put(field.name, field);
         }
         ArrayList<Binding> iteratingSetters = new ArrayList<Binding>(desc.setters);
         Collections.reverse(iteratingSetters);
         for (Binding setter : iteratingSetters) {
-            for (String fromName : setter.fromNames) {
-                Binding existing = byName.get(fromName);
-                if (existing == null) {
-                    byName.put(fromName, setter);
-                    continue;
-                }
-                if (desc.fields.remove(existing)) {
-                    continue;
-                }
-                if (existing.method != null && existing.method.getName().equals(setter.method.getName())) {
-                    // inherited interface setter
-                    // iterate in reverse order, so that the setter from child class will be kept
-                    desc.setters.remove(existing);
-                    continue;
-                }
-                throw new JsonException("setter decode from same name: " + fromName);
+            Binding existing = byFieldName.get(setter.name);
+            if (existing != null) {
+                existing.fromNames = new String[0];
             }
+            deduplicateByFromName(byFromName, setter);
         }
         for (WrapperDescriptor wrapper : desc.bindingTypeWrappers) {
             for (Binding param : wrapper.parameters) {
-                for (String fromName : param.fromNames) {
-                    Binding existing = byName.get(fromName);
-                    if (existing == null) {
-                        byName.put(fromName, param);
-                        continue;
-                    }
-                    if (desc.fields.remove(existing)) {
-                        continue;
-                    }
-                    if (desc.setters.remove(existing)) {
-                        continue;
-                    }
-                    throw new JsonException("wrapper parameter decode from same name: " + fromName);
-                }
+                deduplicateByFromName(byFromName, param);
             }
         }
         for (Binding param : desc.ctor.parameters) {
-            for (String fromName : param.fromNames) {
-                Binding existing = byName.get(fromName);
-                if (existing == null) {
-                    byName.put(fromName, param);
-                    continue;
-                }
-                if (desc.fields.remove(existing)) {
-                    continue;
-                }
-                if (desc.setters.remove(existing)) {
-                    continue;
-                }
-                throw new JsonException("ctor parameter decode from same name: " + fromName);
+            deduplicateByFromName(byFromName, param);
+        }
+    }
+
+    private static void deduplicateByFromName(Map<String, Binding> byFromName, Binding setter) {
+        for (String fromName : setter.fromNames) {
+            Binding existing = byFromName.get(fromName);
+            if (existing == null) {
+                byFromName.put(fromName, setter);
+                continue;
             }
+            existing.fromNames = new String[0];
         }
     }
 

src/test/java/com/jsoniter/TestObject.java

@@ -3,9 +3,6 @@
 import com.jsoniter.annotation.JsonProperty;
 import com.jsoniter.any.Any;
 import com.jsoniter.fuzzy.MaybeEmptyArrayDecoder;
-import com.jsoniter.output.EncodingMode;
-import com.jsoniter.output.JsonStream;
-import com.jsoniter.spi.Config;
 import com.jsoniter.spi.EmptyExtension;
 import com.jsoniter.spi.JsonException;
 import com.jsoniter.spi.JsoniterSpi;
@@ -38,7 +35,7 @@ public void test_empty_object() throws IOException {
         assertNull(simpleObj.field1);
         iter.reset(iter.buf);
         Object obj = iter.read(Object.class);
-        assertEquals(0, ((Map)obj).size());
+        assertEquals(0, ((Map) obj).size());
         iter.reset(iter.buf);
         Any any = iter.readAny();
         assertEquals(0, any.size());
@@ -58,7 +55,7 @@ public void test_one_field() throws IOException {
         assertEquals("hello", any.toString("field1"));
         assertEquals(ValueType.INVALID, any.get("field2").valueType());
         iter.reset(iter.buf);
-        assertEquals("hello", ((Map)iter.read()).get("field1"));
+        assertEquals("hello", ((Map) iter.read()).get("field1"));
     }
 
     public void test_two_fields() throws IOException {
@@ -168,6 +165,7 @@ public enum MyEnum {
             WORLD,
             WOW
         }
+
         public MyEnum field1;
     }
 
@@ -224,6 +222,7 @@ private static class PrivateSub extends PublicSuper {
 
     public static class TestObject7 {
         public PrivateSub field1;
+
         public void setFieldXXX(PrivateSub obj) {
         }
     }
@@ -233,6 +232,20 @@ public void test_private_ref() throws IOException {
         assertNull(obj.field1);
     }
 
+    public static class TestObject8 {
+        public String field1;
+
+        @JsonProperty(from = {"field-1"})
+        public void setField1(String obj) {
+            field1 = "!!!" + obj;
+        }
+    }
+
+    public void test_setter_is_preferred() throws IOException {
+        TestObject8 obj = JsonIterator.deserialize("{\"field-1\":\"hello\"}", TestObject8.class);
+        assertEquals("!!!hello", obj.field1);
+    }
+
     public void skip_object_lazy_any_to_string() {
         Any any = JsonIterator.deserialize("{\"field1\":1,\"field2\":2,\"field3\":3}");
         any.asMap().put("field4", Any.wrap(4));