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

ResolvableType.forClassWithGenerics retains original TypeVariables

Browse Source 
Issue: SPR-16456
This commit is contained in:
Juergen Hoeller
2018-02-09 15:29:00 +01:00
parent a639535f33
commit e873b18f43
2 changed files with 1 additions and 3 deletions
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

@@ -1047,7 +1047,7 @@ public class ResolvableType implements Serializable {
for (int i = 0; i < generics.length; i++) {
ResolvableType generic = generics[i];
Type argument = (generic != null ? generic.getType() : null);
arguments[i] = (argument != null ? argument : variables[i]);
arguments[i] = (argument != null && !(argument instanceof TypeVariable) ? argument : variables[i]);
}
ParameterizedType syntheticType = new SyntheticParameterizedType(clazz, arguments);

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

@@ -43,7 +43,6 @@ import java.util.TreeSet;
import java.util.concurrent.Callable;
import org.hamcrest.Matchers;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -1338,7 +1337,6 @@ public class ResolvableTypeTests {
assertTrue(setClass.isAssignableFrom(fromReturnType));
}
@Ignore
@Test
public void testSpr16456() throws Exception {
ResolvableType genericType = ResolvableType.forField(