andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a bug where TypeParameterMatcher does not detect the case where the type parameter is derived from an outer class

Browse Source 
- Fixes #1153
This commit is contained in:
Trustin Lee 2013-03-14 07:22:44 +09:00
parent b86d3d692a
commit 4323fea5fb
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/main/java/io/netty/util/internal/TypeParameterMatcher.java
View File

@ -18,7 +18,6 @@ package io.netty.util.internal;
import java.lang.reflect.Array;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.GenericDeclaration;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
@ -40,7 +39,7 @@ public abstract class TypeParameterMatcher {
};
public static TypeParameterMatcher find(
final Object object, final GenericDeclaration parameterizedSuperclass, final String typeParamName) {
final Object object, final Class<?> parameterizedSuperclass, final String typeParamName) {
final Map<Class<?>, Map<String, TypeParameterMatcher>> typeMap = TypeParameterMatcher.typeMap.get();
final Class<?> thisClass = object.getClass();
@ -80,7 +79,7 @@ public abstract class TypeParameterMatcher {
}
private static Class<?> find0(
final Object object, GenericDeclaration parameterizedSuperclass, String typeParamName) {
final Object object, Class<?> parameterizedSuperclass, String typeParamName) {
final Class<?> thisClass = object.getClass();
Class<?> currentClass = thisClass;
@ -127,9 +126,17 @@ public abstract class TypeParameterMatcher {
// Resolved type parameter points to another type parameter.
TypeVariable<?> v = (TypeVariable<?>) actualTypeParam;
currentClass = thisClass;
parameterizedSuperclass = v.getGenericDeclaration();
if (!(v.getGenericDeclaration() instanceof Class)) {
return Object.class;
}
parameterizedSuperclass = (Class<?>) v.getGenericDeclaration();
typeParamName = v.getName();
continue;
if (parameterizedSuperclass.isAssignableFrom(thisClass)) {
continue;
} else {
return Object.class;
}
}
return fail(thisClass, typeParamName);

10
common/src/test/java/io/netty/util/internal/TypeParameterMatcherTest.java
View File

@ -118,4 +118,14 @@ public class TypeParameterMatcherTest {
TypeParameterMatcher m = TypeParameterMatcher.find(new U() { }, U.class, "E");
assertTrue(m.match(new Object()));
}
private static class V<E> {
U<E> u = new U<E>() { };
}
@Test
public void testInnerClass() throws Exception {
TypeParameterMatcher m = TypeParameterMatcher.find(new V<String>().u, U.class, "E");
assertTrue(m.match(new Object()));
}
}