Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Andy Wilkinson
2018-11-27 20:54:41 +00:00
parent dad6d4beca
commit 2dc8f49f8a
7 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertySource.java
View File

@@ -30,6 +30,7 @@ import org.springframework.boot.origin.OriginTrackedValue;
* @see OriginTrackedValue * @see OriginTrackedValue
* @see #getConfigurationProperty(ConfigurationPropertyName) * @see #getConfigurationProperty(ConfigurationPropertyName)
*/ */
@FunctionalInterface
public interface ConfigurationPropertySource { public interface ConfigurationPropertySource {
/** /**

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java
View File

@@ -61,9 +61,8 @@ class TomcatEmbeddedContext extends StandardContext {
} }
public void deferredLoadOnStartup() throws LifecycleException { public void deferredLoadOnStartup() throws LifecycleException {
doWithThreadContextClassLoader(getLoader().getClassLoader(), () -> { doWithThreadContextClassLoader(getLoader().getClassLoader(),
getLoadOnStartupWrappers(findChildren()).forEach(this::load); () -> getLoadOnStartupWrappers(findChildren()).forEach(this::load));
});
} }
private Stream<Wrapper> getLoadOnStartupWrappers(Container[] children) { private Stream<Wrapper> getLoadOnStartupWrappers(Container[] children) {

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
View File

@@ -29,9 +29,6 @@ import javax.servlet.FilterRegistration;
import javax.servlet.FilterRegistration.Dynamic; import javax.servlet.FilterRegistration.Dynamic;
import javax.servlet.ServletContext; 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.Assert;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@@ -55,8 +52,6 @@ public abstract class AbstractFilterRegistrationBean<T extends Filter>
@Deprecated @Deprecated
protected static final int REQUEST_WRAPPER_FILTER_MAX_ORDER = 0; 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 static final String[] DEFAULT_URL_MAPPINGS = { "/*" };
private Set<ServletRegistrationBean<?>> servletRegistrationBeans = new LinkedHashSet<>(); private Set<ServletRegistrationBean<?>> servletRegistrationBeans = new LinkedHashSet<>();

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java
View File

@@ -26,9 +26,6 @@ import javax.servlet.Servlet;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import javax.servlet.ServletRegistration; 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.Assert;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@@ -54,8 +51,6 @@ import org.springframework.util.StringUtils;
public class ServletRegistrationBean<T extends Servlet> public class ServletRegistrationBean<T extends Servlet>
extends DynamicRegistrationBean<ServletRegistration.Dynamic> { extends DynamicRegistrationBean<ServletRegistration.Dynamic> {
private static final Log logger = LogFactory.getLog(ServletRegistrationBean.class);
private static final String[] DEFAULT_MAPPINGS = { "/*" }; private static final String[] DEFAULT_MAPPINGS = { "/*" };
private T servlet; private T servlet;

1
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/webservices/client/WebServiceTemplateCustomizer.java
View File

@@ -24,6 +24,7 @@ import org.springframework.ws.client.core.WebServiceTemplate;
* @author Dmytro Nosan * @author Dmytro Nosan
* @since 2.1.0 * @since 2.1.0
*/ */
@FunctionalInterface
public interface WebServiceTemplateCustomizer { public interface WebServiceTemplateCustomizer {
/** /**

8
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletComponentScanRegistrarTests.java
View File

@@ -85,11 +85,9 @@ public class ServletComponentScanRegistrarTests {
@Test @Test
public void packagesConfiguredWithBothValueAndBasePackages() { public void packagesConfiguredWithBothValueAndBasePackages() {
assertThatExceptionOfType(AnnotationConfigurationException.class) assertThatExceptionOfType(AnnotationConfigurationException.class)
.isThrownBy(() -> { .isThrownBy(() -> this.context = new AnnotationConfigApplicationContext(
this.context = new AnnotationConfigApplicationContext( ValueAndBasePackages.class))
ValueAndBasePackages.class); .withMessageContaining("'value'").withMessageContaining("'basePackages'")
}).withMessageContaining("'value'")
.withMessageContaining("'basePackages'")
.withMessageContaining("com.example.foo") .withMessageContaining("com.example.foo")
.withMessageContaining("com.example.bar"); .withMessageContaining("com.example.bar");
} }

5
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
View File

@@ -1049,9 +1049,8 @@ public abstract class AbstractServletWebServerFactoryTests {
@Test @Test
public void exceptionThrownOnLoadFailureIsRethrown() { public void exceptionThrownOnLoadFailureIsRethrown() {
AbstractServletWebServerFactory factory = getFactory(); AbstractServletWebServerFactory factory = getFactory();
this.webServer = factory.getWebServer((context) -> { this.webServer = factory.getWebServer((context) -> context
context.addServlet("failing", FailingServlet.class).setLoadOnStartup(0); .addServlet("failing", FailingServlet.class).setLoadOnStartup(0));
});
assertThatExceptionOfType(WebServerException.class) assertThatExceptionOfType(WebServerException.class)
.isThrownBy(this.webServer::start) .isThrownBy(this.webServer::start)
.satisfies(this::wrapsFailingServletException); .satisfies(this::wrapsFailingServletException);