bug fixed for generic types

wenshao · wenshao · commit f3986dfe552a · 2012-11-07T23:20:20.000+08:00
diff --git a/src/main/java/com/alibaba/fastjson/util/FieldInfo.java b/src/main/java/com/alibaba/fastjson/util/FieldInfo.java
@@ -2,6 +2,7 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
+import java.lang.reflect.GenericDeclaration;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
@@ -69,9 +70,19 @@ public FieldInfo(String name, Method method, Field field, Class<?> clazz, Type t
             fieldType = field.getGenericType();
             this.declaringClass = field.getDeclaringClass();
         }
+        
+        if (clazz != null && fieldClass == Object.class && fieldType instanceof TypeVariable) {
+            TypeVariable<?> tv = (TypeVariable<?>) fieldType;
+            Type genericFieldType = getInheritGenericType(clazz, tv);
+            if (genericFieldType != null) {
+                this.fieldClass = TypeUtils.getClass(genericFieldType);
+                this.fieldType = genericFieldType;
+                return;
+            }
+        }
 
         Type genericFieldType = getFieldType(clazz, type, fieldType);
-
+        
         if (genericFieldType != fieldType) {
             if (genericFieldType instanceof ParameterizedType) {
                 fieldClass = TypeUtils.getClass(genericFieldType);
@@ -107,6 +118,28 @@ public static Type getFieldType(Class<?> clazz, Type type, Type fieldType) {
 
         return fieldType;
     }
+    
+    public static Type getInheritGenericType(Class<?> clazz, TypeVariable<?> tv) {
+        Type type = null;
+        GenericDeclaration gd = tv.getGenericDeclaration();
+        do {
+            type = clazz.getGenericSuperclass();
+            if (type instanceof ParameterizedType) {
+                ParameterizedType ptype = (ParameterizedType) type;
+                if (ptype.getRawType() == gd) {
+                    TypeVariable<?>[] tvs = gd.getTypeParameters();
+                    Type[] types = ptype.getActualTypeArguments();
+                    for (int i = 0; i < tvs.length; i++) {
+                        if (tvs[i] == tv)
+                            return types[i];
+                    }
+                    return null;
+                }
+            }
+            clazz = TypeUtils.getClass(type);
+        } while (type != null);
+        return null;
+    }
 
     public String toString() {
         return this.name;
diff --git a/src/test/java/com/alibaba/json/bvt/bug/Bug_for_jinghui70.java b/src/test/java/com/alibaba/json/bvt/bug/Bug_for_jinghui70.java
@@ -0,0 +1,33 @@
+package com.alibaba.json.bvt.bug;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.alibaba.fastjson.JSON;
+
+public class Bug_for_jinghui70 extends TestCase {
+
+    public static abstract class IdObject<I> {
+
+        private I id;
+
+        public I getId() {
+            return id;
+        }
+
+        public void setId(I id) {
+            this.id = id;
+        }
+    }
+
+    public static class Child extends IdObject<Long> {
+
+    }
+    
+    public void test_generic() throws Exception {
+        String str = "{\"id\":0}";
+        
+        Child child = JSON.parseObject(str, Child.class);
+        Assert.assertEquals(Long.class, child.getId().getClass());
+    }
+}
