This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit c22c0141bb7a00f366f929d0e5d3c6379d1004e0 Merge: a0eb114 d091720 Author: Stephen Mallette <[email protected]> AuthorDate: Thu Feb 17 12:52:44 2022 -0500 Merge branch '3.5-dev' CHANGELOG.asciidoc | 1 + ...Visitor.java => DefaultGremlinBaseVisitor.java} | 647 +++++++-------------- .../language/grammar/GenericLiteralVisitor.java | 8 +- .../grammar/GraphTraversalSourceVisitor.java | 2 +- .../language/grammar/GremlinAntlrToJava.java | 16 +- .../grammar/GremlinStringConstantsVisitor.java | 2 +- .../grammar/NestedTraversalSourceListVisitor.java | 2 +- .../language/grammar/TraversalFunctionVisitor.java | 2 +- .../grammar/TraversalPredicateVisitor.java | 2 +- .../language/grammar/TraversalRootVisitor.java | 3 +- .../grammar/TraversalSourceSelfMethodVisitor.java | 6 +- .../grammar/TraversalSourceSpawnMethodVisitor.java | 6 +- .../language/grammar/TraversalSourceTxVisitor.java | 2 +- .../language/grammar/TraversalStrategyVisitor.java | 6 +- .../grammar/TraversalTerminalMethodVisitor.java | 2 +- .../grammar/TraversalStrategyVisitorTest.java | 3 +- 16 files changed, 237 insertions(+), 473 deletions(-) diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/DefaultGremlinBaseVisitor.java index c4d332f,57f4903..868d41e --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/DefaultGremlinBaseVisitor.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/DefaultGremlinBaseVisitor.java @@@ -23,7 -23,7 +23,7 @@@ import org.antlr.v4.runtime.tree.ParseT /** * This class provides implementation of {@link GremlinVisitor}, where each method will throw -- * {@code UnsupportedOperationException}. All the visitor class will extends this class, so that if there is method ++ * {@code UnsupportedOperationException}. All the visitor class will extend this class, so that if there is method * that are not manually implemented, and called, an exception will be thrown to help us catch bugs. * * @param <T> The return type of the visit operation. Use {@link Void} for @@@ -34,7 -34,10 +34,10 @@@ public class DefaultGremlinBaseVisitor< final String className = (ctx != null)? ctx.getClass().getName() : ""; throw new UnsupportedOperationException("Method not implemented for context class " + className); } - + + /** + * {@inheritDoc} + */ @Override public T visitQueryList(final GremlinParser.QueryListContext ctx) { notImplemented(ctx); return null; } /** * {@inheritDoc} @@@ -295,12 -279,8 +279,10 @@@ * {@inheritDoc} */ @Override public T visitTraversalMethod_coin(final GremlinParser.TraversalMethod_coinContext ctx) { notImplemented(ctx); return null; } - - @Override - public T visitTraversalMethod_connectedComponent(final GremlinParser.TraversalMethod_connectedComponentContext ctx) { - notImplemented(ctx); return null; - } -- ++ /** ++ * {@inheritDoc} ++ */ + @Override public T visitTraversalMethod_connectedComponent(final GremlinParser.TraversalMethod_connectedComponentContext ctx) { notImplemented(ctx); return null; } /** * {@inheritDoc} */ @@@ -351,19 -328,6 +330,14 @@@ /** * {@inheritDoc} */ - @Override - public T visitTraversalMethod_fail_Empty(final GremlinParser.TraversalMethod_fail_EmptyContext ctx) { notImplemented(ctx); return null; } - ++ @Override public T visitTraversalMethod_fail_Empty(final GremlinParser.TraversalMethod_fail_EmptyContext ctx) { notImplemented(ctx); return null; } + /** + * {@inheritDoc} + */ - @Override - public T visitTraversalMethod_fail_String(final GremlinParser.TraversalMethod_fail_StringContext ctx) { notImplemented(ctx); return null; } - ++ @Override public T visitTraversalMethod_fail_String(final GremlinParser.TraversalMethod_fail_StringContext ctx) { notImplemented(ctx); return null; } + /** + * {@inheritDoc} + */ @Override public T visitTraversalMethod_filter_Predicate(final GremlinParser.TraversalMethod_filter_PredicateContext ctx) { notImplemented(ctx); return null; } /** * {@inheritDoc} @@@ -392,11 -356,6 +366,10 @@@ /** * {@inheritDoc} */ - @Override - public T visitTraversalMethod_from_Vertex(final GremlinParser.TraversalMethod_from_VertexContext ctx) { notImplemented(ctx); return null; } ++ @Override public T visitTraversalMethod_from_Vertex(final GremlinParser.TraversalMethod_from_VertexContext ctx) { notImplemented(ctx); return null; } + /** + * {@inheritDoc} + */ @Override public T visitTraversalMethod_group_Empty(final GremlinParser.TraversalMethod_group_EmptyContext ctx) { notImplemented(ctx); return null; } /** * {@inheritDoc} @@@ -709,11 -648,7 +670,8 @@@ /** * {@inheritDoc} */ - @Override - public T visitTraversalMethod_repeat_Traversal(final GremlinParser.TraversalMethod_repeat_TraversalContext ctx) { - notImplemented(ctx); return null; - } - @Override public T visitTraversalMethod_repeat_Traversal(final GremlinParser.TraversalMethod_repeat_TraversalContext ctx) { notImplemented(ctx); return null; } /** ++ @Override public T visitTraversalMethod_repeat_Traversal(final GremlinParser.TraversalMethod_repeat_TraversalContext ctx) { notImplemented(ctx); return null; } + /** * {@inheritDoc} */ @Override public T visitTraversalMethod_sack_BiFunction(final GremlinParser.TraversalMethod_sack_BiFunctionContext ctx) { notImplemented(ctx); return null; } @@@ -741,12 -676,8 +699,10 @@@ * {@inheritDoc} */ @Override public T visitTraversalMethod_select_Pop_String_String_String(final GremlinParser.TraversalMethod_select_Pop_String_String_StringContext ctx) { notImplemented(ctx); return null; } - - @Override - public T visitTraversalMethod_select_Pop_Traversal(final GremlinParser.TraversalMethod_select_Pop_TraversalContext ctx) { - notImplemented(ctx); return null; - } -- ++ /** ++ * {@inheritDoc} ++ */ + @Override public T visitTraversalMethod_select_Pop_Traversal(final GremlinParser.TraversalMethod_select_Pop_TraversalContext ctx) { notImplemented(ctx); return null; } /** * {@inheritDoc} */ @@@ -837,11 -765,6 +790,10 @@@ /** * {@inheritDoc} */ - @Override - public T visitTraversalMethod_to_Vertex(final GremlinParser.TraversalMethod_to_VertexContext ctx) { notImplemented(ctx); return null; } ++ @Override public T visitTraversalMethod_to_Vertex(final GremlinParser.TraversalMethod_to_VertexContext ctx) { notImplemented(ctx); return null; } + /** + * {@inheritDoc} + */ @Override public T visitTraversalMethod_toE(final GremlinParser.TraversalMethod_toEContext ctx) { notImplemented(ctx); return null; } /** * {@inheritDoc} @@@ -1198,20 -1105,7 +1134,15 @@@ /** * {@inheritDoc} */ - @Override public T visitNanLiteral(GremlinParser.NanLiteralContext ctx) { notImplemented(ctx); return null; } ++ @Override public T visitNanLiteral(final GremlinParser.NanLiteralContext ctx) { notImplemented(ctx); return null; } + /** + * {@inheritDoc} + */ - @Override public T visitInfLiteral(GremlinParser.InfLiteralContext ctx) { notImplemented(ctx); return null; } - ++ @Override public T visitInfLiteral(final GremlinParser.InfLiteralContext ctx) { notImplemented(ctx); return null; } + /** + * {@inheritDoc} + */ - @Override - public T visitGremlinStringConstants(final GremlinParser.GremlinStringConstantsContext ctx) { - notImplemented(ctx); return null; - } - + @Override public T visitGremlinStringConstants(final GremlinParser.GremlinStringConstantsContext ctx) { notImplemented(ctx); return null; } /** * {@inheritDoc} */ @@@ -1279,11 -1141,7 +1178,7 @@@ /** * {@inheritDoc} */ - @Override - public T visitGremlinStringConstants_peerPressureStringConstants_times(final GremlinParser.GremlinStringConstants_peerPressureStringConstants_timesContext ctx) { - notImplemented(ctx);return null; - } - - @Override public T visitGremlinStringConstants_peerPressureStringConstants_times(final GremlinParser.GremlinStringConstants_peerPressureStringConstants_timesContext ctx) { notImplemented(ctx); return null; } ++ @Override public T visitGremlinStringConstants_peerPressureStringConstants_times(final GremlinParser.GremlinStringConstants_peerPressureStringConstants_timesContext ctx) { notImplemented(ctx);return null; } /** * {@inheritDoc} */ @@@ -1533,73 -1253,24 +1290,81 @@@ /** * {@inheritDoc} */ - @Override - public T visitStructureVertex(final GremlinParser.StructureVertexContext ctx) { - notImplemented(ctx); return null; - } - - @Override - public T visitTraversalSourceSpawnMethod_mergeV_Map(final GremlinParser.TraversalSourceSpawnMethod_mergeV_MapContext ctx) { - notImplemented(ctx); return null; - } - - @Override - public T visitTraversalSourceSpawnMethod_mergeV_Traversal(final GremlinParser.TraversalSourceSpawnMethod_mergeV_TraversalContext ctx) { - notImplemented(ctx); return null; - } - - @Override - public T visitTraversalMethod_option_Merge_Map(final GremlinParser.TraversalMethod_option_Merge_MapContext ctx) { - notImplemented(ctx); return null; - } - - @Override - public T visitTraversalMethod_option_Merge_Traversal(final GremlinParser.TraversalMethod_option_Merge_TraversalContext ctx) { - notImplemented(ctx); return null; - } - - @Override - public T visitTraversalMerge(final GremlinParser.TraversalMergeContext ctx) { - notImplemented(ctx); return null; - } - - @Override - public T visitTraversalMethod_mergeV_Map(final GremlinParser.TraversalMethod_mergeV_MapContext ctx) { - notImplemented(ctx); return null; - } - - @Override - public T visitTraversalMethod_mergeV_Traversal(final GremlinParser.TraversalMethod_mergeV_TraversalContext ctx) { - notImplemented(ctx); return null; - } - - @Override - public T visitTraversalMethod_mergeE_Map(final GremlinParser.TraversalMethod_mergeE_MapContext ctx) { - notImplemented(ctx); return null; - } - - @Override - public T visitTraversalMethod_mergeE_Traversal(final GremlinParser.TraversalMethod_mergeE_TraversalContext ctx) { - notImplemented(ctx); return null; - } - - @Override - public T visitTraversalSourceSpawnMethod_mergeE_Map(final GremlinParser.TraversalSourceSpawnMethod_mergeE_MapContext ctx) { - notImplemented(ctx); return null; - } - - @Override - public T visitTraversalSourceSpawnMethod_mergeE_Traversal(final GremlinParser.TraversalSourceSpawnMethod_mergeE_TraversalContext ctx) { - notImplemented(ctx); return null; - } - - @Override - public T visitTraversalMethod_mergeV_empty(final GremlinParser.TraversalMethod_mergeV_emptyContext ctx) { - notImplemented(ctx); return null; - } - - @Override - public T visitTraversalMethod_mergeE_empty(final GremlinParser.TraversalMethod_mergeE_emptyContext ctx) { - notImplemented(ctx); return null; - } + @Override public T visitConnectedComponentConstants(final GremlinParser.ConnectedComponentConstantsContext ctx) { notImplemented(ctx); return null; } + /** + * {@inheritDoc} + */ + @Override public T visitGremlinStringConstants_connectedComponentStringConstants_component(final GremlinParser.GremlinStringConstants_connectedComponentStringConstants_componentContext ctx) { notImplemented(ctx); return null; } + /** + * {@inheritDoc} + */ + @Override public T visitGremlinStringConstants_connectedComponentStringConstants_edges(final GremlinParser.GremlinStringConstants_connectedComponentStringConstants_edgesContext ctx) { notImplemented(ctx); return null; } + /** + * {@inheritDoc} + */ - @Override public T visitGremlinStringConstants_connectedComponentStringConstants_propertyName(final GremlinParser.GremlinStringConstants_connectedComponentStringConstants_propertyNameContext ctx) { notImplemented(ctx); return null; } ++ @Override public T visitGremlinStringConstants_connectedComponentStringConstants_propertyName(GremlinParser.GremlinStringConstants_connectedComponentStringConstants_propertyNameContext ctx) { notImplemented(ctx); return null; } + /** + * {@inheritDoc} + */ + @Override public T visitConnectedComponentStringConstant(final GremlinParser.ConnectedComponentStringConstantContext ctx) { notImplemented(ctx); return null; } + /** + * {@inheritDoc} + */ - @Override public T visitIoOptionsStringConstant(final GremlinParser.IoOptionsStringConstantContext ctx) { notImplemented(ctx); return null; }} ++ @Override public T visitIoOptionsStringConstant(final GremlinParser.IoOptionsStringConstantContext ctx) { notImplemented(ctx); return null; } ++ /** ++ * {@inheritDoc} ++ */ ++ @Override public T visitStructureVertex(final GremlinParser.StructureVertexContext ctx) { notImplemented(ctx); return null; } ++ /** ++ * {@inheritDoc} ++ */ ++ @Override public T visitTraversalSourceSpawnMethod_mergeV_Map(final GremlinParser.TraversalSourceSpawnMethod_mergeV_MapContext ctx) { notImplemented(ctx); return null; } ++ /** ++ * {@inheritDoc} ++ */ ++ @Override public T visitTraversalSourceSpawnMethod_mergeV_Traversal(final GremlinParser.TraversalSourceSpawnMethod_mergeV_TraversalContext ctx) { notImplemented(ctx); return null; } ++ /** ++ * {@inheritDoc} ++ */ ++ @Override public T visitTraversalMethod_option_Merge_Map(final GremlinParser.TraversalMethod_option_Merge_MapContext ctx) { notImplemented(ctx); return null; } ++ /** ++ * {@inheritDoc} ++ */ ++ @Override public T visitTraversalMethod_option_Merge_Traversal(final GremlinParser.TraversalMethod_option_Merge_TraversalContext ctx) { notImplemented(ctx); return null; } ++ /** ++ * {@inheritDoc} ++ */ ++ @Override public T visitTraversalMerge(final GremlinParser.TraversalMergeContext ctx) { notImplemented(ctx); return null; } ++ /** ++ * {@inheritDoc} ++ */ ++ @Override public T visitTraversalMethod_mergeV_Map(final GremlinParser.TraversalMethod_mergeV_MapContext ctx) { notImplemented(ctx); return null; } ++ /** ++ * {@inheritDoc} ++ */ ++ @Override public T visitTraversalMethod_mergeV_Traversal(final GremlinParser.TraversalMethod_mergeV_TraversalContext ctx) { notImplemented(ctx); return null; } ++ /** ++ * {@inheritDoc} ++ */ ++ @Override public T visitTraversalMethod_mergeE_Map(final GremlinParser.TraversalMethod_mergeE_MapContext ctx) { notImplemented(ctx); return null; } ++ /** ++ * {@inheritDoc} ++ */ ++ @Override public T visitTraversalMethod_mergeE_Traversal(final GremlinParser.TraversalMethod_mergeE_TraversalContext ctx) { notImplemented(ctx); return null; } ++ /** ++ * {@inheritDoc} ++ */ ++ @Override public T visitTraversalSourceSpawnMethod_mergeE_Map(final GremlinParser.TraversalSourceSpawnMethod_mergeE_MapContext ctx) { notImplemented(ctx); return null; } ++ /** ++ * {@inheritDoc} ++ */ ++ @Override public T visitTraversalSourceSpawnMethod_mergeE_Traversal(final GremlinParser.TraversalSourceSpawnMethod_mergeE_TraversalContext ctx) { notImplemented(ctx); return null; } ++ /** ++ * {@inheritDoc} ++ */ ++ @Override public T visitTraversalMethod_mergeV_empty(final GremlinParser.TraversalMethod_mergeV_emptyContext ctx) { notImplemented(ctx); return null; } ++ /** ++ * {@inheritDoc} ++ */ ++ @Override public T visitTraversalMethod_mergeE_empty(final GremlinParser.TraversalMethod_mergeE_emptyContext ctx) { notImplemented(ctx); return null; } +} diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalPredicateVisitor.java index 608c20d,43e53d2..907eca6 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalPredicateVisitor.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalPredicateVisitor.java @@@ -26,10 -26,10 +26,10 @@@ import java.util.Collection import java.util.List; import java.util.Set; - public class TraversalPredicateVisitor extends GremlinBaseVisitor<P> { + public class TraversalPredicateVisitor extends DefaultGremlinBaseVisitor<P> { private static TraversalPredicateVisitor instance; - public static TraversalPredicateVisitor getInstance() { + public static TraversalPredicateVisitor instance() { if (instance == null) { instance = new TraversalPredicateVisitor(); }
