Skip to content

Commit 99350a2

Browse files
author
Phillip Webb
committed
Tidy ConfigurableEmbeddedServletContainerFactory
Rename ConfigurableEmbeddedServletContainerFactory to ConfigurableEmbeddedServletContainer and extract AbstractConfigurableEmbeddedServletContainer from AbstractEmbeddedServletContainerFactory.
1 parent 3f9ca68 commit 99350a2

File tree

12 files changed

+322
-285
lines changed

12 files changed

+322
-285
lines changed

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3737
import org.springframework.boot.autoconfigure.condition.SearchStrategy;
3838
import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
39-
import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
39+
import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer;
4040
import org.springframework.boot.context.embedded.EmbeddedServletContainer;
4141
import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
4242
import org.springframework.boot.context.embedded.ErrorPage;
@@ -76,16 +76,16 @@ protected static class ServerCustomization implements
7676
private ManagementServerProperties managementServerProperties;
7777

7878
@Override
79-
public void customize(ConfigurableEmbeddedServletContainerFactory factory) {
79+
public void customize(ConfigurableEmbeddedServletContainer container) {
8080
if (this.managementServerProperties == null) {
8181
this.managementServerProperties = BeanFactoryUtils
8282
.beanOfTypeIncludingAncestors(this.beanFactory,
8383
ManagementServerProperties.class);
8484
}
85-
factory.setPort(this.managementServerProperties.getPort());
86-
factory.setAddress(this.managementServerProperties.getAddress());
87-
factory.setContextPath(this.managementServerProperties.getContextPath());
88-
factory.addErrorPages(new ErrorPage(this.errorPath));
85+
container.setPort(this.managementServerProperties.getPort());
86+
container.setAddress(this.managementServerProperties.getAddress());
87+
container.setContextPath(this.managementServerProperties.getContextPath());
88+
container.addErrorPages(new ErrorPage(this.errorPath));
8989
}
9090

9191
}

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ErrorMvcAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
3838
import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration.DefaultTemplateResolverConfiguration;
3939
import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
40-
import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
40+
import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer;
4141
import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
4242
import org.springframework.boot.context.embedded.ErrorPage;
4343
import org.springframework.context.annotation.Bean;
@@ -80,8 +80,8 @@ public BasicErrorController basicErrorController() {
8080
}
8181

8282
@Override
83-
public void customize(ConfigurableEmbeddedServletContainerFactory factory) {
84-
factory.addErrorPages(new ErrorPage(this.errorPath));
83+
public void customize(ConfigurableEmbeddedServletContainer container) {
84+
container.addErrorPages(new ErrorPage(this.errorPath));
8585
}
8686

8787
@Configuration

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.apache.catalina.valves.RemoteIpValve;
2828
import org.apache.coyote.AbstractProtocol;
2929
import org.apache.coyote.ProtocolHandler;
30-
import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
30+
import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer;
3131
import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
3232
import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor;
3333
import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
@@ -110,22 +110,22 @@ public void setLoader(String value) {
110110
}
111111

112112
@Override
113-
public void customize(ConfigurableEmbeddedServletContainerFactory factory) {
114-
Integer port = getPort();
115-
if (port != null) {
116-
factory.setPort(port);
113+
public void customize(ConfigurableEmbeddedServletContainer container) {
114+
if (getPort() != null) {
115+
container.setPort(getPort());
117116
}
118117
if (getAddress() != null) {
119-
factory.setAddress(getAddress());
118+
container.setAddress(getAddress());
120119
}
121120
if (getContextPath() != null) {
122-
factory.setContextPath(getContextPath());
121+
container.setContextPath(getContextPath());
123122
}
124123
if (getSessionTimeout() != null) {
125-
factory.setSessionTimeout(getSessionTimeout());
124+
container.setSessionTimeout(getSessionTimeout());
126125
}
127-
if (factory instanceof TomcatEmbeddedServletContainerFactory) {
128-
getTomcat().customizeTomcat((TomcatEmbeddedServletContainerFactory) factory);
126+
if (container instanceof TomcatEmbeddedServletContainerFactory) {
127+
getTomcat()
128+
.customizeTomcat((TomcatEmbeddedServletContainerFactory) container);
129129
}
130130
}
131131

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2323
import org.springframework.boot.autoconfigure.condition.SearchStrategy;
24-
import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
24+
import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer;
2525
import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
2626
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2727
import org.springframework.context.ApplicationContext;
@@ -33,7 +33,7 @@
3333

3434
/**
3535
* {@link EnableAutoConfiguration Auto-configuration} that configures the
36-
* {@link ConfigurableEmbeddedServletContainerFactory} from a {@link ServerProperties}
36+
* {@link ConfigurableEmbeddedServletContainer} from a {@link ServerProperties}
3737
* bean.
3838
*
3939
* @author Dave Syer
@@ -59,7 +59,7 @@ public void setApplicationContext(ApplicationContext applicationContext)
5959
}
6060

6161
@Override
62-
public void customize(ConfigurableEmbeddedServletContainerFactory factory) {
62+
public void customize(ConfigurableEmbeddedServletContainer container) {
6363
// ServerProperties handles customization, this just checks we only have
6464
// a single bean
6565
String[] serverPropertiesBeans = this.applicationContext

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.springframework.beans.factory.config.BeanPostProcessor;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
2727
import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
28-
import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
28+
import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer;
2929
import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
3030
import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
3131
import org.springframework.boot.context.embedded.MockEmbeddedServletContainerFactory;
@@ -211,7 +211,7 @@ public static class EnsureContainerHasNoServletContext implements BeanPostProces
211211
@Override
212212
public Object postProcessBeforeInitialization(Object bean, String beanName)
213213
throws BeansException {
214-
if (bean instanceof ConfigurableEmbeddedServletContainerFactory) {
214+
if (bean instanceof ConfigurableEmbeddedServletContainer) {
215215
MockEmbeddedServletContainerFactory containerFactory = (MockEmbeddedServletContainerFactory) bean;
216216
assertNull(containerFactory.getServletContext());
217217
}
@@ -229,8 +229,8 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
229229
public static class CallbackEmbeddedContainerCustomizer implements
230230
EmbeddedServletContainerCustomizer {
231231
@Override
232-
public void customize(ConfigurableEmbeddedServletContainerFactory factory) {
233-
factory.setPort(9000);
232+
public void customize(ConfigurableEmbeddedServletContainer container) {
233+
container.setPort(9000);
234234
}
235235
}
236236

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
2828
import org.springframework.boot.context.embedded.AbstractEmbeddedServletContainerFactory;
2929
import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
30-
import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
30+
import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer;
3131
import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
3232
import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor;
3333
import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
@@ -177,9 +177,10 @@ public EmbeddedServletContainerCustomizer containerCustomizer() {
177177
return new EmbeddedServletContainerCustomizer() {
178178

179179
@Override
180-
public void customize(ConfigurableEmbeddedServletContainerFactory factory) {
181-
factory.setPort(3000);
180+
public void customize(ConfigurableEmbeddedServletContainer container) {
181+
container.setPort(3000);
182182
}
183+
183184
};
184185
}
185186

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.junit.Test;
2525
import org.springframework.beans.MutablePropertyValues;
2626
import org.springframework.boot.bind.RelaxedDataBinder;
27-
import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
27+
import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer;
2828

2929
import static org.junit.Assert.assertEquals;
3030
import static org.junit.Assert.assertFalse;
@@ -73,14 +73,14 @@ public void testTomcatBinding() throws Exception {
7373

7474
@Test
7575
public void testCustomizeTomcat() throws Exception {
76-
ConfigurableEmbeddedServletContainerFactory factory = mock(ConfigurableEmbeddedServletContainerFactory.class);
76+
ConfigurableEmbeddedServletContainer factory = mock(ConfigurableEmbeddedServletContainer.class);
7777
this.properties.customize(factory);
7878
verify(factory).setContextPath("");
7979
}
8080

8181
@Test
8282
public void testCustomizeTomcatPort() throws Exception {
83-
ConfigurableEmbeddedServletContainerFactory factory = mock(ConfigurableEmbeddedServletContainerFactory.class);
83+
ConfigurableEmbeddedServletContainer factory = mock(ConfigurableEmbeddedServletContainer.class);
8484
this.properties.setPort(8080);
8585
this.properties.customize(factory);
8686
verify(factory).setPort(8080);

0 commit comments

Comments
 (0)