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

Polish

This commit is contained in:
Phillip Webb 2014-09-25 20:15:49 -07:00
parent bff39e954e
commit fa02c01727
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java
View File

@ -85,11 +85,11 @@ public class EndpointWebMvcChildContextConfiguration {
this.managementServerProperties = BeanFactoryUtils this.managementServerProperties = BeanFactoryUtils
.beanOfTypeIncludingAncestors(this.beanFactory, .beanOfTypeIncludingAncestors(this.beanFactory,
ManagementServerProperties.class); ManagementServerProperties.class);
this.server = BeanFactoryUtils this.server = BeanFactoryUtils.beanOfTypeIncludingAncestors(
.beanOfTypeIncludingAncestors(this.beanFactory, this.beanFactory, ServerProperties.class);
ServerProperties.class);
} }
// Customize as per the parent context first (so e.g. the access logs go to the same place) // Customize as per the parent context first (so e.g. the access logs go to
// the same place)
server.customize(container); server.customize(container);
// Then reset the error pages // Then reset the error pages
container.setErrorPages(Collections.<ErrorPage> emptySet()); container.setErrorPages(Collections.<ErrorPage> emptySet());

7
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
View File

@ -223,7 +223,8 @@ public class EndpointWebMvcAutoConfigurationTests {
assertThat(localServerPort, notNullValue()); assertThat(localServerPort, notNullValue());
assertThat(localManagementPort, notNullValue()); assertThat(localManagementPort, notNullValue());
assertThat(localServerPort, not(equalTo(localManagementPort))); assertThat(localServerPort, not(equalTo(localManagementPort)));
assertThat(applicationContext.getBean(ServerPortConfig.class).getCount(), equalTo(2)); assertThat(this.applicationContext.getBean(ServerPortConfig.class).getCount(),
equalTo(2));
this.applicationContext.close(); this.applicationContext.close();
assertAllClosed(); assertAllClosed();
} }
@ -309,7 +310,7 @@ public class EndpointWebMvcAutoConfigurationTests {
private int count = 0; private int count = 0;
public int getCount() { public int getCount() {
return count; return this.count;
} }
@Bean @Bean
@ -317,7 +318,7 @@ public class EndpointWebMvcAutoConfigurationTests {
ServerProperties properties = new ServerProperties() { ServerProperties properties = new ServerProperties() {
@Override @Override
public void customize(ConfigurableEmbeddedServletContainer container) { public void customize(ConfigurableEmbeddedServletContainer container) {
count++; ServerPortConfig.this.count++;
super.customize(container); super.customize(container);
} }
}; };