Merge branch '1.5.x'
This commit is contained in:
@@ -19,7 +19,6 @@ package org.springframework.boot.configurationprocessor;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@@ -188,14 +187,14 @@ class TypeUtils {
|
||||
return getQualifiedName(enclosingElement) + "$"
|
||||
+ type.asElement().getSimpleName().toString();
|
||||
}
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append(getQualifiedName(type.asElement()));
|
||||
StringBuilder name = new StringBuilder();
|
||||
name.append(getQualifiedName(type.asElement()));
|
||||
if (!type.getTypeArguments().isEmpty()) {
|
||||
List<String> parameters = type.getTypeArguments().stream()
|
||||
.map(TypeMirror::toString).collect(Collectors.toList());
|
||||
sb.append("<").append(String.join(",", parameters)).append(">");
|
||||
name.append(
|
||||
"<" + type.getTypeArguments().stream().map(TypeMirror::toString)
|
||||
.collect(Collectors.joining(",")) + ">");
|
||||
}
|
||||
return sb.toString();
|
||||
return name.toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user