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

Merge branch '5.2.x'

Browse Source
This commit is contained in:
Rossen Stoyanchev
2020-05-04 10:55:25 +01:00
parent 1b4b4c3302 9288067ea8
commit 153690e717
9 changed files with 221 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1634,7 +1634,7 @@ extracts the name, version, and file extension:
.Java
----
@GetMapping("/{name:[a-z-]+}-{version:\\d\\.\\d\\.\\d}{ext:\\.[a-z]+}")
public void handle(@PathVariable String version, @PathVariable String ext) {
public void handle(@PathVariable String name, @PathVariable String version, @PathVariable String ext) {
// ...
}
----
@@ -1642,7 +1642,7 @@ extracts the name, version, and file extension:
.Kotlin
----
@GetMapping("/{name:[a-z-]+}-{version:\\d\\.\\d\\.\\d}{ext:\\.[a-z]+}")
fun handle(@PathVariable version: String, @PathVariable ext: String) {
fun handle(@PathVariable name: String, @PathVariable version: String, @PathVariable ext: String) {
// ...
}
----