root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Rename WebFluxAnnotationAutoConfiguration 

Rename WebFluxAnnotationAutoConfiguration to WebFluxAutoConfiguration
to better align with Spring MVC.
This commit is contained in:
Phillip Webb 2017-04-20 15:58:23 -07:00
parent 99a3ec8b74
commit 9981ae6874
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfiguration.java
View File

@ -54,7 +54,7 @@ import org.springframework.web.server.session.WebSessionManager;
@ConditionalOnClass({ DispatcherHandler.class, HttpHandler.class }) @ConditionalOnClass({ DispatcherHandler.class, HttpHandler.class })
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
@ConditionalOnMissingBean(HttpHandler.class) @ConditionalOnMissingBean(HttpHandler.class)
@AutoConfigureAfter({ WebFluxAnnotationAutoConfiguration.class }) @AutoConfigureAfter({ WebFluxAutoConfiguration.class })
@AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE + 10) @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE + 10)
public class HttpHandlerAutoConfiguration { public class HttpHandlerAutoConfiguration {

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAnnotationAutoConfiguration.java → spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java
View File

@ -99,7 +99,7 @@ import org.springframework.web.reactive.result.view.ViewResolver;
@ConditionalOnMissingBean({ WebFluxConfigurationSupport.class, RouterFunction.class }) @ConditionalOnMissingBean({ WebFluxConfigurationSupport.class, RouterFunction.class })
@AutoConfigureAfter(ReactiveWebServerAutoConfiguration.class) @AutoConfigureAfter(ReactiveWebServerAutoConfiguration.class)
@AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE + 10) @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE + 10)
public class WebFluxAnnotationAutoConfiguration { public class WebFluxAutoConfiguration {
@Configuration @Configuration
@EnableConfigurationProperties({ ResourceProperties.class, WebFluxProperties.class }) @EnableConfigurationProperties({ ResourceProperties.class, WebFluxProperties.class })

2
spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
View File

@ -108,7 +108,7 @@ org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration,\
org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration,\ org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration,\
org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration,\ org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration,\
org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServerAutoConfiguration,\ org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServerAutoConfiguration,\
org.springframework.boot.autoconfigure.web.reactive.WebFluxAnnotationAutoConfiguration,\ org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration,\
org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration,\ org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration,\
org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration,\ org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration,\
org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration,\ org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration,\

4
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfigurationTests.java
View File

@ -64,7 +64,7 @@ public class HttpHandlerAutoConfigurationTests {
@Test @Test
public void shouldConfigureHttpHandlerAnnotation() { public void shouldConfigureHttpHandlerAnnotation() {
load(WebFluxAnnotationAutoConfiguration.class); load(WebFluxAutoConfiguration.class);
assertThat(this.context.getBeansOfType(HttpHandler.class).size()).isEqualTo(1); assertThat(this.context.getBeansOfType(HttpHandler.class).size()).isEqualTo(1);
} }
@ -125,7 +125,7 @@ public class HttpHandlerAutoConfigurationTests {
} }
@Configuration @Configuration
@Import(WebFluxAnnotationAutoConfiguration.class) @Import(WebFluxAutoConfiguration.class)
protected static class AnnotationConfigWithWebFilters { protected static class AnnotationConfigWithWebFilters {
@Bean @Bean

6
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAnnotationAutoConfigurationTests.java → spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java
View File

@ -62,12 +62,12 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
/** /**
* Tests for {@link WebFluxAnnotationAutoConfiguration}. * Tests for {@link WebFluxAutoConfiguration}.
* *
* @author Brian Clozel * @author Brian Clozel
* @author Andy Wilkinson * @author Andy Wilkinson
*/ */
public class WebFluxAnnotationAutoConfigurationTests { public class WebFluxAutoConfigurationTests {
@Rule @Rule
public ExpectedException thrown = ExpectedException.none(); public ExpectedException thrown = ExpectedException.none();
@ -358,7 +358,7 @@ public class WebFluxAnnotationAutoConfigurationTests {
} }
@Configuration @Configuration
@Import({ WebFluxAnnotationAutoConfiguration.class }) @Import({ WebFluxAutoConfiguration.class })
@EnableConfigurationProperties(WebFluxProperties.class) @EnableConfigurationProperties(WebFluxProperties.class)
protected static class BaseConfiguration { protected static class BaseConfiguration {

2
spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
View File

@ -67,7 +67,7 @@ org.springframework.boot.test.autoconfigure.web.reactive.WebTestClientAutoConfig
org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebFlux=\ org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebFlux=\
org.springframework.boot.autoconfigure.context.MessageSourceAutoConfiguration,\ org.springframework.boot.autoconfigure.context.MessageSourceAutoConfiguration,\
org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration,\ org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration,\
org.springframework.boot.autoconfigure.web.reactive.WebFluxAnnotationAutoConfiguration org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration
# AutoConfigureMockMvc auto-configuration imports # AutoConfigureMockMvc auto-configuration imports
org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc=\ org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc=\