Commit d61c3816 authored by Phillip Webb's avatar Phillip Webb

Formatting

parent 533d36a4
...@@ -86,10 +86,10 @@ import org.springframework.web.servlet.DispatcherServlet; ...@@ -86,10 +86,10 @@ import org.springframework.web.servlet.DispatcherServlet;
@ConditionalOnClass({ Servlet.class, DispatcherServlet.class }) @ConditionalOnClass({ Servlet.class, DispatcherServlet.class })
@ConditionalOnWebApplication @ConditionalOnWebApplication
@AutoConfigureAfter({ PropertyPlaceholderAutoConfiguration.class, @AutoConfigureAfter({ PropertyPlaceholderAutoConfiguration.class,
EmbeddedServletContainerAutoConfiguration.class, WebMvcAutoConfiguration.class, EmbeddedServletContainerAutoConfiguration.class, WebMvcAutoConfiguration.class,
ManagementServerPropertiesAutoConfiguration.class }) ManagementServerPropertiesAutoConfiguration.class })
public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware, public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware,
SmartInitializingSingleton { SmartInitializingSingleton {
private static Log logger = LogFactory.getLog(EndpointWebMvcAutoConfiguration.class); private static Log logger = LogFactory.getLog(EndpointWebMvcAutoConfiguration.class);
...@@ -119,7 +119,7 @@ SmartInitializingSingleton { ...@@ -119,7 +119,7 @@ SmartInitializingSingleton {
if (managementPort == ManagementServerPort.DIFFERENT if (managementPort == ManagementServerPort.DIFFERENT
&& this.applicationContext instanceof EmbeddedWebApplicationContext && this.applicationContext instanceof EmbeddedWebApplicationContext
&& ((EmbeddedWebApplicationContext) this.applicationContext) && ((EmbeddedWebApplicationContext) this.applicationContext)
.getEmbeddedServletContainer() != null) { .getEmbeddedServletContainer() != null) {
createChildManagementContext(); createChildManagementContext();
} }
if (managementPort == ManagementServerPort.SAME if (managementPort == ManagementServerPort.SAME
...@@ -139,7 +139,7 @@ SmartInitializingSingleton { ...@@ -139,7 +139,7 @@ SmartInitializingSingleton {
EmbeddedServletContainerAutoConfiguration.class, EmbeddedServletContainerAutoConfiguration.class,
DispatcherServletAutoConfiguration.class); DispatcherServletAutoConfiguration.class);
CloseEventPropagationListener CloseEventPropagationListener
.addIfPossible(this.applicationContext, childContext); .addIfPossible(this.applicationContext, childContext);
try { try {
childContext.refresh(); childContext.refresh();
managementContextResolver().setApplicationContext(childContext); managementContextResolver().setApplicationContext(childContext);
...@@ -205,7 +205,7 @@ SmartInitializingSingleton { ...@@ -205,7 +205,7 @@ SmartInitializingSingleton {
@Override @Override
protected void doFilterInternal(HttpServletRequest request, protected void doFilterInternal(HttpServletRequest request,
HttpServletResponse response, FilterChain filterChain) HttpServletResponse response, FilterChain filterChain)
throws ServletException, IOException { throws ServletException, IOException {
if (this.properties == null) { if (this.properties == null) {
this.properties = this.applicationContext this.properties = this.applicationContext
.getBean(ManagementServerProperties.class); .getBean(ManagementServerProperties.class);
...@@ -224,7 +224,7 @@ SmartInitializingSingleton { ...@@ -224,7 +224,7 @@ SmartInitializingSingleton {
* parent to a child. * parent to a child.
*/ */
private static class CloseEventPropagationListener implements private static class CloseEventPropagationListener implements
ApplicationListener<ContextClosedEvent> { ApplicationListener<ContextClosedEvent> {
private final ApplicationContext parentContext; private final ApplicationContext parentContext;
...@@ -289,7 +289,7 @@ SmartInitializingSingleton { ...@@ -289,7 +289,7 @@ SmartInitializingSingleton {
return ((port == null) return ((port == null)
|| (serverProperties.getPort() == null && port.equals(8080)) || (serverProperties.getPort() == null && port.equals(8080))
|| (port != 0 && port.equals(serverProperties.getPort())) ? SAME || (port != 0 && port.equals(serverProperties.getPort())) ? SAME
: DIFFERENT); : DIFFERENT);
} }
} }
...@@ -329,9 +329,11 @@ SmartInitializingSingleton { ...@@ -329,9 +329,11 @@ SmartInitializingSingleton {
if ((managementPort == null) if ((managementPort == null)
|| (serverPort == null && managementPort.equals(8080)) || (serverPort == null && managementPort.equals(8080))
|| (managementPort != 0 && managementPort.equals(serverPort))) { || (managementPort != 0 && managementPort.equals(serverPort))) {
return ConditionOutcome.match("The main context is the management context"); return ConditionOutcome
.match("The main context is the management context");
} }
return ConditionOutcome.noMatch("The main context is not the management context"); return ConditionOutcome
.noMatch("The main context is not the management context");
} }
private <T> T getBeanCarefully(ConditionContext context, Class<T> type) { private <T> T getBeanCarefully(ConditionContext context, Class<T> type) {
......
...@@ -16,9 +16,6 @@ ...@@ -16,9 +16,6 @@
package org.springframework.boot.autoconfigure.web; package org.springframework.boot.autoconfigure.web;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
...@@ -39,6 +36,9 @@ import org.springframework.test.web.servlet.MockMvc; ...@@ -39,6 +36,9 @@ import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.ConfigurableWebApplicationContext; import org.springframework.web.context.ConfigurableWebApplicationContext;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
/** /**
* Tests for welcome page using {@link MockMvc} and {@link SpringJUnit4ClassRunner}. * Tests for welcome page using {@link MockMvc} and {@link SpringJUnit4ClassRunner}.
* *
...@@ -69,7 +69,7 @@ public class WelcomePageMockMvcTests { ...@@ -69,7 +69,7 @@ public class WelcomePageMockMvcTests {
public void homePageCustomLocation() throws Exception { public void homePageCustomLocation() throws Exception {
this.wac = (ConfigurableWebApplicationContext) new SpringApplicationBuilder( this.wac = (ConfigurableWebApplicationContext) new SpringApplicationBuilder(
TestConfiguration.class).properties( TestConfiguration.class).properties(
"spring.resources.staticLocations:classpath:/custom/").run(); "spring.resources.staticLocations:classpath:/custom/").run();
this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
this.mockMvc.perform(get("/")).andExpect(status().isOk()).andReturn(); this.mockMvc.perform(get("/")).andExpect(status().isOk()).andReturn();
} }
...@@ -78,7 +78,7 @@ public class WelcomePageMockMvcTests { ...@@ -78,7 +78,7 @@ public class WelcomePageMockMvcTests {
public void homePageCustomLocationNoTrailingSlash() throws Exception { public void homePageCustomLocationNoTrailingSlash() throws Exception {
this.wac = (ConfigurableWebApplicationContext) new SpringApplicationBuilder( this.wac = (ConfigurableWebApplicationContext) new SpringApplicationBuilder(
TestConfiguration.class).properties( TestConfiguration.class).properties(
"spring.resources.staticLocations:classpath:/custom").run(); "spring.resources.staticLocations:classpath:/custom").run();
this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
this.mockMvc.perform(get("/")).andExpect(status().isOk()).andReturn(); this.mockMvc.perform(get("/")).andExpect(status().isOk()).andReturn();
} }
...@@ -87,9 +87,9 @@ public class WelcomePageMockMvcTests { ...@@ -87,9 +87,9 @@ public class WelcomePageMockMvcTests {
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
@Import({ ServerPropertiesAutoConfiguration.class, @Import({ ServerPropertiesAutoConfiguration.class,
DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class, DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class,
HttpMessageConvertersAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class })
protected static @interface MinimalWebConfiguration { protected static @interface MinimalWebConfiguration {
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment