Merge branch '1.5.x'

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java

@@ -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