diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java index 891e1bb937..4a8ac6351a 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java @@ -245,13 +245,7 @@ public abstract class YamlProcessor { if (value instanceof Map) { value = asMap(value); } - if (key instanceof CharSequence) { - result.put(key.toString(), value); - } - else { - // It has to be a map key in this case - result.put("[" + key.toString() + "]", value); - } + result.put(key.toString(), value); }); return result; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java index 1f9dcc7709..9a54593489 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlMapFactoryBeanTests.java @@ -128,4 +128,18 @@ class YamlMapFactoryBeanTests { this.factory.getObject().get("mymap")); } + @Test + void testMapWithIntegerKey() { + this.factory.setResources(new ByteArrayResource("foo:\n 1: bar".getBytes())); + Map map = this.factory.getObject(); + + assertThat(map).hasSize(1); + assertThat(map.containsKey("foo")).isTrue(); + Object object = map.get("foo"); + assertThat(object).isInstanceOf(LinkedHashMap.class); + @SuppressWarnings("unchecked") + Map sub = (Map) object; + assertThat(sub.containsKey("1")).isTrue(); + assertThat(sub.get("1")).isEqualTo("bar"); + } } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java index 7a039b1142..e1fd98831e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlProcessorTests.java @@ -99,7 +99,7 @@ class YamlProcessorTests { void integerKeyBehaves() { setYaml("foo: bar\n1: bar"); this.processor.process((properties, map) -> { - assertThat(properties.get("[1]")).isEqualTo("bar"); + assertThat(properties.get("1")).isEqualTo("bar"); assertThat(properties).hasSize(2); }); } @@ -108,7 +108,7 @@ class YamlProcessorTests { void integerDeepKeyBehaves() { setYaml("foo:\n 1: bar"); this.processor.process((properties, map) -> { - assertThat(properties.get("foo[1]")).isEqualTo("bar"); + assertThat(properties.get("foo.1")).isEqualTo("bar"); assertThat(properties).hasSize(1); }); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBeanTests.java index 8e9d5b19be..0331fc2ea8 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/YamlPropertiesFactoryBeanTests.java @@ -180,7 +180,8 @@ class YamlPropertiesFactoryBeanTests { new ByteArrayResource("indexed2:\n - \"[a]\": foo\n \"[b]\": bar".getBytes()), new ByteArrayResource("only-left-bracket:\n \"[/key1/\": foo".getBytes()), new ByteArrayResource("only-right-bracket:\n \"/key1/]\": foo".getBytes()), - new ByteArrayResource("special-bracket:\n \"][/key1/][\": foo".getBytes())); + new ByteArrayResource("special-bracket:\n \"][/key1/][\": foo".getBytes()), + new ByteArrayResource("number-key:\n 1: foo".getBytes())); Properties properties = factory.getObject(); assertThat(properties.getProperty("root.webservices[[domain.test:8080]][0].username")).isEqualTo("foo"); @@ -195,6 +196,8 @@ class YamlPropertiesFactoryBeanTests { assertThat(properties.getProperty("only-left-bracket[[/key1/]")).isEqualTo("foo"); assertThat(properties.getProperty("only-right-bracket[/key1/]]")).isEqualTo("foo"); assertThat(properties.getProperty("special-bracket.][/key1/][")).isEqualTo("foo"); + + assertThat(properties.getProperty("number-key.1")).isEqualTo("foo"); }