1515@ Internal
1616public 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 ();
0 commit comments