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

Minor refactoring

Browse Source 
Avoid creating a map for a nested list.

See gh-280
This commit is contained in:
rstoyanchev
2022-03-22 14:21:09 +00:00
parent fc1e05bbf0
commit 0e2c5be01b
1 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
spring-graphql/src/main/java/org/springframework/graphql/data/GraphQlArgumentBinder.java
View File

@@ -19,7 +19,6 @@ package org.springframework.graphql.data;
import java.lang.reflect.Constructor;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -222,14 +221,11 @@ public class GraphQlArgumentBinder {
// Default constructor with data binding
if (ctor.getParameterCount() == 0) {
MutablePropertyValues mpvs = new MutablePropertyValues();
visitArgumentMap(rawMap, mpvs, new Stack<>());
target = BeanUtils.instantiateClass(ctor);
DataBinder dataBinder = new DataBinder(target);
dataBinder.getBindingResult().setNestedPath(toArgumentPath(segments));
dataBinder.setConversionService(getConversionService());
dataBinder.bind(mpvs);
dataBinder.bind(initBindValues(rawMap));
if (dataBinder.getBindingResult().hasErrors()) {
addErrors(dataBinder, bindingResult, segments);
@@ -284,36 +280,43 @@ public class GraphQlArgumentBinder {
}
}
@SuppressWarnings("unchecked")
private void visitArgumentMap(Map<String, Object> rawMap, MutablePropertyValues mpvs, Stack<String> segments) {
private MutablePropertyValues initBindValues(Map<String, Object> rawMap) {
MutablePropertyValues mpvs = new MutablePropertyValues();
Stack<String> segments = new Stack<>();
for (String key : rawMap.keySet()) {
Object rawValue = rawMap.get(key);
if (rawValue instanceof List) {
List<Object> items = (List<Object>) rawValue;
if (items.isEmpty()) {
segments.push(key);
mpvs.add(toArgumentPath(segments), rawValue);
segments.pop();
}
else {
Map<String, Object> subValues = new HashMap<>(items.size());
for (int i = 0; i < items.size(); i++) {
subValues.put(key + "[" + i + "]", items.get(i));
}
visitArgumentMap(subValues, mpvs, segments);
}
}
else if (rawValue instanceof Map) {
segments.push(key + ".");
visitArgumentMap((Map<String, Object>) rawValue, mpvs, segments);
addBindValues(mpvs, key, rawMap.get(key), segments);
}
return mpvs;
}
@SuppressWarnings("unchecked")
private void addBindValues(MutablePropertyValues mpvs, String name, Object value, Stack<String> segments) {
if (value instanceof List) {
List<Object> items = (List<Object>) value;
if (items.isEmpty()) {
segments.push(name);
mpvs.add(toArgumentPath(segments), value);
segments.pop();
}
else {
segments.push(key);
mpvs.add(toArgumentPath(segments), rawValue);
segments.pop();
for (int i = 0; i < items.size(); i++) {
addBindValues(mpvs, name + "[" + i + "]", items.get(i), segments);
}
}
}
else if (value instanceof Map) {
segments.push(name + ".");
Map<String, Object> map = (Map<String, Object>) value;
for (String key : map.keySet()) {
addBindValues(mpvs, key, map.get(key), segments);
}
segments.pop();
}
else {
segments.push(name);
mpvs.add(toArgumentPath(segments), value);
segments.pop();
}
}
private String toArgumentPath(Stack<String> path) {