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

Merge branch '6.2.x'

Browse Source
This commit is contained in:
rstoyanchev
2025-02-11 11:18:23 +00:00
parent 85855ec793 d04883f839
commit bae12e739d
4 changed files with 116 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
spring-context/src/test/java/org/springframework/validation/DataBinderConstructTests.java
View File

@@ -188,6 +188,17 @@ class DataBinderConstructTests {
assertThat(target.integerList()).containsExactly(1, 2);
}
@Test
void simpleListBindingEmptyBrackets() {
MapValueResolver valueResolver = new MapValueResolver(Map.of("integerList[]", "1"));
DataBinder binder = initDataBinder(IntegerListRecord.class);
binder.construct(valueResolver);
IntegerListRecord target = getTarget(binder);
assertThat(target.integerList()).containsExactly(1);
}
@Test
void simpleMapBinding() {
MapValueResolver valueResolver = new MapValueResolver(Map.of("integerMap[a]", "1", "integerMap[b]", "2"));
@@ -210,6 +221,34 @@ class DataBinderConstructTests {
assertThat(target.integerArray()).containsExactly(1, 2);
}
@Test
void nestedListWithinMap() {
MapValueResolver valueResolver = new MapValueResolver(Map.of(
"integerListMap[a][0]", "1", "integerListMap[a][1]", "2",
"integerListMap[b][0]", "3", "integerListMap[b][1]", "4"));
DataBinder binder = initDataBinder(IntegerListMapRecord.class);
binder.construct(valueResolver);
IntegerListMapRecord target = getTarget(binder);
assertThat(target.integerListMap().get("a")).containsExactly(1, 2);
assertThat(target.integerListMap().get("b")).containsExactly(3, 4);
}
@Test
void nestedMapWithinList() {
MapValueResolver valueResolver = new MapValueResolver(Map.of(
"integerMapList[0][a]", "1", "integerMapList[0][b]", "2",
"integerMapList[1][a]", "3", "integerMapList[1][b]", "4"));
DataBinder binder = initDataBinder(IntegerMapListRecord.class);
binder.construct(valueResolver);
IntegerMapListRecord target = getTarget(binder);
assertThat(target.integerMapList().get(0)).containsOnly(Map.entry("a", 1), Map.entry("b", 2));
assertThat(target.integerMapList().get(1)).containsOnly(Map.entry("a", 3), Map.entry("b", 4));
}
@SuppressWarnings("SameParameterValue")
private static DataBinder initDataBinder(Class<?> targetType) {
@@ -304,6 +343,14 @@ class DataBinderConstructTests {
}
private record IntegerMapListRecord(List<Map<String, Integer>> integerMapList) {
}
private record IntegerListMapRecord(Map<String, List<Integer>> integerListMap) {
}
private record MapValueResolver(Map<String, Object> map) implements DataBinder.ValueResolver {
@Override