android-jdk6-redkale/src/org/redkale/convert/ObjectDecoder.java

@@ -71,6 +71,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
             this.creator = factory.loadCreator(clazz);
 
             final Set<DeMember> list = new HashSet();
+            final ConstructorProperties cps = ObjectEncoder.findConstructorProperties(this.creator);
             try {
                 ConvertColumnEntry ref;
                 for (final Field field : clazz.getFields()) {
@@ -89,7 +90,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
                     if (!method.getName().startsWith("set")) continue;
                     if (method.getParameterTypes().length != 1) continue;
                     if (method.getReturnType() != void.class) continue;
-                    if (reversible) {
+                    if (reversible && (cps == null || !ObjectEncoder.contains(cps.value(), ObjectEncoder.readGetSetFieldName(method)))) {
                         boolean is = method.getParameterTypes()[0] == boolean.class || method.getParameterTypes()[0] == Boolean.class;
                         try {
                             clazz.getMethod(method.getName().replaceFirst("set", is ? "is" : "get"));
@@ -102,24 +103,51 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
                     Type t = ObjectEncoder.makeGenericType(method.getGenericParameterTypes()[0], virGenericTypes, realGenericTypes);
                     list.add(new DeMember(ObjectEncoder.createAttribute(factory, clazz, null, null, method), factory.loadDecoder(t)));
                 }
-                this.members = list.toArray(new DeMember[list.size()]);
+                if (cps != null) { //可能存在某些构造函数中的字段名不存在setter方法
-                Arrays.sort(this.members);
+                    for (final String constructorField : cps.value()) {
-                try {
+                        boolean flag = false;
-                    ConstructorProperties cps = this.creator.getClass().getConstructor().getAnnotation(ConstructorProperties.class);
+                        for (DeMember m : list) {
-                    if (cps != null) {
+                            if (m.attribute.field().equals(constructorField)) {
-                        final String[] fields = cps.value();
+                                flag = true;
-                        final DeMember<R, T, ?>[] ms = new DeMember[fields.length];
+                                break;
-                        for (int i = 0; i < fields.length; i++) {
-                            for (DeMember m : this.members) {
-                                if (m.attribute.field().equals(fields[i])) {
-                                    ms[i] = m;
-                                    break;
-                                }
                             }
                         }
-                        this.creatorConstructorMembers = ms;
+                        if (flag) continue;
+                        //不存在setter方法
+                        try {
+                            Field f = clazz.getDeclaredField(constructorField);
+                            Type t = ObjectEncoder.makeGenericType(f.getGenericType(), virGenericTypes, realGenericTypes);
+                            list.add(new DeMember(ObjectEncoder.createAttribute(factory, clazz, f, null, null), factory.loadDecoder(t)));
+                        } catch (NoSuchFieldException nsfe) { //不存在field， 可能存在getter方法
+                            char[] fs = constructorField.toCharArray();
+                            fs[0] = Character.toUpperCase(fs[0]);
+                            String mn = new String(fs);
+                            Method getter = null;
+                            try {
+                                getter = clazz.getMethod("get" + mn);
+                            } catch (NoSuchMethodException ex) {
+                                getter = clazz.getMethod("is" + mn);
+                            }
+                            Type t = ObjectEncoder.makeGenericType(getter.getGenericParameterTypes()[0], virGenericTypes, realGenericTypes);
+                            list.add(new DeMember(ObjectEncoder.createAttribute(factory, clazz, null, getter, null), factory.loadDecoder(t)));
+                        }
                     }
-                } catch (Exception e) { //不存在则忽略
+                }
+                this.members = list.toArray(new DeMember[list.size()]);
+                Arrays.sort(this.members);
+
+                if (cps != null) {
+                    final String[] fields = cps.value();
+                    final DeMember<R, T, ?>[] ms = new DeMember[fields.length];
+                    for (int i = 0; i < fields.length; i++) {
+                        for (DeMember m : this.members) {
+                            if (m.attribute.field().equals(fields[i])) {
+                                ms[i] = m;
+                                break;
+                            }
+                        }
+                    }
+                    this.creatorConstructorMembers = ms;
                 }
             } catch (Exception ex) {
                 throw new ConvertException(ex);

android-jdk6-redkale/src/org/redkale/convert/ObjectEncoder.java

@@ -5,9 +5,11 @@
  */
 package org.redkale.convert;
 
+import java.beans.*;
 import org.redkale.util.Attribute;
 import java.lang.reflect.*;
 import java.util.*;
+import org.redkale.util.*;
 import org.redkale.util.Attribute.Attributes;
 
 /**
@@ -93,7 +95,14 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
         return type;
     }
 
-    private static String readGetSetFieldName(Method method) {
+    static boolean contains(String[] values, String value) {
+        for (String str : values) {
+            if (str.equals(value)) return true;
+        }
+        return false;
+    }
+
+    static String readGetSetFieldName(Method method) {
         if (method == null) return null;
         String fname = method.getName();
         if (!fname.startsWith("is") && !fname.startsWith("get") && !fname.startsWith("set")) return fname;
@@ -106,6 +115,14 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
         return fname;
     }
 
+    static ConstructorProperties findConstructorProperties(Creator creator) {
+        try {
+            return creator.getClass().getConstructor().getAnnotation(ConstructorProperties.class);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
     static Attribute createAttribute(final Factory factory, Class clazz, final Field field, final Method getter, final Method setter) {
         String fieldalias = null;
         if (field != null) { // public field
@@ -147,6 +164,7 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
             if (realGenericTypes != null) {
                 //    println(type + "," + Arrays.toString(virGenericTypes) + ", " + Arrays.toString(realGenericTypes));
             }
+            final ConstructorProperties cps = ObjectEncoder.findConstructorProperties(factory.loadCreator(this.typeClass));
             try {
                 ConvertColumnEntry ref;
                 for (final Field field : clazz.getFields()) {
@@ -166,7 +184,7 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
                     if (!method.getName().startsWith("is") && !method.getName().startsWith("get")) continue;
                     if (method.getParameterTypes().length != 0) continue;
                     if (method.getReturnType() == void.class) continue;
-                    if (reversible) {
+                    if (reversible && (cps == null || !contains(cps.value(), readGetSetFieldName(method)))) {
                         boolean is = method.getName().startsWith("is");
                         try {
                             clazz.getMethod(method.getName().replaceFirst(is ? "is" : "get", "set"), method.getReturnType());