Skip to content

Commit 0734806

Browse files
committed
Merge branch '2.4.x'
2 parents 9aa1b52 + f568aa4 commit 0734806

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -583,9 +583,8 @@ This means that the JSON cannot override properties from lower order property so
583583

584584

585585

586-
[[boot-features-external-config-application-property-files]]
587586
[[boot-features-external-config-files]]
588-
=== External Application Properties
587+
=== External Application Properties [[boot-features-external-config-application-property-files]]
589588
Spring Boot will automatically find and load `application.properties` and `application.yaml` files from the following locations when your application starts:
590589

591590
. The classpath root
@@ -1853,7 +1852,7 @@ If you used `@Value("{demo.itemPrice}")` instead, `demo.item-price` and `DEMO_IT
18531852
If you define a set of configuration keys for your own components, we recommend you group them in a POJO annotated with `@ConfigurationProperties`.
18541853
Doing so will provide you with structured, type-safe object that you can inject into your own beans.
18551854

1856-
`SpEL` expressions from <<boot-features-external-config-application-property-files,application property files>> are not processed at time of parsing these files and populating the environment.
1855+
`SpEL` expressions from <<boot-features-external-config-files,application property files>> are not processed at time of parsing these files and populating the environment.
18571856
However, it is possible to write a `SpEL` expression in `@Value`.
18581857
If the value of a property from an application property file is a `SpEL` expression, it will be evaluated when consumed via `@Value`.
18591858

0 commit comments

Comments
 (0)