root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2016-11-15 13:14:44 +00:00
parent 6aa57e8ffe 22e456a177
commit e26a3e3766
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/AbstractEndpointHandlerMappingTests.java
View File

@ -41,7 +41,7 @@ public abstract class AbstractEndpointHandlerMappingTests {
public void pathNotMappedWhenGetPathReturnsNull() throws Exception {
TestMvcEndpoint endpoint = new TestMvcEndpoint(new TestEndpoint("a"));
TestActionEndpoint other = new TestActionEndpoint(new TestEndpoint("b"));
AbstractEndpointHandlerMapping mapping = new TestEndpointHandlerMapping(
AbstractEndpointHandlerMapping<?> mapping = new TestEndpointHandlerMapping<MvcEndpoint>(
Arrays.asList(endpoint, other));
mapping.setApplicationContext(this.context);
mapping.afterPropertiesSet();
@ -89,9 +89,10 @@ public abstract class AbstractEndpointHandlerMappingTests {
}
private static class TestEndpointHandlerMapping extends AbstractEndpointHandlerMapping {
private static class TestEndpointHandlerMapping<E extends MvcEndpoint>
extends AbstractEndpointHandlerMapping<E> {
TestEndpointHandlerMapping(Collection<? extends MvcEndpoint> endpoints) {
TestEndpointHandlerMapping(Collection<E> endpoints) {
super(endpoints);
}

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;