Skip to content

Commit 457e876

Browse files
committed
Polish reference manual regarding placeholders
1 parent 021bf6e commit 457e876

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

framework-docs/modules/ROOT/pages/core/beans/factory-extension.adoc

+4-3
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ with placeholder values is defined:
342342
The example shows properties configured from an external `Properties` file. At runtime,
343343
a `PropertySourcesPlaceholderConfigurer` is applied to the metadata that replaces some
344344
properties of the DataSource. The values to replace are specified as placeholders of the
345-
form pass:q[`${property-name}`], which follows the Ant and log4j and JSP EL style.
345+
form pass:q[`${property-name}`], which follows the Ant, log4j, and JSP EL style.
346346

347347
The actual values come from another file in the standard Java `Properties` format:
348348

@@ -357,9 +357,10 @@ jdbc.password=root
357357
Therefore, the `${jdbc.username}` string is replaced at runtime with the value, 'sa', and
358358
the same applies for other placeholder values that match keys in the properties file.
359359
The `PropertySourcesPlaceholderConfigurer` checks for placeholders in most properties and
360-
attributes of a bean definition. Furthermore, you can customize the placeholder prefix and suffix.
360+
attributes of a bean definition. Furthermore, you can customize the placeholder prefix, suffix,
361+
default value separator, and escape character.
361362

362-
With the `context` namespace introduced in Spring 2.5, you can configure property placeholders
363+
With the `context` namespace, you can configure property placeholders
363364
with a dedicated configuration element. You can provide one or more locations as a
364365
comma-separated list in the `location` attribute, as the following example shows:
365366

framework-docs/modules/ROOT/pages/languages/kotlin/spring-projects-in.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ NOTE: If you use Spring Boot, you should probably use
190190
instead of `@Value` annotations.
191191

192192
As an alternative, you can customize the property placeholder prefix by declaring the
193-
following configuration beans:
193+
following configuration bean:
194194

195195
[source,kotlin,indent=0]
196196
----

framework-docs/modules/ROOT/pages/web/webflux/controller/ann-requestmapping.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,8 @@ Kotlin::
234234
--
235235

236236
URI path patterns can also have embedded `${...}` placeholders that are resolved on startup
237-
through `PropertySourcesPlaceholderConfigurer` against local, system, environment, and
238-
other property sources. You can use this to, for example, parameterize a base URL based on
237+
by using `PropertySourcesPlaceholderConfigurer` against local, system, environment, and
238+
other property sources. You can use this, for example, to parameterize a base URL based on
239239
some external configuration.
240240

241241
NOTE: Spring WebFlux uses `PathPattern` and the `PathPatternParser` for URI path matching support.

0 commit comments

Comments
 (0)