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

Polish "Resolved nested placeholder for CharSequence"

Browse Source 
See gh-32876
This commit is contained in:
Stéphane Nicoll
2024-07-22 14:53:19 +02:00
parent 5331499393
commit b6fbbeccdc
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -84,8 +84,10 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
} }
Object value = propertySource.getProperty(key); Object value = propertySource.getProperty(key);
if (value != null) { if (value != null) {
if (resolveNestedPlaceholders && value instanceof String string) { if (resolveNestedPlaceholders &&
value = resolveNestedPlaceholders(string); (String.class.equals(targetValueType) || CharSequence.class.equals(targetValueType)) &&
value instanceof CharSequence cs) {
value = resolveNestedPlaceholders(cs.toString());
} }
logKeyFound(key, propertySource, value); logKeyFound(key, propertySource, value);
return convertValueIfNecessary(value, targetValueType); return convertValueIfNecessary(value, targetValueType);

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

@@ -300,6 +300,31 @@ class PropertySourcesPropertyResolverTests {
.withMessageContaining("Circular"); .withMessageContaining("Circular");
} }
@Test
void resolveNestedPlaceholdersIfValueIsCharSequence() {
MutablePropertySources ps = new MutablePropertySources();
ps.addFirst(new MockPropertySource()
.withProperty("p1", "v1")
.withProperty("p2", "v2")
.withProperty("p3", new StringBuilder("${p1}:${p2}")));
ConfigurablePropertyResolver pr = new PropertySourcesPropertyResolver(ps);
assertThat(pr.getProperty("p1")).isEqualTo("v1");
assertThat(pr.getProperty("p2")).isEqualTo("v2");
assertThat(pr.getProperty("p3")).isEqualTo("v1:v2");
}
@Test
void resolveNestedPlaceholdersIfValueIsCharSequenceAndStringBuilderIsRequested() {
MutablePropertySources ps = new MutablePropertySources();
ps.addFirst(new MockPropertySource()
.withProperty("p1", "v1")
.withProperty("p2", "v2")
.withProperty("p3", new StringBuilder("${p1}:${p2}")));
ConfigurablePropertyResolver pr = new PropertySourcesPropertyResolver(ps);
assertThat(pr.getProperty("p3", StringBuilder.class)).isInstanceOf(StringBuilder.class)
.hasToString("${p1}:${p2}");
}
@Test @Test
void ignoreUnresolvableNestedPlaceholdersIsConfigurable() { void ignoreUnresolvableNestedPlaceholdersIsConfigurable() {
MutablePropertySources ps = new MutablePropertySources(); MutablePropertySources ps = new MutablePropertySources();