diff --git a/build.gradle b/build.gradle index 319c6317..b7e1dd13 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ sonarqube { } ext { - springVersion = '5.0.0.RELEASE' + springVersion = '5.0.1.RELEASE' javadocLinks = [ 'http://docs.oracle.com/javase/8/docs/api/', "http://docs.spring.io/spring-framework/docs/$springVersion/javadoc-api/", diff --git a/docs/src/test/java/com/example/webtestclient/RequestPartPayload.java b/docs/src/test/java/com/example/webtestclient/RequestPartPayload.java index e04f9d14..c532b8ae 100644 --- a/docs/src/test/java/com/example/webtestclient/RequestPartPayload.java +++ b/docs/src/test/java/com/example/webtestclient/RequestPartPayload.java @@ -24,6 +24,7 @@ import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import org.springframework.web.reactive.function.BodyInserters; import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; import static org.springframework.restdocs.payload.PayloadDocumentation.requestPartBody; @@ -49,7 +50,7 @@ public class RequestPartPayload { }; multipartData.add("image", imageResource); multipartData.add("metadata", Collections.singletonMap("version", "1.0")); - this.webTestClient.post().uri("/images").syncBody(multipartData) + this.webTestClient.post().uri("/images").body(BodyInserters.fromMultipartData(multipartData)) .accept(MediaType.APPLICATION_JSON).exchange() .expectStatus().isOk().expectBody() .consumeWith(document("image-upload", @@ -72,7 +73,7 @@ public class RequestPartPayload { multipartData.add("image", imageResource); multipartData.add("metadata", Collections.singletonMap("version", "1.0")); - this.webTestClient.post().uri("/images").syncBody(multipartData) + this.webTestClient.post().uri("/images").body(BodyInserters.fromMultipartData(multipartData)) .accept(MediaType.APPLICATION_JSON).exchange() .expectStatus().isOk().expectBody() .consumeWith(document("image-upload", diff --git a/docs/src/test/java/com/example/webtestclient/RequestParts.java b/docs/src/test/java/com/example/webtestclient/RequestParts.java index df8c6e31..c463b5d0 100644 --- a/docs/src/test/java/com/example/webtestclient/RequestParts.java +++ b/docs/src/test/java/com/example/webtestclient/RequestParts.java @@ -19,6 +19,7 @@ package com.example.webtestclient; import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import org.springframework.web.reactive.function.BodyInserters; import static org.springframework.restdocs.request.RequestDocumentation.partWithName; import static org.springframework.restdocs.request.RequestDocumentation.requestParts; @@ -34,7 +35,7 @@ public class RequestParts { // tag::request-parts[] MultiValueMap multipartData = new LinkedMultiValueMap<>(); multipartData.add("file", "example".getBytes()); - this.webTestClient.post().uri("/upload").syncBody(multipartData) // <1> + this.webTestClient.post().uri("/upload").body(BodyInserters.fromMultipartData(multipartData)) // <1> .exchange().expectStatus().isOk().expectBody() .consumeWith(document("upload", requestParts( // <2> partWithName("file").description("The file to upload")) // <3> diff --git a/spring-restdocs-webtestclient/src/test/java/org/springframework/restdocs/webtestclient/WebTestClientRequestConverterTests.java b/spring-restdocs-webtestclient/src/test/java/org/springframework/restdocs/webtestclient/WebTestClientRequestConverterTests.java index 8d2ee944..6ec4c22f 100644 --- a/spring-restdocs-webtestclient/src/test/java/org/springframework/restdocs/webtestclient/WebTestClientRequestConverterTests.java +++ b/spring-restdocs-webtestclient/src/test/java/org/springframework/restdocs/webtestclient/WebTestClientRequestConverterTests.java @@ -155,8 +155,8 @@ public class WebTestClientRequestConverterTests { req.body(BodyExtractors.toMultipartData()).block(); return null; })).configureClient().baseUrl("http://localhost").build().post() - .uri("/foo").syncBody(multipartData).exchange().expectBody() - .returnResult(); + .uri("/foo").body(BodyInserters.fromMultipartData(multipartData)) + .exchange().expectBody().returnResult(); OperationRequest request = this.converter.convert(result); assertThat(request.getUri(), is(URI.create("http://localhost/foo"))); assertThat(request.getMethod(), is(HttpMethod.POST)); @@ -187,8 +187,8 @@ public class WebTestClientRequestConverterTests { req.body(BodyExtractors.toMultipartData()).block(); return null; })).configureClient().baseUrl("http://localhost").build().post() - .uri("/foo").syncBody(multipartData).exchange().expectBody() - .returnResult(); + .uri("/foo").body(BodyInserters.fromMultipartData(multipartData)) + .exchange().expectBody().returnResult(); OperationRequest request = this.converter.convert(result); assertThat(request.getUri(), is(URI.create("http://localhost/foo"))); assertThat(request.getMethod(), is(HttpMethod.POST)); diff --git a/spring-restdocs-webtestclient/src/test/java/org/springframework/restdocs/webtestclient/WebTestClientRestDocumentationIntegrationTests.java b/spring-restdocs-webtestclient/src/test/java/org/springframework/restdocs/webtestclient/WebTestClientRestDocumentationIntegrationTests.java index 8949193e..5d393344 100644 --- a/spring-restdocs-webtestclient/src/test/java/org/springframework/restdocs/webtestclient/WebTestClientRestDocumentationIntegrationTests.java +++ b/spring-restdocs-webtestclient/src/test/java/org/springframework/restdocs/webtestclient/WebTestClientRestDocumentationIntegrationTests.java @@ -37,6 +37,7 @@ import org.springframework.util.FileSystemUtils; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.reactive.function.BodyExtractors; +import org.springframework.web.reactive.function.BodyInserters; import org.springframework.web.reactive.function.server.RequestPredicates; import org.springframework.web.reactive.function.server.RouterFunction; import org.springframework.web.reactive.function.server.RouterFunctions; @@ -140,7 +141,8 @@ public class WebTestClientRestDocumentationIntegrationTests { Consumer> documentation = document("multipart", requestParts(partWithName("a").description("Part a"), partWithName("b").description("Part b"))); - this.webTestClient.post().uri("/upload").syncBody(multipartData).exchange() + this.webTestClient.post().uri("/upload") + .body(BodyInserters.fromMultipartData(multipartData)).exchange() .expectStatus().isOk().expectBody().consumeWith(documentation); assertThat(new File("build/generated-snippets/multipart/request-parts.adoc"), is(snippet(asciidoctor())