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

Fix SystemEnvironmentPropertyMapper tests and remove duplicate names

Browse Source 
See gh-45741
This commit is contained in:
Phillip Webb
2025-06-09 17:53:48 -07:00
parent bb13eaa837
commit 4301186a95
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
There Normal file
View File

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

@@ -16,6 +16,7 @@
package org.springframework.boot.context.properties.source; package org.springframework.boot.context.properties.source;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.function.BiPredicate; import java.util.function.BiPredicate;
@@ -40,10 +41,18 @@ final class SystemEnvironmentPropertyMapper implements PropertyMapper {
@Override @Override
public List<String> map(ConfigurationPropertyName configurationPropertyName) { public List<String> map(ConfigurationPropertyName configurationPropertyName) {
return List.of(configurationPropertyName.toString(ToStringFormat.SYSTEM_ENVIRONMENT, true), List<String> mapped = new ArrayList<>(4);
configurationPropertyName.toString(ToStringFormat.LEGACY_SYSTEM_ENVIRONMENT, true), addIfMissing(mapped, configurationPropertyName.toString(ToStringFormat.SYSTEM_ENVIRONMENT, true));
configurationPropertyName.toString(ToStringFormat.SYSTEM_ENVIRONMENT, false), addIfMissing(mapped, configurationPropertyName.toString(ToStringFormat.LEGACY_SYSTEM_ENVIRONMENT, true));
configurationPropertyName.toString(ToStringFormat.LEGACY_SYSTEM_ENVIRONMENT, false)); addIfMissing(mapped, configurationPropertyName.toString(ToStringFormat.SYSTEM_ENVIRONMENT, false));
addIfMissing(mapped, configurationPropertyName.toString(ToStringFormat.LEGACY_SYSTEM_ENVIRONMENT, false));
return mapped;
}
private void addIfMissing(List<String> list, String value) {
if (!list.contains(value)) {
list.add(value);
}
} }
@Override @Override

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

@@ -48,13 +48,14 @@ class SystemEnvironmentPropertyMapperTests extends AbstractPropertyMapperTests {
@Test @Test
void mapFromConfigurationShouldReturnBestGuess() { void mapFromConfigurationShouldReturnBestGuess() {
assertThat(mapConfigurationPropertyName("server")).containsExactly("SERVER"); assertThat(mapConfigurationPropertyName("server")).containsExactly("SERVER", "server");
assertThat(mapConfigurationPropertyName("server.port")).containsExactly("SERVER_PORT"); assertThat(mapConfigurationPropertyName("server.port")).containsExactly("SERVER_PORT", "server_port");
assertThat(mapConfigurationPropertyName("host[0]")).containsExactly("HOST_0"); assertThat(mapConfigurationPropertyName("host[0]")).containsExactly("HOST_0", "host_0");
assertThat(mapConfigurationPropertyName("host[0][1]")).containsExactly("HOST_0_1"); assertThat(mapConfigurationPropertyName("host[0][1]")).containsExactly("HOST_0_1", "host_0_1");
assertThat(mapConfigurationPropertyName("host[0].name")).containsExactly("HOST_0_NAME"); assertThat(mapConfigurationPropertyName("host[0].name")).containsExactly("HOST_0_NAME", "host_0_name");
assertThat(mapConfigurationPropertyName("host.f00.name")).containsExactly("HOST_F00_NAME"); assertThat(mapConfigurationPropertyName("host.f00.name")).containsExactly("HOST_F00_NAME", "host_f00_name");
assertThat(mapConfigurationPropertyName("foo.the-bar")).containsExactly("FOO_THEBAR", "FOO_THE_BAR"); assertThat(mapConfigurationPropertyName("foo.the-bar")).containsExactly("FOO_THEBAR", "FOO_THE_BAR",
"foo_thebar", "foo_the_bar");
} }
@Test @Test