Fix #86

Author: caoli5288

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

@@ -25,6 +25,7 @@ public class Binding {
  public boolean asExtraWhenPresent;
  public boolean isNullable = true;
  public boolean isCollectionValueNullable = true;
+ public boolean isTransient;
  public OmitValue defaultValueToOmit;
  // then this property will not be unknown
  // but we do not want to bind it anywhere

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

@@ -30,9 +30,10 @@ 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);
+ Map<String, Binding> allFields = getFields(lookup, classInfo, includingPrivate);
+ desc.setters = getSetters(lookup, classInfo, includingPrivate, allFields);
  desc.getters = new ArrayList<Binding>();
+ desc.fields = omitTransient(allFields);
  desc.bindingTypeWrappers = new ArrayList<WrapperDescriptor>();
  desc.keyValueTypeWrappers = new ArrayList<Method>();
  desc.unwrappers = new ArrayList<UnwrapperDescriptor>();
@@ -85,8 +86,9 @@ public static ClassDescriptor getEncodingClassDescriptor(ClassInfo classInfo, bo
  desc.classInfo = classInfo;
  desc.clazz = clazz;
  desc.lookup = lookup;
- desc.fields = getFields(lookup, classInfo, includingPrivate);
- desc.getters = getGetters(lookup, classInfo, includingPrivate);
+ Map<String, Binding> allFields = getFields(lookup, classInfo, includingPrivate);
+ desc.getters = getGetters(lookup, classInfo, includingPrivate, allFields);
+ desc.fields = omitTransient(allFields);
  desc.bindingTypeWrappers = new ArrayList<WrapperDescriptor>();
  desc.keyValueTypeWrappers = new ArrayList<Method>();
  desc.unwrappers = new ArrayList<UnwrapperDescriptor>();
@@ -111,6 +113,16 @@ public static ClassDescriptor getEncodingClassDescriptor(ClassInfo classInfo, bo
  return desc;
  }
 
+ private static List<Binding> omitTransient(Map<String, Binding> map) {
+ List<Binding> out = new ArrayList<Binding>();
+ for (Binding binding : map.values()) {
+ if (!binding.isTransient) {
+ out.add(binding);
+ }
+ }
+ return out;
+ }
+
  private static void decodingDeduplicate(ClassDescriptor desc) {
  HashMap<String, Binding> byName = new HashMap<String, Binding>();
  for (Binding field : desc.fields) {
@@ -223,35 +235,33 @@ private static ConstructorDescriptor getCtor(Class clazz) {
  return cctor;
  }
 
- private static List<Binding> getFields(Map<String, Type> lookup, ClassInfo classInfo, boolean includingPrivate) {
- ArrayList<Binding> bindings = new ArrayList<Binding>();
+ private static Map<String, Binding> getFields(Map<String, Type> lookup, ClassInfo classInfo, boolean includingPrivate) {
+ Map<String, Binding> output = new LinkedHashMap<String, Binding>();// To ensure fields order
  for (Field field : getAllFields(classInfo.clazz, includingPrivate)) {
  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);
- bindings.add(binding);
+ Binding binding = createBindingFromField(lookup, classInfo, field, Modifier.isTransient(field.getModifiers()));
+ output.put(binding.name, binding);
  }
- return bindings;
+ return output;
  }
 
- private static Binding createBindingFromField(Map<String, Type> lookup, ClassInfo classInfo, Field field) {
+ private static Binding createBindingFromField(Map<String, Type> lookup, ClassInfo classInfo, Field field, boolean isTransient) {
  try {
  Binding binding = new Binding(classInfo, lookup, field.getGenericType());
  binding.fromNames = new String[]{field.getName()};
  binding.toNames = new String[]{field.getName()};
  binding.name = field.getName();
  binding.annotations = field.getAnnotations();
  binding.field = field;
+ binding.isTransient = isTransient;
  return binding;
  } catch (Exception e) {
  throw new JsonException("failed to create binding for field: " + field, e);
@@ -271,7 +281,7 @@ private static List<Field> getAllFields(Class clazz, boolean includingPrivate) {
  return allFields;
  }
 
- private static List<Binding> getSetters(Map<String, Type> lookup, ClassInfo classInfo, boolean includingPrivate) {
+ private static List<Binding> getSetters(Map<String, Type> lookup, ClassInfo classInfo, boolean includingPrivate, Map<String, Binding> allFields) {
  ArrayList<Binding> setters = new ArrayList<Binding>();
  for (Method method : getAllMethods(classInfo.clazz, includingPrivate)) {
  if (Modifier.isStatic(method.getModifiers())) {
@@ -296,12 +306,16 @@ 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);
+ Binding field = allFields.get(fromName);
+ if (!(field == null) && field.isTransient) {
+ continue;
+ }
+ Binding setter = new Binding(classInfo, lookup, paramTypes[0]);
+ 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);
  }
@@ -333,7 +347,7 @@ private static String translateSetterName(String methodName) {
  return fromName;
  }
 
- private static List<Binding> getGetters(Map<String, Type> lookup, ClassInfo classInfo, boolean includingPrivate) {
+ private static List<Binding> getGetters(Map<String, Type> lookup, ClassInfo classInfo, boolean includingPrivate, Map<String, Binding> allFields) {
  ArrayList<Binding> getters = new ArrayList<Binding>();
  for (Method method : getAllMethods(classInfo.clazz, includingPrivate)) {
  if (Modifier.isStatic(method.getModifiers())) {
@@ -356,6 +370,10 @@ private static List<Binding> getGetters(Map<String, Type> lookup, ClassInfo clas
  char[] fromNameChars = toName.toCharArray();
  fromNameChars[0] = Character.toLowerCase(fromNameChars[0]);
  toName = new String(fromNameChars);
+ Binding field = allFields.get(toName);
+ if (!(field == null) && field.isTransient) {
+ continue;
+ }
  Binding getter = new Binding(classInfo, lookup, method.getGenericReturnType());
  getter.toNames = new String[]{toName};
  getter.name = toName;