Merge branch 'caoli5288-pull/fix-86'

Author: taowen

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

@@ -3,6 +3,8 @@
 import java.lang.reflect.*;
 import java.util.*;
 
+import static java.lang.reflect.Modifier.isTransient;
+
 public class ClassDescriptor {
 
     public ClassInfo classInfo;
@@ -30,9 +32,9 @@ public static ClassDescriptor getDecodingClassDescriptor(ClassInfo classInfo, bo
         desc.clazz = clazz;
         desc.lookup = lookup;
         desc.ctor = getCtor(clazz);
-        desc.fields = getFields(lookup, classInfo, includingPrivate);
         desc.setters = getSetters(lookup, classInfo, includingPrivate);
         desc.getters = new ArrayList<Binding>();
+        desc.fields = getFields(lookup, classInfo, includingPrivate);
         desc.bindingTypeWrappers = new ArrayList<WrapperDescriptor>();
         desc.keyValueTypeWrappers = new ArrayList<Method>();
         desc.unwrappers = new ArrayList<UnwrapperDescriptor>();
@@ -111,6 +113,7 @@ 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>();
         for (Binding field : desc.fields) {
@@ -178,6 +181,7 @@ 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>();
         for (Binding field : desc.fields) {
@@ -188,7 +192,6 @@ private static void encodingDeduplicate(ClassDescriptor desc) {
                 byName.put(toName, field);
             }
         }
-
         for (Binding getter : new ArrayList<Binding>(desc.getters)) {
             for (String toName : getter.toNames) {
                 Binding existing = byName.get(toName);
@@ -229,16 +232,17 @@ private static List<Binding> getFields(Map<String, Type> lookup, ClassInfo class
             if (Modifier.isStatic(field.getModifiers())) {
                 continue;
             }
-            if (Modifier.isTransient(field.getModifiers())) {
-                continue;
-            }
             if (!includingPrivate && !Modifier.isPublic(field.getType().getModifiers())) {
                 continue;
             }
             if (includingPrivate) {
                 field.setAccessible(true);
             }
             Binding binding = createBindingFromField(lookup, classInfo, field);
+            if (isTransient(field.getModifiers())) {
+                binding.toNames = new String[0];
+                binding.fromNames = new String[0];
+            }
             bindings.add(binding);
         }
         return bindings;
@@ -296,12 +300,22 @@ private static List<Binding> getSetters(Map<String, Type> lookup, ClassInfo clas
             }
             try {
                 String fromName = translateSetterName(methodName);
-                Binding binding = new Binding(classInfo, lookup, paramTypes[0]);
-                binding.fromNames = new String[]{fromName};
-                binding.name = fromName;
-                binding.method = method;
-                binding.annotations = method.getAnnotations();
-                setters.add(binding);
+                Field field = null;
+                try {
+                    field = method.getDeclaringClass().getDeclaredField(fromName);
+                } catch (NoSuchFieldException e) {
+                    // ignore
+                }
+                Binding setter = new Binding(classInfo, lookup, paramTypes[0]);
+                if (field != null && isTransient(field.getModifiers())) {
+                    setter.fromNames = new String[0];
+                } else {
+                    setter.fromNames = new String[]{fromName};
+                }
+                setter.name = fromName;
+                setter.method = method;
+                setter.annotations = method.getAnnotations();
+                setters.add(setter);
             } catch (Exception e) {
                 throw new JsonException("failed to create binding from setter: " + method, e);
             }
@@ -353,11 +367,21 @@ private static List<Binding> getGetters(Map<String, Type> lookup, ClassInfo clas
                 continue;
             }
             String toName = methodName.substring("get".length());
-            char[] fromNameChars = toName.toCharArray();
-            fromNameChars[0] = Character.toLowerCase(fromNameChars[0]);
-            toName = new String(fromNameChars);
+            char[] toNameChars = toName.toCharArray();
+            toNameChars[0] = Character.toLowerCase(toNameChars[0]);
+            toName = new String(toNameChars);
             Binding getter = new Binding(classInfo, lookup, method.getGenericReturnType());
-            getter.toNames = new String[]{toName};
+            Field field = null;
+            try {
+                field = method.getDeclaringClass().getDeclaredField(toName);
+            } catch (NoSuchFieldException e) {
+                // ignore
+            }
+            if (field != null && isTransient(field.getModifiers())) {
+                getter.toNames = new String[0];
+            } else {
+                getter.toNames = new String[]{toName};
+            }
             getter.name = toName;
             getter.method = method;
             getter.annotations = method.getAnnotations();

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

@@ -417,4 +417,17 @@ public void test_omit_selft_defined() {
                 .build();
         assertEquals("{}", JsonStream.serialize(cfg, new TestObject18()));
     }
+
+    public static class TestObject19 {
+        public transient int hello;
+
+        public int getHello() {
+            return hello;
+        }
+    }
+
+    public void test_transient_field_getter() {
+        String output = JsonStream.serialize(new TestObject19());
+        assertEquals("{}", output);
+    }
 }