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

Consistently support CompletionStage next to CompletableFuture

Browse Source 
Issue: SPR-15258
(cherry picked from commit 50d93d3)
This commit is contained in:
Juergen Hoeller
2017-02-15 23:16:11 +01:00
parent 4d2360e5b5
commit 06231721c3
6 changed files with 49 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/asciidoc/web-mvc.adoc
View File

@@ -1436,8 +1436,8 @@ The following are the supported return types:
asynchronously in a thread managed by Spring MVC.
* A `DeferredResult<?>` can be returned when the application wants to produce the return
value from a thread of its own choosing.
* A `ListenableFuture<?>` can be returned when the application wants to produce the return
value from a thread of its own choosing.
* A `ListenableFuture<?>` or `CompletableFuture<?>`/`CompletionStage<?>` can be returned
when the application wants to produce the value from a thread pool submission.
* A `ResponseBodyEmitter` can be returned to write multiple objects to the response
asynchronously; also supported as the body within a `ResponseEntity`.
* An `SseEmitter` can be returned to write Server-Sent Events to the response

10
src/asciidoc/web-websocket.adoc
View File

@@ -1354,7 +1354,7 @@ the declared method argument type as necessary.
* `java.security.Principal` method arguments reflecting the user logged in at
the time of the WebSocket HTTP handshake.
The return value from an `@MessageMapping` method is converted with a
A return value from an `@MessageMapping` method will be converted with a
`org.springframework.messaging.converter.MessageConverter` and used as the body
of a new message that is then sent, by default, to the `"brokerChannel"` with
the same destination as the client message but using the prefix `"/topic"` by
@@ -1362,8 +1362,12 @@ default. An `@SendTo` message level annotation can be used to specify any
other destination instead. It can also be set a class-level to share a common
destination.
An `@SubscribeMapping` annotation can also be used to map subscription requests
to `@Controller` methods. It is supported on the method level, but can also be
A response message may also be provided asynchronously via a `ListenableFuture`
or `CompletableFuture`/`CompletionStage` return type signature, analogous to
deferred results in an MVC handler method.
A `@SubscribeMapping` annotation can be used to map subscription requests to
`@Controller` methods. It is supported on the method level, but can also be
combined with a type level `@MessageMapping` annotation that expresses shared
mappings across all message handling methods within the same controller.