admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ResolvableType isAssignableFrom for <?>

Browse Source 
Fix ResolvableType.isAssignableFrom to correctly deal with <?> style
generics.

Issue: SPR-10973
This commit is contained in:
Phillip Webb
2013-10-10 09:22:22 -07:00
parent 501a1cbb5d
commit 5358cc0f5f
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
+7 -4
View File
@@ -52,8 +52,6 @@ import static org.mockito.BDDMockito.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
// FIXME nested
/**
* Tests for {@link ResolvableType}.
*
@@ -822,8 +820,8 @@ public class ResolvableTypeTests {
ResolvableType objectType = ResolvableType.forClass(Object.class);
ResolvableType unresolvableVariable = ResolvableType.forField(AssignmentBase.class.getField("o"));
assertThat(unresolvableVariable.resolve(), nullValue());
assertAssignable(objectType, unresolvableVariable).equalTo(false);
assertAssignable(unresolvableVariable, objectType).equalTo(false);
assertAssignable(objectType, unresolvableVariable).equalTo(true);
assertAssignable(unresolvableVariable, objectType).equalTo(true);
}
@Test
@@ -936,6 +934,7 @@ public class ResolvableTypeTests {
ResolvableType object = ResolvableType.forClass(Object.class);
ResolvableType charSequence = ResolvableType.forClass(CharSequence.class);
ResolvableType string = ResolvableType.forClass(String.class);
ResolvableType extendsAnon = ResolvableType.forField(AssignmentBase.class.getField("listAnon"), Assignment.class).getGeneric();
ResolvableType extendsObject = ResolvableType.forField(AssignmentBase.class.getField("listxo"), Assignment.class).getGeneric();
ResolvableType extendsCharSequence = ResolvableType.forField(AssignmentBase.class.getField("listxc"), Assignment.class).getGeneric();
ResolvableType extendsString = ResolvableType.forField(AssignmentBase.class.getField("listxs"), Assignment.class).getGeneric();
@@ -972,6 +971,8 @@ public class ResolvableTypeTests {
equalTo(false, true, true);
assertAssignable(charSequence, extendsObject, extendsCharSequence, extendsString).
equalTo(false, false, false);
assertAssignable(extendsAnon, object, charSequence, string).
equalTo(true, true, true);
// T <= ? super T
assertAssignable(superCharSequence, object, charSequence, string).
@@ -1144,6 +1145,8 @@ public class ResolvableTypeTests {
public List<S> lists;
public List<?> listAnon;
public List<? extends O> listxo;
public List<? extends C> listxc;