Skip to content

Commit 077ffbd

Browse files
committed
Create spring-boot-webflux module
1 parent b1180de commit 077ffbd

File tree

84 files changed

+293
-251
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+293
-251
lines changed

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ include "spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"
133133
include "spring-boot-project:spring-boot-tx"
134134
include "spring-boot-project:spring-boot-undertow"
135135
include "spring-boot-project:spring-boot-validation"
136+
include "spring-boot-project:spring-boot-webflux"
136137
include "spring-boot-project:spring-boot-webmvc"
137138
include "spring-boot-project:spring-boot-webservices"
138139
include "spring-boot-system-tests:spring-boot-deployment-tests"

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ dependencies {
6363
optional(project(":spring-boot-project:spring-boot-tomcat"))
6464
optional(project(":spring-boot-project:spring-boot-undertow"))
6565
optional(project(":spring-boot-project:spring-boot-validation"))
66+
optional(project(":spring-boot-project:spring-boot-webflux"))
6667
optional(project(":spring-boot-project:spring-boot-webmvc"))
6768
optional("ch.qos.logback:logback-classic")
6869
optional("org.apache.cassandra:java-driver-core") {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryReactiveHealthEndpointWebExtensionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
import org.springframework.boot.actuate.health.HealthIndicator;
3333
import org.springframework.boot.autoconfigure.AutoConfigurations;
3434
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
35-
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
3635
import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
3736
import org.springframework.boot.http.autoconfigure.HttpMessageConvertersAutoConfiguration;
3837
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3938
import org.springframework.boot.security.autoconfigure.reactive.ReactiveSecurityAutoConfiguration;
4039
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
40+
import org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration;
4141
import org.springframework.context.annotation.Bean;
4242
import org.springframework.context.annotation.Configuration;
4343
import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
import org.springframework.boot.actuate.endpoint.web.ExposableWebEndpoint;
4545
import org.springframework.boot.actuate.endpoint.web.annotation.WebEndpointDiscoverer;
4646
import org.springframework.boot.autoconfigure.AutoConfigurations;
47-
import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration;
48-
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
4947
import org.springframework.boot.reactor.netty.autoconfigure.NettyReactiveWebServerAutoConfiguration;
5048
import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
5149
import org.springframework.boot.test.context.runner.ContextConsumer;
5250
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
5351
import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebServerApplicationContext;
52+
import org.springframework.boot.webflux.autoconfigure.HttpHandlerAutoConfiguration;
53+
import org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration;
5454
import org.springframework.context.ApplicationContext;
5555
import org.springframework.context.annotation.Bean;
5656
import org.springframework.context.annotation.Configuration;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import org.springframework.boot.autoconfigure.AutoConfigurations;
5151
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
5252
import org.springframework.boot.autoconfigure.info.ProjectInfoAutoConfiguration;
53-
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
5453
import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
5554
import org.springframework.boot.http.autoconfigure.HttpMessageConvertersAutoConfiguration;
5655
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
@@ -62,6 +61,7 @@
6261
import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
6362
import org.springframework.boot.testsupport.classpath.resources.WithResource;
6463
import org.springframework.boot.web.reactive.function.client.WebClientCustomizer;
64+
import org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration;
6565
import org.springframework.context.ApplicationContext;
6666
import org.springframework.context.annotation.Bean;
6767
import org.springframework.context.annotation.Configuration;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AbstractEndpointDocumentationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
import org.springframework.boot.actuate.endpoint.jackson.EndpointObjectMapper;
3838
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
3939
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
40-
import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration;
41-
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
4240
import org.springframework.boot.http.autoconfigure.HttpMessageConvertersAutoConfiguration;
4341
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
42+
import org.springframework.boot.webflux.autoconfigure.HttpHandlerAutoConfiguration;
43+
import org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration;
4444
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
4545
import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
4646
import org.springframework.context.annotation.Bean;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/ControllerEndpointWebFluxIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
import org.springframework.boot.actuate.endpoint.web.annotation.RestControllerEndpoint;
2929
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
3030
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
31-
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
3231
import org.springframework.boot.http.autoconfigure.HttpMessageConvertersAutoConfiguration;
3332
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3433
import org.springframework.boot.test.util.TestPropertyValues;
3534
import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebApplicationContext;
35+
import org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration;
3636
import org.springframework.security.authentication.TestingAuthenticationToken;
3737
import org.springframework.security.test.context.TestSecurityContextHolder;
3838
import org.springframework.test.web.reactive.server.WebTestClient;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebFluxEndpointAccessIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
2626
import org.springframework.boot.autoconfigure.AutoConfigurations;
27-
import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration;
28-
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
2927
import org.springframework.boot.http.codec.autoconfigure.CodecsAutoConfiguration;
3028
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3129
import org.springframework.boot.reactor.netty.autoconfigure.NettyReactiveWebServerAutoConfiguration;
3230
import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
3331
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
3432
import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebServerApplicationContext;
3533
import org.springframework.boot.web.reactive.context.ReactiveWebServerApplicationContext;
34+
import org.springframework.boot.webflux.autoconfigure.HttpHandlerAutoConfiguration;
35+
import org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration;
3636
import org.springframework.http.HttpMethod;
3737
import org.springframework.http.HttpStatus;
3838
import org.springframework.test.web.reactive.server.EntityExchangeResult;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebFluxEndpointCorsIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
import org.springframework.boot.actuate.autoconfigure.endpoint.web.reactive.WebFluxEndpointManagementContextConfiguration;
2727
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
2828
import org.springframework.boot.autoconfigure.AutoConfigurations;
29-
import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration;
30-
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
3129
import org.springframework.boot.http.codec.autoconfigure.CodecsAutoConfiguration;
3230
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3331
import org.springframework.boot.test.context.runner.ContextConsumer;
3432
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
3533
import org.springframework.boot.web.reactive.context.ReactiveWebApplicationContext;
34+
import org.springframework.boot.webflux.autoconfigure.HttpHandlerAutoConfiguration;
35+
import org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration;
3636
import org.springframework.http.HttpHeaders;
3737
import org.springframework.test.web.reactive.server.WebTestClient;
3838

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebFluxEndpointIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
2626
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
2727
import org.springframework.boot.autoconfigure.AutoConfigurations;
28-
import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration;
29-
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
3028
import org.springframework.boot.http.codec.autoconfigure.CodecsAutoConfiguration;
3129
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3230
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
31+
import org.springframework.boot.webflux.autoconfigure.HttpHandlerAutoConfiguration;
32+
import org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration;
3333
import org.springframework.context.ApplicationContext;
3434
import org.springframework.context.annotation.Bean;
3535
import org.springframework.context.annotation.Configuration;

0 commit comments

Comments
 (0)