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

Merge branch '2.3.x'

Browse Source
This commit is contained in:
Phillip Webb
2020-08-06 10:15:36 -07:00
parent dac63fc3e5 4924573074
commit 8d06b0f368
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,12 +116,8 @@ class DefinitionsParser {
}
if (types.isEmpty() && element instanceof Field) {
Field field = (Field) element;
if (field.getGenericType() instanceof TypeVariable) {
types.add(ResolvableType.forField(field, source));
}
else {
types.add(ResolvableType.forField(field));
}
types.add((field.getGenericType() instanceof TypeVariable) ? ResolvableType.forField(field, source)
: ResolvableType.forField(field));
}
return types;
}