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

Fix and improve docs on {*var} pattern 

Closes gh-27132
This commit is contained in:
Rossen Stoyanchev 2021-07-09 20:09:06 +01:00
parent d3b1c4f62b
commit 39442143b7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -64,10 +64,10 @@ import org.springframework.util.StringUtils;
* underneath the {@code /resources/} path, including {@code /resources/image.png}
* and {@code /resources/css/spring.css}</li>
* <li><code>/resources/{&#42;path}</code> &mdash; matches all files
* underneath the {@code /resources/} path and captures their relative path in
* a variable named "path"; {@code /resources/image.png} will match with
* "path" &rarr; "/image.png", and {@code /resources/css/spring.css} will match
* with "path" &rarr; "/css/spring.css"</li>
* underneath the {@code /resources/}, as well as {@code /resources}, and captures
* their relative path in a variable named "path"; {@code /resources/image.png}
* will match with "path" &rarr; "/image.png", and {@code /resources/css/spring.css}
* will match with "path" &rarr; "/css/spring.css"</li>
* <li><code>/resources/{filename:\\w+}.dat</code> will match {@code /resources/spring.dat}
* and assign the value {@code "spring"} to the {@code filename} variable</li>
* </ul>

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

@ -1448,7 +1448,7 @@ You can map requests by using glob patterns and wildcards:
| `+{*path}+`
| Matches zero or more path segments until the end of the path and captures it as a variable named "path"
| `+"/resources/{*file}"+` matches `+"/resources/images/file.png"+` and captures `+file=images/file.png+`
| `+"/resources/{*file}"+` matches `+"/resources/images/file.png"+` and captures `+file=/images/file.png+`
|===
@ -1517,7 +1517,7 @@ information or with the `-parameters` compiler flag on Java 8.
The syntax `{*varName}` declares a URI variable that matches zero or more remaining path
segments. For example `/resources/{*path}` matches all files under `/resources/`, and the
`"path"` variable captures the complete relative path.
`"path"` variable captures the complete path under `/resources`.
The syntax `{varName:regex}` declares a URI variable with a regular expression that has the
syntax: `{varName:regex}`. For example, given a URL of `/spring-web-3.0.5.jar`, the following method