Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1122,6 +1122,9 @@ private boolean hasValuesFor(String paramPath, ValueResolver resolver) {

int startIdx = paramPath.length() + 1;
int endIdx = name.indexOf(']', startIdx);
if (endIdx == -1) {
continue;
}
boolean quoted = (endIdx - startIdx > 2 && name.charAt(startIdx) == '\'' && name.charAt(endIdx - 1) == '\'');
String key = (quoted ? name.substring(startIdx + 1, endIdx - 1) : name.substring(startIdx, endIdx));

Expand Down Expand Up @@ -1183,8 +1186,16 @@ else if (map.containsKey(key)) {
}
else {
int endIndex = name.indexOf(']', paramPath.length() + 2);
if (endIndex == -1) {
continue;
}
String indexValue = name.substring(paramPath.length() + 1, endIndex);
index = Integer.parseInt(indexValue);
try {
index = Integer.parseInt(indexValue);
}
catch (NumberFormatException ex) {
continue;
}
}
indexes = (indexes != null ? indexes : new TreeSet<>());
indexes.add(index);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,40 @@ void simpleListBindingEmptyBrackets() {
assertThat(target.integerList()).containsExactly(1);
}

@Test
void simpleListBindingIgnoresUnclosedIndex() {
MapValueResolver valueResolver = new MapValueResolver(Map.of("integerList[0]", "1", "integerList[35", "2"));

DataBinder binder = initDataBinder(IntegerListRecord.class);
binder.construct(valueResolver);

IntegerListRecord target = getTarget(binder);
assertThat(target.integerList()).containsExactly(1);
}

@Test
void simpleListBindingIgnoresNonNumericOrOutOfRangeIndex() {
MapValueResolver valueResolver = new MapValueResolver(Map.of(
"integerList[0]", "1", "integerList[abc]", "2", "integerList[99999999999]", "3"));

DataBinder binder = initDataBinder(IntegerListRecord.class);
binder.construct(valueResolver);

IntegerListRecord target = getTarget(binder);
assertThat(target.integerList()).containsExactly(1);
}

@Test
void simpleMapBindingIgnoresUnclosedKey() {
MapValueResolver valueResolver = new MapValueResolver(Map.of("integerMap[a]", "1", "integerMap[b", "2"));

DataBinder binder = initDataBinder(IntegerMapRecord.class);
binder.construct(valueResolver);

IntegerMapRecord target = getTarget(binder);
assertThat(target.integerMap()).hasSize(1).containsEntry("a", 1);
}

@Test
void simpleMapBinding() {
MapValueResolver valueResolver = new MapValueResolver(Map.of("integerMap[a]", "1", "integerMap[b]", "2"));
Expand Down