json-iterator#57 inherited setter is not duplicate

taowen · taowen · commit e440a11fdeca · 2017-05-23T08:34:34.000+08:00
diff --git a/src/main/java/com/jsoniter/spi/Binding.java b/src/main/java/com/jsoniter/spi/Binding.java
@@ -106,12 +106,14 @@ public boolean equals(Object o) {
         Binding binding = (Binding) o;
 
         if (clazz != null ? !clazz.equals(binding.clazz) : binding.clazz != null) return false;
+        if (method != null ? !method.equals(binding.method) : binding.method != null) return false;
         return name != null ? name.equals(binding.name) : binding.name == null;
     }
 
     @Override
     public int hashCode() {
         int result = clazz != null ? clazz.hashCode() : 0;
+        result = 31 * result + (method != null ? method.hashCode() : 0);
         result = 31 * result + (name != null ? name.hashCode() : 0);
         return result;
     }
diff --git a/src/main/java/com/jsoniter/spi/JsoniterSpi.java b/src/main/java/com/jsoniter/spi/JsoniterSpi.java
@@ -187,27 +187,57 @@ public static ClassDescriptor getEncodingClassDescriptor(Class clazz, boolean in
     private static void decodingDeduplicate(ClassDescriptor desc) {
         HashMap<String, Binding> byName = new HashMap<String, Binding>();
         for (Binding field : desc.fields) {
-            if (byName.containsKey(field.name)) {
-                throw new JsonException("field name conflict: " + field.name);
+            for (String fromName : field.fromNames) {
+                if (byName.containsKey(fromName)) {
+                    throw new JsonException("field decode from same name: " + fromName);
+                }
+                byName.put(fromName, field);
             }
-            byName.put(field.name, field);
         }
-        for (Binding setter : desc.setters) {
-            Binding existing = byName.get(setter.name);
-            if (existing == null) {
-                byName.put(setter.name, setter);
-                continue;
-            }
-            if (desc.fields.remove(existing)) {
-                continue;
+        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);
             }
-            throw new JsonException("setter name conflict: " + setter.name);
         }
         for (WrapperDescriptor wrapper : desc.wrappers) {
             for (Binding param : wrapper.parameters) {
-                Binding existing = byName.get(param.name);
+                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);
+                }
+            }
+        }
+        for (Binding param : desc.ctor.parameters) {
+            for (String fromName : param.fromNames) {
+                Binding existing = byName.get(fromName);
                 if (existing == null) {
-                    byName.put(param.name, param);
+                    byName.put(fromName, param);
                     continue;
                 }
                 if (desc.fields.remove(existing)) {
@@ -216,22 +246,8 @@ private static void decodingDeduplicate(ClassDescriptor desc) {
                 if (desc.setters.remove(existing)) {
                     continue;
                 }
-                throw new JsonException("wrapper parameter name conflict: " + param.name);
-            }
-        }
-        for (Binding param : desc.ctor.parameters) {
-            Binding existing = byName.get(param.name);
-            if (existing == null) {
-                byName.put(param.name, param);
-                continue;
-            }
-            if (desc.fields.remove(existing)) {
-                continue;
-            }
-            if (desc.setters.remove(existing)) {
-                continue;
+                throw new JsonException("ctor parameter decode from same name: " + fromName);
             }
-            throw new JsonException("ctor parameter name conflict: " + param.name);
         }
     }
 
@@ -257,6 +273,7 @@ private static void encodingDeduplicate(ClassDescriptor desc) {
                     continue;
                 }
                 if (existing.method != null && existing.method.getName().equals(getter.method.getName())) {
+                    // inherited interface getter
                     desc.getters.remove(getter);
                     continue;
                 }
diff --git a/src/test/java/com/jsoniter/TestAnnotation.java b/src/test/java/com/jsoniter/TestAnnotation.java
@@ -270,4 +270,25 @@ public void test_name_conflict() throws IOException {
         JsonIterator iter = JsonIterator.parse("{}");
         assertNotNull(iter.read(TestObject17.class));
     }
+
+    public interface TestObject18Interface<A> {
+        void setHello(A val);
+    }
+
+    public static class TestObject18 implements TestObject18Interface<Integer> {
+
+        public int _val;
+
+        @Override
+        public void setHello(Integer val) {
+            _val = val;
+        }
+    }
+
+    public void test_inherited_setter_is_not_duplicate() throws IOException {
+        JsonIterator iter = JsonIterator.parse("{\"hello\":1}");
+        TestObject18 obj = iter.read(TestObject18.class);
+        assertNotNull(obj);
+        assertEquals(1, obj._val);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -106,12 +106,14 @@ public boolean equals(Object o) {`
`106`	`106`	`Binding binding = (Binding) o;`
`107`	`107`
`108`	`108`	`if (clazz != null ? !clazz.equals(binding.clazz) : binding.clazz != null) return false;`
	`109`	`+ if (method != null ? !method.equals(binding.method) : binding.method != null) return false;`
`109`	`110`	`return name != null ? name.equals(binding.name) : binding.name == null;`
`110`	`111`	`}`
`111`	`112`
`112`	`113`	`@Override`
`113`	`114`	`public int hashCode() {`
`114`	`115`	`int result = clazz != null ? clazz.hashCode() : 0;`
	`116`	`+ result = 31 * result + (method != null ? method.hashCode() : 0);`
`115`	`117`	`result = 31 * result + (name != null ? name.hashCode() : 0);`
`116`	`118`	`return result;`
`117`	`119`	`}`