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

Increased ResolvableType unit test coverage

Browse Source 
Issue: SPR-11034
This commit is contained in:
Phillip Webb
2013-10-26 09:19:35 -07:00
parent 6cfbcf4f17
commit 2e1c035d42
2 changed files with 52 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-core/src/main/java/org/springframework/core/ResolvableType.java
View File

@@ -358,18 +358,16 @@ public final class ResolvableType implements Serializable {
* The result will be {@code true} only in those two scenarios.
*/
public boolean hasUnresolvableGenerics() {
ResolvableType[] generics = getGenerics();
for (ResolvableType generic : generics) {
if (generic.resolve() == null) {
for (Class<?> generic : resolveGenerics()) {
if (generic == null) {
return true;
}
}
Class<?> resolved = resolve();
if (resolved != null) {
Type[] ifcs = resolved.getGenericInterfaces();
for (Type ifc : ifcs) {
if (ifc instanceof Class) {
if (forClass((Class) ifc).hasGenerics()) {
for (Type genericInterface : resolved.getGenericInterfaces()) {
if (genericInterface instanceof Class) {
if (forClass((Class<?>) genericInterface).hasGenerics()) {
return true;
}
}