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

Allow clash in spring.config.name 

Remove the recently added slash restriction since Spring Cloud
Config Server needs to support names with slashes.

See gh-21217
This commit is contained in:
Phillip Webb 2020-05-07 07:56:01 -07:00
parent 559c178637
commit 81058cab03
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -728,8 +728,6 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
private void assertValidConfigName(String name) { private void assertValidConfigName(String name) {
Assert.state(!name.contains("*"), () -> "Config name '" + name + "' cannot contain wildcards"); Assert.state(!name.contains("*"), () -> "Config name '" + name + "' cannot contain wildcards");
Assert.state(!name.contains("/") && !name.contains("\\"),
() -> "Config name '" + name + "' cannot contain slashes");
} }
private void addLoadedPropertySources() { private void addLoadedPropertySources() {

8
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java
View File

@ -1051,6 +1051,14 @@ class ConfigFileApplicationListenerTests {
.withMessage("Config name '*/application' cannot contain wildcards"); .withMessage("Config name '*/application' cannot contain wildcards");
} }
@Test
void configNameCanContainSlash() {
// Spring Cloud config server depends on this
TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.environment,
"spring.config.location=file:src/test/resources/", "spring.config.name=config/application");
this.initializer.postProcessEnvironment(this.environment, this.application);
}
@Test @Test
void directoryLocationsWithMultipleWildcardsShouldThrowException() { void directoryLocationsWithMultipleWildcardsShouldThrowException() {
String location = "file:src/test/resources/config/**/"; String location = "file:src/test/resources/config/**/";