From b11e885e003d9e4ed90670e671f6b4c2dc9242d6 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 26 Sep 2022 13:07:43 +0200 Subject: [PATCH] Polish "Improve resolution of generic type variables" See gh-23418 --- .../java/org/springframework/core/GenericTypeResolver.java | 2 -- .../org/springframework/core/GenericTypeResolverTests.java | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java index a28765c50b..e9a0895e39 100644 --- a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java +++ b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java @@ -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; } diff --git a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java index b2019af524..efd1f67aff 100644 --- a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java @@ -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 {