Skip to content

Commit 5e5e28d

Browse files
committed
renamed RecursionState to TraverserState and replaced stack or queue check
with subclasses
1 parent 2944646 commit 5e5e28d

2 files changed

Lines changed: 52 additions & 44 deletions

File tree

‎src/main/java/graphql/util/Traverser.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@Internal
1616
public class Traverser<T> {
1717

18-
private final RecursionState<T> recursionState;
18+
private final TraverserState<T> traverserState;
1919
private final Function<? super T, ? extends List<T>> getChildren;
2020
private final Map<Class<?>, Object> rootVars = new ConcurrentHashMap<>();
2121

@@ -24,13 +24,13 @@ public class Traverser<T> {
2424
* children nodes from the current root
2525
*
2626
* @param getChildren a function to extract children
27-
* @param recursionState a queue of pended {@link TraverserContext} nodes to visit
27+
* @param traverserState a queue of pended {@link TraverserContext} nodes to visit
2828
* <br>
2929
* * LIFO structure makes the traversal depth-first
3030
* * FIFO structure makes the traversal breadth-first
3131
*/
32-
private Traverser(RecursionState<T> recursionState, Function<? super T, ? extends List<T>> getChildren) {
33-
this.recursionState = assertNotNull(recursionState);
32+
private Traverser(TraverserState<T> traverserState, Function<? super T, ? extends List<T>> getChildren) {
33+
this.traverserState = assertNotNull(traverserState);
3434
this.getChildren = assertNotNull(getChildren);
3535
}
3636

@@ -75,7 +75,7 @@ public static <T> Traverser<T> depthFirst(Function<? super T, ? extends List<T>>
7575
* @return Traverser instance
7676
*/
7777
public static <T> Traverser<T> depthFirst(Function<? super T, ? extends List<T>> getChildren, Object initialData) {
78-
return new Traverser<>(new RecursionState<>(RecursionState.Type.STACK, initialData), getChildren);
78+
return new Traverser<>(TraverserState.newStackState(initialData), getChildren);
7979
}
8080

8181

@@ -93,14 +93,14 @@ public static <T> Traverser<T> breadthFirst(Function<? super T, ? extends List<T
9393
* @return Traverser instance
9494
*/
9595
public static <T> Traverser<T> breadthFirst(Function<? super T, ? extends List<T>> getChildren, Object initialData) {
96-
return new Traverser<>(new RecursionState<>(RecursionState.Type.QUEUE, initialData), getChildren);
96+
return new Traverser<>(TraverserState.newQueueState(initialData), getChildren);
9797
}
9898

9999
/**
100100
* Resets the Traverser to the original state, so it can be re-used
101101
*/
102102
public void reset() {
103-
recursionState.clear();
103+
traverserState.clear();
104104
rootVars.clear();
105105
}
106106

@@ -135,17 +135,17 @@ public <U> Object traverse(Collection<? extends T> roots, TraverserVisitor<? sup
135135
assertNotNull(roots);
136136
assertNotNull(visitor);
137137

138-
recursionState.addNewContexts(roots, recursionState.newContext(null, null, rootVars));
138+
traverserState.addNewContexts(roots, traverserState.newContext(null, null, rootVars));
139139

140140
TraverserContext currentContext = null;
141141
traverseLoop:
142-
while (!recursionState.isEmpty()) {
143-
Object top = recursionState.pop();
142+
while (!traverserState.isEmpty()) {
143+
Object top = traverserState.pop();
144144

145-
if (top == RecursionState.Marker.END_LIST) {
145+
if (top == TraverserState.Marker.END_LIST) {
146146
// end-of-list marker, we are done recursing children,
147147
// mark the current node as fully visited
148-
TraversalControl traversalControl = visitor.leave((TraverserContext) recursionState.pop());
148+
TraversalControl traversalControl = visitor.leave((TraverserContext) traverserState.pop());
149149
assertNotNull(traversalControl, "result of leave must not be null");
150150
switch (traversalControl) {
151151
case QUIT:
@@ -170,7 +170,7 @@ public <U> Object traverse(Collection<? extends T> roots, TraverserVisitor<? sup
170170
case ABORT:
171171
continue;
172172
case CONTINUE:
173-
recursionState.pushAll(currentContext, getChildren);
173+
traverserState.pushAll(currentContext, getChildren);
174174
continue;
175175
default:
176176
assertShouldNeverHappen();

src/main/java/graphql/util/RecursionState.java renamed to src/main/java/graphql/util/TraverserState.java

Lines changed: 39 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,80 @@
11
package graphql.util;
22

3-
import graphql.Assert;
43
import graphql.Internal;
54

65
import java.util.ArrayDeque;
76
import java.util.Collection;
87
import java.util.Deque;
8+
import java.util.Iterator;
99
import java.util.LinkedHashSet;
1010
import java.util.List;
11+
import java.util.ListIterator;
1112
import java.util.Map;
1213
import java.util.Set;
1314
import java.util.concurrent.ConcurrentHashMap;
1415
import java.util.function.Function;
1516

1617
import static graphql.Assert.assertNotNull;
17-
import java.util.Iterator;
18-
import java.util.ListIterator;
1918

2019
@Internal
21-
public class RecursionState<T> {
20+
public abstract class TraverserState<T> {
2221

2322
private Object initialData;
2423

25-
public enum Type {
26-
STACK,
27-
QUEUE
28-
}
2924

3025
private final Deque<Object> state;
3126
private final Set<T> visited = new LinkedHashSet<>();
32-
private final Type type;
3327

3428

29+
private static class StackTraverserState<U> extends TraverserState<U> {
30+
31+
private StackTraverserState(Object initialData) {
32+
super(initialData);
33+
}
34+
35+
public void pushAll(TraverserContext<U> o, Function<? super U, ? extends List<U>> getChildren) {
36+
super.state.push(o);
37+
super.state.push(Marker.END_LIST);
38+
new ReverseIterator<>(getChildren.apply(o.thisNode())).forEachRemaining((e) -> super.state.push(newContext(e, o)));
39+
}
40+
}
41+
42+
private static class QueueTraverserState<U> extends TraverserState<U> {
43+
44+
private QueueTraverserState(Object initialData) {
45+
super(initialData);
46+
}
47+
48+
public void pushAll(TraverserContext<U> o, Function<? super U, ? extends List<U>> getChildren) {
49+
getChildren.apply(o.thisNode()).iterator().forEachRemaining((e) -> super.state.add(newContext(e, o)));
50+
super.state.add(Marker.END_LIST);
51+
super.state.add(o);
52+
}
53+
}
54+
3555
public enum Marker {
3656
END_LIST
3757
}
3858

39-
public RecursionState(Type type, Object initialData) {
59+
private TraverserState(Object initialData) {
4060
this.initialData = initialData;
4161
this.state = new ArrayDeque<>(32);
42-
this.type = assertNotNull(type);
4362
}
4463

64+
public static <U> TraverserState<U> newQueueState(Object initialData) {
65+
return new QueueTraverserState<>(initialData);
66+
}
4567

46-
public Object peek() {
47-
return state.peek();
68+
public static <U> TraverserState<U> newStackState(Object initialData) {
69+
return new StackTraverserState<>(initialData);
4870
}
4971

72+
public abstract void pushAll(TraverserContext<T> o, Function<? super T, ? extends List<T>> getChildren);
5073

5174
public Object pop() {
5275
return this.state.pop();
5376
}
5477

55-
public void pushAll(TraverserContext<T> o, Function<? super T, ? extends List<T>> getChildren) {
56-
if (type == Type.QUEUE) {
57-
getChildren.apply(o.thisNode()).iterator().forEachRemaining((e) -> this.state.add(newContext(e, o)));
58-
this.state.add(Marker.END_LIST);
59-
this.state.add(o);
60-
} else if (type == Type.STACK) {
61-
this.state.push(o);
62-
this.state.push(Marker.END_LIST);
63-
new ReverseIterator<>(getChildren.apply(o.thisNode())).forEachRemaining((e) -> this.state.push(newContext(e, o)));
64-
} else {
65-
Assert.assertShouldNeverHappen();
66-
}
67-
68-
}
69-
7078

7179
public void addNewContexts(Collection<? extends T> children, TraverserContext<T> root) {
7280
assertNotNull(children).stream().map((x) -> newContext(x, root)).forEach(this.state::add);
@@ -149,12 +157,12 @@ public Object getInitialData() {
149157
private static class ReverseIterator<T> implements Iterator<T> {
150158
private final ListIterator<T> delegate;
151159

152-
private ReverseIterator (List<T> list) {
160+
private ReverseIterator(List<T> list) {
153161
assertNotNull(list);
154-
162+
155163
this.delegate = list.listIterator(list.size());
156164
}
157-
165+
158166
@Override
159167
public boolean hasNext() {
160168
return delegate.hasPrevious();

0 commit comments

Comments
 (0)