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

Merge branch '5.1.x'

This commit is contained in:
Phillip Webb 2019-07-20 13:23:37 +01:00
parent 9110a56e11 e5bef10d85
commit be65bef91b
2 changed files with 13 additions and 1 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

@ -1013,7 +1013,7 @@ public class ResolvableType implements Serializable {
} }
@Override @Override
public boolean isAssignableFrom(ResolvableType other) { public boolean isAssignableFrom(ResolvableType other) {
Class<?> otherClass = other.getRawClass(); Class<?> otherClass = other.resolve();
return (otherClass != null && (clazz == null || ClassUtils.isAssignable(clazz, otherClass))); return (otherClass != null && (clazz == null || ClassUtils.isAssignable(clazz, otherClass)));
} }
}; };

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

@ -134,6 +134,18 @@ public class ResolvableTypeTests {
assertThat(type.isAssignableFrom(String.class)).isTrue(); assertThat(type.isAssignableFrom(String.class)).isTrue();
} }
@Test
public void forRawClassAssignableFromTypeVariable() { // gh-23321
ResolvableType typeVariable = ResolvableType.forClass(ExtendsList.class).as(List.class).getGeneric();
ResolvableType raw = ResolvableType.forRawClass(CharSequence.class);
assertThat(raw.resolve()).isEqualTo(CharSequence.class);
assertThat(typeVariable.resolve()).isEqualTo(CharSequence.class);
assertThat(raw.resolve().isAssignableFrom(typeVariable.resolve())).isTrue();
assertThat(typeVariable.resolve().isAssignableFrom(raw.resolve())).isTrue();
assertThat(raw.isAssignableFrom(typeVariable)).isTrue();
assertThat(typeVariable.isAssignableFrom(raw)).isTrue();
}
@Test @Test
public void forInstanceMustNotBeNull() { public void forInstanceMustNotBeNull() {
assertThatIllegalArgumentException().isThrownBy(() -> assertThatIllegalArgumentException().isThrownBy(() ->