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

Support empty body without content type in WebFlux

Browse Source 
Issue: SPR-15758
This commit is contained in:
Rossen Stoyanchev
2017-07-13 11:11:34 +02:00
parent d9eafce266
commit ed5cc27f7b
3 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java
View File

@@ -83,14 +83,16 @@ public class MessageReaderArgumentResolverTests {
}
@SuppressWarnings("unchecked")
@Test
public void missingContentType() throws Exception {
ServerWebExchange exchange = post("/path").body("{\"bar\":\"BARBAR\",\"foo\":\"FOOFOO\"}").toExchange();
ResolvableType type = forClassWithGenerics(Mono.class, TestBean.class);
MethodParameter param = this.testMethod.arg(type);
Mono<Object> result = this.resolver.readBody(param, true, this.bindingContext, exchange);
Mono<TestBean> value = (Mono<TestBean>) result.block(Duration.ofSeconds(1));
StepVerifier.create(result).expectError(UnsupportedMediaTypeStatusException.class).verify();
StepVerifier.create(value).expectError(UnsupportedMediaTypeStatusException.class).verify();
}
// More extensive "empty body" tests in RequestBody- and HttpEntityArgumentResolverTests

10
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolverTests.java
View File

@@ -19,6 +19,7 @@ package org.springframework.web.reactive.result.method.annotation;
import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import io.reactivex.Maybe;
@@ -106,6 +107,14 @@ public class RequestBodyArgumentResolverTests {
assertNull(body);
}
@Test // SPR-15758
public void emptyBodyWithoutContentType() throws Exception {
MethodParameter param = this.testMethod.annot(requestBody().notRequired()).arg(Map.class);
String body = resolveValueWithEmptyBody(param);
assertNull(body);
}
@Test
@SuppressWarnings("unchecked")
public void emptyBodyWithMono() throws Exception {
@@ -262,6 +271,7 @@ public class RequestBodyArgumentResolverTests {
@RequestBody(required = false) Observable<String> obsNotRequired,
@RequestBody(required = false) io.reactivex.Observable<String> rxjava2ObsNotRequired,
@RequestBody(required = false) CompletableFuture<String> futureNotRequired,
@RequestBody(required = false) Map<?, ?> mapNotRequired,
String notAnnotated) {}
}