root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Allow empty body with no content type in BodyExtractors 

Issue: SPR-15758
This commit is contained in:
Rossen Stoyanchev 2017-07-14 14:38:42 +02:00
parent d2c6ea5b1b
commit 9d04c0424d
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java
View File

@ -103,7 +103,8 @@ public abstract class BodyExtractors {
return reader.readMono(elementType, inputMessage, context.hints()); return reader.readMono(elementType, inputMessage, context.hints());
} }
}, },
Mono::error, ex -> (inputMessage.getHeaders().getContentType() == null) ?
Mono.from(permitEmptyOrFail(inputMessage, ex)) : Mono.error(ex),
Mono::empty); Mono::empty);
} }
@ -138,6 +139,7 @@ public abstract class BodyExtractors {
return toFlux(ResolvableType.forType(typeReference.getType())); return toFlux(ResolvableType.forType(typeReference.getType()));
} }
@SuppressWarnings("unchecked")
static <T> BodyExtractor<Flux<T>, ReactiveHttpInputMessage> toFlux(ResolvableType elementType) { static <T> BodyExtractor<Flux<T>, ReactiveHttpInputMessage> toFlux(ResolvableType elementType) {
Assert.notNull(elementType, "'elementType' must not be null"); Assert.notNull(elementType, "'elementType' must not be null");
return (inputMessage, context) -> readWithMessageReaders(inputMessage, context, return (inputMessage, context) -> readWithMessageReaders(inputMessage, context,
@ -152,10 +154,18 @@ public abstract class BodyExtractors {
return reader.read(elementType, inputMessage, context.hints()); return reader.read(elementType, inputMessage, context.hints());
} }
}, },
Flux::error, ex -> (inputMessage.getHeaders().getContentType() == null) ?
permitEmptyOrFail(inputMessage, ex) : Flux.error(ex),
Flux::empty); Flux::empty);
} }
@SuppressWarnings("unchecked")
private static <T> Flux<T> permitEmptyOrFail(ReactiveHttpInputMessage message, UnsupportedMediaTypeException ex) {
return message.getBody().doOnNext(buffer -> {
throw ex;
}).map(o -> (T) o);
}
/** /**
* Return a {@code BodyExtractor} that reads form data into a {@link MultiValueMap}. * Return a {@code BodyExtractor} that reads form data into a {@link MultiValueMap}.
* @return a {@code BodyExtractor} that reads form data * @return a {@code BodyExtractor} that reads form data
@ -225,7 +235,8 @@ public abstract class BodyExtractors {
private static <T, S extends Publisher<T>> S readWithMessageReaders( private static <T, S extends Publisher<T>> S readWithMessageReaders(
ReactiveHttpInputMessage inputMessage, BodyExtractor.Context context, ResolvableType elementType, ReactiveHttpInputMessage inputMessage, BodyExtractor.Context context, ResolvableType elementType,
Function<HttpMessageReader<T>, S> readerFunction, Function<Throwable, S> unsupportedError, Function<HttpMessageReader<T>, S> readerFunction,
Function<UnsupportedMediaTypeException, S> unsupportedError,
Supplier<S> empty) { Supplier<S> empty) {
if (VOID_TYPE.equals(elementType)) { if (VOID_TYPE.equals(elementType)) {

15
spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java
View File

@ -56,7 +56,9 @@ import org.springframework.http.server.reactive.ServerHttpResponse;
import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest; import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import static org.junit.Assert.*; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.springframework.http.codec.json.Jackson2CodecSupport.JSON_VIEW_HINT; import static org.springframework.http.codec.json.Jackson2CodecSupport.JSON_VIEW_HINT;
/** /**
@ -169,6 +171,17 @@ public class BodyExtractorsTests {
.verify(); .verify();
} }
@Test // SPR-15758
public void toMonoWithEmptyBodyAndNoContentType() throws Exception {
BodyExtractor<Mono<Map<String, String>>, ReactiveHttpInputMessage> extractor =
BodyExtractors.toMono(new ParameterizedTypeReference<Map<String, String>>() {});
MockServerHttpRequest request = MockServerHttpRequest.post("/").body(Flux.empty());
Mono<Map<String, String>> result = extractor.extract(request, this.context);
StepVerifier.create(result).expectComplete().verify();
}
@Test @Test
public void toFlux() throws Exception { public void toFlux() throws Exception {
BodyExtractor<Flux<String>, ReactiveHttpInputMessage> extractor = BodyExtractors.toFlux(String.class); BodyExtractor<Flux<String>, ReactiveHttpInputMessage> extractor = BodyExtractors.toFlux(String.class);