Skip to content

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

Fix visibility of inner classes of ServletWebServerFactoryConfiguration 

Closes gh-19395
parent c3c01d9c
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryConfiguration.java
View file @ c6dab447
...@@ -54,7 +54,7 @@ class ServletWebServerFactoryConfiguration { ...@@ -54,7 +54,7 @@ class ServletWebServerFactoryConfiguration {
@Configuration @Configuration
@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() { public TomcatServletWebServerFactory tomcatServletWebServerFactory() {
...@@ -69,7 +69,7 @@ class ServletWebServerFactoryConfiguration { ...@@ -69,7 +69,7 @@ class ServletWebServerFactoryConfiguration {
@Configuration @Configuration
@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() { public JettyServletWebServerFactory JettyServletWebServerFactory() {
...@@ -84,7 +84,7 @@ class ServletWebServerFactoryConfiguration { ...@@ -84,7 +84,7 @@ class ServletWebServerFactoryConfiguration {
@Configuration @Configuration
@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() { public UndertowServletWebServerFactory 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