diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java index 0818900e7b..0edcdef180 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java @@ -38,13 +38,12 @@ import org.springframework.web.method.support.ModelAndViewContainer; */ public class DeferredResultMethodReturnValueHandler implements HandlerMethodReturnValueHandler { - @Override public boolean supportsReturnType(MethodParameter returnType) { Class type = returnType.getParameterType(); - return DeferredResult.class.isAssignableFrom(type) || + return (DeferredResult.class.isAssignableFrom(type) || ListenableFuture.class.isAssignableFrom(type) || - CompletionStage.class.isAssignableFrom(type); + CompletionStage.class.isAssignableFrom(type)); } @Override diff --git a/src/docs/asciidoc/web/webflux-webclient.adoc b/src/docs/asciidoc/web/webflux-webclient.adoc index abe5a77c62..b0592a3133 100644 --- a/src/docs/asciidoc/web/webflux-webclient.adoc +++ b/src/docs/asciidoc/web/webflux-webclient.adoc @@ -44,7 +44,7 @@ You can also get a stream of objects decoded from the response: [subs="verbatim,quotes"] ---- Flux result = client.get() - .uri("/quotes").accept(TEXT_EVENT_STREAM) + .uri("/quotes").accept(MediaType.TEXT_EVENT_STREAM) .retrieve() .bodyToFlux(Quote.class); ---- @@ -60,7 +60,7 @@ By default, responses with 4xx or 5xx status codes result in an error of type .retrieve() .onStatus(HttpStatus::is4xxServerError, response -> ...) .onStatus(HttpStatus::is5xxServerError, response -> ...) - .bodyToFlux(Person.class); + .bodyToMono(Person.class); ----