Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll
2018-01-30 16:43:54 +01:00

View File

@@ -188,14 +188,18 @@ class TypeUtils {
return getQualifiedName(enclosingElement) + "$"
+ type.asElement().getSimpleName().toString();
}
StringBuilder name = new StringBuilder();
name.append(getQualifiedName(type.asElement()));
if (!type.getTypeArguments().isEmpty()) {
name.append(
"<" + type.getTypeArguments().stream().map(TypeMirror::toString)
.collect(Collectors.joining(",")) + ">");
String qualifiedName = getQualifiedName(type.asElement());
if (type.getTypeArguments().isEmpty()) {
return qualifiedName;
}
else {
StringBuilder name = new StringBuilder();
name.append(qualifiedName);
name.append("<").append(type.getTypeArguments().stream()
.map(TypeMirror::toString).collect(Collectors.joining(",")))
.append(">");
return name.toString();
}
return name.toString();
}
@Override