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

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Phillip Webb
2018-01-18 22:03:51 -08:00
parent ba6be4f22f 8e783cdae9
commit 6d93573db0
6 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

16
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java
View File

@@ -277,12 +277,12 @@ public class ConfigurationMetadataAnnotationProcessorTests {
@Test
public void parseArrayConfig() throws Exception {
ConfigurationMetadata metadata = compile(SimpleArrayProperties.class);
assertThat(metadata).has(Metadata.withGroup("array")
.ofType(SimpleArrayProperties.class));
assertThat(metadata).has(Metadata.withProperty("array.primitive",
"java.lang.Integer[]"));
assertThat(metadata).has(Metadata.withProperty("array.simple",
"java.lang.String[]"));
assertThat(metadata)
.has(Metadata.withGroup("array").ofType(SimpleArrayProperties.class));
assertThat(metadata)
.has(Metadata.withProperty("array.primitive", "java.lang.Integer[]"));
assertThat(metadata)
.has(Metadata.withProperty("array.simple", "java.lang.String[]"));
assertThat(metadata).has(Metadata.withProperty("array.inner",
"org.springframework.boot.configurationsample.simple.SimpleArrayProperties$Holder[]"));
assertThat(metadata).has(Metadata.withProperty("array.name-to-integer",
@@ -503,8 +503,8 @@ public class ConfigurationMetadataAnnotationProcessorTests {
@Test
public void wildcardTypes() throws IOException {
ConfigurationMetadata metadata = compile(WildcardConfig.class);
assertThat(metadata).has(Metadata.withGroup("wildcard")
.ofType(WildcardConfig.class));
assertThat(metadata)
.has(Metadata.withGroup("wildcard").ofType(WildcardConfig.class));
assertThat(metadata).has(Metadata.withProperty("wildcard.string-to-number")
.ofType("java.util.Map<java.lang.String,? extends java.lang.Number>")
.fromSource(WildcardConfig.class));

1
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleCollectionProperties.java
View File

@@ -89,6 +89,7 @@ public class SimpleCollectionProperties {
public static class Holder<T> {
@SuppressWarnings("unused")
private T target;
public void setTarget(T target) {