Skip to content

Preserve bracketed YAML map keys #37032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Develop-KIM wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −1
Open

Preserve bracketed YAML map keys #37032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,8 @@ private Map<String, Object> asMap(Object object) {
value = asMap(value);
}
if (key instanceof CharSequence) {
result.put(key.toString(), value);
String keyString = key.toString();
result.put((keyString.startsWith("[") ? "[" + keyString + "]" : keyString), value);
}
else {
// It has to be a map key in this case
Expand Down
15 changes: 15 additions & 0 deletions ...rc/test/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBeanTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,21 @@ void loadArrayOfObject() {
assertThat(properties.get("foo")).isNull();
}

@Test
void loadNestedMapWithBracketedKey() {
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
factory.setResources(new ByteArrayResource("""
root:
webservices:
"[domain.test:8080]":
- username: me
password: mypassword
""".getBytes()));
Properties properties = factory.getObject();
assertThat(properties.getProperty("root.webservices[[domain.test:8080]][0].username")).isEqualTo("me");
assertThat(properties.getProperty("root.webservices[[domain.test:8080]][0].password")).isEqualTo("mypassword");
}

@Test
@SuppressWarnings("unchecked")
void yaml() {
Expand Down