Skip to content

Commit

Permalink
Resolve nested placeholders if value is CharSequence
Browse files Browse the repository at this point in the history
  • Loading branch information
quaff committed May 22, 2024
1 parent 33057d3 commit e7fd31a
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
* underlying sources if the name is a value {@link ConfigurationPropertyName}.
*
* @author Phillip Webb
* @author Yanming Zhou
*/
class ConfigurationPropertySourcesPropertyResolver extends AbstractPropertyResolver {

Expand Down Expand Up @@ -76,8 +77,8 @@ private <T> T getProperty(String key, Class<T> targetValueType, boolean resolveN
if (value == null) {
return null;
}
if (resolveNestedPlaceholders && value instanceof String string) {
value = resolveNestedPlaceholders(string);
if (resolveNestedPlaceholders && value instanceof CharSequence cs) {
value = resolveNestedPlaceholders(cs.toString());
}
return convertValueIfNecessary(value, targetValueType);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -33,6 +33,7 @@
* Tests for {@link ConfigurationPropertySourcesPropertyResolver}.
*
* @author Phillip Webb
* @author Yanming Zhou
*/
class ConfigurationPropertySourcesPropertyResolverTests {

Expand Down Expand Up @@ -113,6 +114,40 @@ void getPropertyAsTypeWhenHasPlaceholder() {
assertThat(environment.getProperty("v2", Integer.class)).isOne();
}

@Test // gh-34195
void resolveNestedPlaceholdersIfValueIsCharSequence() {
ResolverEnvironment environment = new ResolverEnvironment();
MockPropertySource propertySource = new MockPropertySource();
propertySource.withProperty("v1", "1");
propertySource.withProperty("v2", new CharSequence() {

static final String underlying = "${v1}";

@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;
}
});
environment.getPropertySources().addFirst(propertySource);
assertThat(environment.getProperty("v2")).isEqualTo("1");
assertThat(environment.getProperty("v2", Integer.class)).isOne();
}

private CountingMockPropertySource createMockPropertySource(StandardEnvironment environment, boolean attach) {
CountingMockPropertySource propertySource = new CountingMockPropertySource();
propertySource.withProperty("spring", "boot");
Expand Down

0 comments on commit e7fd31a

Please sign in to comment.