Skip to content

S
spring-boot
Commit c9bb17f4 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '2.1.x' into 2.2.x 

Closes gh-19443
parents 930a0ef7 c6dab447
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryConfiguration.java
View file @ c9bb17f4
...@@ -65,10 +65,10 @@ class ServletWebServerFactoryConfiguration { ...@@ -65,10 +65,10 @@ class ServletWebServerFactoryConfiguration {
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ConditionalOnClass({ Servlet.class, Tomcat.class, UpgradeProtocol.class }) @ConditionalOnClass({ Servlet.class, Tomcat.class, UpgradeProtocol.class })
@ConditionalOnMissingBean(value = ServletWebServerFactory.class, search = SearchStrategy.CURRENT) @ConditionalOnMissingBean(value = ServletWebServerFactory.class, search = SearchStrategy.CURRENT)
public static class EmbeddedTomcat { static class EmbeddedTomcat {
@Bean @Bean
public TomcatServletWebServerFactory tomcatServletWebServerFactory( TomcatServletWebServerFactory tomcatServletWebServerFactory(
ObjectProvider<TomcatConnectorCustomizer> connectorCustomizers, ObjectProvider<TomcatConnectorCustomizer> connectorCustomizers,
ObjectProvider<TomcatContextCustomizer> contextCustomizers, ObjectProvider<TomcatContextCustomizer> contextCustomizers,
ObjectProvider<TomcatProtocolHandlerCustomizer<?>> protocolHandlerCustomizers) { ObjectProvider<TomcatProtocolHandlerCustomizer<?>> protocolHandlerCustomizers) {
...@@ -90,10 +90,10 @@ class ServletWebServerFactoryConfiguration { ...@@ -90,10 +90,10 @@ class ServletWebServerFactoryConfiguration {
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ConditionalOnClass({ Servlet.class, Server.class, Loader.class, WebAppContext.class }) @ConditionalOnClass({ Servlet.class, Server.class, Loader.class, WebAppContext.class })
@ConditionalOnMissingBean(value = ServletWebServerFactory.class, search = SearchStrategy.CURRENT) @ConditionalOnMissingBean(value = ServletWebServerFactory.class, search = SearchStrategy.CURRENT)
public static class EmbeddedJetty { static class EmbeddedJetty {
@Bean @Bean
public JettyServletWebServerFactory JettyServletWebServerFactory( JettyServletWebServerFactory JettyServletWebServerFactory(
ObjectProvider<JettyServerCustomizer> serverCustomizers) { ObjectProvider<JettyServerCustomizer> serverCustomizers) {
JettyServletWebServerFactory factory = new JettyServletWebServerFactory(); JettyServletWebServerFactory factory = new JettyServletWebServerFactory();
factory.getServerCustomizers().addAll(serverCustomizers.orderedStream().collect(Collectors.toList())); factory.getServerCustomizers().addAll(serverCustomizers.orderedStream().collect(Collectors.toList()));
...@@ -108,10 +108,10 @@ class ServletWebServerFactoryConfiguration { ...@@ -108,10 +108,10 @@ class ServletWebServerFactoryConfiguration {
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ConditionalOnClass({ Servlet.class, Undertow.class, SslClientAuthMode.class }) @ConditionalOnClass({ Servlet.class, Undertow.class, SslClientAuthMode.class })
@ConditionalOnMissingBean(value = ServletWebServerFactory.class, search = SearchStrategy.CURRENT) @ConditionalOnMissingBean(value = ServletWebServerFactory.class, search = SearchStrategy.CURRENT)
public static class EmbeddedUndertow { static class EmbeddedUndertow {
@Bean @Bean
public UndertowServletWebServerFactory undertowServletWebServerFactory( UndertowServletWebServerFactory undertowServletWebServerFactory(
ObjectProvider<UndertowDeploymentInfoCustomizer> deploymentInfoCustomizers, ObjectProvider<UndertowDeploymentInfoCustomizer> deploymentInfoCustomizers,
ObjectProvider<UndertowBuilderCustomizer> builderCustomizers) { ObjectProvider<UndertowBuilderCustomizer> builderCustomizers) {
UndertowServletWebServerFactory factory = new UndertowServletWebServerFactory(); UndertowServletWebServerFactory factory = new UndertowServletWebServerFactory();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment