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

ResponseBodyResultHandler ignores ResponseEntity

Browse Source 
Currently ResponseEntityResultHandler is ordered lower than
ResponseBodyResultHandler by default whch means a ResponseEntity
should not be picked by the ResponseBodyResultHandler.

However as it is easy to have both ResponseEntity and @ResponseBody
e.g. in @RestControler (or even by mistake) and in general it makes
sense for ResponseBodyResultHandler to explicitly recognize and
ignore the ResponseEntity return type.
This commit is contained in:
Rossen Stoyanchev
2016-06-27 08:38:01 -04:00
parent c24b504a07
commit 699b057126
2 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java
View File

@@ -23,6 +23,7 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
import reactor.core.publisher.Mono;
import org.springframework.core.ResolvableType;
import org.springframework.core.codec.support.ByteBufferEncoder;
@@ -34,6 +35,7 @@ import org.springframework.core.convert.support.GenericConversionService;
import org.springframework.core.convert.support.ReactiveStreamsToCompletableFutureConverter;
import org.springframework.core.convert.support.ReactiveStreamsToRxJava1Converter;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.http.converter.reactive.CodecHttpMessageConverter;
import org.springframework.http.converter.reactive.HttpMessageConverter;
import org.springframework.http.converter.reactive.ResourceHttpMessageConverter;
@@ -108,14 +110,14 @@ public class ResponseBodyResultHandlerTests {
@Test
public void supports() throws NoSuchMethodException {
TestController controller = new TestController();
testSupports(controller, "handleReturningString", true);
testSupports(controller, "handleReturningVoid", true);
Object controller = new TestController();
testSupports(controller, "handleToString", true);
testSupports(controller, "doWork", false);
TestRestController restController = new TestRestController();
testSupports(restController, "handleReturningString", true);
testSupports(restController, "handleReturningVoid", true);
controller = new TestRestController();
testSupports(controller, "handleToString", true);
testSupports(controller, "handleToResponseEntity", false);
testSupports(controller, "handleToMonoResponseEntity", false);
}
private void testSupports(Object controller, String method, boolean result) throws NoSuchMethodException {
@@ -139,11 +141,15 @@ public class ResponseBodyResultHandlerTests {
@RestController @SuppressWarnings("unused")
private static class TestRestController {
public String handleReturningString() {
public String handleToString() {
return null;
}
public Void handleReturningVoid() {
public ResponseEntity<String> handleToResponseEntity() {
return null;
}
public Mono<ResponseEntity<String>> handleToMonoResponseEntity() {
return null;
}
}
@@ -152,12 +158,7 @@ public class ResponseBodyResultHandlerTests {
private static class TestController {
@ResponseBody
public String handleReturningString() {
return null;
}
@ResponseBody
public Void handleReturningVoid() {
public String handleToString() {
return null;
}