root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polish "Extend nested placeholders resolution to any CharSequence" 

See gh-32876
This commit is contained in:
Stéphane Nicoll 2024-05-23 08:36:34 +02:00
parent 5a7bfa9dec
commit 79b5ee75d3
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,6 @@ import org.springframework.lang.Nullable;
*
* @author Chris Beams
* @author Juergen Hoeller
* @author Yanming Zhou
* @since 3.1
* @see PropertySource
* @see PropertySources

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

@ -34,7 +34,6 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
/**
* @author Chris Beams
* @author Yanming Zhou
* @since 3.1
*/
class PropertySourcesPropertyResolverTests {
@ -307,31 +306,7 @@ class PropertySourcesPropertyResolverTests {
ps.addFirst(new MockPropertySource()
.withProperty("p1", "v1")
.withProperty("p2", "v2")
.withProperty("p3", new CharSequence() {
static final String underlying = "${p1}:${p2}";
@Override
public int length() {
return underlying.length();
}
@Override
public char charAt(int index) {
return underlying.charAt(index);
}
@Override
public CharSequence subSequence(int start, int end) {
return underlying.subSequence(start, end);
}
@Override
public String toString() {
return underlying;
}
})
);
.withProperty("p3", new StringBuilder("${p1}:${p2}")));
ConfigurablePropertyResolver pr = new PropertySourcesPropertyResolver(ps);
assertThat(pr.getProperty("p1")).isEqualTo("v1");
assertThat(pr.getProperty("p2")).isEqualTo("v2");