Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ignore empty prefixes in new PrefixedConfigurationPropertySource

Browse Source 
See gh-25445
This commit is contained in:
dreis2211
2021-02-26 09:50:11 +01:00
committed by Andy Wilkinson
parent a8592f36d4
commit 4b694560eb
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/PrefixedConfigurationPropertySource.java
View File

@@ -47,7 +47,10 @@ class PrefixedConfigurationPropertySource implements ConfigurationPropertySource
}
private ConfigurationPropertyName getPrefixedName(ConfigurationPropertyName name) {
String prefix = (StringUtils.hasText(this.prefix)) ? this.prefix + "." : "";
if (!StringUtils.hasText(this.prefix)) {
return name;
}
String prefix = this.prefix + ".";
return ConfigurationPropertyName.of(prefix + name);
}

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/PrefixedIterableConfigurationPropertySource.java
View File

@@ -18,6 +18,8 @@ package org.springframework.boot.context.properties.source;
import java.util.stream.Stream;
import org.springframework.util.StringUtils;
/**
* An iterable {@link PrefixedConfigurationPropertySource}.
*
@@ -32,6 +34,9 @@ class PrefixedIterableConfigurationPropertySource extends PrefixedConfigurationP
@Override
public Stream<ConfigurationPropertyName> stream() {
if (!StringUtils.hasText(getPrefix())) {
return getSource().stream();
}
ConfigurationPropertyName prefix = ConfigurationPropertyName.of(getPrefix());
return getSource().stream().map((propertyName) -> {
if (prefix.isAncestorOf(propertyName)) {

11
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/PrefixedIterableConfigurationPropertySourceTests.java
View File

@@ -38,4 +38,15 @@ class PrefixedIterableConfigurationPropertySourceTests {
ConfigurationPropertyName.of("foo.baz"), ConfigurationPropertyName.of("hello.bing"));
}
@Test
void emptyPrefixShouldReturnOriginalStream() {
MockConfigurationPropertySource source = new MockConfigurationPropertySource();
source.put("my.foo.bar", "bing");
source.put("my.foo.baz", "biff");
source.put("hello.bing", "blah");
IterableConfigurationPropertySource prefixed = source.withPrefix("");
assertThat(prefixed.stream()).containsExactly(ConfigurationPropertyName.of("my.foo.bar"),
ConfigurationPropertyName.of("my.foo.baz"), ConfigurationPropertyName.of("hello.bing"));
}
}