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

Merge branch '1.4.x' into 1.5.x

Browse Source
This commit is contained in:
Andy Wilkinson
2016-11-15 11:48:53 +00:00
parent 2b8801a6b5 c2730ac63f
commit 22e456a177
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/GenericConfig.java
View File

@@ -25,6 +25,7 @@ import org.springframework.boot.configurationsample.NestedConfigurationProperty;
/**
* Demonstrate that only relevant generics are stored in the metadata.
*
* @param <T> the type of the config
* @author Stephane Nicoll
*/
@ConfigurationProperties("generic")
@@ -43,11 +44,9 @@ public class GenericConfig<T> {
@NestedConfigurationProperty
private final Bar<String> bar = new Bar<String>();
private final Map<String, Bar<Integer>> stringToBar =
new HashMap<String, Bar<Integer>>();
private final Map<String, Bar<Integer>> stringToBar = new HashMap<String, Bar<Integer>>();
private final Map<String, Integer> stringToInteger =
new HashMap<String, Integer>();
private final Map<String, Integer> stringToInteger = new HashMap<String, Integer>();
public String getName() {
return this.name;