Hacking

Author: mbhave

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java

@@ -86,7 +86,17 @@ public Iterator<ConfigurationPropertyName> iterator() {
 
 	@Override
 	public ConfigurationPropertyState containsDescendantOf(ConfigurationPropertyName name) {
-		return ConfigurationPropertyState.search(this, name::isAncestorOf);
+		return ConfigurationPropertyState.search(this, (propertyName) -> {
+			boolean ancestorOf = name.isAncestorOf(propertyName);
+			if (ancestorOf || !shouldTryLegacyName(name.toString())) {
+				return ancestorOf;
+			}
+			return ConfigurationPropertyName.of(name.toString().replace('-', '.')).isAncestorOf(propertyName);
+		});
+	}
+
+	private boolean shouldTryLegacyName(String name) {
+		return this.getPropertySource() instanceof SystemEnvironmentPropertySource && name.contains("-");
 	}
 
 	private List<ConfigurationPropertyName> getConfigurationPropertyNames() {

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySourceTests.java

@@ -31,6 +31,8 @@
 import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.PropertySource;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.core.env.SystemEnvironmentPropertySource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -154,6 +156,23 @@ void containsDescendantOfShouldCheckSourceNames() {
 				.isEqualTo(ConfigurationPropertyState.ABSENT);
 	}
 
+	@Test
+	void containsDescendantOfWhenSystemEnvironmentPropertySourceShouldLegacyProperty() {
+		Map<String, Object> source = new LinkedHashMap<>();
+		source.put("FOO_BAR_BAZ_BONG", "bing");
+		source.put("FOO_ALPHABRAVO_GAMMA", "delta");
+		SystemEnvironmentPropertySource propertySource = new SystemEnvironmentPropertySource(
+				StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME, source);
+		SpringIterableConfigurationPropertySource adapter = new SpringIterableConfigurationPropertySource(
+				propertySource, SystemEnvironmentPropertyMapper.INSTANCE);
+		assertThat(adapter.containsDescendantOf(ConfigurationPropertyName.of("foo.bar-baz")))
+				.isEqualTo(ConfigurationPropertyState.PRESENT);
+		assertThat(adapter.containsDescendantOf(ConfigurationPropertyName.of("foo.alpha-bravo")))
+				.isEqualTo(ConfigurationPropertyState.PRESENT);
+		assertThat(adapter.containsDescendantOf(ConfigurationPropertyName.of("foo.blah")))
+				.isEqualTo(ConfigurationPropertyState.ABSENT);
+	}
+
 	@Test
 	void simpleMapPropertySourceKeyDataChangeInvalidatesCache() {
 		// gh-13344