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

Merge branch '5.3.x'

This commit is contained in:
Stephane Nicoll 2022-06-07 08:30:59 +02:00
parent 26944f3c8e 209fe5f452
commit 62d98685ce
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1563,9 +1563,9 @@ extracts the name, version, and file extension:
---- ----
URI path patterns can also have embedded `${...}` placeholders that are resolved on startup URI path patterns can also have embedded `${...}` placeholders that are resolved on startup
through `PropertyPlaceHolderConfigurer` against local, system, environment, and other property through `PropertySourcesPlaceholderConfigurer` against local, system, environment, and
sources. You ca use this to, for example, parameterize a base URL based on some external other property sources. You ca use this to, for example, parameterize a base URL based on
configuration. some external configuration.
NOTE: Spring WebFlux uses `PathPattern` and the `PathPatternParser` for URI path matching support. NOTE: Spring WebFlux uses `PathPattern` and the `PathPatternParser` for URI path matching support.
Both classes are located in `spring-web` and are expressly designed for use with HTTP URL Both classes are located in `spring-web` and are expressly designed for use with HTTP URL

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

@ -1718,9 +1718,9 @@ extracts the name, version, and file extension:
---- ----
URI path patterns can also have embedded `${...}` placeholders that are resolved on startup URI path patterns can also have embedded `${...}` placeholders that are resolved on startup
by using `PropertyPlaceHolderConfigurer` against local, system, environment, and other property by using `PropertySourcesPlaceholderConfigurer` against local, system, environment, and
sources. You can use this, for example, to parameterize a base URL based on some external other property sources. You can use this, for example, to parameterize a base URL based on
configuration. some external configuration.