From 77aac7768d730d455410c5bcac623af5ba4cd1b7 Mon Sep 17 00:00:00 2001 From: "Lee, Kyutae" Date: Mon, 6 Jun 2022 19:12:43 +0900 Subject: [PATCH 1/2] Update reference docs to use PropertySourcesPlaceholderConfigurer See gh-28572 --- src/docs/asciidoc/web/webflux.adoc | 2 +- src/docs/asciidoc/web/webmvc.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/docs/asciidoc/web/webflux.adoc b/src/docs/asciidoc/web/webflux.adoc index bc38abea4e4..3d87bff5027 100644 --- a/src/docs/asciidoc/web/webflux.adoc +++ b/src/docs/asciidoc/web/webflux.adoc @@ -1540,7 +1540,7 @@ extracts the name, version, and file extension: ---- 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 other property sources. You ca use this to, for example, parameterize a base URL based on some external configuration. diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc index 30a3867b00b..1d3b2c9413f 100644 --- a/src/docs/asciidoc/web/webmvc.adoc +++ b/src/docs/asciidoc/web/webmvc.adoc @@ -1712,7 +1712,7 @@ extracts the name, version, and file extension: ---- 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 other property sources. You can use this, for example, to parameterize a base URL based on some external configuration. From e18a118f8b0089f963805c3d1a5ac09f9b8a7bf9 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 7 Jun 2022 08:29:28 +0200 Subject: [PATCH 2/2] Polish contribution See gh-28572 --- src/docs/asciidoc/web/webflux.adoc | 6 +++--- src/docs/asciidoc/web/webmvc.adoc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/docs/asciidoc/web/webflux.adoc b/src/docs/asciidoc/web/webflux.adoc index 3d87bff5027..611cf6ba660 100644 --- a/src/docs/asciidoc/web/webflux.adoc +++ b/src/docs/asciidoc/web/webflux.adoc @@ -1540,9 +1540,9 @@ extracts the name, version, and file extension: ---- URI path patterns can also have embedded `${...}` placeholders that are resolved on startup -through `PropertySourcesPlaceholderConfigurer` against local, system, environment, and other property -sources. You ca use this to, for example, parameterize a base URL based on some external -configuration. +through `PropertySourcesPlaceholderConfigurer` against local, system, environment, and +other property sources. You ca use this to, for example, parameterize a base URL based on +some external configuration. 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 diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc index 1d3b2c9413f..20964461ed4 100644 --- a/src/docs/asciidoc/web/webmvc.adoc +++ b/src/docs/asciidoc/web/webmvc.adoc @@ -1712,9 +1712,9 @@ extracts the name, version, and file extension: ---- URI path patterns can also have embedded `${...}` placeholders that are resolved on startup -by using `PropertySourcesPlaceholderConfigurer` against local, system, environment, and other property -sources. You can use this, for example, to parameterize a base URL based on some external -configuration. +by using `PropertySourcesPlaceholderConfigurer` against local, system, environment, and +other property sources. You can use this, for example, to parameterize a base URL based on +some external configuration.