root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Consistently detect wildcard without bounds as unresolvable 

Closes gh-32327
See gh-20727
This commit is contained in:
Juergen Hoeller 2024-02-24 20:25:56 +01:00
parent 567547b63c
commit 260404b7f2
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,7 +325,7 @@ public class ResolvableType implements Serializable {
other.getComponentType(), true, matchedBefore, upUntilUnresolvable));
}
if (upUntilUnresolvable && other.isUnresolvableTypeVariable()) {
if (upUntilUnresolvable && (other.isUnresolvableTypeVariable() || other.isWildcardWithoutBounds())) {
return true;
}

18
spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
View File

@ -1367,6 +1367,18 @@ class ResolvableTypeTests {
assertThat(type.resolveGeneric()).isEqualTo(Integer.class);
}
@Test
void gh32327() throws Exception {
ResolvableType repository1 = ResolvableType.forField(Fields.class.getField("repository"));
ResolvableType repository2 = ResolvableType.forMethodReturnType(Methods.class.getMethod("repository"));
assertThat(repository1.hasUnresolvableGenerics());
assertThat(repository1.isAssignableFrom(repository2)).isFalse();
assertThat(repository1.isAssignableFromResolvedPart(repository2)).isTrue();
assertThat(repository2.hasUnresolvableGenerics());
assertThat(repository2.isAssignableFrom(repository1)).isTrue();
assertThat(repository2.isAssignableFromResolvedPart(repository1)).isTrue();
}
private ResolvableType testSerialization(ResolvableType type) throws Exception {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
@ -1407,7 +1419,7 @@ class ResolvableTypeTests {
}
interface SomeRepository {
interface SomeRepository<S extends Serializable> {
<T> T someMethod(Class<T> arg0, Class<?> arg1, Class<Object> arg2);
}
@ -1458,6 +1470,8 @@ class ResolvableTypeTests {
public Integer[] integerArray;
public int[] intArray;
public SomeRepository<? extends Serializable> repository;
}
@ -1486,6 +1500,8 @@ class ResolvableTypeTests {
List<String> list1();
List<String> list2();
SomeRepository<?> repository();
}