From ae2b5d68398177251c868af2431844b8f7c4dfce Mon Sep 17 00:00:00 2001 From: Ready Date: Wed, 16 Mar 2016 14:57:14 +0800 Subject: [PATCH] =?UTF-8?q?bug=20fixed=20for=20JKD=205=E3=80=816=E3=80=817?= =?UTF-8?q?=20compatible?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deserializer/JavaBeanDeserializer.java | 2 +- .../deserializer/ThrowableDeserializer.java | 9 +++--- .../fastjson/util/DeserializeBeanInfo.java | 31 +++++++++---------- .../com/alibaba/fastjson/util/FieldInfo.java | 5 +-- .../com/alibaba/fastjson/util/TypeUtils.java | 22 +++++-------- 5 files changed, 31 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/alibaba/fastjson/parser/deserializer/JavaBeanDeserializer.java b/src/main/java/com/alibaba/fastjson/parser/deserializer/JavaBeanDeserializer.java index e8ea01034..efd9521b6 100755 --- a/src/main/java/com/alibaba/fastjson/parser/deserializer/JavaBeanDeserializer.java +++ b/src/main/java/com/alibaba/fastjson/parser/deserializer/JavaBeanDeserializer.java @@ -108,7 +108,7 @@ public class JavaBeanDeserializer implements ObjectDeserializer { Object object; try { Constructor constructor = beanInfo.getDefaultConstructor(); - if (constructor.getParameterCount() == 0) { + if (constructor.getParameterTypes().length == 0) { object = constructor.newInstance(); } else { object = constructor.newInstance(parser.getContext().getObject()); diff --git a/src/main/java/com/alibaba/fastjson/parser/deserializer/ThrowableDeserializer.java b/src/main/java/com/alibaba/fastjson/parser/deserializer/ThrowableDeserializer.java index 24880cbc6..7c9babe99 100755 --- a/src/main/java/com/alibaba/fastjson/parser/deserializer/ThrowableDeserializer.java +++ b/src/main/java/com/alibaba/fastjson/parser/deserializer/ThrowableDeserializer.java @@ -127,19 +127,18 @@ public class ThrowableDeserializer extends JavaBeanDeserializer { Constructor messageConstructor = null; Constructor causeConstructor = null; for (Constructor constructor : exClass.getConstructors()) { - if (constructor.getParameterCount() == 0) { + Class[] types = constructor.getParameterTypes(); + if (types.length == 0) { defaultConstructor = constructor; continue; } - if (constructor.getParameterCount() == 1 && constructor.getParameterTypes()[0] == String.class) { + if (types.length == 1 && types[0] == String.class) { messageConstructor = constructor; continue; } - Class[] types; - if (constructor.getParameterCount() == 2 && (types = constructor.getParameterTypes())[0] == String.class - && types[1] == Throwable.class) { + if (types.length == 2 && types[0] == String.class && types[1] == Throwable.class) { causeConstructor = constructor; continue; } diff --git a/src/main/java/com/alibaba/fastjson/util/DeserializeBeanInfo.java b/src/main/java/com/alibaba/fastjson/util/DeserializeBeanInfo.java index 0060e53fd..b4585c065 100755 --- a/src/main/java/com/alibaba/fastjson/util/DeserializeBeanInfo.java +++ b/src/main/java/com/alibaba/fastjson/util/DeserializeBeanInfo.java @@ -142,10 +142,10 @@ public class DeserializeBeanInfo { TypeUtils.setAccessible(creatorConstructor); beanInfo.setCreatorConstructor(creatorConstructor); - int count = creatorConstructor.getParameterCount(); - if (count > 0) { + Class[] types = creatorConstructor.getParameterTypes(); + if (types.length > 0) { Annotation[][] paramAnnotationArrays = creatorConstructor.getParameterAnnotations(); - for (int i = 0; i < count; ++i) { + for (int i = 0; i < types.length; ++i) { Annotation[] paramAnnotations = paramAnnotationArrays[i]; JSONField fieldAnnotation = null; for (Annotation paramAnnotation : paramAnnotations) { @@ -157,7 +157,7 @@ public class DeserializeBeanInfo { if (fieldAnnotation == null) { throw new JSONException("illegal json creator"); } - Class fieldClass = creatorConstructor.getParameterTypes()[i]; + Class fieldClass = types[i]; Type fieldType = creatorConstructor.getGenericParameterTypes()[i]; Field field = TypeUtils.getField(clazz, fieldAnnotation.name()); final int ordinal = fieldAnnotation.ordinal(); @@ -174,11 +174,10 @@ public class DeserializeBeanInfo { if (factoryMethod != null) { TypeUtils.setAccessible(factoryMethod); beanInfo.setFactoryMethod(factoryMethod); - - int count = factoryMethod.getParameterCount(); - if (count > 0) { + Class[] types = factoryMethod.getParameterTypes(); + if (types.length > 0) { Annotation[][] paramAnnotationArrays = factoryMethod.getParameterAnnotations(); - for (int i = 0; i < count; ++i) { + for (int i = 0; i < types.length; ++i) { Annotation[] paramAnnotations = paramAnnotationArrays[i]; JSONField fieldAnnotation = null; for (Annotation paramAnnotation : paramAnnotations) { @@ -191,7 +190,7 @@ public class DeserializeBeanInfo { throw new JSONException("illegal json creator"); } - Class fieldClass = factoryMethod.getParameterTypes()[i]; + Class fieldClass = types[i]; Type fieldType = factoryMethod.getGenericParameterTypes()[i]; Field field = TypeUtils.getField(clazz, fieldAnnotation.name()); final int ordinal = fieldAnnotation.ordinal(); @@ -328,8 +327,8 @@ public class DeserializeBeanInfo { if (!(method.getReturnType().equals(Void.TYPE) || method.getReturnType().equals(clazz))) { continue; } - - if (method.getParameterCount() != 1) { + Class[] types = method.getParameterTypes(); + if (types.length != 1) { continue; } @@ -380,7 +379,7 @@ public class DeserializeBeanInfo { } Field field = TypeUtils.getField(clazz, propertyName); - if (field == null && method.getParameterTypes()[0] == boolean.class) { + if (field == null && types[0] == boolean.class) { String isFieldName = "is" + Character.toUpperCase(propertyName.charAt(0)) + propertyName.substring(1); field = TypeUtils.getField(clazz, isFieldName); } @@ -448,7 +447,7 @@ public class DeserializeBeanInfo { } if (methodName.startsWith("get") && Character.isUpperCase(methodName.charAt(3))) { - if (method.getParameterCount() != 0) { + if (method.getParameterTypes().length != 0) { continue; } @@ -489,7 +488,7 @@ public class DeserializeBeanInfo { final Constructor[] constructors = clazz.getDeclaredConstructors(); for (Constructor constructor : constructors) { - if (constructor.getParameterCount() == 0) { // getParameterTypes() 内部是调用数组的克隆方法，开销相对较大 + if (constructor.getParameterTypes().length == 0) { defaultConstructor = constructor; break; } @@ -497,9 +496,9 @@ public class DeserializeBeanInfo { if (defaultConstructor == null) { if (clazz.isMemberClass() && !Modifier.isStatic(clazz.getModifiers())) { + Class[] types; for (Constructor constructor : constructors) { - if (constructor.getParameterCount() == 1 - && constructor.getParameterTypes()[0].equals(clazz.getDeclaringClass())) { + if ( (types = constructor.getParameterTypes()).length == 1 && types[0].equals(clazz.getDeclaringClass())) { defaultConstructor = constructor; break; } diff --git a/src/main/java/com/alibaba/fastjson/util/FieldInfo.java b/src/main/java/com/alibaba/fastjson/util/FieldInfo.java index f99f40fe8..72d806cb7 100755 --- a/src/main/java/com/alibaba/fastjson/util/FieldInfo.java +++ b/src/main/java/com/alibaba/fastjson/util/FieldInfo.java @@ -84,8 +84,9 @@ public class FieldInfo implements Comparable { Type fieldType; Class fieldClass; if (method != null) { - if (method.getParameterTypes().length == 1) { - fieldClass = method.getParameterTypes()[0]; + Class[] types; + if ((types = method.getParameterTypes()).length == 1) { + fieldClass = types[0]; fieldType = method.getGenericParameterTypes()[0]; } else { fieldClass = method.getReturnType(); diff --git a/src/main/java/com/alibaba/fastjson/util/TypeUtils.java b/src/main/java/com/alibaba/fastjson/util/TypeUtils.java index 59383bc35..5dc91ab0b 100755 --- a/src/main/java/com/alibaba/fastjson/util/TypeUtils.java +++ b/src/main/java/com/alibaba/fastjson/util/TypeUtils.java @@ -1330,28 +1330,22 @@ public class TypeUtils { public static JSONField getSupperMethodAnnotation(final Class clazz, final Method method) { Class[] interfaces = clazz.getInterfaces(); if (interfaces.length > 0) { - int paramsCount = method.getParameterCount(); - Class[] methodParamTypes = null; + Class[] types = method.getParameterTypes(); for (Class interfaceClass : interfaces) { for (Method interfaceMethod : interfaceClass.getMethods()) { - if (interfaceMethod.getParameterCount() != paramsCount) { + Class[] interfaceTypes = interfaceMethod.getParameterTypes(); + if (interfaceTypes.length != types.length) { continue; } if (!interfaceMethod.getName().equals(method.getName())) { continue; } boolean match = true; - if (paramsCount > 0) { - Class[] interfaceTypes = interfaceMethod.getParameterTypes(); - if (methodParamTypes == null) { - methodParamTypes = method.getParameterTypes(); - } - for (int i = 0; i < paramsCount; ++i) { - if (!interfaceTypes[i].equals(methodParamTypes[i])) { - match = false; - break; - } - } + for (int i = 0; i < types.length; ++i) { + if (!interfaceTypes[i].equals(types[i])) { + match = false; + break; + } } if (!match) {