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

Some minor cleanups for TypeParameterMatcher (#11286)

Browse Source 
Motivation:

The code in TypeParamterMatcher can be simplified and cleaned up.

Modification:

Cleanup

Result:

Cleanup
This commit is contained in:
terrarier2111 2021-05-27 09:02:29 +02:00 committed by Norman Maurer
parent bad51c5e36
commit 73bafaaf9b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,18 +119,17 @@ public abstract class TypeParameterMatcher {
if (actualTypeParam instanceof TypeVariable) { if (actualTypeParam instanceof TypeVariable) {
// Resolved type parameter points to another type parameter. // Resolved type parameter points to another type parameter.
TypeVariable<?> v = (TypeVariable<?>) actualTypeParam; TypeVariable<?> v = (TypeVariable<?>) actualTypeParam;
currentClass = thisClass;
if (!(v.getGenericDeclaration() instanceof Class)) { if (!(v.getGenericDeclaration() instanceof Class)) {
return Object.class; return Object.class;
} }
currentClass = thisClass;
parametrizedSuperclass = (Class<?>) v.getGenericDeclaration(); parametrizedSuperclass = (Class<?>) v.getGenericDeclaration();
typeParamName = v.getName(); typeParamName = v.getName();
if (parametrizedSuperclass.isAssignableFrom(thisClass)) { if (parametrizedSuperclass.isAssignableFrom(thisClass)) {
continue; continue;
} else {
return Object.class;
} }
return Object.class;
} }
return fail(thisClass, typeParamName); return fail(thisClass, typeParamName);