...

FasterXML · Oct 31, 2015 · 827f082 · 827f082
1 parent 1d0f7c0
commit 827f082
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 25 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedClass.java b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedClass.java
@@ -235,11 +235,6 @@ public boolean hasAnnotation(Class<?> acls) {
         }
         return _classAnnotations.has(acls);
     }
-
-    @Override
-    public Type getGenericType() {
-        return _class;
-    }
 
     @Override
     public Class<?> getRawType() {

diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedConstructor.java b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedConstructor.java
@@ -67,6 +67,11 @@ public AnnotatedConstructor withAnnotations(AnnotationMap ann) {
     @Override
     public String getName() { return _constructor.getName(); }
 
+    @Override
+    public JavaType getType() {
+        return _context.resolveMemberType(getRawType());
+    }
+
     @Override
     public Class<?> getRawType() {
         return _constructor.getDeclaringClass();

diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedField.java b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedField.java
@@ -2,6 +2,7 @@
 
 import java.lang.reflect.*;
 
+import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.util.ClassUtil;
 
 /**
@@ -70,15 +71,15 @@ protected AnnotatedField(Serialization ser)
     public String getName() { return _field.getName(); }
 
     @Override
-    public Type getGenericType() {
-        return _field.getGenericType();
+    public Class<?> getRawType() {
+        return _field.getType();
     }
 
     @Override
-    public Class<?> getRawType() {
-        return _field.getType();
+    public JavaType getType() {
+        return _context.resolveMemberType(_field.getGenericType());
     }
-    
+
     /*
     /**********************************************************
     /* AnnotatedMember impl

diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedMember.java b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedMember.java
@@ -4,7 +4,6 @@
 import java.lang.reflect.Member;
 import java.util.Collections;
 
-import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.util.ClassUtil;
 
 /**
@@ -56,11 +55,6 @@ protected AnnotatedMember(AnnotatedMember base) {
      */
     public abstract Class<?> getDeclaringClass();
 
-    @Override
-    public JavaType getType() {
-        return _context.resolveMemberType(getGenericType());
-    }
-
     public abstract Member getMember();
 
     /**

diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedMethod.java b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedMethod.java
@@ -86,9 +86,8 @@ public AnnotatedMethod withAnnotations(AnnotationMap ann) {
      * type is returned here)
      */
     @Override
-    @Deprecated
-    public Type getGenericType() {
-        return _method.getGenericReturnType();
+    public JavaType getType() {
+        return _context.resolveMemberType(_method.getGenericReturnType());
     }
 
     /**

diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedParameter.java b/src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedParameter.java
@@ -81,16 +81,16 @@ public AnnotatedParameter withAnnotations(AnnotationMap ann) {
     @Override
     public String getName() { return ""; }
 
-    @Override
-    public Type getGenericType() {
-        return _type;
-    }
-
     @Override
     public Class<?> getRawType() {
         return _type.getRawClass();
     }
 
+    @Override
+    public JavaType getType() {
+        return _context.resolveMemberType(_type);
+    }
+
     /*
     /**********************************************************
     /* AnnotatedMember extras

diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/VirtualAnnotatedMember.java b/src/main/java/com/fasterxml/jackson/databind/introspect/VirtualAnnotatedMember.java
@@ -2,6 +2,8 @@
 
 import java.lang.reflect.*;
 
+import com.fasterxml.jackson.databind.JavaType;
+
 /**
  * Placeholder used by virtual properties as placeholder for
  * underlying {@link AnnotatedMember}.
@@ -58,7 +60,12 @@ public Annotated withAnnotations(AnnotationMap fallback) {
     public Class<?> getRawType() {
         return _rawType;
     }
-
+
+    @Override
+    public JavaType getType() {
+        return _context.resolveMemberType(_rawType);
+    }
+
     /*
     /**********************************************************
     /* AnnotatedMember impl