#110 if @JsonProperty is marked on field, ignore getter/setter

Author: taowen

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

@@ -128,6 +128,9 @@ private static void decodingDeduplicate(ClassDescriptor desc) {
         ArrayList<Binding> iteratingSetters = new ArrayList<Binding>(desc.setters);
         Collections.reverse(iteratingSetters);
         for (Binding setter : iteratingSetters) {
+            if (setter.fromNames.length == 0) {
+                continue;
+            }
             Binding existing = byFieldName.get(setter.name);
             if (existing != null) {
                 existing.fromNames = new String[0];
@@ -168,6 +171,9 @@ private static void encodingDeduplicate(ClassDescriptor desc) {
             byFieldName.put(field.name, field);
         }
         for (Binding getter : new ArrayList<Binding>(desc.getters)) {
+            if (getter.toNames.length == 0) {
+                continue;
+            }
             Binding existing = byFieldName.get(getter.name);
             if (existing != null) {
                 existing.toNames = new String[0];

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

@@ -420,8 +420,15 @@ private void updateBindings(ClassDescriptor desc) {
             if (annotated && binding.field != null) {
                 if (desc.setters != null) {
                     for (Binding setter : desc.setters) {
-                        if (binding.name.equals(setter.name)) {
-                            throw new JsonException("annotation should be marked on getter/setter for field: " + binding.name);
+                        if (binding.field.getName().equals(setter.name)) {
+                            setter.fromNames = new String[0];
+                            setter.toNames = new String[0];
+                        }
+                    }
+                    for (Binding getter : desc.getters) {
+                        if (binding.field.getName().equals(getter.name)) {
+                            getter.fromNames = new String[0];
+                            getter.toNames = new String[0];
                         }
                     }
                 }

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

@@ -178,12 +178,10 @@ public void setField(int field) {
         }
     }
 
-    public void test_should_throw_exception_when_json_property_on_field_when_getter_and_setter_present() {
+    public void test_field_and_getter_setter() {
         String input = "{\"hello\":100}";
-        try {
-            JsonIterator.deserialize(input, TestObject11.class);
-            fail();
-        } catch (JsonException e) {
-        }
+        TestObject11 obj = JsonIterator.deserialize(input, TestObject11.class);
+        assertEquals(100, obj.field);
     }
+
 }