From d61c38167e354bb490c5ac800574332c1c68c043 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 1 Jul 2015 16:18:26 -0700 Subject: [PATCH] Formatting --- .../EndpointWebMvcAutoConfiguration.java | 22 ++++++++++--------- .../web/WelcomePageMockMvcTests.java | 16 +++++++------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java index d5b20ff2c3..227427682d 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java @@ -86,10 +86,10 @@ import org.springframework.web.servlet.DispatcherServlet; @ConditionalOnClass({ Servlet.class, DispatcherServlet.class }) @ConditionalOnWebApplication @AutoConfigureAfter({ PropertyPlaceholderAutoConfiguration.class, - EmbeddedServletContainerAutoConfiguration.class, WebMvcAutoConfiguration.class, - ManagementServerPropertiesAutoConfiguration.class }) + EmbeddedServletContainerAutoConfiguration.class, WebMvcAutoConfiguration.class, + ManagementServerPropertiesAutoConfiguration.class }) public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware, -SmartInitializingSingleton { + SmartInitializingSingleton { private static Log logger = LogFactory.getLog(EndpointWebMvcAutoConfiguration.class); @@ -119,7 +119,7 @@ SmartInitializingSingleton { if (managementPort == ManagementServerPort.DIFFERENT && this.applicationContext instanceof EmbeddedWebApplicationContext && ((EmbeddedWebApplicationContext) this.applicationContext) - .getEmbeddedServletContainer() != null) { + .getEmbeddedServletContainer() != null) { createChildManagementContext(); } if (managementPort == ManagementServerPort.SAME @@ -139,7 +139,7 @@ SmartInitializingSingleton { EmbeddedServletContainerAutoConfiguration.class, DispatcherServletAutoConfiguration.class); CloseEventPropagationListener - .addIfPossible(this.applicationContext, childContext); + .addIfPossible(this.applicationContext, childContext); try { childContext.refresh(); managementContextResolver().setApplicationContext(childContext); @@ -205,7 +205,7 @@ SmartInitializingSingleton { @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) - throws ServletException, IOException { + throws ServletException, IOException { if (this.properties == null) { this.properties = this.applicationContext .getBean(ManagementServerProperties.class); @@ -224,7 +224,7 @@ SmartInitializingSingleton { * parent to a child. */ private static class CloseEventPropagationListener implements - ApplicationListener { + ApplicationListener { private final ApplicationContext parentContext; @@ -289,7 +289,7 @@ SmartInitializingSingleton { return ((port == null) || (serverProperties.getPort() == null && port.equals(8080)) || (port != 0 && port.equals(serverProperties.getPort())) ? SAME - : DIFFERENT); + : DIFFERENT); } } @@ -329,9 +329,11 @@ SmartInitializingSingleton { if ((managementPort == null) || (serverPort == null && managementPort.equals(8080)) || (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 getBeanCarefully(ConditionContext context, Class type) { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WelcomePageMockMvcTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WelcomePageMockMvcTests.java index 663ab276d1..c635b348e4 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WelcomePageMockMvcTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WelcomePageMockMvcTests.java @@ -16,9 +16,6 @@ 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.ElementType; import java.lang.annotation.Retention; @@ -39,6 +36,9 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; 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}. * @@ -69,7 +69,7 @@ public class WelcomePageMockMvcTests { public void homePageCustomLocation() throws Exception { this.wac = (ConfigurableWebApplicationContext) new SpringApplicationBuilder( TestConfiguration.class).properties( - "spring.resources.staticLocations:classpath:/custom/").run(); + "spring.resources.staticLocations:classpath:/custom/").run(); this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); this.mockMvc.perform(get("/")).andExpect(status().isOk()).andReturn(); } @@ -78,7 +78,7 @@ public class WelcomePageMockMvcTests { public void homePageCustomLocationNoTrailingSlash() throws Exception { this.wac = (ConfigurableWebApplicationContext) new SpringApplicationBuilder( TestConfiguration.class).properties( - "spring.resources.staticLocations:classpath:/custom").run(); + "spring.resources.staticLocations:classpath:/custom").run(); this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); this.mockMvc.perform(get("/")).andExpect(status().isOk()).andReturn(); } @@ -87,9 +87,9 @@ public class WelcomePageMockMvcTests { @Retention(RetentionPolicy.RUNTIME) @Documented @Import({ ServerPropertiesAutoConfiguration.class, - DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class, - HttpMessageConvertersAutoConfiguration.class, - ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) + DispatcherServletAutoConfiguration.class, WebMvcAutoConfiguration.class, + HttpMessageConvertersAutoConfiguration.class, + ErrorMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) protected static @interface MinimalWebConfiguration { }