Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove ServerWebExchange::getParts and ServerRequest::parts

Browse Source 
Revert to state before DefaultMultipartMessageReader
This commit is contained in:
Arjen Poutsma
2019-07-10 16:20:20 +02:00
parent 09572e7b60
commit 2909de8829
11 changed files with 26 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-webflux/src/test/java/org/springframework/web/reactive/function/MultipartIntegrationTests.java
View File

@@ -129,7 +129,8 @@ public class MultipartIntegrationTests extends AbstractRouterFunctionIntegration
private static class MultipartHandler {
public Mono<ServerResponse> multipartData(ServerRequest request) {
return request.multipartData()
return request
.body(BodyExtractors.toMultipartData())
.flatMap(map -> {
Map<String, Part> parts = map.toSingleValueMap();
try {
@@ -145,7 +146,7 @@ public class MultipartIntegrationTests extends AbstractRouterFunctionIntegration
}
public Mono<ServerResponse> parts(ServerRequest request) {
return request.parts().collectList()
return request.body(BodyExtractors.toParts()).collectList()
.flatMap(parts -> {
try {
assertThat(parts.size()).isEqualTo(2);
@@ -160,7 +161,7 @@ public class MultipartIntegrationTests extends AbstractRouterFunctionIntegration
}
public Mono<ServerResponse> transferTo(ServerRequest request) {
return request.parts()
return request.body(BodyExtractors.toParts())
.filter(part -> part instanceof FilePart)
.next()
.cast(FilePart.class)

7
spring-webflux/src/test/java/org/springframework/web/reactive/function/server/MockServerRequest.java
View File

@@ -247,13 +247,6 @@ public class MockServerRequest implements ServerRequest {
return (Mono<MultiValueMap<String, Part>>) this.body;
}
@Override
@SuppressWarnings("unchecked")
public Flux<Part> parts() {
Assert.state(this.body != null, "No body");
return (Flux<Part>) this.body;
}
@Override
public ServerWebExchange exchange() {
Assert.state(this.exchange != null, "No exchange");