Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Improve resolution of generic type variables"

Browse Source 
See gh-23418
This commit is contained in:
Stephane Nicoll
2022-09-26 13:07:43 +02:00
parent 124a76b1ad
commit b11e885e00
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java
View File

@@ -203,7 +203,6 @@ public final class GenericTypeResolver {
if (variableResolver == null) {
return ResolvableType.NONE;
}
resolvedType = variableResolver.resolveVariable(typeVariable);
if (resolvedType != null) {
return resolvedType;
@@ -223,7 +222,6 @@ public final class GenericTypeResolver {
return resolvedType;
}
}
return ResolvableType.NONE;
}

6
spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
View File

@@ -176,15 +176,13 @@ class GenericTypeResolverTests {
@Test
public void resolvePartiallySpecializedTypeVariables() {
Type resolved = resolveType(BiGenericClass.class.getTypeParameters()[0], TypeFixedBiGenericClass.class);
assertThat(resolved).isNotNull();
assertThat(D.class).isEqualTo(resolved);
assertThat(resolved).isEqualTo(D.class);
}
@Test
public void resolveTransitiveTypeVariableWithDifferentName() {
Type resolved = resolveType(BiGenericClass.class.getTypeParameters()[1], TypeFixedBiGenericClass.class);
assertThat(resolved).isNotNull();
assertThat(E.class).isEqualTo(resolved);
assertThat(resolved).isEqualTo(E.class);
}
public interface MyInterfaceType<T> {