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

Restore nested property resolution for non CharSequence types

Browse Source 
Closes gh-33727

Co-authored-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
This commit is contained in:
Stéphane Nicoll
2024-10-17 10:22:08 +02:00
parent cbdfe815aa
commit bdf76b2f8d
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java vendored
View File

@@ -84,10 +84,14 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
}
Object value = propertySource.getProperty(key);
if (value != null) {
if (resolveNestedPlaceholders &&
(String.class.equals(targetValueType) || CharSequence.class.equals(targetValueType)) &&
value instanceof CharSequence cs) {
value = resolveNestedPlaceholders(cs.toString());
if (resolveNestedPlaceholders) {
if (value instanceof String string) {
value = resolveNestedPlaceholders(string);
}
else if ((value instanceof CharSequence cs) && (String.class.equals(targetValueType) ||
CharSequence.class.equals(targetValueType))) {
value = resolveNestedPlaceholders(cs.toString());
}
}
logKeyFound(key, propertySource, value);
return convertValueIfNecessary(value, targetValueType);

8
spring-core/src/test/java/org/springframework/core/env/PropertySourcesPropertyResolverTests.java vendored
View File

@@ -325,6 +325,14 @@ class PropertySourcesPropertyResolverTests {
.hasToString("${p1}:${p2}");
}
@Test // gh-33727
void resolveNestedPlaceHolderIfValueShouldConvertToOtherTypes() {
MutablePropertySources ps = new MutablePropertySources();
ps.addFirst(new MockPropertySource().withProperty("new.enabled", "${old.enabled:true}"));
ConfigurablePropertyResolver pr = new PropertySourcesPropertyResolver(ps);
assertThat(pr.getProperty("new.enabled", Boolean.class, false)).isTrue();
}
@Test
void ignoreUnresolvableNestedPlaceholdersIsConfigurable() {
MutablePropertySources ps = new MutablePropertySources();