Skip to content

Commit 517f2df

Browse files
authored
Batch refactoring/async (#631)
This refactors the batch execution strategy and adds async (CompletableFuture) support.
1 parent 031f4db commit 517f2df

12 files changed

Lines changed: 341 additions & 414 deletions

‎src/main/java/graphql/execution/batched/BatchedExecutionStrategy.java‎

Lines changed: 180 additions & 127 deletions
Large diffs are not rendered by default.

‎src/main/java/graphql/execution/batched/ChildDataCollector.java‎

Lines changed: 0 additions & 66 deletions
This file was deleted.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
package graphql.execution.batched;
2+
3+
import graphql.language.Field;
4+
import graphql.schema.GraphQLObjectType;
5+
6+
import java.util.List;
7+
import java.util.Map;
8+
9+
class ExecutionNode {
10+
11+
private final GraphQLObjectType type;
12+
private final Map<String, List<Field>> fields;
13+
private final List<MapOrList> parentResults;
14+
private final List<Object> sources;
15+
16+
public ExecutionNode(GraphQLObjectType type,
17+
Map<String, List<Field>> fields,
18+
List<MapOrList> parentResults,
19+
List<Object> sources) {
20+
this.type = type;
21+
this.fields = fields;
22+
this.parentResults = parentResults;
23+
this.sources = sources;
24+
}
25+
26+
public GraphQLObjectType getType() {
27+
return type;
28+
}
29+
30+
public Map<String, List<Field>> getFields() {
31+
return fields;
32+
}
33+
34+
public List<MapOrList> getParentResults() {
35+
return parentResults;
36+
}
37+
38+
public List<Object> getSources() {
39+
return sources;
40+
}
41+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package graphql.execution.batched;
2+
3+
public class FetchedValue {
4+
5+
private final MapOrList mapOrList;
6+
private final Object value;
7+
8+
public FetchedValue(MapOrList parentResult, Object value) {
9+
this.mapOrList = parentResult;
10+
this.value = value;
11+
}
12+
13+
public MapOrList getParentResult() {
14+
return mapOrList;
15+
}
16+
17+
public Object getValue() {
18+
return value;
19+
}
20+
}

‎src/main/java/graphql/execution/batched/GraphQLExecutionNode.java‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎src/main/java/graphql/execution/batched/GraphQLExecutionNodeDatum.java‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎src/main/java/graphql/execution/batched/GraphQLExecutionNodeValue.java‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/main/java/graphql/execution/batched/GraphQLExecutionResultContainer.java‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎src/main/java/graphql/execution/batched/GraphQLExecutionResultList.java‎

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
package graphql.execution.batched;
2+
3+
import graphql.Internal;
4+
5+
import java.util.ArrayList;
6+
import java.util.LinkedHashMap;
7+
import java.util.List;
8+
import java.util.Map;
9+
10+
@Internal
11+
public class MapOrList {
12+
13+
14+
private Map<String, Object> map;
15+
private List<Object> list;
16+
17+
public static MapOrList createList(List<Object> list) {
18+
MapOrList mapOrList = new MapOrList();
19+
mapOrList.list = list;
20+
return mapOrList;
21+
}
22+
23+
public static MapOrList createMap(Map<String, Object> map) {
24+
MapOrList mapOrList = new MapOrList();
25+
mapOrList.map = map;
26+
return mapOrList;
27+
}
28+
29+
public MapOrList createAndPutMap(String key) {
30+
Map<String, Object> map = new LinkedHashMap<>();
31+
putOrAdd(key, map);
32+
return createMap(map);
33+
}
34+
35+
public MapOrList createAndPutList(String key) {
36+
List<Object> resultList = new ArrayList<>();
37+
putOrAdd(key, resultList);
38+
return createList(resultList);
39+
}
40+
41+
public void putOrAdd(String fieldName, Object value) {
42+
if (this.map != null) {
43+
this.map.put(fieldName, value);
44+
} else {
45+
this.list.add(value);
46+
}
47+
}
48+
49+
50+
public Object toObject() {
51+
if (this.map != null) {
52+
return this.map;
53+
} else {
54+
return this.list;
55+
}
56+
}
57+
}

0 commit comments

Comments
 (0)