From 9981ae687499e13449a6447a4a9c170af218f93c Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 20 Apr 2017 15:58:23 -0700 Subject: [PATCH] Rename WebFluxAnnotationAutoConfiguration Rename WebFluxAnnotationAutoConfiguration to WebFluxAutoConfiguration to better align with Spring MVC. --- .../web/reactive/HttpHandlerAutoConfiguration.java | 2 +- ...AutoConfiguration.java => WebFluxAutoConfiguration.java} | 2 +- .../src/main/resources/META-INF/spring.factories | 2 +- .../web/reactive/HttpHandlerAutoConfigurationTests.java | 4 ++-- ...urationTests.java => WebFluxAutoConfigurationTests.java} | 6 +++--- .../src/main/resources/META-INF/spring.factories | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/{WebFluxAnnotationAutoConfiguration.java => WebFluxAutoConfiguration.java} (99%) rename spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/{WebFluxAnnotationAutoConfigurationTests.java => WebFluxAutoConfigurationTests.java} (99%) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfiguration.java index febef45b23..035fd64084 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfiguration.java @@ -54,7 +54,7 @@ import org.springframework.web.server.session.WebSessionManager; @ConditionalOnClass({ DispatcherHandler.class, HttpHandler.class }) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) @ConditionalOnMissingBean(HttpHandler.class) -@AutoConfigureAfter({ WebFluxAnnotationAutoConfiguration.class }) +@AutoConfigureAfter({ WebFluxAutoConfiguration.class }) @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE + 10) public class HttpHandlerAutoConfiguration { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAnnotationAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java similarity index 99% rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAnnotationAutoConfiguration.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java index 2bc60a3be4..7224bea60f 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAnnotationAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java @@ -99,7 +99,7 @@ import org.springframework.web.reactive.result.view.ViewResolver; @ConditionalOnMissingBean({ WebFluxConfigurationSupport.class, RouterFunction.class }) @AutoConfigureAfter(ReactiveWebServerAutoConfiguration.class) @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE + 10) -public class WebFluxAnnotationAutoConfiguration { +public class WebFluxAutoConfiguration { @Configuration @EnableConfigurationProperties({ ResourceProperties.class, WebFluxProperties.class }) diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories index a8545038a9..8c016073f8 100644 --- a/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories @@ -108,7 +108,7 @@ org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration,\ org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration,\ org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration,\ 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.ServletWebServerFactoryAutoConfiguration,\ org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration,\ diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfigurationTests.java index 3102c6dc38..db4defa45b 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfigurationTests.java @@ -64,7 +64,7 @@ public class HttpHandlerAutoConfigurationTests { @Test public void shouldConfigureHttpHandlerAnnotation() { - load(WebFluxAnnotationAutoConfiguration.class); + load(WebFluxAutoConfiguration.class); assertThat(this.context.getBeansOfType(HttpHandler.class).size()).isEqualTo(1); } @@ -125,7 +125,7 @@ public class HttpHandlerAutoConfigurationTests { } @Configuration - @Import(WebFluxAnnotationAutoConfiguration.class) + @Import(WebFluxAutoConfiguration.class) protected static class AnnotationConfigWithWebFilters { @Bean diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAnnotationAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java similarity index 99% rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAnnotationAutoConfigurationTests.java rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java index 001699cfa9..70ba22a0f8 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAnnotationAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java @@ -62,12 +62,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; /** - * Tests for {@link WebFluxAnnotationAutoConfiguration}. + * Tests for {@link WebFluxAutoConfiguration}. * * @author Brian Clozel * @author Andy Wilkinson */ -public class WebFluxAnnotationAutoConfigurationTests { +public class WebFluxAutoConfigurationTests { @Rule public ExpectedException thrown = ExpectedException.none(); @@ -358,7 +358,7 @@ public class WebFluxAnnotationAutoConfigurationTests { } @Configuration - @Import({ WebFluxAnnotationAutoConfiguration.class }) + @Import({ WebFluxAutoConfiguration.class }) @EnableConfigurationProperties(WebFluxProperties.class) protected static class BaseConfiguration { diff --git a/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories index 8adbf8565b..3afd7de3f4 100644 --- a/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories @@ -67,7 +67,7 @@ org.springframework.boot.test.autoconfigure.web.reactive.WebTestClientAutoConfig org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebFlux=\ org.springframework.boot.autoconfigure.context.MessageSourceAutoConfiguration,\ org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration,\ -org.springframework.boot.autoconfigure.web.reactive.WebFluxAnnotationAutoConfiguration +org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration # AutoConfigureMockMvc auto-configuration imports org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc=\