lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
wentch
2015-12-24 11:54:35 +08:00
parent 6f80c63f94
commit c4498fb7d5
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/org/redkale/convert/ObjectDecoder.java
View File

@@ -5,7 +5,6 @@
*/ */
package org.redkale.convert; package org.redkale.convert;
import java.beans.*;
import org.redkale.util.Creator; import org.redkale.util.Creator;
import java.lang.reflect.*; import java.lang.reflect.*;
import java.util.Arrays; import java.util.Arrays;
@@ -68,7 +67,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
this.creator = factory.loadCreator(clazz); this.creator = factory.loadCreator(clazz);
final Set<DeMember> list = new HashSet(); final Set<DeMember> list = new HashSet();
final ConstructorProperties cps = ObjectEncoder.findConstructorProperties(this.creator); final String[] cps = ObjectEncoder.findConstructorProperties(this.creator);
try { try {
ConvertColumnEntry ref; ConvertColumnEntry ref;
for (final Field field : clazz.getFields()) { for (final Field field : clazz.getFields()) {
@@ -87,7 +86,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
if (!method.getName().startsWith("set")) continue; if (!method.getName().startsWith("set")) continue;
if (method.getParameterTypes().length != 1) continue; if (method.getParameterTypes().length != 1) continue;
if (method.getReturnType() != void.class) continue; if (method.getReturnType() != void.class) continue;
if (reversible && (cps == null || !ObjectEncoder.contains(cps.value(), ObjectEncoder.readGetSetFieldName(method)))) { if (reversible && (cps == null || !ObjectEncoder.contains(cps, ObjectEncoder.readGetSetFieldName(method)))) {
boolean is = method.getParameterTypes()[0] == boolean.class || method.getParameterTypes()[0] == Boolean.class; boolean is = method.getParameterTypes()[0] == boolean.class || method.getParameterTypes()[0] == Boolean.class;
try { try {
clazz.getMethod(method.getName().replaceFirst("set", is ? "is" : "get")); clazz.getMethod(method.getName().replaceFirst("set", is ? "is" : "get"));
@@ -101,7 +100,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
list.add(new DeMember(ObjectEncoder.createAttribute(factory, clazz, null, null, method), factory.loadDecoder(t))); list.add(new DeMember(ObjectEncoder.createAttribute(factory, clazz, null, null, method), factory.loadDecoder(t)));
} }
if (cps != null) { //可能存在某些构造函数中的字段名不存在setter方法 if (cps != null) { //可能存在某些构造函数中的字段名不存在setter方法
for (final String constructorField : cps.value()) { for (final String constructorField : cps) {
boolean flag = false; boolean flag = false;
for (DeMember m : list) { for (DeMember m : list) {
if (m.attribute.field().equals(constructorField)) { if (m.attribute.field().equals(constructorField)) {
@@ -134,7 +133,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
Arrays.sort(this.members); Arrays.sort(this.members);
if (cps != null) { if (cps != null) {
final String[] fields = cps.value(); final String[] fields = cps;
final DeMember<R, T, ?>[] ms = new DeMember[fields.length]; final DeMember<R, T, ?>[] ms = new DeMember[fields.length];
for (int i = 0; i < fields.length; i++) { for (int i = 0; i < fields.length; i++) {
for (DeMember m : this.members) { for (DeMember m : this.members) {

9
src/org/redkale/convert/ObjectEncoder.java
View File

@@ -53,7 +53,7 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
//if (!(type instanceof Class)) throw new ConvertException("[" + type + "] is no a class"); //if (!(type instanceof Class)) throw new ConvertException("[" + type + "] is no a class");
final Class clazz = this.typeClass; final Class clazz = this.typeClass;
final Set<EnMember> list = new HashSet(); final Set<EnMember> list = new HashSet();
final ConstructorProperties cps = ObjectEncoder.findConstructorProperties(factory.loadCreator(this.typeClass)); final String[] cps = ObjectEncoder.findConstructorProperties(factory.loadCreator(this.typeClass));
try { try {
ConvertColumnEntry ref; ConvertColumnEntry ref;
for (final Field field : clazz.getFields()) { for (final Field field : clazz.getFields()) {
@@ -73,7 +73,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.getName().startsWith("is") && !method.getName().startsWith("get")) continue;
if (method.getParameterTypes().length != 0) continue; if (method.getParameterTypes().length != 0) continue;
if (method.getReturnType() == void.class) continue; if (method.getReturnType() == void.class) continue;
if (reversible && (cps == null || !contains(cps.value(), readGetSetFieldName(method)))) { if (reversible && (cps == null || !contains(cps, readGetSetFieldName(method)))) {
boolean is = method.getName().startsWith("is"); boolean is = method.getName().startsWith("is");
try { try {
clazz.getMethod(method.getName().replaceFirst(is ? "is" : "get", "set"), method.getReturnType()); clazz.getMethod(method.getName().replaceFirst(is ? "is" : "get", "set"), method.getReturnType());
@@ -239,9 +239,10 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
return fname; return fname;
} }
static ConstructorProperties findConstructorProperties(Creator creator) { static String[] findConstructorProperties(Creator creator) {
try { try {
return creator.getClass().getConstructor().getAnnotation(ConstructorProperties.class); ConstructorProperties cps = creator.getClass().getConstructor().getAnnotation(ConstructorProperties.class);
return cps == null ? null : cps.value();
} catch (Exception e) { } catch (Exception e) {
return null; return null;
} }