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-test/src/main/java/org/springframework/mock/web/reactive/function/server/MockServerRequest.java
View File

@@ -249,13 +249,6 @@ public final 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");

15
spring-web/src/main/java/org/springframework/web/server/ServerWebExchange.java
View File

@@ -22,7 +22,6 @@ import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Function;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import org.springframework.context.ApplicationContext;
@@ -139,23 +138,9 @@ public interface ServerWebExchange {
* cached so that this method is safe to call more than once.
* <p><strong>Note:</strong>the {@linkplain Part#content() contents} of each
* part is not cached, and can only be read once.
* @see #getParts()
*/
Mono<MultiValueMap<String, Part>> getMultipartData();
/**
* Return the parts of a multipart request if the Content-Type is
* {@code "multipart/form-data"} or an empty flux otherwise.
* <p><strong>Note:</strong> calling this method causes the request body to
* be read and parsed in full and the resulting {@code Flux} is
* cached so that this method is safe to call more than once.
* <p><strong>Note:</strong>the {@linkplain Part#content() contents} of each
* part is not cached, and can only be read once.
* @since 5.2
* @see #getMultipartData()
*/
Flux<Part> getParts();
/**
* Return the {@link LocaleContext} using the configured
* {@link org.springframework.web.server.i18n.LocaleContextResolver}.

6
spring-web/src/main/java/org/springframework/web/server/ServerWebExchangeDecorator.java
View File

@@ -20,7 +20,6 @@ import java.time.Instant;
import java.util.Map;
import java.util.function.Function;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import org.springframework.context.ApplicationContext;
@@ -108,11 +107,6 @@ public class ServerWebExchangeDecorator implements ServerWebExchange {
return getDelegate().getMultipartData();
}
@Override
public Flux<Part> getParts() {
return getDelegate().getParts();
}
@Override
public boolean isNotModified() {
return getDelegate().isNotModified();

36
spring-web/src/main/java/org/springframework/web/server/adapter/DefaultServerWebExchange.java
View File

@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import org.springframework.context.ApplicationContext;
@@ -66,7 +65,8 @@ public class DefaultServerWebExchange implements ServerWebExchange {
private static final ResolvableType FORM_DATA_TYPE =
ResolvableType.forClassWithGenerics(MultiValueMap.class, String.class, String.class);
private static final ResolvableType PARTS_DATA_TYPE = ResolvableType.forClass(Part.class);
private static final ResolvableType MULTIPART_DATA_TYPE = ResolvableType.forClassWithGenerics(
MultiValueMap.class, String.class, Part.class);
private static final Mono<MultiValueMap<String, String>> EMPTY_FORM_DATA =
Mono.just(CollectionUtils.unmodifiableMultiValueMap(new LinkedMultiValueMap<String, String>(0)))
@@ -91,8 +91,6 @@ public class DefaultServerWebExchange implements ServerWebExchange {
private final Mono<MultiValueMap<String, Part>> multipartDataMono;
private final Flux<Part> partFlux;
@Nullable
private final ApplicationContext applicationContext;
@@ -131,8 +129,7 @@ public class DefaultServerWebExchange implements ServerWebExchange {
this.sessionMono = sessionManager.getSession(this).cache();
this.localeContextResolver = localeContextResolver;
this.formDataMono = initFormData(request, codecConfigurer, getLogPrefix());
this.partFlux = initParts(request, codecConfigurer, getLogPrefix());
this.multipartDataMono = initMultipartData(this.partFlux);
this.multipartDataMono = initMultipartData(request, codecConfigurer, getLogPrefix());
this.applicationContext = applicationContext;
}
@@ -159,33 +156,27 @@ public class DefaultServerWebExchange implements ServerWebExchange {
}
@SuppressWarnings("unchecked")
private static Flux<Part> initParts(ServerHttpRequest request, ServerCodecConfigurer configurer, String logPrefix) {
private static Mono<MultiValueMap<String, Part>> initMultipartData(ServerHttpRequest request,
ServerCodecConfigurer configurer, String logPrefix) {
try {
MediaType contentType = request.getHeaders().getContentType();
if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType)) {
return ((HttpMessageReader<Part>)configurer.getReaders().stream()
.filter(reader -> reader.canRead(PARTS_DATA_TYPE, MediaType.MULTIPART_FORM_DATA))
return ((HttpMessageReader<MultiValueMap<String, Part>>) configurer.getReaders().stream()
.filter(reader -> reader.canRead(MULTIPART_DATA_TYPE, MediaType.MULTIPART_FORM_DATA))
.findFirst()
.orElseThrow(() -> new IllegalStateException("No multipart HttpMessageReader.")))
.read(PARTS_DATA_TYPE, request, Hints.from(Hints.LOG_PREFIX_HINT, logPrefix))
.readMono(MULTIPART_DATA_TYPE, request, Hints.from(Hints.LOG_PREFIX_HINT, logPrefix))
.switchIfEmpty(EMPTY_MULTIPART_DATA)
.cache();
}
}
catch (InvalidMediaTypeException ex) {
// Ignore
}
return Flux.empty();
return EMPTY_MULTIPART_DATA;
}
private static Mono<MultiValueMap<String, Part>> initMultipartData(Flux<Part> parts) {
return parts.collect(
() -> (MultiValueMap<String, Part>) new LinkedMultiValueMap<String, Part>(),
(map, part) -> map.add(part.name(), part))
.switchIfEmpty(EMPTY_MULTIPART_DATA)
.cache();
}
@Override
public ServerHttpRequest getRequest() {
@@ -230,11 +221,6 @@ public class DefaultServerWebExchange implements ServerWebExchange {
return this.multipartDataMono;
}
@Override
public Flux<Part> getParts() {
return this.partFlux;
}
@Override
public LocaleContext getLocaleContext() {
return this.localeContextResolver.resolveLocaleContext(this);

5
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequest.java
View File

@@ -220,11 +220,6 @@ class DefaultServerRequest implements ServerRequest {
return this.exchange.getMultipartData();
}
@Override
public Flux<Part> parts() {
return this.exchange.getParts();
}
private ServerHttpRequest request() {
return this.exchange.getRequest();
}

35
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequestBuilder.java
View File

@@ -290,7 +290,8 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
private static final ResolvableType FORM_DATA_TYPE =
ResolvableType.forClassWithGenerics(MultiValueMap.class, String.class, String.class);
private static final ResolvableType PARTS_DATA_TYPE = ResolvableType.forClass(Part.class);
private static final ResolvableType MULTIPART_DATA_TYPE = ResolvableType.forClassWithGenerics(
MultiValueMap.class, String.class, Part.class);
private static final Mono<MultiValueMap<String, String>> EMPTY_FORM_DATA =
Mono.just(CollectionUtils.unmodifiableMultiValueMap(new LinkedMultiValueMap<String, String>(0))).cache();
@@ -306,16 +307,13 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
private final Mono<MultiValueMap<String, Part>> multipartDataMono;
private final Flux<Part> parts;
public DelegatingServerWebExchange(
ServerHttpRequest request, ServerWebExchange delegate, List<HttpMessageReader<?>> messageReaders) {
this.request = request;
this.delegate = delegate;
this.formDataMono = initFormData(request, messageReaders);
this.parts = initParts(request, messageReaders);
this.multipartDataMono = initMultipartData(this.parts);
this.multipartDataMono = initMultipartData(request, messageReaders);
}
@SuppressWarnings("unchecked")
@@ -341,32 +339,26 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
}
@SuppressWarnings("unchecked")
private static Flux<Part> initParts(ServerHttpRequest request, List<HttpMessageReader<?>> readers) {
private static Mono<MultiValueMap<String, Part>> initMultipartData(ServerHttpRequest request,
List<HttpMessageReader<?>> readers) {
try {
MediaType contentType = request.getHeaders().getContentType();
if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType)) {
return ((HttpMessageReader<Part>)readers.stream()
.filter(reader -> reader.canRead(PARTS_DATA_TYPE, MediaType.MULTIPART_FORM_DATA))
return ((HttpMessageReader<MultiValueMap<String, Part>>) readers.stream()
.filter(reader -> reader.canRead(MULTIPART_DATA_TYPE, MediaType.MULTIPART_FORM_DATA))
.findFirst()
.orElseThrow(() -> new IllegalStateException("No multipart HttpMessageReader.")))
.read(PARTS_DATA_TYPE, request, Hints.none());
.readMono(MULTIPART_DATA_TYPE, request, Hints.none())
.switchIfEmpty(EMPTY_MULTIPART_DATA)
.cache();
}
}
catch (InvalidMediaTypeException ex) {
// Ignore
}
return Flux.empty();
return EMPTY_MULTIPART_DATA;
}
private static Mono<MultiValueMap<String, Part>> initMultipartData(Flux<Part> parts) {
return parts.collect(
() -> (MultiValueMap<String, Part>) new LinkedMultiValueMap<String, Part>(),
(map, part) -> map.add(part.name(), part))
.switchIfEmpty(EMPTY_MULTIPART_DATA)
.cache();
}
@Override
public ServerHttpRequest getRequest() {
return this.request;
@@ -382,11 +374,6 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder {
return this.multipartDataMono;
}
@Override
public Flux<Part> getParts() {
return this.parts;
}
// Delegating methods
@Override

5
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
View File

@@ -1025,11 +1025,6 @@ public abstract class RequestPredicates {
return this.request.multipartData();
}
@Override
public Flux<Part> parts() {
return this.request.parts();
}
@Override
public ServerWebExchange exchange() {
return this.request.exchange();

14
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java
View File

@@ -270,23 +270,9 @@ public interface ServerRequest {
* <p><strong>Note:</strong> calling this method causes the request body to
* be read and parsed in full, and the resulting {@code MultiValueMap} is
* cached so that this method is safe to call more than once.
* <p><strong>Note:</strong>the {@linkplain Part#content() contents} of each
* part is not cached, and can only be read once.
*/
Mono<MultiValueMap<String, Part>> multipartData();
/**
* Get the parts of a multipart request if the Content-Type is
* {@code "multipart/form-data"} or an empty flux otherwise.
* <p><strong>Note:</strong> calling this method causes the request body to
* be read and parsed in full and the resulting {@code Flux} is
* cached so that this method is safe to call more than once.
* <p><strong>Note:</strong>the {@linkplain Part#content() contents} of each
* part is not cached, and can only be read once.
* @since 5.2
*/
Flux<Part> parts();
/**
* Get the web exchange that this request is based on.
* <p>Note: Manipulating the exchange directly (instead of using the methods provided on

5
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapper.java
View File

@@ -208,11 +208,6 @@ public class ServerRequestWrapper implements ServerRequest {
return this.delegate.multipartData();
}
@Override
public Flux<Part> parts() {
return this.delegate.parts();
}
@Override
public ServerWebExchange exchange() {
return this.delegate.exchange();

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");