This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch gvalue in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit e1b8059d02af503f97172774a39601fd86530ddd Author: Stephen Mallette <[email protected]> AuthorDate: Fri Nov 15 09:45:19 2024 -0500 Fixes after rebase --- .../traversal/dsl/graph/GraphTraversal.java | 58 +++++++++++----------- .../traversal/dsl/graph/GraphTraversalSource.java | 8 +-- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java index a780f742a3..ab5af2445b 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java @@ -373,7 +373,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 4.0.0 */ public default <E2> GraphTraversal<S, E2> constant(final GValue<E2> e) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.constant, e); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.constant, e); return this.asAdmin().addStep(new ConstantStep<E, E2>(this.asAdmin(), e)); } @@ -432,7 +432,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 4.0.0 */ public default GraphTraversal<S, Vertex> to(final Direction direction, final GValue<String> edgeLabel, final GValue<String>... edgeLabels) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.to, direction, edgeLabel, edgeLabels); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.to, direction, edgeLabel, edgeLabels); final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, edgeLabel, GValue.class); return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, direction, labels)); } @@ -461,7 +461,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { */ public default GraphTraversal<S, Vertex> out(final GValue<String> label, final GValue<String>... edgeLabels) { final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class); - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.out, label, edgeLabels); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.out, label, edgeLabels); return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.OUT, labels)); } @@ -489,7 +489,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { */ public default GraphTraversal<S, Vertex> in(final GValue<String> label, final GValue<String>... edgeLabels) { final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class); - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.in, label, edgeLabels); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.in, label, edgeLabels); return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.IN, labels)); } @@ -517,7 +517,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { */ public default GraphTraversal<S, Vertex> both(final GValue<String> label, final GValue<String>... edgeLabels) { final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class); - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.both, label, edgeLabels); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.both, label, edgeLabels); return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, Direction.BOTH, labels)); } @@ -547,7 +547,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 4.0.0 */ public default GraphTraversal<S, Edge> toE(final Direction direction, final GValue<String> edgeLabel, final GValue<String>... edgeLabels) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.toE, direction, edgeLabel, edgeLabels); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.toE, direction, edgeLabel, edgeLabels); final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, edgeLabel, GValue.class); return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, direction, labels)); } @@ -576,7 +576,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { */ public default GraphTraversal<S, Edge> outE(final GValue<String> label, final GValue<String>... edgeLabels) { final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class); - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.outE, label, edgeLabels); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.outE, label, edgeLabels); return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.OUT, labels)); } @@ -604,7 +604,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { */ public default GraphTraversal<S, Edge> inE(final GValue<String> label, final GValue<String>... edgeLabels) { final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class); - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.inE, label, edgeLabels); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.inE, label, edgeLabels); return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.IN, labels)); } @@ -633,7 +633,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { */ public default GraphTraversal<S, Edge> bothE(final GValue<String> label, final GValue<String>... edgeLabels) { final GValue<String>[] labels = CollectionUtil.addFirst(edgeLabels, label, GValue.class); - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.bothE, label, edgeLabels); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.bothE, label, edgeLabels); return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, Direction.BOTH, labels)); } @@ -1276,7 +1276,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { */ public default GraphTraversal<S, Vertex> addV(final GValue<String> vertexLabel) { if (null == vertexLabel || null == vertexLabel.get()) throw new IllegalArgumentException("vertexLabel cannot be null"); - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.addV, vertexLabel); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.addV, vertexLabel); return this.asAdmin().addStep(new AddVertexStep<>(this.asAdmin(), vertexLabel)); } @@ -1348,7 +1348,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 4.0.0 */ public default GraphTraversal<S, Vertex> mergeV(final GValue<Map<Object, Object>> searchCreate) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.mergeV, searchCreate); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.mergeV, searchCreate); final MergeVertexStep<S> step = new MergeVertexStep(this.asAdmin(), false, null == searchCreate ? GValue.ofMap(null) : searchCreate); return this.asAdmin().addStep(step); } @@ -1403,7 +1403,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { */ public default GraphTraversal<S, Edge> mergeE(final GValue<Map<Object, Object>> searchCreate) { // get a construction time exception if the Map is bad - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.mergeE, searchCreate); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.mergeE, searchCreate); final MergeEdgeStep<S> step = new MergeEdgeStep(this.asAdmin(), false, null == searchCreate ? GValue.ofMap(null) : searchCreate); return this.asAdmin().addStep(step); } @@ -1442,7 +1442,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 4.0.0 */ public default GraphTraversal<S, Edge> addE(final GValue<String> edgeLabel) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.addE, edgeLabel); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.addE, edgeLabel); return this.asAdmin().addStep(new AddEdgeStep<>(this.asAdmin(), edgeLabel)); } @@ -1539,7 +1539,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { throw new IllegalArgumentException(String.format( "The to() step cannot follow %s", prev.getClass().getSimpleName())); - this.asAdmin().getBytecode().addStep(Symbols.to, toStepLabel); + this.asAdmin().getGremlinLang().addStep(Symbols.to, toStepLabel); ((FromToModulating) prev).addTo(toStepLabel); return this; } @@ -1667,7 +1667,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 4.0.0 */ default <E> GraphTraversal<S, E> call(final String service, final GValue<Map> params) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.call, service, params); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.call, service, params); final CallStep<S,E> call = new CallStep<>(this.asAdmin(), false, service, params); return this.asAdmin().addStep(call); } @@ -1720,7 +1720,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 4.0.0 */ default <E> GraphTraversal<S, E> call(final String service, final GValue<Map> params, final Traversal<?, Map<?,?>> childTraversal) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.call, service, params, childTraversal); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.call, service, params, childTraversal); final CallStep<S,E> step = null == childTraversal ? new CallStep(this.asAdmin(), false, service, params) : new CallStep(this.asAdmin(), false, service, params, childTraversal.asAdmin()); return this.asAdmin().addStep(step); @@ -2183,7 +2183,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 4.0.0 */ public default GraphTraversal<S, Set<?>> difference(final GValue<Object> values) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.difference, values); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.difference, values); return this.asAdmin().addStep(new DifferenceStep<>(this.asAdmin(), values)); } @@ -2207,7 +2207,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 4.0.0 */ public default GraphTraversal<S, Set<?>> disjunct(final GValue<Object> values) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.disjunct, values); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.disjunct, values); return this.asAdmin().addStep(new DisjunctStep<>(this.asAdmin(), values)); } @@ -2231,7 +2231,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 4.0.0 */ public default GraphTraversal<S, Set<?>> intersect(final GValue<Object> values) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.intersect, values); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.intersect, values); return this.asAdmin().addStep(new IntersectStep<>(this.asAdmin(), values)); } @@ -2255,7 +2255,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 4.0.0 */ public default GraphTraversal<S, String> conjoin(final GValue<String> delimiter) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.conjoin, delimiter); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.conjoin, delimiter); return this.asAdmin().addStep(new ConjoinStep<>(this.asAdmin(), delimiter)); } @@ -2279,7 +2279,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 4.0.0 */ public default <E2> GraphTraversal<S, E2> merge(final GValue<Object> values) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.merge, values); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.merge, values); return this.asAdmin().addStep(new MergeStep<>(this.asAdmin(), values)); } @@ -2303,7 +2303,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 4.0.0 */ public default GraphTraversal<S, List<?>> combine(final GValue<Object> values) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.combine, values); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.combine, values); return this.asAdmin().addStep(new CombineStep<>(this.asAdmin(), values)); } @@ -2327,7 +2327,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 4.0.0 */ public default GraphTraversal<S, List<List<?>>> product(final GValue<Object> values) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.product, values); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.product, values); return this.asAdmin().addStep(new ProductStep<>(this.asAdmin(), values)); } @@ -2680,7 +2680,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 4.0.0 */ public default GraphTraversal<S, E> has(final GValue<String> label, final String propertyKey, final Object value) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.has, label.get(), propertyKey, value); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.has, label.get(), propertyKey, value); TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(T.label.getAccessor(), P.eq(label))); return TraversalHelper.addHasContainer(this.asAdmin(), new HasContainer(propertyKey, value instanceof P ? (P) value : P.eq(value))); } @@ -2745,7 +2745,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 4.0.0 */ public default GraphTraversal<S, E> hasLabel(final GValue<String> label, final GValue<String>... otherLabels) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.hasLabel, label, otherLabels); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.hasLabel, label, otherLabels); // groovy evaluation seems to do strange things with varargs given hasLabel(null, null). odd someone would // do this but the failure is ugly if not handled. @@ -2979,7 +2979,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 4.0.0 */ public default GraphTraversal<S, E> coin(final GValue<Double> probability) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.coin, probability); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.coin, probability); return this.asAdmin().addStep(new CoinStep<>(this.asAdmin(), probability)); } @@ -4393,7 +4393,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 3.0.0-incubating */ public default <M, E2> GraphTraversal<S, E> option(final GValue<M> token, final Traversal<?, E2> traversalOption) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.option, token, traversalOption); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.option, token, traversalOption); // handle null similar to how option() with Map handles it, otherwise we get a NPE if this one gets used final Traversal.Admin<E,E2> t = null == traversalOption ? @@ -4414,7 +4414,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 3.7.3 */ public default <M, E2> GraphTraversal<S, E> option(final M token, final GValue<Map<Object, Object>> m) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.option, token, m); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.option, token, m); ((TraversalOptionParent<M, E, E2>) this.asAdmin().getEndStep()).addChildOption(token, (Traversal.Admin<E, E2>) new ConstantTraversal<>(m).asAdmin()); return this; } @@ -4431,7 +4431,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @since 3.7.3 */ public default <M, E2> GraphTraversal<S, E> option(final Merge merge, final GValue<Map<Object, Object>> m, final VertexProperty.Cardinality cardinality) { - this.asAdmin().getBytecode().addStep(GraphTraversal.Symbols.option, merge, m, cardinality); + this.asAdmin().getGremlinLang().addStep(GraphTraversal.Symbols.option, merge, m, cardinality); final Map<Object, Object> map = m.get(); diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java index 467d9d7eb4..63e49e243f 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java @@ -418,7 +418,7 @@ public class GraphTraversalSource implements TraversalSource { */ public GraphTraversal<Vertex, Vertex> mergeV(final GValue<Map<Object, Object>> searchCreate) { final GraphTraversalSource clone = GraphTraversalSource.this.clone(); - clone.bytecode.addStep(GraphTraversal.Symbols.mergeV, searchCreate); + clone.gremlinLang.addStep(GraphTraversal.Symbols.mergeV, searchCreate); final GraphTraversal.Admin<Vertex, Vertex> traversal = new DefaultGraphTraversal<>(clone); return traversal.addStep(new MergeVertexStep(traversal, true, searchCreate)); } @@ -464,7 +464,7 @@ public class GraphTraversalSource implements TraversalSource { */ public GraphTraversal<Edge, Edge> mergeE(final GValue<Map<?, Object>> searchCreate) { final GraphTraversalSource clone = GraphTraversalSource.this.clone(); - clone.bytecode.addStep(GraphTraversal.Symbols.mergeE, searchCreate); + clone.gremlinLang.addStep(GraphTraversal.Symbols.mergeE, searchCreate); final GraphTraversal.Admin<Edge, Edge> traversal = new DefaultGraphTraversal<>(clone); return traversal.addStep(new MergeEdgeStep(traversal, true, searchCreate)); } @@ -598,7 +598,7 @@ public class GraphTraversalSource implements TraversalSource { */ public <S> GraphTraversal<S, S> call(final String service, final GValue<Map> params) { final GraphTraversalSource clone = GraphTraversalSource.this.clone(); - clone.bytecode.addStep(GraphTraversal.Symbols.call, service, params); + clone.gremlinLang.addStep(GraphTraversal.Symbols.call, service, params); final GraphTraversal.Admin<S, S> traversal = new DefaultGraphTraversal<>(clone); return traversal.addStep(new CallStep<>(traversal, true, service, params)); } @@ -613,7 +613,7 @@ public class GraphTraversalSource implements TraversalSource { */ public <S> GraphTraversal<S, S> call(final String service, final GValue<Map> params, final Traversal<S, Map> childTraversal) { final GraphTraversalSource clone = GraphTraversalSource.this.clone(); - clone.bytecode.addStep(GraphTraversal.Symbols.call, service, params); + clone.gremlinLang.addStep(GraphTraversal.Symbols.call, service, params); final GraphTraversal.Admin<S, S> traversal = new DefaultGraphTraversal<>(clone); return traversal.addStep(new CallStep<>(traversal, true, service, params, childTraversal.asAdmin())); }
