TINKERPOP-3023 Expand type syntax in grammar - Remove Vertex - TP4 (#3138)

This is a followup to #3133 with changes exclusively for TP4. The primary difference in TP4 is that bytecode has been replaced with GremlinLang, which means that the use of Vertex in V(), from(), and to() is now sugar added by GraphTraversal. These vertices must be converted to their ids when passed into GremlinLang.

---------

Co-authored-by: Peter Tribe <peter.tribe@improving.com>

Author: Cole-Greer

CHANGELOG.asciidoc

@@ -94,6 +94,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 
 This release also includes changes from <<release-3-7-XXX, 3.7.XXX>>.
 
+* Removed Vertex/ReferenceVertex from grammar. Use vertex id in traversals now instead.
 * Modified mathematical operators to prevent overflows in steps such as `sum()` and 'sack()' to prefer promotion to the next highest number type.
 * Added `DateTime` ontop of the existing 'datetime' grammar.
 * Added UUID() + UUID(value) to grammar

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/ArgumentVisitor.java

@@ -81,13 +81,6 @@ public Object parseObject(final GremlinParser.GenericArgumentContext ctx) {
         return visitGenericArgument(ctx);
     }
 
-    /**
-     * Wrapper for visit function for {@link Vertex} types.
-     */
-    public Vertex parseVertex(final GremlinParser.StructureVertexArgumentContext ctx) {
-        return (Vertex) visitStructureVertexArgument(ctx);
-    }
-
     /**
      * Wrapper for visit function for {@code Map} types.
      */
@@ -223,15 +216,6 @@ public Object visitGenericArgument(final GremlinParser.GenericArgumentContext ct
         }
     }
 
-    @Override
-    public Object visitStructureVertexArgument(final GremlinParser.StructureVertexArgumentContext ctx) {
-        if (ctx.structureVertexLiteral() != null) {
-            return antlr.structureVisitor.visitStructureVertexLiteral(ctx.structureVertexLiteral());
-        } else {
-            return visitVariable(ctx.variable());
-        }
-    }
-
     @Override
     public Object visitGenericMapArgument(final GremlinParser.GenericMapArgumentContext ctx) {
         if (ctx.genericMapLiteral() != null) {

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/DefaultGremlinBaseVisitor.java

@@ -414,11 +414,14 @@ protected void notImplemented(final ParseTree ctx) {
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override public T visitTraversalMethod_from_Vertex(final GremlinParser.TraversalMethod_from_VertexContext ctx) { notImplemented(ctx); return null; }
+	@Override public T visitTraversalMethod_from_GenricArgument(GremlinParser.TraversalMethod_from_GenricArgumentContext ctx) { return null; }
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override public T visitTraversalMethod_from_Traversal(final GremlinParser.TraversalMethod_from_TraversalContext ctx) { notImplemented(ctx); return null; }
+	@Override
+	public T visitTraversalMethod_from_Traversal(GremlinParser.TraversalMethod_from_TraversalContext ctx) {
+		return null;
+	}
 	/**
 	 * {@inheritDoc}
 	 */
@@ -858,11 +861,11 @@ protected void notImplemented(final ParseTree ctx) {
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override public T visitTraversalMethod_to_Vertex(final GremlinParser.TraversalMethod_to_VertexContext ctx) { notImplemented(ctx); return null; }
+	@Override public T visitTraversalMethod_to_Traversal(final GremlinParser.TraversalMethod_to_TraversalContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
 	 */
-	@Override public T visitTraversalMethod_to_Traversal(final GremlinParser.TraversalMethod_to_TraversalContext ctx) { notImplemented(ctx); return null; }
+	@Override public T visitTraversalMethod_to_GenricArgument(final GremlinParser.TraversalMethod_to_GenricArgumentContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
 	 */
@@ -1379,10 +1382,6 @@ protected void notImplemented(final ParseTree ctx) {
 	 * {@inheritDoc}
 	 */
 	@Override public T visitIoOptionsStringConstant(final GremlinParser.IoOptionsStringConstantContext ctx) { notImplemented(ctx); return null; }
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitStructureVertexLiteral(final GremlinParser.StructureVertexLiteralContext ctx) { notImplemented(ctx); return null; }
 	/**
 	 * {@inheritDoc}
 	 */
@@ -1695,8 +1694,4 @@ protected void notImplemented(final ParseTree ctx) {
 	 * {@inheritDoc}
 	 */
 	@Override public T visitNakedKey(final GremlinParser.NakedKeyContext ctx) { notImplemented(ctx); return null;}
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override public T visitStructureVertexArgument(final GremlinParser.StructureVertexArgumentContext ctx) { notImplemented(ctx); return null; }
 }

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GenericLiteralVisitor.java

@@ -386,11 +386,6 @@ public Object visitNestedTraversal(final GremlinParser.NestedTraversalContext ct
         return antlr.tvisitor.visitNestedTraversal(ctx);
     }
 
-    @Override
-    public Object visitStructureVertexLiteral(final GremlinParser.StructureVertexLiteralContext ctx) {
-        return antlr.structureVisitor.visitStructureVertexLiteral(ctx);
-    }
-
     /**
      * {@inheritDoc}
      */

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/GremlinAntlrToJava.java

@@ -99,11 +99,6 @@ public class GremlinAntlrToJava extends DefaultGremlinBaseVisitor<Object> {
      */
     final TraversalPredicateVisitor traversalPredicateVisitor;
 
-    /**
-     * Parses structure instances like {@link Vertex}.
-     */
-    final StructureElementVisitor structureVisitor;
-
     /**
      * Constructs a new instance and is bound to an {@link EmptyGraph}. This form of construction is helpful for
      * generating {@link GremlinLang} or for various forms of testing. {@link Traversal} instances constructed from this
@@ -196,7 +191,6 @@ protected GremlinAntlrToJava(final String traversalSourceName, final Graph graph
         this.txVisitor = new TraversalSourceTxVisitor(g, this);
         this.traversalPredicateVisitor = new TraversalPredicateVisitor(this);
         this.traversalStrategyVisitor = new TraversalStrategyVisitor(this);
-        this.structureVisitor = new StructureElementVisitor(this);
         this.genericVisitor = new GenericLiteralVisitor(this);
         this.argumentVisitor = new ArgumentVisitor(variableResolver, this);
     }

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/StructureElementVisitor.java

@@ -698,18 +698,6 @@ public Traversal visitTraversalMethod_from_String(final GremlinParser.TraversalM
         return graphTraversal.from(antlr.genericVisitor.parseString(ctx.stringLiteral()));
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Traversal visitTraversalMethod_from_Vertex(final GremlinParser.TraversalMethod_from_VertexContext ctx) {
-        final Object literalOrVar = antlr.argumentVisitor.visitStructureVertexArgument(ctx.structureVertexArgument());
-        if (GValue.valueInstanceOf(literalOrVar, GType.VERTEX))
-            return graphTraversal.from((GValue<Vertex>) literalOrVar);
-        else
-            return graphTraversal.from((Vertex) literalOrVar);
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -1819,18 +1807,6 @@ public Traversal visitTraversalMethod_to_String(final GremlinParser.TraversalMet
         return graphTraversal.to(antlr.genericVisitor.parseString(ctx.stringLiteral()));
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Traversal visitTraversalMethod_to_Vertex(final GremlinParser.TraversalMethod_to_VertexContext ctx) {
-        final Object literalOrVar = antlr.argumentVisitor.visitStructureVertexArgument(ctx.structureVertexArgument());
-        if (GValue.valueInstanceOf(literalOrVar, GType.VERTEX))
-            return graphTraversal.to((GValue<Vertex>) literalOrVar);
-        else
-            return graphTraversal.to((Vertex) literalOrVar);
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -1967,6 +1943,22 @@ public Traversal visitTraversalMethod_option_Predicate_Traversal(final GremlinPa
                 antlr.tvisitor.visitNestedTraversal(ctx.nestedTraversal()));
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public GraphTraversal visitTraversalMethod_from_GenricArgument(final GremlinParser.TraversalMethod_from_GenricArgumentContext ctx) {
+        return graphTraversal.from(antlr.argumentVisitor.visitGenericArgument(ctx.genericArgument()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Traversal visitTraversalMethod_to_GenricArgument(final GremlinParser.TraversalMethod_to_GenricArgumentContext ctx) {
+        return graphTraversal.to(antlr.argumentVisitor.visitGenericArgument(ctx.genericArgument()));
+    }
+
     /**
      * {@inheritDoc}
      */

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/grammar/TraversalMethodVisitor.java

@@ -199,16 +199,6 @@ public Void visitNullLiteral(final GremlinParser.NullLiteralContext ctx) {
         return null;
     }
 
-    @Override
-    public Void visitStructureVertexLiteral(final GremlinParser.StructureVertexLiteralContext ctx) {
-        sb.append(GO_PACKAGE_NAME).append("Vertex{Element{");
-        visit(ctx.getChild(3)); // id
-        sb.append(", ");
-        visit(ctx.getChild(5)); // label
-        sb.append("}}");
-        return null;
-    }
-
     @Override
     public Void visitTraversalStrategy(final GremlinParser.TraversalStrategyContext ctx) {
         if (ctx.getChildCount() == 1)

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/GoTranslateVisitor.java

@@ -46,18 +46,6 @@ public GroovyTranslateVisitor(final String graphTraversalSourceName) {
         super(graphTraversalSourceName);
     }
 
-    @Override
-    public Void visitStructureVertexLiteral(final GremlinParser.StructureVertexLiteralContext ctx) {
-        sb.append("new ");
-        sb.append(vertexClassName);
-        sb.append("(");
-        visit(ctx.getChild(3)); // id
-        sb.append(", ");
-        visit(ctx.getChild(5)); // label
-        sb.append(")");
-        return null;
-    }
-
     @Override
     public Void visitIntegerLiteral(final GremlinParser.IntegerLiteralContext ctx) {
         final String integerLiteral = ctx.getText().toLowerCase();

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/GroovyTranslateVisitor.java

@@ -52,18 +52,6 @@ public JavaTranslateVisitor(final String graphTraversalSourceName) {
         super(graphTraversalSourceName);
     }
 
-    @Override
-    public Void visitStructureVertexLiteral(final GremlinParser.StructureVertexLiteralContext ctx) {
-        sb.append("new ");
-        sb.append(vertexClassName);
-        sb.append("(");
-        visit(ctx.getChild(3)); // id
-        sb.append(", ");
-        visit(ctx.getChild(5)); // label
-        sb.append(")");
-        return null;
-    }
-
     @Override
     public Void visitTraversalStrategy(final GremlinParser.TraversalStrategyContext ctx) {
         if (ctx.getChildCount() == 1)