fix #136, field with only getter is also considered as java bean property, so that @JsonIgnore on the field should be propagated to getter

Author: taowen

src/main/java/com/jsoniter/CodegenImplObjectHash.java

@@ -44,6 +44,9 @@ public static String genObjectUsingHash(ClassDescriptor desc) {
         append(lines, "} // end of if end");
         append(lines, "} else { com.jsoniter.CodegenAccess.unreadByte(iter); }// end of if not quote");
         for (Binding field : desc.fields) {
+            if (field.fromNames.length == 0) {
+                continue;
+            }
             appendVarDef(lines, field);
         }
         for (Binding setter : desc.setters) {
@@ -94,6 +97,9 @@ public int compare(String o1, String o2) {
         append(lines, "} while (com.jsoniter.CodegenAccess.nextTokenIsComma(iter));");
         append(lines, CodegenImplNative.getTypeName(clazz) + " obj = {{newInst}};");
         for (Binding field : desc.fields) {
+            if (field.fromNames.length == 0) {
+                continue;
+            }
             append(lines, String.format("obj.%s = _%s_;", field.field.getName(), field.name));
         }
         for (Binding setter : desc.setters) {

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

@@ -68,6 +68,9 @@ public static String genObjectUsingStrict(ClassDescriptor desc) {
             }
             append(lines, "}");
             for (Binding field : desc.fields) {
+                if (field.fromNames.length == 0) {
+                    continue;
+                }
                 appendVarDef(lines, field);
             }
             for (Binding setter : desc.setters) {
@@ -91,6 +94,9 @@ public static String genObjectUsingStrict(ClassDescriptor desc) {
         if (desc.ctor.parameters.isEmpty()) {
             // if not field or setter, the value will set to temp variable
             for (Binding field : desc.fields) {
+                if (field.fromNames.length == 0) {
+                    continue;
+                }
                 rendered = updateBindingSetOp(rendered, field);
             }
             for (Binding setter : desc.setters) {
@@ -128,6 +134,9 @@ public static String genObjectUsingStrict(ClassDescriptor desc) {
         if (!desc.ctor.parameters.isEmpty()) {
             append(lines, String.format("%s obj = {{newInst}};", CodegenImplNative.getTypeName(desc.clazz)));
             for (Binding field : desc.fields) {
+                if (field.fromNames.length == 0) {
+                    continue;
+                }
                 append(lines, String.format("obj.%s = _%s_;", field.field.getName(), field.name));
             }
             for (Binding setter : desc.setters) {

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

@@ -205,20 +205,25 @@ private static ConstructorDescriptor getCtor(Class clazz) {
 
     private static List<Binding> getFields(Map<String, Type> lookup, ClassInfo classInfo, boolean includingPrivate) {
         ArrayList<Binding> bindings = new ArrayList<Binding>();
-        for (Field field : getAllFields(classInfo.clazz, includingPrivate)) {
+        for (Field field : getAllFields(classInfo.clazz)) {
             if (Modifier.isStatic(field.getModifiers())) {
                 continue;
             }
-            if (!includingPrivate && !Modifier.isPublic(field.getType().getModifiers())) {
-                continue;
-            }
             if (includingPrivate) {
                 field.setAccessible(true);
             }
             if (isTransient(field.getModifiers())) {
                 continue;
             }
             Binding binding = createBindingFromField(lookup, classInfo, field);
+            if (!includingPrivate && !Modifier.isPublic(field.getModifiers())) {
+                binding.toNames = new String[0];
+                binding.fromNames = new String[0];
+            }
+            if (!includingPrivate && !Modifier.isPublic(field.getType().getModifiers())) {
+                binding.toNames = new String[0];
+                binding.fromNames = new String[0];
+            }
             bindings.add(binding);
         }
         return bindings;
@@ -240,15 +245,12 @@ private static Binding createBindingFromField(Map<String, Type> lookup, ClassInf
         }
     }
 
-    private static List<Field> getAllFields(Class clazz, boolean includingPrivate) {
-        List<Field> allFields = Arrays.asList(clazz.getFields());
-        if (includingPrivate) {
-            allFields = new ArrayList<Field>();
-            Class current = clazz;
-            while (current != null) {
-                allFields.addAll(Arrays.asList(current.getDeclaredFields()));
-                current = current.getSuperclass();
-            }
+    private static List<Field> getAllFields(Class clazz) {
+        ArrayList<Field> allFields = new ArrayList<Field>();
+        Class current = clazz;
+        while (current != null) {
+            allFields.addAll(Arrays.asList(current.getDeclaredFields()));
+            current = current.getSuperclass();
         }
         return allFields;
     }

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

@@ -436,6 +436,8 @@ private void updateBindings(ClassDescriptor desc) {
                             setter.toNames = new String[0];
                         }
                     }
+                }
+                if (desc.getters != null) {
                     for (Binding getter : desc.getters) {
                         if (binding.field.getName().equals(getter.name)) {
                             getter.fromNames = new String[0];

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

@@ -1,22 +1,16 @@
 package com.jsoniter;
 
-import com.jsoniter.annotation.*;
-import com.jsoniter.any.Any;
-import com.jsoniter.fuzzy.StringIntDecoder;
+import com.jsoniter.annotation.JsonCreator;
+import com.jsoniter.annotation.JsonProperty;
 import com.jsoniter.spi.JsonException;
-import com.jsoniter.spi.JsoniterSpi;
 import junit.framework.TestCase;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 
 public class TestAnnotation extends TestCase {
 
     static {
-//        JsonIterator.setMode(DecodingMode.DYNAMIC_MODE_AND_MATCH_FIELD_WITH_HASH);
+//        JsonIterator.setMode(DecodingMode.DYNAMIC_MODE_AND_MATCH_FIELD_STRICTLY);
 //        JsonIterator.setMode(DecodingMode.REFLECTION_MODE);
     }
 

src/test/java/com/jsoniter/TestAnnotationJsonWrapper.java

@@ -4,6 +4,7 @@
 import com.jsoniter.annotation.JsonProperty;
 import com.jsoniter.annotation.JsonWrapper;
 import com.jsoniter.annotation.JsonWrapperType;
+import com.jsoniter.spi.DecodingMode;
 import junit.framework.TestCase;
 
 import java.io.IOException;

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

@@ -3,6 +3,7 @@
 import com.jsoniter.annotation.JsonProperty;
 import com.jsoniter.any.Any;
 import com.jsoniter.fuzzy.MaybeEmptyArrayDecoder;
+import com.jsoniter.spi.DecodingMode;
 import com.jsoniter.spi.EmptyExtension;
 import com.jsoniter.spi.JsonException;
 import com.jsoniter.spi.JsoniterSpi;

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

@@ -4,7 +4,6 @@
 import junit.framework.TestCase;
 
 import java.io.IOException;
-import java.io.Serializable;
 
 public class TestAnnotationJsonIgnore extends TestCase {
 
@@ -29,4 +28,19 @@ public void test_ignore_decoding_only() throws IOException {
         obj.field1 = 100;
         assertEquals("{\"field1\":100}", JsonStream.serialize(obj));
     }
+
+    public static class TestPrivateVariables {
+        @JsonIgnore
+        private String field1;
+
+        public String getField1() {
+            return field1;
+        }
+    }
+
+    public void test_private_serialize() throws IOException {
+        TestPrivateVariables obj = new TestPrivateVariables();
+        obj.field1 = "hello";
+        assertEquals("{}", JsonStream.serialize(obj));
+    }
 }

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

@@ -47,14 +47,6 @@ public String getField1() {
         }
     }
 
-    public void test_getter() throws IOException {
-        TestObject2 obj = new TestObject2();
-        obj.field1 = "hello";
-        stream.writeVal(obj);
-        stream.close();
-        assertEquals("{'field1':'hello'}".replace('\'', '"'), baos.toString());
-    }
-
     public void test_null() throws IOException {
         stream.writeVal(new TypeLiteral<TestObject2>() {
         }, null);