From 2dc8f49f8a3a2b7b321836f96cc6aea40840e2df Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 27 Nov 2018 20:54:41 +0000 Subject: [PATCH] Polish --- .../properties/source/ConfigurationPropertySource.java | 1 + .../boot/web/embedded/tomcat/TomcatEmbeddedContext.java | 5 ++--- .../boot/web/servlet/AbstractFilterRegistrationBean.java | 5 ----- .../boot/web/servlet/ServletRegistrationBean.java | 5 ----- .../webservices/client/WebServiceTemplateCustomizer.java | 1 + .../web/servlet/ServletComponentScanRegistrarTests.java | 8 +++----- .../server/AbstractServletWebServerFactoryTests.java | 5 ++--- 7 files changed, 9 insertions(+), 21 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertySource.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertySource.java index 25cf1304b52..119b4aec555 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertySource.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertySource.java @@ -30,6 +30,7 @@ import org.springframework.boot.origin.OriginTrackedValue; * @see OriginTrackedValue * @see #getConfigurationProperty(ConfigurationPropertyName) */ +@FunctionalInterface public interface ConfigurationPropertySource { /** diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java index 1cb20089280..ff831871313 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java @@ -61,9 +61,8 @@ class TomcatEmbeddedContext extends StandardContext { } public void deferredLoadOnStartup() throws LifecycleException { - doWithThreadContextClassLoader(getLoader().getClassLoader(), () -> { - getLoadOnStartupWrappers(findChildren()).forEach(this::load); - }); + doWithThreadContextClassLoader(getLoader().getClassLoader(), + () -> getLoadOnStartupWrappers(findChildren()).forEach(this::load)); } private Stream getLoadOnStartupWrappers(Container[] children) { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java index dfd2b5a0760..def751c1240 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java @@ -29,9 +29,6 @@ import javax.servlet.FilterRegistration; import javax.servlet.FilterRegistration.Dynamic; import javax.servlet.ServletContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -55,8 +52,6 @@ public abstract class AbstractFilterRegistrationBean @Deprecated protected static final int REQUEST_WRAPPER_FILTER_MAX_ORDER = 0; - private final Log logger = LogFactory.getLog(getClass()); - private static final String[] DEFAULT_URL_MAPPINGS = { "/*" }; private Set> servletRegistrationBeans = new LinkedHashSet<>(); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java index d5456bed19d..908856f296c 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java @@ -26,9 +26,6 @@ import javax.servlet.Servlet; import javax.servlet.ServletContext; import javax.servlet.ServletRegistration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; @@ -54,8 +51,6 @@ import org.springframework.util.StringUtils; public class ServletRegistrationBean extends DynamicRegistrationBean { - private static final Log logger = LogFactory.getLog(ServletRegistrationBean.class); - private static final String[] DEFAULT_MAPPINGS = { "/*" }; private T servlet; diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateCustomizer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateCustomizer.java index 36a6404ea66..43dd6b8dc11 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateCustomizer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateCustomizer.java @@ -24,6 +24,7 @@ import org.springframework.ws.client.core.WebServiceTemplate; * @author Dmytro Nosan * @since 2.1.0 */ +@FunctionalInterface public interface WebServiceTemplateCustomizer { /** diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanRegistrarTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanRegistrarTests.java index 979b4b22d9e..44ab3b4da79 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanRegistrarTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanRegistrarTests.java @@ -85,11 +85,9 @@ public class ServletComponentScanRegistrarTests { @Test public void packagesConfiguredWithBothValueAndBasePackages() { assertThatExceptionOfType(AnnotationConfigurationException.class) - .isThrownBy(() -> { - this.context = new AnnotationConfigApplicationContext( - ValueAndBasePackages.class); - }).withMessageContaining("'value'") - .withMessageContaining("'basePackages'") + .isThrownBy(() -> this.context = new AnnotationConfigApplicationContext( + ValueAndBasePackages.class)) + .withMessageContaining("'value'").withMessageContaining("'basePackages'") .withMessageContaining("com.example.foo") .withMessageContaining("com.example.bar"); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java index 871c373fc66..93ce49fc3e7 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java @@ -1049,9 +1049,8 @@ public abstract class AbstractServletWebServerFactoryTests { @Test public void exceptionThrownOnLoadFailureIsRethrown() { AbstractServletWebServerFactory factory = getFactory(); - this.webServer = factory.getWebServer((context) -> { - context.addServlet("failing", FailingServlet.class).setLoadOnStartup(0); - }); + this.webServer = factory.getWebServer((context) -> context + .addServlet("failing", FailingServlet.class).setLoadOnStartup(0)); assertThatExceptionOfType(WebServerException.class) .isThrownBy(this.webServer::start) .satisfies(this::wrapsFailingServletException);