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

Polish 'Support system-dependent path separators' 

See gh-24490
This commit is contained in:
Phillip Webb 2021-04-08 20:42:22 -07:00
parent f918a46ea2
commit 7056a95ffc
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
View File

@ -563,9 +563,11 @@ TIP: Use the prefix `optional:` if the <<boot-features-external-config-optional-
WARNING: `spring.config.name` and `spring.config.location` are used very early to determine which files have to be loaded.
They must be defined as an environment property (typically an OS environment variable, a system property, or a command-line argument).
If `spring.config.location` contains directories (as opposed to files), they should end in `/` (at runtime they will be appended with the names generated from `spring.config.name` before being loaded).
Files specified in `spring.config.location` are used as-is.
Whether specified directly or contained in a directory, configuration files must include a file extension in their name.
If `spring.config.location` contains directories (as opposed to files), they must end in `/` or the system-dependent `File.separator`.
At runtime they will be appended with the names generated from `spring.config.name` before being loaded.
If `spring.config.location` contains files, they are used as-is.
Whether specified directly or contained in a directory, files references must include a file extension in their name.
Typical extensions that are supported out-of-the-box are `.properties`, `.yaml`, and `.yml`.
When multiple locations are specified, the later ones can override the values of earlier ones.

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataLocationResolver.java
View File

@ -16,6 +16,7 @@
package org.springframework.boot.context.config;
import java.io.File;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collection;
@ -26,7 +27,6 @@ import java.util.List;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.io.File;
import org.apache.commons.logging.Log;