diff --git a/build.gradle b/build.gradle index 53b2472dca..96d5e6dd20 100644 --- a/build.gradle +++ b/build.gradle @@ -858,6 +858,7 @@ project("spring-web-reactive") { testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") testCompile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") + testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}") testRuntime("javax.el:javax.el-api:${elApiVersion}") testRuntime("org.glassfish:javax.el:3.0.1-b08") testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}") @@ -1466,6 +1467,22 @@ configure(project(':spring-core')) { } } +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /* * Support publication of artifacts versioned by topic branch. * CI builds supply `-P BRANCH_NAME=` to gradle at build time. diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/ClientRequest.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java similarity index 99% rename from spring-web/src/main/java/org/springframework/web/client/reactive/ClientRequest.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java index ec16e156b4..3b1a1d52fd 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/ClientRequest.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.client.reactive; +package org.springframework.web.reactive.function.client; import java.net.URI; import java.nio.charset.Charset; diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/ClientResponse.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java similarity index 98% rename from spring-web/src/main/java/org/springframework/web/client/reactive/ClientResponse.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java index af1f26a347..70d1bb94d2 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/ClientResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.client.reactive; +package org.springframework.web.reactive.function.client; import java.util.List; import java.util.Optional; diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/DefaultClientRequestBuilder.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilder.java similarity index 99% rename from spring-web/src/main/java/org/springframework/web/client/reactive/DefaultClientRequestBuilder.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilder.java index 83d786c5b4..bfa28d3069 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/DefaultClientRequestBuilder.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.client.reactive; +package org.springframework.web.reactive.function.client; import java.net.URI; import java.nio.charset.Charset; diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/DefaultClientResponse.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java similarity index 98% rename from spring-web/src/main/java/org/springframework/web/client/reactive/DefaultClientResponse.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java index 741758e4ae..c5db40c700 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/DefaultClientResponse.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.client.reactive; +package org.springframework.web.reactive.function.client; import java.util.Collections; import java.util.List; diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/DefaultWebClientBuilder.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java similarity index 98% rename from spring-web/src/main/java/org/springframework/web/client/reactive/DefaultWebClientBuilder.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java index a6eb33ea1d..b6100a0bb3 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/DefaultWebClientBuilder.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.client.reactive; +package org.springframework.web.reactive.function.client; import java.util.logging.Level; diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/DefaultWebClientStrategiesBuilder.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientStrategiesBuilder.java similarity index 99% rename from spring-web/src/main/java/org/springframework/web/client/reactive/DefaultWebClientStrategiesBuilder.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientStrategiesBuilder.java index bdee2cd1c3..dd583d2014 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/DefaultWebClientStrategiesBuilder.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientStrategiesBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.client.reactive; +package org.springframework.web.reactive.function.client; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/ExchangeFilterFunction.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunction.java similarity index 98% rename from spring-web/src/main/java/org/springframework/web/client/reactive/ExchangeFilterFunction.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunction.java index c226cee5b2..d0df689b16 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/ExchangeFilterFunction.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.client.reactive; +package org.springframework.web.reactive.function.client; import java.util.function.Function; diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/ExchangeFilterFunctions.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java similarity index 97% rename from spring-web/src/main/java/org/springframework/web/client/reactive/ExchangeFilterFunctions.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java index 818ab1e072..382692c683 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/ExchangeFilterFunctions.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.client.reactive; +package org.springframework.web.reactive.function.client; import java.nio.charset.StandardCharsets; import java.util.Base64; diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/ExchangeFunction.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java similarity index 95% rename from spring-web/src/main/java/org/springframework/web/client/reactive/ExchangeFunction.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java index 2682598db3..337dfe824f 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/ExchangeFunction.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.client.reactive; +package org.springframework.web.reactive.function.client; import reactor.core.publisher.Mono; diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/WebClient.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/WebClient.java similarity index 98% rename from spring-web/src/main/java/org/springframework/web/client/reactive/WebClient.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/WebClient.java index 38d138b63e..8ecd734f40 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/WebClient.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/WebClient.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.client.reactive; +package org.springframework.web.reactive.function.client; import reactor.core.publisher.Mono; diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/WebClientException.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/WebClientException.java similarity index 95% rename from spring-web/src/main/java/org/springframework/web/client/reactive/WebClientException.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/WebClientException.java index 6039f1326a..52eb3aec57 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/WebClientException.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/WebClientException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.client.reactive; +package org.springframework.web.reactive.function.client; import org.springframework.core.NestedRuntimeException; diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/WebClientStrategies.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/WebClientStrategies.java similarity index 99% rename from spring-web/src/main/java/org/springframework/web/client/reactive/WebClientStrategies.java rename to spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/WebClientStrategies.java index 24f70d8968..7d40486e87 100644 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/WebClientStrategies.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/WebClientStrategies.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.client.reactive; +package org.springframework.web.reactive.function.client; import java.util.function.Supplier; import java.util.stream.Stream; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/package-info.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/package-info.java new file mode 100644 index 0000000000..c0f99da517 --- /dev/null +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/package-info.java @@ -0,0 +1,22 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Provides a reactive {@link org.springframework.web.reactive.function.client.WebClient} + * that builds on top of the + * {@code org.springframework.http.client.reactive} reactive HTTP adapter layer. + */ +package org.springframework.web.reactive.function.client; diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/FlushingIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/FlushingIntegrationTests.java similarity index 90% rename from spring-web/src/test/java/org/springframework/http/server/reactive/FlushingIntegrationTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/FlushingIntegrationTests.java index acafc93c3d..d2a3f776eb 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/FlushingIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/FlushingIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.http.server.reactive; +package org.springframework.web.reactive; import java.nio.charset.StandardCharsets; import java.time.Duration; @@ -30,9 +30,13 @@ import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBufferFactory; import org.springframework.http.client.reactive.ReactorClientHttpConnector; import org.springframework.http.codec.BodyExtractors; +import org.springframework.http.server.reactive.AbstractHttpHandlerIntegrationTests; +import org.springframework.http.server.reactive.HttpHandler; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.util.Assert; -import org.springframework.web.client.reactive.ClientRequest; -import org.springframework.web.client.reactive.WebClient; +import org.springframework.web.reactive.function.client.ClientRequest; +import org.springframework.web.reactive.function.client.WebClient; /** * @author Sebastien Deleuze diff --git a/spring-web/src/test/java/org/springframework/web/client/reactive/DefaultClientRequestBuilderTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java similarity index 99% rename from spring-web/src/test/java/org/springframework/web/client/reactive/DefaultClientRequestBuilderTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java index 7a50e02264..33e5f23c81 100644 --- a/spring-web/src/test/java/org/springframework/web/client/reactive/DefaultClientRequestBuilderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.client.reactive; +package org.springframework.web.reactive.function.client; import java.net.URI; import java.nio.ByteBuffer; diff --git a/spring-web/src/test/java/org/springframework/web/client/reactive/DefaultClientResponseTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java similarity index 99% rename from spring-web/src/test/java/org/springframework/web/client/reactive/DefaultClientResponseTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java index 0f2e594308..3ae9183c8c 100644 --- a/spring-web/src/test/java/org/springframework/web/client/reactive/DefaultClientResponseTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.client.reactive; +package org.springframework.web.reactive.function.client; import java.net.InetSocketAddress; import java.nio.ByteBuffer; diff --git a/spring-web/src/test/java/org/springframework/web/client/reactive/ExchangeFilterFunctionsTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java similarity index 98% rename from spring-web/src/test/java/org/springframework/web/client/reactive/ExchangeFilterFunctionsTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java index 9666ca04ee..299ce98b22 100644 --- a/spring-web/src/test/java/org/springframework/web/client/reactive/ExchangeFilterFunctionsTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.client.reactive; +package org.springframework.web.reactive.function.client; import org.junit.Test; import reactor.core.publisher.Mono; diff --git a/spring-web/src/test/java/org/springframework/web/client/reactive/WebClientIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java similarity index 80% rename from spring-web/src/test/java/org/springframework/web/client/reactive/WebClientIntegrationTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java index 7df6f10378..455b6bf52c 100644 --- a/spring-web/src/test/java/org/springframework/web/client/reactive/WebClientIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.client.reactive; +package org.springframework.web.reactive.function.client; import java.time.Duration; @@ -24,6 +24,7 @@ import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; import org.hamcrest.Matchers; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import reactor.core.publisher.Flux; @@ -80,9 +81,9 @@ public class WebClientIntegrationTests { .verify(Duration.ofSeconds(3)); RecordedRequest recordedRequest = server.takeRequest(); - assertEquals(1, server.getRequestCount()); - assertEquals("*/*", recordedRequest.getHeader(HttpHeaders.ACCEPT)); - assertEquals("/greeting?name=Spring", recordedRequest.getPath()); + Assert.assertEquals(1, server.getRequestCount()); + Assert.assertEquals("*/*", recordedRequest.getHeader(HttpHeaders.ACCEPT)); + Assert.assertEquals("/greeting?name=Spring", recordedRequest.getPath()); } @Test @@ -104,10 +105,10 @@ public class WebClientIntegrationTests { .verify(Duration.ofSeconds(3)); RecordedRequest recordedRequest = server.takeRequest(); - assertEquals(1, server.getRequestCount()); - assertEquals("testvalue", recordedRequest.getHeader("X-Test-Header")); - assertEquals("*/*", recordedRequest.getHeader(HttpHeaders.ACCEPT)); - assertEquals("/greeting?name=Spring", recordedRequest.getPath()); + Assert.assertEquals(1, server.getRequestCount()); + Assert.assertEquals("testvalue", recordedRequest.getHeader("X-Test-Header")); + Assert.assertEquals("*/*", recordedRequest.getHeader(HttpHeaders.ACCEPT)); + Assert.assertEquals("/greeting?name=Spring", recordedRequest.getPath()); } @Test @@ -131,9 +132,9 @@ public class WebClientIntegrationTests { .verify(Duration.ofSeconds(3)); RecordedRequest recordedRequest = server.takeRequest(); - assertEquals(1, server.getRequestCount()); - assertEquals("/json", recordedRequest.getPath()); - assertEquals("application/json", recordedRequest.getHeader(HttpHeaders.ACCEPT)); + Assert.assertEquals(1, server.getRequestCount()); + Assert.assertEquals("/json", recordedRequest.getPath()); + Assert.assertEquals("application/json", recordedRequest.getHeader(HttpHeaders.ACCEPT)); } @Test @@ -156,9 +157,9 @@ public class WebClientIntegrationTests { .verify(Duration.ofSeconds(3)); RecordedRequest recordedRequest = server.takeRequest(); - assertEquals(1, server.getRequestCount()); - assertEquals("/pojo", recordedRequest.getPath()); - assertEquals("application/json", recordedRequest.getHeader(HttpHeaders.ACCEPT)); + Assert.assertEquals(1, server.getRequestCount()); + Assert.assertEquals("/pojo", recordedRequest.getPath()); + Assert.assertEquals("application/json", recordedRequest.getHeader(HttpHeaders.ACCEPT)); } @Test @@ -182,9 +183,9 @@ public class WebClientIntegrationTests { .verify(Duration.ofSeconds(3)); RecordedRequest recordedRequest = server.takeRequest(); - assertEquals(1, server.getRequestCount()); - assertEquals("/pojos", recordedRequest.getPath()); - assertEquals("application/json", recordedRequest.getHeader(HttpHeaders.ACCEPT)); + Assert.assertEquals(1, server.getRequestCount()); + Assert.assertEquals("/pojos", recordedRequest.getPath()); + Assert.assertEquals("application/json", recordedRequest.getHeader(HttpHeaders.ACCEPT)); } @Test @@ -210,12 +211,12 @@ public class WebClientIntegrationTests { .verify(Duration.ofSeconds(3)); RecordedRequest recordedRequest = server.takeRequest(); - assertEquals(1, server.getRequestCount()); - assertEquals("/pojo/capitalize", recordedRequest.getPath()); - assertEquals("{\"foo\":\"foofoo\",\"bar\":\"barbar\"}", recordedRequest.getBody().readUtf8()); - assertEquals("chunked", recordedRequest.getHeader(HttpHeaders.TRANSFER_ENCODING)); - assertEquals("application/json", recordedRequest.getHeader(HttpHeaders.ACCEPT)); - assertEquals("application/json", recordedRequest.getHeader(HttpHeaders.CONTENT_TYPE)); + Assert.assertEquals(1, server.getRequestCount()); + Assert.assertEquals("/pojo/capitalize", recordedRequest.getPath()); + Assert.assertEquals("{\"foo\":\"foofoo\",\"bar\":\"barbar\"}", recordedRequest.getBody().readUtf8()); + Assert.assertEquals("chunked", recordedRequest.getHeader(HttpHeaders.TRANSFER_ENCODING)); + Assert.assertEquals("application/json", recordedRequest.getHeader(HttpHeaders.ACCEPT)); + Assert.assertEquals("application/json", recordedRequest.getHeader(HttpHeaders.CONTENT_TYPE)); } @Test @@ -238,9 +239,9 @@ public class WebClientIntegrationTests { .verify(Duration.ofSeconds(3)); RecordedRequest recordedRequest = server.takeRequest(); - assertEquals(1, server.getRequestCount()); - assertEquals("/test", recordedRequest.getPath()); - assertEquals("testkey=testvalue", recordedRequest.getHeader(HttpHeaders.COOKIE)); + Assert.assertEquals(1, server.getRequestCount()); + Assert.assertEquals("/test", recordedRequest.getPath()); + Assert.assertEquals("testkey=testvalue", recordedRequest.getHeader(HttpHeaders.COOKIE)); } @Test @@ -262,9 +263,9 @@ public class WebClientIntegrationTests { .verify(Duration.ofSeconds(3)); RecordedRequest recordedRequest = server.takeRequest(); - assertEquals(1, server.getRequestCount()); - assertEquals("*/*", recordedRequest.getHeader(HttpHeaders.ACCEPT)); - assertEquals("/greeting?name=Spring", recordedRequest.getPath()); + Assert.assertEquals(1, server.getRequestCount()); + Assert.assertEquals("*/*", recordedRequest.getHeader(HttpHeaders.ACCEPT)); + Assert.assertEquals("/greeting?name=Spring", recordedRequest.getPath()); } @Test @@ -291,8 +292,8 @@ public class WebClientIntegrationTests { .verify(Duration.ofSeconds(3)); RecordedRequest recordedRequest = server.takeRequest(); - assertEquals(1, server.getRequestCount()); - assertEquals("bar", recordedRequest.getHeader("foo")); + Assert.assertEquals(1, server.getRequestCount()); + Assert.assertEquals("bar", recordedRequest.getHeader("foo")); } @@ -320,8 +321,8 @@ public class WebClientIntegrationTests { .verify(Duration.ofSeconds(3)); RecordedRequest recordedRequest = server.takeRequest(); - assertEquals(1, server.getRequestCount()); - assertEquals("bar", recordedRequest.getHeader("foo")); + Assert.assertEquals(1, server.getRequestCount()); + Assert.assertEquals("bar", recordedRequest.getHeader("foo")); } diff --git a/spring-web/src/test/java/org/springframework/web/client/reactive/WebClientStrategiesTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/WebClientStrategiesTests.java similarity index 98% rename from spring-web/src/test/java/org/springframework/web/client/reactive/WebClientStrategiesTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/WebClientStrategiesTests.java index 763b234b74..e5a13bbca0 100644 --- a/spring-web/src/test/java/org/springframework/web/client/reactive/WebClientStrategiesTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/WebClientStrategiesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.client.reactive; +package org.springframework.web.reactive.function.client; import java.util.Collections; import java.util.List; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java index f8bdef02f0..b9d921d2c7 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java @@ -22,6 +22,7 @@ import org.junit.Before; import org.junit.Test; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -32,13 +33,12 @@ import org.springframework.http.codec.BodyExtractors; import org.springframework.http.codec.ServerSentEvent; import org.springframework.http.server.reactive.AbstractHttpHandlerIntegrationTests; import org.springframework.http.server.reactive.HttpHandler; -import reactor.test.StepVerifier; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.client.reactive.ClientRequest; -import org.springframework.web.client.reactive.WebClient; import org.springframework.web.reactive.DispatcherHandler; import org.springframework.web.reactive.config.EnableWebReactive; +import org.springframework.web.reactive.function.client.ClientRequest; +import org.springframework.web.reactive.function.client.WebClient; import org.springframework.web.server.adapter.WebHttpHandlerBuilder; diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/package-info.java b/spring-web/src/main/java/org/springframework/web/client/reactive/package-info.java deleted file mode 100644 index bc41e11abb..0000000000 --- a/spring-web/src/main/java/org/springframework/web/client/reactive/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Provides a reactive {@link org.springframework.web.client.reactive.WebClient} - * that builds on top of the - * {@code org.springframework.http.client.reactive} reactive HTTP adapter layer. - */ -package org.springframework.web.client.reactive;