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

Merge branch '2.3.x'

Browse Source 
Closes gh-22584
This commit is contained in:
Andy Wilkinson
2020-07-27 13:08:40 +01:00
parent 4827e84a12 39cb912819
commit d16838e4b7
2 changed files with 136 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java
View File

@@ -18,6 +18,7 @@ package org.springframework.boot.test.mock.mockito;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Field;
import java.lang.reflect.TypeVariable;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
@@ -114,7 +115,13 @@ class DefinitionsParser {
types.add(ResolvableType.forClass(clazz));
}
if (types.isEmpty() && element instanceof Field) {
types.add(ResolvableType.forField((Field) element, source));
Field field = (Field) element;
if (field.getGenericType() instanceof TypeVariable) {
types.add(ResolvableType.forField(field, source));
}
else {
types.add(ResolvableType.forField(field));
}
}
return types;
}