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:
Stephane Nicoll
2018-01-18 13:59:19 +01:00
parent 849baa4c02 927c2cacfa
commit 60f5cf10ba
3 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,6 +267,8 @@ public class ConfigurationMetadataAnnotationProcessorTests {
"java.util.Collection<java.lang.Byte>"));
assertThat(metadata).has(Metadata.withProperty("collection.doubles",
"java.util.List<java.lang.Double>"));
assertThat(metadata).has(Metadata.withProperty("collection.names-to-holders",
"java.util.Map<java.lang.String,org.springframework.boot.configurationsample.simple.SimpleCollectionProperties.Holder<java.lang.String>>"));
}
@Test

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -45,6 +45,8 @@ public class SimpleCollectionProperties {
private final List<Double> doubles = new ArrayList<>();
private final Map<String, Holder<String>> namesToHolders = new HashMap<>();
public Map<Integer, String> getIntegersToNames() {
return this.integersToNames;
}
@@ -81,4 +83,18 @@ public class SimpleCollectionProperties {
return this.doubles;
}
public Map<String, Holder<String>> getNamesToHolders() {
return this.namesToHolders;
}
public static class Holder<T> {
private T target;
public void setTarget(T target) {
this.target = target;
}
}
}