diff --git a/src/docs/asciidoc/web/webflux.adoc b/src/docs/asciidoc/web/webflux.adoc index 196ed831385..c1fd40917ec 100644 --- a/src/docs/asciidoc/web/webflux.adoc +++ b/src/docs/asciidoc/web/webflux.adoc @@ -2414,22 +2414,26 @@ configure or customize message writing. ==== `ResponseEntity` [.small]#<># -Using `ResponseEntity` is more or less identical to using <> but is based -on a container object that specifies request headers and body. The following example uses `ResponseEntity`: +`ResponseEntity` is like <> but with status and headers. For example: ==== [source,java,indent=0] [subs="verbatim,quotes"] ---- - @PostMapping("/something") + @GetMapping("/something") public ResponseEntity handle() { - // ... - URI location = ... - return new ResponseEntity.created(location).build(); + String body = ... ; + String etag = ... ; + return ResponseEntity.ok().eTag(etag).build(body); } ---- ==== +WebFlux supports using a single value <> to +produce the `ResponseEntity` asynchronously, and/or single and multi-value reactive types +for the body. + + [[webflux-ann-jackson]] diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc index a10c22a6d88..9d6f5026b4f 100644 --- a/src/docs/asciidoc/web/webmvc.adoc +++ b/src/docs/asciidoc/web/webmvc.adoc @@ -2789,22 +2789,26 @@ See <> for details. ==== ResponseEntity [.small]#<># -`ResponseEntity` is more or less identical to using <> but is based -on a container object that specifies request headers and body. The following listing shows an example: +`ResponseEntity` is like <> but with status and headers. For example: ==== [source,java,indent=0] [subs="verbatim,quotes"] ---- - @PostMapping("/something") + @GetMapping("/something") public ResponseEntity handle() { - // ... - URI location = ... ; - return ResponseEntity.created(location).build(); + String body = ... ; + String etag = ... ; + return ResponseEntity.ok().eTag(etag).build(body); } ---- ==== +Spring MVC supports using a single value <> +to produce the `ResponseEntity` asynchronously, and/or single and multi-value reactive +types for the body. + + [[mvc-ann-jackson]] @@ -3854,10 +3858,11 @@ customize the status and headers of the response. === Reactive Types [.small]#<># -Spring MVC supports use of reactive client libraries in a controller. This includes the -`WebClient` from `spring-webflux` and others, such as Spring Data reactive data -repositories. In such scenarios, it is convenient to be able to return reactive types -from the controller method . +Spring MVC supports use of reactive client libraries in a controller (also read +<> in the WebFlux section). +This includes the `WebClient` from `spring-webflux` and others, such as Spring Data +reactive data repositories. In such scenarios, it is convenient to be able to return +reactive types from the controller method. Reactive return values are handled as follows: