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

Separate container customization from ServerProperties

Browse Source 
This commit creates a separate
`ServerPropertiesServletContainerCustomizer` that holds the servlet
container customization code, separating that concern from the server
configuration keys.

See gh-8066
This commit is contained in:
Brian Clozel
2017-01-27 21:29:02 +01:00
parent 8899b93de0
commit aeef41c977
11 changed files with 1175 additions and 1054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
View File

@@ -35,10 +35,8 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
import org.springframework.boot.autoconfigure.web.ResourceProperties;
import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext;
import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.devtools.classpath.ClassPathChangedEvent;
import org.springframework.boot.devtools.classpath.ClassPathFileSystemWatcher;
import org.springframework.boot.devtools.filewatch.ChangedFiles;
@@ -281,7 +279,6 @@ public class LocalDevToolsAutoConfigurationTests {
@Configuration
@Import({ EmbeddedServletContainerAutoConfiguration.class,
LocalDevToolsAutoConfiguration.class, ThymeleafAutoConfiguration.class })
@EnableConfigurationProperties(ServerProperties.class)
public static class Config {
}
@@ -289,7 +286,6 @@ public class LocalDevToolsAutoConfigurationTests {
@Configuration
@Import({ EmbeddedServletContainerAutoConfiguration.class,
LocalDevToolsAutoConfiguration.class, ThymeleafAutoConfiguration.class })
@EnableConfigurationProperties(ServerProperties.class)
public static class ConfigWithMockLiveReload {
@Bean
@@ -302,7 +298,6 @@ public class LocalDevToolsAutoConfigurationTests {
@Configuration
@Import({ EmbeddedServletContainerAutoConfiguration.class,
LocalDevToolsAutoConfiguration.class, ResourceProperties.class })
@EnableConfigurationProperties(ServerProperties.class)
public static class WebResourcesConfig {
}