root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #1849 from jasssonpet:patch-1 

* pr/1849:
  Fix format typo in webmvc.adoc
This commit is contained in:
Stephane Nicoll 2018-06-04 20:56:33 +02:00
parent f2ee18493f 6f17c28246
commit 7396309dba
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/docs/asciidoc/web/webmvc.adoc
View File

@ -1789,7 +1789,7 @@ supported for all return values, see below for more details.
`ResponseEntity`. See <<mvc-ann-async>> and <<mvc-ann-async-http-streaming>>.
| Reactive types -- Reactor, RxJava, or others via `ReactiveAdapterRegistry`
| Alternative to ``DeferredResult` with multi-value streams (e.g. `Flux`, `Observable`)
| Alternative to `DeferredResult` with multi-value streams (e.g. `Flux`, `Observable`)
collected to a `List`.
For streaming scenarios -- e.g. `text/event-stream`, `application/json+stream` --
@ -1899,7 +1899,7 @@ To get all matrix variables, use a `MultiValueMap`:
@GetMapping("/owners/{ownerId}/pets/{petId}")
public void findPet(
@MatrixVariable MultiValueMap<String, String> matrixVars,
@MatrixVariable(pathVar="petId"") MultiValueMap<String, String> petMatrixVars) {
@MatrixVariable(pathVar="petId") MultiValueMap<String, String> petMatrixVars) {
// matrixVars: ["q" : [11,22], "r" : 12, "s" : 23]
// petMatrixVars: ["q" : 22, "s" : 23]