Rename WebFluxAnnotationAutoConfiguration
Rename WebFluxAnnotationAutoConfiguration to WebFluxAutoConfiguration to better align with Spring MVC.
This commit is contained in:
parent
99a3ec8b74
commit
9981ae6874
|
@ -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 {
|
||||
|
||||
|
|
|
@ -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 })
|
|
@ -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,\
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
|
@ -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=\
|
||||
|
|
Loading…
Reference in New Issue