Merge pull request #25445 from dreis2211

* gh-25445: Ignore empty prefixes in new PrefixedConfigurationPropertySource Closes gh-25445
spring-projects · Feb 26, 2021 · 33b3753 · 33b3753
2 parents a8592f3 + 4b69456
commit 33b3753
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/...g/springframework/boot/context/properties/source/PrefixedConfigurationPropertySource.java b/...g/springframework/boot/context/properties/source/PrefixedConfigurationPropertySource.java
@@ -47,7 +47,10 @@ public ConfigurationProperty getConfigurationProperty(ConfigurationPropertyName
 	}
 
 	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);
 	}
 

diff --git a/...framework/boot/context/properties/source/PrefixedIterableConfigurationPropertySource.java b/...framework/boot/context/properties/source/PrefixedIterableConfigurationPropertySource.java
@@ -18,6 +18,8 @@
 
 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)) {

diff --git a/...work/boot/context/properties/source/PrefixedIterableConfigurationPropertySourceTests.java b/...work/boot/context/properties/source/PrefixedIterableConfigurationPropertySourceTests.java
@@ -38,4 +38,15 @@ void streamShouldConsiderPrefix() {
 				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"));
+	}
+
 }