ignore field when getter is available

Author: taowen

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

@@ -181,32 +181,30 @@ private static void decodingDeduplicate(ClassDescriptor desc) {
         }
     }
 
-    // TODO: do not remove, set toNames to []
     private static void encodingDeduplicate(ClassDescriptor desc) {
-        HashMap<String, Binding> byName = new HashMap<String, Binding>();
+        HashMap<String, Binding> byToName = new HashMap<String, Binding>();
+        HashMap<String, Binding> byFieldName = new HashMap<String, Binding>();
         for (Binding field : desc.fields) {
             for (String toName : field.toNames) {
-                if (byName.containsKey(toName)) {
+                if (byToName.containsKey(toName)) {
                     throw new JsonException("field encode to same name: " + toName);
                 }
-                byName.put(toName, field);
+                byToName.put(toName, field);
             }
+            byFieldName.put(field.name, field);
         }
         for (Binding getter : new ArrayList<Binding>(desc.getters)) {
+            Binding existing = byFieldName.get(getter.name);
+            if (existing != null) {
+                existing.toNames = new String[0];
+            }
             for (String toName : getter.toNames) {
-                Binding existing = byName.get(toName);
+                existing = byToName.get(toName);
                 if (existing == null) {
-                    byName.put(toName, getter);
-                    continue;
-                }
-                if (desc.fields.remove(existing)) {
-                    continue;
-                }
-                if (existing.method != null && existing.method.getName().equals(getter.method.getName())) {
-                    // inherited interface getter
-                    desc.getters.remove(getter);
+                    byToName.put(toName, getter);
                     continue;
                 }
+                existing.toNames = new String[0];
                 throw new JsonException("field encode to same name: " + toName);
             }
         }

src/test/java/com/jsoniter/output/TestAnnotationJsonProperty.java

@@ -36,4 +36,18 @@ public void test_encoder() throws IOException {
         String output = JsonStream.serialize(obj);
         assertEquals("{\"field1\":\"100\"}", output);
     }
+
+    public static class TestObject3 {
+        public String field1 = "hello";
+
+        @JsonProperty(to = {"field-1"})
+        public String getField1() {
+            return field1;
+        }
+    }
+
+    public void test_getter() throws IOException {
+        String output = JsonStream.serialize(new TestObject3());
+        assertEquals("{\"field-1\":\"hello\"}", output);
+    }
 }