You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by jo...@apache.org on 2021/06/03 13:51:34 UTC

[tinkerpop] branch TINKERPOP-2563-language updated (6f56819 -> 0640fc0)

This is an automated email from the ASF dual-hosted git repository.

joshsh pushed a change to branch TINKERPOP-2563-language
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.


    from 6f56819  Merge branch 'master' of github.com:/apache/tinkerpop into TINKERPOP-2563-language
     new a64cc57  Update coding style for generated classes
     new 18c3714  Rename rdf to rdf11concepts for clarity
     new 0640fc0  Add generated classes for rdf11-concepts

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../model/constants/GremlinStringConstant.java     |  20 +-
 .../language/model/literals/DateLiteral.java       |   4 +-
 .../model/literals/EmptyStringLiteral.java         |   4 +-
 .../language/model/literals/GenericLiteral.java    |  30 +-
 .../model/literals/NonEmptyStringLiteral.java      |   4 +-
 .../language/model/literals/StringLiteral.java     |  15 +-
 .../language/model/methods/ExplainMethod.java      |   4 +-
 .../language/model/methods/HasNextMethod.java      |   4 +-
 .../language/model/methods/IterateMethod.java      |   4 +-
 .../gremlin/language/model/methods/NextMethod.java |   4 +-
 .../language/model/methods/ToBulkSetMethod.java    |   4 +-
 .../language/model/methods/ToListMethod.java       |   4 +-
 .../language/model/methods/ToSetMethod.java        |   4 +-
 .../model/methods/TraversalSackMethod.java         |   4 +-
 .../model/methods/TraversalSelfMethod.java         |   5 +-
 .../model/methods/TraversalTerminalMethod.java     |  40 +-
 .../language/model/methods/TryNextMethod.java      |   4 +-
 .../gremlin/language/model/predicates/Between.java |   4 +-
 .../language/model/predicates/Containing.java      |   4 +-
 .../language/model/predicates/EndingWith.java      |   4 +-
 .../gremlin/language/model/predicates/Eq.java      |   4 +-
 .../gremlin/language/model/predicates/Gt.java      |   4 +-
 .../gremlin/language/model/predicates/Gte.java     |   4 +-
 .../gremlin/language/model/predicates/Inside.java  |   4 +-
 .../gremlin/language/model/predicates/Lt.java      |   4 +-
 .../gremlin/language/model/predicates/Lte.java     |   4 +-
 .../gremlin/language/model/predicates/Neq.java     |   4 +-
 .../gremlin/language/model/predicates/Not.java     |   4 +-
 .../language/model/predicates/NotContaining.java   |   4 +-
 .../language/model/predicates/NotEndingWith.java   |   4 +-
 .../language/model/predicates/NotStartingWith.java |   4 +-
 .../gremlin/language/model/predicates/Outside.java |   4 +-
 .../language/model/predicates/StartingWith.java    |   4 +-
 .../model/predicates/TraversalPredicate.java       |  95 +++-
 .../gremlin/language/model/predicates/Within.java  |   4 +-
 .../gremlin/language/model/predicates/Without.java |   4 +-
 .../gremlin/language/model/query/Query.java        |  40 +-
 .../gremlin/language/model/steps/AddEStep.java     |  10 +-
 .../gremlin/language/model/steps/AddVStep.java     |  20 +-
 .../language/model/steps/AggregateStep.java        |   4 +-
 .../gremlin/language/model/steps/AndStep.java      |   4 +-
 .../gremlin/language/model/steps/AsStep.java       |   4 +-
 .../gremlin/language/model/steps/BarrierStep.java  |  20 +-
 .../gremlin/language/model/steps/BothEStep.java    |   4 +-
 .../gremlin/language/model/steps/BothStep.java     |   4 +-
 .../gremlin/language/model/steps/BothVStep.java    |   4 +-
 .../gremlin/language/model/steps/BranchStep.java   |   4 +-
 .../gremlin/language/model/steps/ByStep.java       |  73 ++-
 .../gremlin/language/model/steps/CapStep.java      |   4 +-
 .../gremlin/language/model/steps/ChooseStep.java   |  41 +-
 .../gremlin/language/model/steps/CoalesceStep.java |   4 +-
 .../gremlin/language/model/steps/CoinStep.java     |   4 +-
 .../model/steps/ConnectedComponentStep.java        |   4 +-
 .../gremlin/language/model/steps/ConstantStep.java |   4 +-
 .../gremlin/language/model/steps/CountStep.java    |   4 +-
 .../language/model/steps/CyclicPathStep.java       |   4 +-
 .../gremlin/language/model/steps/DedupStep.java    |   4 +-
 .../gremlin/language/model/steps/DropStep.java     |   4 +-
 .../language/model/steps/ElementMapStep.java       |   4 +-
 .../gremlin/language/model/steps/EmitStep.java     |  20 +-
 .../gremlin/language/model/steps/FilterStep.java   |  10 +-
 .../gremlin/language/model/steps/FlatMapStep.java  |   4 +-
 .../gremlin/language/model/steps/FoldStep.java     |  14 +-
 .../gremlin/language/model/steps/FromStep.java     |  10 +-
 .../language/model/steps/GroupCountStep.java       |   4 +-
 .../gremlin/language/model/steps/GroupStep.java    |   4 +-
 .../gremlin/language/model/steps/HasIdStep.java    |  20 +-
 .../gremlin/language/model/steps/HasKeyStep.java   |  20 +-
 .../gremlin/language/model/steps/HasLabelStep.java |  20 +-
 .../gremlin/language/model/steps/HasNotStep.java   |   4 +-
 .../gremlin/language/model/steps/HasStep.java      | 116 ++++-
 .../gremlin/language/model/steps/HasValueStep.java |  10 +-
 .../gremlin/language/model/steps/IdStep.java       |   4 +-
 .../gremlin/language/model/steps/IdentityStep.java |   4 +-
 .../gremlin/language/model/steps/InEStep.java      |   4 +-
 .../gremlin/language/model/steps/InStep.java       |   4 +-
 .../gremlin/language/model/steps/InVStep.java      |   4 +-
 .../gremlin/language/model/steps/IndexStep.java    |   4 +-
 .../gremlin/language/model/steps/InjectStep.java   |   4 +-
 .../gremlin/language/model/steps/IsStep.java       |  10 +-
 .../gremlin/language/model/steps/KeyStep.java      |   4 +-
 .../gremlin/language/model/steps/LabelStep.java    |   4 +-
 .../gremlin/language/model/steps/LimitStep.java    |   4 +-
 .../gremlin/language/model/steps/LocalStep.java    |   4 +-
 .../gremlin/language/model/steps/LoopsStep.java    |   4 +-
 .../gremlin/language/model/steps/MapStep.java      |   4 +-
 .../gremlin/language/model/steps/MatchStep.java    |   4 +-
 .../gremlin/language/model/steps/MathStep.java     |   4 +-
 .../gremlin/language/model/steps/MaxStep.java      |   4 +-
 .../gremlin/language/model/steps/MeanStep.java     |   4 +-
 .../gremlin/language/model/steps/MinStep.java      |   4 +-
 .../gremlin/language/model/steps/NotStep.java      |   4 +-
 .../gremlin/language/model/steps/OptionStep.java   |  35 +-
 .../gremlin/language/model/steps/OptionalStep.java |   4 +-
 .../gremlin/language/model/steps/OrStep.java       |   4 +-
 .../gremlin/language/model/steps/OrderStep.java    |   4 +-
 .../gremlin/language/model/steps/OtherVStep.java   |   4 +-
 .../gremlin/language/model/steps/OutEStep.java     |   4 +-
 .../gremlin/language/model/steps/OutStep.java      |   4 +-
 .../gremlin/language/model/steps/OutVStep.java     |   4 +-
 .../gremlin/language/model/steps/PageRankStep.java |   4 +-
 .../gremlin/language/model/steps/PathStep.java     |   4 +-
 .../language/model/steps/PeerPressureStep.java     |   4 +-
 .../gremlin/language/model/steps/ProfileStep.java  |   4 +-
 .../gremlin/language/model/steps/ProjectStep.java  |   4 +-
 .../language/model/steps/PropertiesStep.java       |   4 +-
 .../language/model/steps/PropertyMapStep.java      |   4 +-
 .../gremlin/language/model/steps/PropertyStep.java |   4 +-
 .../gremlin/language/model/steps/RangeStep.java    |   4 +-
 .../gremlin/language/model/steps/ReadStep.java     |   4 +-
 .../gremlin/language/model/steps/RepeatStep.java   |   4 +-
 .../gremlin/language/model/steps/SackStep.java     |   4 +-
 .../gremlin/language/model/steps/SampleStep.java   |   4 +-
 .../gremlin/language/model/steps/SelectStep.java   |  56 ++-
 .../language/model/steps/ShortestPathStep.java     |   4 +-
 .../language/model/steps/SideEffectStep.java       |   4 +-
 .../language/model/steps/SimplePathStep.java       |   4 +-
 .../gremlin/language/model/steps/SkipStep.java     |   4 +-
 .../gremlin/language/model/steps/StoreStep.java    |   4 +-
 .../gremlin/language/model/steps/SubgraphStep.java |   4 +-
 .../gremlin/language/model/steps/SumStep.java      |   4 +-
 .../gremlin/language/model/steps/TailStep.java     |   4 +-
 .../language/model/steps/TimeLimitStep.java        |   4 +-
 .../gremlin/language/model/steps/TimesStep.java    |   4 +-
 .../gremlin/language/model/steps/ToEStep.java      |   4 +-
 .../gremlin/language/model/steps/ToStep.java       |  25 +-
 .../gremlin/language/model/steps/ToVStep.java      |   4 +-
 .../language/model/steps/TraversalMethod.java      | 505 ++++++++++++++++-----
 .../gremlin/language/model/steps/TreeStep.java     |   4 +-
 .../gremlin/language/model/steps/UnfoldStep.java   |   4 +-
 .../gremlin/language/model/steps/UnionStep.java    |   4 +-
 .../gremlin/language/model/steps/UntilStep.java    |  10 +-
 .../gremlin/language/model/steps/VStep.java        |   4 +-
 .../gremlin/language/model/steps/ValueMapStep.java |   4 +-
 .../gremlin/language/model/steps/ValueStep.java    |   4 +-
 .../gremlin/language/model/steps/ValuesStep.java   |   4 +-
 .../gremlin/language/model/steps/WhereStep.java    |  20 +-
 .../gremlin/language/model/steps/WithStep.java     |   4 +-
 .../gremlin/language/model/steps/WriteStep.java    |   4 +-
 .../traversal/ChainedParentOfGraphTraversal.java   |   4 +-
 .../language/model/traversal/ChainedTraversal.java |  20 +-
 .../traversal/EdgeLabelVerificationStrategy.java   |  10 +-
 .../language/model/traversal/NestedTraversal.java  |  20 +-
 .../model/traversal/PartitionStrategy.java         |  20 +-
 .../ReservedKeysVerificationStrategy.java          |  15 +-
 .../language/model/traversal/RootTraversal.java    |  20 +-
 .../language/model/traversal/SubgraphStrategy.java |  20 +-
 .../model/traversal/TraversalBiFunction.java       |   4 +-
 .../model/traversal/TraversalComparator.java       |   4 +-
 .../model/traversal/TraversalFunction.java         |  10 +-
 .../language/model/traversal/TraversalSource.java  |   4 +-
 .../model/traversal/TraversalSourceSelfMethod.java |  30 +-
 .../traversal/TraversalSourceSpawnMethod.java      |  30 +-
 .../model/traversal/TraversalStrategy.java         |  25 +-
 .../gremlin/language/model/traversal/With.java     |   4 +-
 .../gremlin/language/model/traversal/WithBulk.java |   4 +-
 .../gremlin/language/model/traversal/WithPath.java |   4 +-
 .../gremlin/language/model/traversal/WithSack.java |   4 +-
 .../language/model/traversal/WithSideEffect.java   |   4 +-
 .../language/model/traversal/WithStrategies.java   |   4 +-
 .../tinkerpop/rdf/rdf11concepts/BlankNode.java     |  40 ++
 .../apache/tinkerpop/rdf/rdf11concepts/Iri.java    |  37 ++
 .../tinkerpop/rdf/rdf11concepts/LanguageTag.java   |  36 ++
 .../rdf/rdf11concepts/NamespacePrefix.java         |  33 ++
 .../tinkerpop/rdf/rdf11concepts/RdfDataset.java    |  63 +++
 .../tinkerpop/rdf/rdf11concepts/RdfGraph.java      |  33 ++
 .../tinkerpop/rdf/rdf11concepts/RdfLiteral.java    |  80 ++++
 .../rdf/rdf11concepts/RdfSubjectTerm.java          | 112 +++++
 .../tinkerpop/rdf/rdf11concepts/RdfTerm.java       | 156 +++++++
 .../tinkerpop/rdf/rdf11concepts/RdfTriple.java     |  78 ++++
 .../tinkerpop/rdf/rdf11concepts/RdfVocabulary.java |  33 ++
 .../tinkerpop/rdf/{rdf.yaml => rdf11concepts.yaml} |   0
 172 files changed, 2324 insertions(+), 391 deletions(-)
 create mode 100644 gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/BlankNode.java
 create mode 100644 gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/Iri.java
 create mode 100644 gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/LanguageTag.java
 create mode 100644 gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/NamespacePrefix.java
 create mode 100644 gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfDataset.java
 create mode 100644 gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfGraph.java
 create mode 100644 gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfLiteral.java
 create mode 100644 gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfSubjectTerm.java
 create mode 100644 gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfTerm.java
 create mode 100644 gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfTriple.java
 create mode 100644 gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfVocabulary.java
 rename gremlin-language/src/main/yaml/org/apache/tinkerpop/rdf/{rdf.yaml => rdf11concepts.yaml} (100%)

[tinkerpop] 03/03: Add generated classes for rdf11-concepts

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joshsh pushed a commit to branch TINKERPOP-2563-language
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 0640fc0a29a6c549edd9a5cc52ce4be3ed57302d
Author: Joshua Shinavier <jo...@uber.com>
AuthorDate: Thu Jun 3 06:51:16 2021 -0700

    Add generated classes for rdf11-concepts
---
 .../tinkerpop/rdf/rdf11concepts/BlankNode.java     |  40 ++++++
 .../apache/tinkerpop/rdf/rdf11concepts/Iri.java    |  37 +++++
 .../tinkerpop/rdf/rdf11concepts/LanguageTag.java   |  36 +++++
 .../rdf/rdf11concepts/NamespacePrefix.java         |  33 +++++
 .../tinkerpop/rdf/rdf11concepts/RdfDataset.java    |  63 +++++++++
 .../tinkerpop/rdf/rdf11concepts/RdfGraph.java      |  33 +++++
 .../tinkerpop/rdf/rdf11concepts/RdfLiteral.java    |  80 +++++++++++
 .../rdf/rdf11concepts/RdfSubjectTerm.java          | 112 +++++++++++++++
 .../tinkerpop/rdf/rdf11concepts/RdfTerm.java       | 156 +++++++++++++++++++++
 .../tinkerpop/rdf/rdf11concepts/RdfTriple.java     |  78 +++++++++++
 .../tinkerpop/rdf/rdf11concepts/RdfVocabulary.java |  33 +++++
 11 files changed, 701 insertions(+)

diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/BlankNode.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/BlankNode.java
new file mode 100644
index 0000000..f0476b4
--- /dev/null
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/BlankNode.java
@@ -0,0 +1,40 @@
+package org.example.org.apache.tinkerpop.rdf.rdf11concepts;
+
+/**
+ * A node in an RDF graph which is neither an IRI nor a literal
+ * 
+ * @seeAlso - id: "https://www.w3.org/TR/rdf11-concepts/#section-blank-nodes"
+ *            title: "RDF 1.1 Concepts and Abstract Syntax, section 3.4: Blank Nodes"
+ */
+public class BlankNode {
+    /**
+     * A local identifier for the blank node which may be used in concrete syntaxes
+     * 
+     * @comments Giving a blank node a string-valued identifier is a pragmatic choice which is intended to support
+     * implementations. rdf11-concepts makes clear that such identifiers are not part of the RDF abstract syntax, and should
+     * not be used as persistent or portable identifiers for blank nodes.
+     * @type string
+     */
+    public final String identifier;
+    
+    /**
+     * Constructs an immutable BlankNode object
+     */
+    public BlankNode(String identifier) {
+        this.identifier = identifier;
+    }
+    
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof BlankNode)) {
+            return false;
+        }
+        BlankNode o = (BlankNode) other;
+        return identifier.equals(o.identifier);
+    }
+    
+    @Override
+    public int hashCode() {
+        return 2 * identifier.hashCode();
+    }
+}
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/Iri.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/Iri.java
new file mode 100644
index 0000000..5eed57b
--- /dev/null
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/Iri.java
@@ -0,0 +1,37 @@
+package org.example.org.apache.tinkerpop.rdf.rdf11concepts;
+
+/**
+ * A Unicode string that conforms to the syntax defined in RFC 3987
+ * 
+ * @seeAlso - id: "https://www.w3.org/TR/rdf11-concepts/#section-IRIs"
+ *            title: "RDF 1.1 Concepts and Abstract Syntax, section 3.2: IRIs"
+ *          - id: "http://www.unicode.org/versions/latest"
+ *            title: The Unicode Standard
+ *          - id: "http://www.ietf.org/rfc/rfc3987.txt"
+ *            title: "Internationalized Resource Identifiers (IRIs)"
+ * @type string
+ */
+public class Iri {
+    public final String value;
+    
+    /**
+     * Constructs an immutable Iri object
+     */
+    public Iri(String value) {
+        this.value = value;
+    }
+    
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof Iri)) {
+            return false;
+        }
+        Iri o = (Iri) other;
+        return value.equals(o.value);
+    }
+    
+    @Override
+    public int hashCode() {
+        return 2 * value.hashCode();
+    }
+}
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/LanguageTag.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/LanguageTag.java
new file mode 100644
index 0000000..7c5376f
--- /dev/null
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/LanguageTag.java
@@ -0,0 +1,36 @@
+package org.example.org.apache.tinkerpop.rdf.rdf11concepts;
+
+/**
+ * A BCP 47 language tag
+ * 
+ * @examples - en
+ *           - de
+ *           - zh
+ * @seeAlso - id: "http://tools.ietf.org/html/bcp47"
+ *            title: Tags for Identifying Languages
+ * @type string
+ */
+public class LanguageTag {
+    public final String value;
+    
+    /**
+     * Constructs an immutable LanguageTag object
+     */
+    public LanguageTag(String value) {
+        this.value = value;
+    }
+    
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof LanguageTag)) {
+            return false;
+        }
+        LanguageTag o = (LanguageTag) other;
+        return value.equals(o.value);
+    }
+    
+    @Override
+    public int hashCode() {
+        return 2 * value.hashCode();
+    }
+}
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/NamespacePrefix.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/NamespacePrefix.java
new file mode 100644
index 0000000..3bc0493
--- /dev/null
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/NamespacePrefix.java
@@ -0,0 +1,33 @@
+package org.example.org.apache.tinkerpop.rdf.rdf11concepts;
+
+/**
+ * A common prefix for IRIs in the same RDF vocabulary
+ * 
+ * @seeAlso - id: "https://www.w3.org/TR/rdf11-concepts/#vocabularies"
+ *            title: "RDF 1.1 Concepts and Abstract Syntax, section 1.4: RDF Vocabularies and Namespace IRIs"
+ * @type string
+ */
+public class NamespacePrefix {
+    public final String value;
+    
+    /**
+     * Constructs an immutable NamespacePrefix object
+     */
+    public NamespacePrefix(String value) {
+        this.value = value;
+    }
+    
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof NamespacePrefix)) {
+            return false;
+        }
+        NamespacePrefix o = (NamespacePrefix) other;
+        return value.equals(o.value);
+    }
+    
+    @Override
+    public int hashCode() {
+        return 2 * value.hashCode();
+    }
+}
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfDataset.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfDataset.java
new file mode 100644
index 0000000..9a535e6
--- /dev/null
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfDataset.java
@@ -0,0 +1,63 @@
+package org.example.org.apache.tinkerpop.rdf.rdf11concepts;
+
+/**
+ * A collection of RDF graphs, consisting of a default graph and a set of named graphs
+ * 
+ * @seeAlso - id: "https://www.w3.org/TR/rdf11-concepts/#section-dataset"
+ *            title: "RDF 1.1 Concepts and Abstract Syntax, section 4: RDF Datasets"
+ */
+public class RdfDataset {
+    /**
+     * The single default (unnamed) graph of the RDF dataset
+     * 
+     * @type org/apache/tinkerpop/rdf/rdf11concepts.RdfGraph
+     */
+    public final RdfGraph defaultGraph;
+    
+    /**
+     * The named graphs of the RDF dataset, as a map from unique graph names to graphs
+     * 
+     * @type map:
+     *         keys: org/apache/tinkerpop/rdf/rdf11concepts.RdfSubjectTerm
+     *         values: org/apache/tinkerpop/rdf/rdf11concepts.RdfGraph
+     */
+    public final java.util.Map<RdfSubjectTerm, RdfGraph> namedGraphs;
+    
+    /**
+     * Constructs an immutable RdfDataset object
+     */
+    public RdfDataset(RdfGraph defaultGraph, java.util.Map<RdfSubjectTerm, RdfGraph> namedGraphs) {
+        this.defaultGraph = defaultGraph;
+        this.namedGraphs = namedGraphs;
+    }
+    
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof RdfDataset)) {
+            return false;
+        }
+        RdfDataset o = (RdfDataset) other;
+        return defaultGraph.equals(o.defaultGraph)
+            && namedGraphs.equals(o.namedGraphs);
+    }
+    
+    @Override
+    public int hashCode() {
+        return 2 * defaultGraph.hashCode()
+            + 3 * namedGraphs.hashCode();
+    }
+    
+    /**
+     * Construct a new immutable RdfDataset object in which defaultGraph is overridden
+     */
+    public RdfDataset withDefaultGraph(RdfGraph defaultGraph) {
+        return new RdfDataset(defaultGraph, namedGraphs);
+    }
+    
+    /**
+     * Construct a new immutable RdfDataset object in which namedGraphs is overridden
+     */
+    public RdfDataset withNamedGraphs(java.util.Map<RdfSubjectTerm, RdfGraph> namedGraphs) {
+        return new RdfDataset(defaultGraph, namedGraphs);
+    }
+}
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfGraph.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfGraph.java
new file mode 100644
index 0000000..70f6ef2
--- /dev/null
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfGraph.java
@@ -0,0 +1,33 @@
+package org.example.org.apache.tinkerpop.rdf.rdf11concepts;
+
+/**
+ * A set of RDF triples
+ * 
+ * @seeAlso - id: "https://www.w3.org/TR/rdf11-concepts/#section-rdf-graph"
+ *            title: "RDF 1.1 Concepts and Abstract Syntax, section 3: RDF Graphs"
+ * @type set: org/apache/tinkerpop/rdf/rdf11concepts.RdfTriple
+ */
+public class RdfGraph {
+    public final java.util.Set<RdfTriple> value;
+    
+    /**
+     * Constructs an immutable RdfGraph object
+     */
+    public RdfGraph(java.util.Set<RdfTriple> value) {
+        this.value = value;
+    }
+    
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof RdfGraph)) {
+            return false;
+        }
+        RdfGraph o = (RdfGraph) other;
+        return value.equals(o.value);
+    }
+    
+    @Override
+    public int hashCode() {
+        return 2 * value.hashCode();
+    }
+}
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfLiteral.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfLiteral.java
new file mode 100644
index 0000000..a6c7f17
--- /dev/null
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfLiteral.java
@@ -0,0 +1,80 @@
+package org.example.org.apache.tinkerpop.rdf.rdf11concepts;
+
+/**
+ * A value such as a string, number, or date
+ * 
+ * @seeAlso - id: "https://www.w3.org/TR/rdf11-concepts/#section-Graph-Literal"
+ *            title: "RDF 1.1 Concepts and Abstract Syntax, section 3.2: Literals"
+ */
+public class RdfLiteral {
+    /**
+     * A Unicode string which should be in Normal Form C
+     * 
+     * @seeAlso - id: "http://www.unicode.org/reports/tr15"
+     *            title: "TR15, Unicode Normalization Forms"
+     * @type string
+     */
+    public final String lexicalForm;
+    
+    /**
+     * An IRI identifying a datatype that determines how the lexical form maps to a literal value
+     * 
+     * @type org/apache/tinkerpop/rdf/rdf11concepts.Iri
+     */
+    public final Iri datatype;
+    
+    /**
+     * An optional language tag, provided only if the datatype of this literal is rdf:langString
+     * 
+     * @type optional: org/apache/tinkerpop/rdf/rdf11concepts.LanguageTag
+     */
+    public final java.util.Optional<LanguageTag> languageTag;
+    
+    /**
+     * Constructs an immutable RdfLiteral object
+     */
+    public RdfLiteral(String lexicalForm, Iri datatype, java.util.Optional<LanguageTag> languageTag) {
+        this.lexicalForm = lexicalForm;
+        this.datatype = datatype;
+        this.languageTag = languageTag;
+    }
+    
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof RdfLiteral)) {
+            return false;
+        }
+        RdfLiteral o = (RdfLiteral) other;
+        return lexicalForm.equals(o.lexicalForm)
+            && datatype.equals(o.datatype)
+            && languageTag.equals(o.languageTag);
+    }
+    
+    @Override
+    public int hashCode() {
+        return 2 * lexicalForm.hashCode()
+            + 3 * datatype.hashCode()
+            + 5 * languageTag.hashCode();
+    }
+    
+    /**
+     * Construct a new immutable RdfLiteral object in which lexicalForm is overridden
+     */
+    public RdfLiteral withLexicalForm(String lexicalForm) {
+        return new RdfLiteral(lexicalForm, datatype, languageTag);
+    }
+    
+    /**
+     * Construct a new immutable RdfLiteral object in which datatype is overridden
+     */
+    public RdfLiteral withDatatype(Iri datatype) {
+        return new RdfLiteral(lexicalForm, datatype, languageTag);
+    }
+    
+    /**
+     * Construct a new immutable RdfLiteral object in which languageTag is overridden
+     */
+    public RdfLiteral withLanguageTag(java.util.Optional<LanguageTag> languageTag) {
+        return new RdfLiteral(lexicalForm, datatype, languageTag);
+    }
+}
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfSubjectTerm.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfSubjectTerm.java
new file mode 100644
index 0000000..f47f232
--- /dev/null
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfSubjectTerm.java
@@ -0,0 +1,112 @@
+package org.example.org.apache.tinkerpop.rdf.rdf11concepts;
+
+/**
+ * An RDF term which may appear in the subject position of a triple, i.e. an IRI or a blank node
+ * 
+ * @comments The concept of an "RDF subject" is not directly defined in rdf11-concepts; it is provided here as a
+ * convenience.
+ */
+public abstract class RdfSubjectTerm {
+    private RdfSubjectTerm() {}
+    
+    public abstract <R> R accept(Visitor<R> visitor) ;
+    
+    /**
+     * An interface for applying a function to a RdfSubjectTerm according to its variant (subclass)
+     */
+    public interface Visitor<R> {
+        R visit(Iri instance) ;
+        
+        R visit(BlankNode instance) ;
+    }
+    
+    /**
+     * An interface for applying a function to a RdfSubjectTerm according to its variant (subclass). If a visit() method for
+     * a particular variant is not implemented, a default method is used instead.
+     */
+    public interface PartialVisitor<R> extends Visitor<R> {
+        default R otherwise(RdfSubjectTerm instance) {
+            throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
+        }
+        
+        @Override
+        default R visit(Iri instance) {
+            return otherwise(instance);
+        }
+        
+        @Override
+        default R visit(BlankNode instance) {
+            return otherwise(instance);
+        }
+    }
+    
+    /**
+     * An IRI
+     * 
+     * @type org/apache/tinkerpop/rdf/rdf11concepts.Iri
+     */
+    public static final class Iri extends RdfSubjectTerm {
+        public final Iri iri;
+        
+        /**
+         * Constructs an immutable Iri object
+         */
+        public Iri(Iri iri) {
+            this.iri = iri;
+        }
+        
+        @Override
+        public <R> R accept(Visitor<R> visitor) {
+            return visitor.visit(this);
+        }
+        
+        @Override
+        public boolean equals(Object other) {
+            if (!(other instanceof Iri)) {
+                return false;
+            }
+            Iri o = (Iri) other;
+            return iri.equals(o.iri);
+        }
+        
+        @Override
+        public int hashCode() {
+            return 2 * iri.hashCode();
+        }
+    }
+    
+    /**
+     * A blank node
+     * 
+     * @type org/apache/tinkerpop/rdf/rdf11concepts.BlankNode
+     */
+    public static final class BlankNode extends RdfSubjectTerm {
+        public final BlankNode blankNode;
+        
+        /**
+         * Constructs an immutable BlankNode object
+         */
+        public BlankNode(BlankNode blankNode) {
+            this.blankNode = blankNode;
+        }
+        
+        @Override
+        public <R> R accept(Visitor<R> visitor) {
+            return visitor.visit(this);
+        }
+        
+        @Override
+        public boolean equals(Object other) {
+            if (!(other instanceof BlankNode)) {
+                return false;
+            }
+            BlankNode o = (BlankNode) other;
+            return blankNode.equals(o.blankNode);
+        }
+        
+        @Override
+        public int hashCode() {
+            return 2 * blankNode.hashCode();
+        }
+    }
+}
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfTerm.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfTerm.java
new file mode 100644
index 0000000..0c311c8
--- /dev/null
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfTerm.java
@@ -0,0 +1,156 @@
+package org.example.org.apache.tinkerpop.rdf.rdf11concepts;
+
+/**
+ * An IRI, literal, or blank node
+ * 
+ * @comments Whereas the "nodes" of a graph are all of that graph's subjects and objects, RDF terms are the set of all
+ * possible IRIs, literals, and blank nodes.
+ * @seeAlso - id: "https://www.w3.org/TR/rdf11-concepts/#section-triples"
+ *            title: "RDF 1.1 Concepts and Abstract Syntax, section 3.1: Triples"
+ */
+public abstract class RdfTerm {
+    private RdfTerm() {}
+    
+    public abstract <R> R accept(Visitor<R> visitor) ;
+    
+    /**
+     * An interface for applying a function to a RdfTerm according to its variant (subclass)
+     */
+    public interface Visitor<R> {
+        R visit(Iri instance) ;
+        
+        R visit(Literal instance) ;
+        
+        R visit(BlankNode instance) ;
+    }
+    
+    /**
+     * An interface for applying a function to a RdfTerm according to its variant (subclass). If a visit() method for a
+     * particular variant is not implemented, a default method is used instead.
+     */
+    public interface PartialVisitor<R> extends Visitor<R> {
+        default R otherwise(RdfTerm instance) {
+            throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
+        }
+        
+        @Override
+        default R visit(Iri instance) {
+            return otherwise(instance);
+        }
+        
+        @Override
+        default R visit(Literal instance) {
+            return otherwise(instance);
+        }
+        
+        @Override
+        default R visit(BlankNode instance) {
+            return otherwise(instance);
+        }
+    }
+    
+    /**
+     * An IRI
+     * 
+     * @type org/apache/tinkerpop/rdf/rdf11concepts.Iri
+     */
+    public static final class Iri extends RdfTerm {
+        public final Iri iri;
+        
+        /**
+         * Constructs an immutable Iri object
+         */
+        public Iri(Iri iri) {
+            this.iri = iri;
+        }
+        
+        @Override
+        public <R> R accept(Visitor<R> visitor) {
+            return visitor.visit(this);
+        }
+        
+        @Override
+        public boolean equals(Object other) {
+            if (!(other instanceof Iri)) {
+                return false;
+            }
+            Iri o = (Iri) other;
+            return iri.equals(o.iri);
+        }
+        
+        @Override
+        public int hashCode() {
+            return 2 * iri.hashCode();
+        }
+    }
+    
+    /**
+     * A literal
+     * 
+     * @type org/apache/tinkerpop/rdf/rdf11concepts.RdfLiteral
+     */
+    public static final class Literal extends RdfTerm {
+        public final RdfLiteral literal;
+        
+        /**
+         * Constructs an immutable Literal object
+         */
+        public Literal(RdfLiteral literal) {
+            this.literal = literal;
+        }
+        
+        @Override
+        public <R> R accept(Visitor<R> visitor) {
+            return visitor.visit(this);
+        }
+        
+        @Override
+        public boolean equals(Object other) {
+            if (!(other instanceof Literal)) {
+                return false;
+            }
+            Literal o = (Literal) other;
+            return literal.equals(o.literal);
+        }
+        
+        @Override
+        public int hashCode() {
+            return 2 * literal.hashCode();
+        }
+    }
+    
+    /**
+     * A blank node
+     * 
+     * @type org/apache/tinkerpop/rdf/rdf11concepts.BlankNode
+     */
+    public static final class BlankNode extends RdfTerm {
+        public final BlankNode blankNode;
+        
+        /**
+         * Constructs an immutable BlankNode object
+         */
+        public BlankNode(BlankNode blankNode) {
+            this.blankNode = blankNode;
+        }
+        
+        @Override
+        public <R> R accept(Visitor<R> visitor) {
+            return visitor.visit(this);
+        }
+        
+        @Override
+        public boolean equals(Object other) {
+            if (!(other instanceof BlankNode)) {
+                return false;
+            }
+            BlankNode o = (BlankNode) other;
+            return blankNode.equals(o.blankNode);
+        }
+        
+        @Override
+        public int hashCode() {
+            return 2 * blankNode.hashCode();
+        }
+    }
+}
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfTriple.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfTriple.java
new file mode 100644
index 0000000..2acc288
--- /dev/null
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfTriple.java
@@ -0,0 +1,78 @@
+package org.example.org.apache.tinkerpop.rdf.rdf11concepts;
+
+/**
+ * A triple consisting of a subject, predicate, and object
+ * 
+ * @seeAlso - id: "https://www.w3.org/TR/rdf11-concepts/#section-triples"
+ *            title: "RDF 1.1 Concepts and Abstract Syntax, section 3.1: Triples"
+ */
+public class RdfTriple {
+    /**
+     * The subject of the triple, which is an IRI or a blank node
+     * 
+     * @type org/apache/tinkerpop/rdf/rdf11concepts.RdfSubjectTerm
+     */
+    public final RdfSubjectTerm subject;
+    
+    /**
+     * The predicate of the triple, which is an IRI
+     * 
+     * @type org/apache/tinkerpop/rdf/rdf11concepts.Iri
+     */
+    public final Iri predicate;
+    
+    /**
+     * The object of the triple, which is an IRI, a literal or a blank node
+     * 
+     * @type org/apache/tinkerpop/rdf/rdf11concepts.RdfTerm
+     */
+    public final RdfTerm object;
+    
+    /**
+     * Constructs an immutable RdfTriple object
+     */
+    public RdfTriple(RdfSubjectTerm subject, Iri predicate, RdfTerm object) {
+        this.subject = subject;
+        this.predicate = predicate;
+        this.object = object;
+    }
+    
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof RdfTriple)) {
+            return false;
+        }
+        RdfTriple o = (RdfTriple) other;
+        return subject.equals(o.subject)
+            && predicate.equals(o.predicate)
+            && object.equals(o.object);
+    }
+    
+    @Override
+    public int hashCode() {
+        return 2 * subject.hashCode()
+            + 3 * predicate.hashCode()
+            + 5 * object.hashCode();
+    }
+    
+    /**
+     * Construct a new immutable RdfTriple object in which subject is overridden
+     */
+    public RdfTriple withSubject(RdfSubjectTerm subject) {
+        return new RdfTriple(subject, predicate, object);
+    }
+    
+    /**
+     * Construct a new immutable RdfTriple object in which predicate is overridden
+     */
+    public RdfTriple withPredicate(Iri predicate) {
+        return new RdfTriple(subject, predicate, object);
+    }
+    
+    /**
+     * Construct a new immutable RdfTriple object in which object is overridden
+     */
+    public RdfTriple withObject(RdfTerm object) {
+        return new RdfTriple(subject, predicate, object);
+    }
+}
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfVocabulary.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfVocabulary.java
new file mode 100644
index 0000000..db66fc1
--- /dev/null
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/rdf/rdf11concepts/RdfVocabulary.java
@@ -0,0 +1,33 @@
+package org.example.org.apache.tinkerpop.rdf.rdf11concepts;
+
+/**
+ * A collection of IRIs intended for use in RDF graphs
+ * 
+ * @seeAlso - id: "https://www.w3.org/TR/rdf11-concepts/#vocabularies"
+ *            title: "RDF 1.1 Concepts and Abstract Syntax, section 1.4: RDF Vocabularies and Namespace IRIs"
+ * @type set: org/apache/tinkerpop/rdf/rdf11concepts.Iri
+ */
+public class RdfVocabulary {
+    public final java.util.Set<Iri> value;
+    
+    /**
+     * Constructs an immutable RdfVocabulary object
+     */
+    public RdfVocabulary(java.util.Set<Iri> value) {
+        this.value = value;
+    }
+    
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof RdfVocabulary)) {
+            return false;
+        }
+        RdfVocabulary o = (RdfVocabulary) other;
+        return value.equals(o.value);
+    }
+    
+    @Override
+    public int hashCode() {
+        return 2 * value.hashCode();
+    }
+}

[tinkerpop] 01/03: Update coding style for generated classes

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joshsh pushed a commit to branch TINKERPOP-2563-language
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit a64cc57408bdbb7ea6b7824543f58743e19d0fea
Author: Joshua Shinavier <jo...@uber.com>
AuthorDate: Thu Jun 3 06:47:18 2021 -0700

    Update coding style for generated classes
---
 .../model/constants/GremlinStringConstant.java     |  20 +-
 .../language/model/literals/DateLiteral.java       |   4 +-
 .../model/literals/EmptyStringLiteral.java         |   4 +-
 .../language/model/literals/GenericLiteral.java    |  30 +-
 .../model/literals/NonEmptyStringLiteral.java      |   4 +-
 .../language/model/literals/StringLiteral.java     |  15 +-
 .../language/model/methods/ExplainMethod.java      |   4 +-
 .../language/model/methods/HasNextMethod.java      |   4 +-
 .../language/model/methods/IterateMethod.java      |   4 +-
 .../gremlin/language/model/methods/NextMethod.java |   4 +-
 .../language/model/methods/ToBulkSetMethod.java    |   4 +-
 .../language/model/methods/ToListMethod.java       |   4 +-
 .../language/model/methods/ToSetMethod.java        |   4 +-
 .../model/methods/TraversalSackMethod.java         |   4 +-
 .../model/methods/TraversalSelfMethod.java         |   5 +-
 .../model/methods/TraversalTerminalMethod.java     |  40 +-
 .../language/model/methods/TryNextMethod.java      |   4 +-
 .../gremlin/language/model/predicates/Between.java |   4 +-
 .../language/model/predicates/Containing.java      |   4 +-
 .../language/model/predicates/EndingWith.java      |   4 +-
 .../gremlin/language/model/predicates/Eq.java      |   4 +-
 .../gremlin/language/model/predicates/Gt.java      |   4 +-
 .../gremlin/language/model/predicates/Gte.java     |   4 +-
 .../gremlin/language/model/predicates/Inside.java  |   4 +-
 .../gremlin/language/model/predicates/Lt.java      |   4 +-
 .../gremlin/language/model/predicates/Lte.java     |   4 +-
 .../gremlin/language/model/predicates/Neq.java     |   4 +-
 .../gremlin/language/model/predicates/Not.java     |   4 +-
 .../language/model/predicates/NotContaining.java   |   4 +-
 .../language/model/predicates/NotEndingWith.java   |   4 +-
 .../language/model/predicates/NotStartingWith.java |   4 +-
 .../gremlin/language/model/predicates/Outside.java |   4 +-
 .../language/model/predicates/StartingWith.java    |   4 +-
 .../model/predicates/TraversalPredicate.java       |  95 +++-
 .../gremlin/language/model/predicates/Within.java  |   4 +-
 .../gremlin/language/model/predicates/Without.java |   4 +-
 .../gremlin/language/model/query/Query.java        |  40 +-
 .../gremlin/language/model/steps/AddEStep.java     |  10 +-
 .../gremlin/language/model/steps/AddVStep.java     |  20 +-
 .../language/model/steps/AggregateStep.java        |   4 +-
 .../gremlin/language/model/steps/AndStep.java      |   4 +-
 .../gremlin/language/model/steps/AsStep.java       |   4 +-
 .../gremlin/language/model/steps/BarrierStep.java  |  20 +-
 .../gremlin/language/model/steps/BothEStep.java    |   4 +-
 .../gremlin/language/model/steps/BothStep.java     |   4 +-
 .../gremlin/language/model/steps/BothVStep.java    |   4 +-
 .../gremlin/language/model/steps/BranchStep.java   |   4 +-
 .../gremlin/language/model/steps/ByStep.java       |  73 ++-
 .../gremlin/language/model/steps/CapStep.java      |   4 +-
 .../gremlin/language/model/steps/ChooseStep.java   |  41 +-
 .../gremlin/language/model/steps/CoalesceStep.java |   4 +-
 .../gremlin/language/model/steps/CoinStep.java     |   4 +-
 .../model/steps/ConnectedComponentStep.java        |   4 +-
 .../gremlin/language/model/steps/ConstantStep.java |   4 +-
 .../gremlin/language/model/steps/CountStep.java    |   4 +-
 .../language/model/steps/CyclicPathStep.java       |   4 +-
 .../gremlin/language/model/steps/DedupStep.java    |   4 +-
 .../gremlin/language/model/steps/DropStep.java     |   4 +-
 .../language/model/steps/ElementMapStep.java       |   4 +-
 .../gremlin/language/model/steps/EmitStep.java     |  20 +-
 .../gremlin/language/model/steps/FilterStep.java   |  10 +-
 .../gremlin/language/model/steps/FlatMapStep.java  |   4 +-
 .../gremlin/language/model/steps/FoldStep.java     |  14 +-
 .../gremlin/language/model/steps/FromStep.java     |  10 +-
 .../language/model/steps/GroupCountStep.java       |   4 +-
 .../gremlin/language/model/steps/GroupStep.java    |   4 +-
 .../gremlin/language/model/steps/HasIdStep.java    |  20 +-
 .../gremlin/language/model/steps/HasKeyStep.java   |  20 +-
 .../gremlin/language/model/steps/HasLabelStep.java |  20 +-
 .../gremlin/language/model/steps/HasNotStep.java   |   4 +-
 .../gremlin/language/model/steps/HasStep.java      | 116 ++++-
 .../gremlin/language/model/steps/HasValueStep.java |  10 +-
 .../gremlin/language/model/steps/IdStep.java       |   4 +-
 .../gremlin/language/model/steps/IdentityStep.java |   4 +-
 .../gremlin/language/model/steps/InEStep.java      |   4 +-
 .../gremlin/language/model/steps/InStep.java       |   4 +-
 .../gremlin/language/model/steps/InVStep.java      |   4 +-
 .../gremlin/language/model/steps/IndexStep.java    |   4 +-
 .../gremlin/language/model/steps/InjectStep.java   |   4 +-
 .../gremlin/language/model/steps/IsStep.java       |  10 +-
 .../gremlin/language/model/steps/KeyStep.java      |   4 +-
 .../gremlin/language/model/steps/LabelStep.java    |   4 +-
 .../gremlin/language/model/steps/LimitStep.java    |   4 +-
 .../gremlin/language/model/steps/LocalStep.java    |   4 +-
 .../gremlin/language/model/steps/LoopsStep.java    |   4 +-
 .../gremlin/language/model/steps/MapStep.java      |   4 +-
 .../gremlin/language/model/steps/MatchStep.java    |   4 +-
 .../gremlin/language/model/steps/MathStep.java     |   4 +-
 .../gremlin/language/model/steps/MaxStep.java      |   4 +-
 .../gremlin/language/model/steps/MeanStep.java     |   4 +-
 .../gremlin/language/model/steps/MinStep.java      |   4 +-
 .../gremlin/language/model/steps/NotStep.java      |   4 +-
 .../gremlin/language/model/steps/OptionStep.java   |  35 +-
 .../gremlin/language/model/steps/OptionalStep.java |   4 +-
 .../gremlin/language/model/steps/OrStep.java       |   4 +-
 .../gremlin/language/model/steps/OrderStep.java    |   4 +-
 .../gremlin/language/model/steps/OtherVStep.java   |   4 +-
 .../gremlin/language/model/steps/OutEStep.java     |   4 +-
 .../gremlin/language/model/steps/OutStep.java      |   4 +-
 .../gremlin/language/model/steps/OutVStep.java     |   4 +-
 .../gremlin/language/model/steps/PageRankStep.java |   4 +-
 .../gremlin/language/model/steps/PathStep.java     |   4 +-
 .../language/model/steps/PeerPressureStep.java     |   4 +-
 .../gremlin/language/model/steps/ProfileStep.java  |   4 +-
 .../gremlin/language/model/steps/ProjectStep.java  |   4 +-
 .../language/model/steps/PropertiesStep.java       |   4 +-
 .../language/model/steps/PropertyMapStep.java      |   4 +-
 .../gremlin/language/model/steps/PropertyStep.java |   4 +-
 .../gremlin/language/model/steps/RangeStep.java    |   4 +-
 .../gremlin/language/model/steps/ReadStep.java     |   4 +-
 .../gremlin/language/model/steps/RepeatStep.java   |   4 +-
 .../gremlin/language/model/steps/SackStep.java     |   4 +-
 .../gremlin/language/model/steps/SampleStep.java   |   4 +-
 .../gremlin/language/model/steps/SelectStep.java   |  56 ++-
 .../language/model/steps/ShortestPathStep.java     |   4 +-
 .../language/model/steps/SideEffectStep.java       |   4 +-
 .../language/model/steps/SimplePathStep.java       |   4 +-
 .../gremlin/language/model/steps/SkipStep.java     |   4 +-
 .../gremlin/language/model/steps/StoreStep.java    |   4 +-
 .../gremlin/language/model/steps/SubgraphStep.java |   4 +-
 .../gremlin/language/model/steps/SumStep.java      |   4 +-
 .../gremlin/language/model/steps/TailStep.java     |   4 +-
 .../language/model/steps/TimeLimitStep.java        |   4 +-
 .../gremlin/language/model/steps/TimesStep.java    |   4 +-
 .../gremlin/language/model/steps/ToEStep.java      |   4 +-
 .../gremlin/language/model/steps/ToStep.java       |  25 +-
 .../gremlin/language/model/steps/ToVStep.java      |   4 +-
 .../language/model/steps/TraversalMethod.java      | 505 ++++++++++++++++-----
 .../gremlin/language/model/steps/TreeStep.java     |   4 +-
 .../gremlin/language/model/steps/UnfoldStep.java   |   4 +-
 .../gremlin/language/model/steps/UnionStep.java    |   4 +-
 .../gremlin/language/model/steps/UntilStep.java    |  10 +-
 .../gremlin/language/model/steps/VStep.java        |   4 +-
 .../gremlin/language/model/steps/ValueMapStep.java |   4 +-
 .../gremlin/language/model/steps/ValueStep.java    |   4 +-
 .../gremlin/language/model/steps/ValuesStep.java   |   4 +-
 .../gremlin/language/model/steps/WhereStep.java    |  20 +-
 .../gremlin/language/model/steps/WithStep.java     |   4 +-
 .../gremlin/language/model/steps/WriteStep.java    |   4 +-
 .../traversal/ChainedParentOfGraphTraversal.java   |   4 +-
 .../language/model/traversal/ChainedTraversal.java |  20 +-
 .../traversal/EdgeLabelVerificationStrategy.java   |  10 +-
 .../language/model/traversal/NestedTraversal.java  |  20 +-
 .../model/traversal/PartitionStrategy.java         |  20 +-
 .../ReservedKeysVerificationStrategy.java          |  15 +-
 .../language/model/traversal/RootTraversal.java    |  20 +-
 .../language/model/traversal/SubgraphStrategy.java |  20 +-
 .../model/traversal/TraversalBiFunction.java       |   4 +-
 .../model/traversal/TraversalComparator.java       |   4 +-
 .../model/traversal/TraversalFunction.java         |  10 +-
 .../language/model/traversal/TraversalSource.java  |   4 +-
 .../model/traversal/TraversalSourceSelfMethod.java |  30 +-
 .../traversal/TraversalSourceSpawnMethod.java      |  30 +-
 .../model/traversal/TraversalStrategy.java         |  25 +-
 .../gremlin/language/model/traversal/With.java     |   4 +-
 .../gremlin/language/model/traversal/WithBulk.java |   4 +-
 .../gremlin/language/model/traversal/WithPath.java |   4 +-
 .../gremlin/language/model/traversal/WithSack.java |   4 +-
 .../language/model/traversal/WithSideEffect.java   |   4 +-
 .../language/model/traversal/WithStrategies.java   |   4 +-
 160 files changed, 1623 insertions(+), 391 deletions(-)

diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/constants/GremlinStringConstant.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/constants/GremlinStringConstant.java
index dbde300..1ca03a3 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/constants/GremlinStringConstant.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/constants/GremlinStringConstant.java
@@ -27,18 +27,22 @@ public abstract class GremlinStringConstant {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(WithOptions instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ShortestPath instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(PageRank instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(PeerPressure instance) {
             return otherwise(instance);
         }
@@ -64,7 +68,9 @@ public abstract class GremlinStringConstant {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithOptions)) return false;
+            if (!(other instanceof WithOptions)) {
+                return false;
+            }
             WithOptions o = (WithOptions) other;
             return withOptions.equals(o.withOptions);
         }
@@ -95,7 +101,9 @@ public abstract class GremlinStringConstant {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ShortestPath)) return false;
+            if (!(other instanceof ShortestPath)) {
+                return false;
+            }
             ShortestPath o = (ShortestPath) other;
             return shortestPath.equals(o.shortestPath);
         }
@@ -126,7 +134,9 @@ public abstract class GremlinStringConstant {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof PageRank)) return false;
+            if (!(other instanceof PageRank)) {
+                return false;
+            }
             PageRank o = (PageRank) other;
             return pageRank.equals(o.pageRank);
         }
@@ -157,7 +167,9 @@ public abstract class GremlinStringConstant {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof PeerPressure)) return false;
+            if (!(other instanceof PeerPressure)) {
+                return false;
+            }
             PeerPressure o = (PeerPressure) other;
             return peerPressure.equals(o.peerPressure);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/DateLiteral.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/DateLiteral.java
index 88673f0..5f57519 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/DateLiteral.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/DateLiteral.java
@@ -15,7 +15,9 @@ public class DateLiteral {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof DateLiteral)) return false;
+        if (!(other instanceof DateLiteral)) {
+            return false;
+        }
         DateLiteral o = (DateLiteral) other;
         return value.equals(o.value);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/EmptyStringLiteral.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/EmptyStringLiteral.java
index 2ea06de..cfd7112 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/EmptyStringLiteral.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/EmptyStringLiteral.java
@@ -8,7 +8,9 @@ public class EmptyStringLiteral {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof EmptyStringLiteral)) return false;
+        if (!(other instanceof EmptyStringLiteral)) {
+            return false;
+        }
         EmptyStringLiteral o = (EmptyStringLiteral) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/GenericLiteral.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/GenericLiteral.java
index 05c4d83..2b52397 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/GenericLiteral.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/GenericLiteral.java
@@ -31,26 +31,32 @@ public abstract class GenericLiteral {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(IntegerEsc instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(FloatEsc instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(BooleanEsc instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(StringEsc instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Date instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Null instance) {
             return otherwise(instance);
         }
@@ -76,7 +82,9 @@ public abstract class GenericLiteral {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof IntegerEsc)) return false;
+            if (!(other instanceof IntegerEsc)) {
+                return false;
+            }
             IntegerEsc o = (IntegerEsc) other;
             return integer.equals(o.integer);
         }
@@ -107,7 +115,9 @@ public abstract class GenericLiteral {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof FloatEsc)) return false;
+            if (!(other instanceof FloatEsc)) {
+                return false;
+            }
             FloatEsc o = (FloatEsc) other;
             return floatEsc.equals(o.floatEsc);
         }
@@ -138,7 +148,9 @@ public abstract class GenericLiteral {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof BooleanEsc)) return false;
+            if (!(other instanceof BooleanEsc)) {
+                return false;
+            }
             BooleanEsc o = (BooleanEsc) other;
             return booleanEsc.equals(o.booleanEsc);
         }
@@ -169,7 +181,9 @@ public abstract class GenericLiteral {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof StringEsc)) return false;
+            if (!(other instanceof StringEsc)) {
+                return false;
+            }
             StringEsc o = (StringEsc) other;
             return string.equals(o.string);
         }
@@ -200,7 +214,9 @@ public abstract class GenericLiteral {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Date)) return false;
+            if (!(other instanceof Date)) {
+                return false;
+            }
             Date o = (Date) other;
             return date.equals(o.date);
         }
@@ -224,7 +240,9 @@ public abstract class GenericLiteral {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Null)) return false;
+            if (!(other instanceof Null)) {
+                return false;
+            }
             Null o = (Null) other;
             return true;
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/NonEmptyStringLiteral.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/NonEmptyStringLiteral.java
index f03a53c..caac3f2 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/NonEmptyStringLiteral.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/NonEmptyStringLiteral.java
@@ -15,7 +15,9 @@ public class NonEmptyStringLiteral {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof NonEmptyStringLiteral)) return false;
+        if (!(other instanceof NonEmptyStringLiteral)) {
+            return false;
+        }
         NonEmptyStringLiteral o = (NonEmptyStringLiteral) other;
         return value.equals(o.value);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/StringLiteral.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/StringLiteral.java
index 596438e..485ec16 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/StringLiteral.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/literals/StringLiteral.java
@@ -27,14 +27,17 @@ public abstract class StringLiteral {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(Empty instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(NonEmpty instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Constant instance) {
             return otherwise(instance);
         }
@@ -60,7 +63,9 @@ public abstract class StringLiteral {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Empty)) return false;
+            if (!(other instanceof Empty)) {
+                return false;
+            }
             Empty o = (Empty) other;
             return empty.equals(o.empty);
         }
@@ -91,7 +96,9 @@ public abstract class StringLiteral {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof NonEmpty)) return false;
+            if (!(other instanceof NonEmpty)) {
+                return false;
+            }
             NonEmpty o = (NonEmpty) other;
             return nonEmpty.equals(o.nonEmpty);
         }
@@ -122,7 +129,9 @@ public abstract class StringLiteral {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Constant)) return false;
+            if (!(other instanceof Constant)) {
+                return false;
+            }
             Constant o = (Constant) other;
             return constant.equals(o.constant);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/ExplainMethod.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/ExplainMethod.java
index 36a7d8c..9f382a2 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/ExplainMethod.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/ExplainMethod.java
@@ -8,7 +8,9 @@ public class ExplainMethod {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ExplainMethod)) return false;
+        if (!(other instanceof ExplainMethod)) {
+            return false;
+        }
         ExplainMethod o = (ExplainMethod) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/HasNextMethod.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/HasNextMethod.java
index 3cf3e84..2463a8d 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/HasNextMethod.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/HasNextMethod.java
@@ -8,7 +8,9 @@ public class HasNextMethod {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof HasNextMethod)) return false;
+        if (!(other instanceof HasNextMethod)) {
+            return false;
+        }
         HasNextMethod o = (HasNextMethod) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/IterateMethod.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/IterateMethod.java
index e656836..99f1d45 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/IterateMethod.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/IterateMethod.java
@@ -8,7 +8,9 @@ public class IterateMethod {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof IterateMethod)) return false;
+        if (!(other instanceof IterateMethod)) {
+            return false;
+        }
         IterateMethod o = (IterateMethod) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/NextMethod.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/NextMethod.java
index 2e1b1f2..04c6f68 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/NextMethod.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/NextMethod.java
@@ -15,7 +15,9 @@ public class NextMethod {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof NextMethod)) return false;
+        if (!(other instanceof NextMethod)) {
+            return false;
+        }
         NextMethod o = (NextMethod) other;
         return value.equals(o.value);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/ToBulkSetMethod.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/ToBulkSetMethod.java
index c63f12f..3a3c43d 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/ToBulkSetMethod.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/ToBulkSetMethod.java
@@ -8,7 +8,9 @@ public class ToBulkSetMethod {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ToBulkSetMethod)) return false;
+        if (!(other instanceof ToBulkSetMethod)) {
+            return false;
+        }
         ToBulkSetMethod o = (ToBulkSetMethod) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/ToListMethod.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/ToListMethod.java
index 1ecc25b..74904b1 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/ToListMethod.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/ToListMethod.java
@@ -8,7 +8,9 @@ public class ToListMethod {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ToListMethod)) return false;
+        if (!(other instanceof ToListMethod)) {
+            return false;
+        }
         ToListMethod o = (ToListMethod) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/ToSetMethod.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/ToSetMethod.java
index a7b8370..d42a33f 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/ToSetMethod.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/ToSetMethod.java
@@ -8,7 +8,9 @@ public class ToSetMethod {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ToSetMethod)) return false;
+        if (!(other instanceof ToSetMethod)) {
+            return false;
+        }
         ToSetMethod o = (ToSetMethod) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/TraversalSackMethod.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/TraversalSackMethod.java
index 0f5d4f6..d6645a1 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/TraversalSackMethod.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/TraversalSackMethod.java
@@ -8,7 +8,9 @@ public class TraversalSackMethod {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof TraversalSackMethod)) return false;
+        if (!(other instanceof TraversalSackMethod)) {
+            return false;
+        }
         TraversalSackMethod o = (TraversalSackMethod) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/TraversalSelfMethod.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/TraversalSelfMethod.java
index d62f750..6bc5484 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/TraversalSelfMethod.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/TraversalSelfMethod.java
@@ -21,6 +21,7 @@ public abstract class TraversalSelfMethod {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(None instance) {
             return otherwise(instance);
         }
@@ -39,7 +40,9 @@ public abstract class TraversalSelfMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof None)) return false;
+            if (!(other instanceof None)) {
+                return false;
+            }
             None o = (None) other;
             return true;
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/TraversalTerminalMethod.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/TraversalTerminalMethod.java
index 3b099dd..f6f9bc8 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/TraversalTerminalMethod.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/TraversalTerminalMethod.java
@@ -35,34 +35,42 @@ public abstract class TraversalTerminalMethod {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(Explain instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Iterate instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(HasNext instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(TryNext instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Next instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ToList instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ToSet instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ToBulkSet instance) {
             return otherwise(instance);
         }
@@ -88,7 +96,9 @@ public abstract class TraversalTerminalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Explain)) return false;
+            if (!(other instanceof Explain)) {
+                return false;
+            }
             Explain o = (Explain) other;
             return explain.equals(o.explain);
         }
@@ -119,7 +129,9 @@ public abstract class TraversalTerminalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Iterate)) return false;
+            if (!(other instanceof Iterate)) {
+                return false;
+            }
             Iterate o = (Iterate) other;
             return iterate.equals(o.iterate);
         }
@@ -150,7 +162,9 @@ public abstract class TraversalTerminalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof HasNext)) return false;
+            if (!(other instanceof HasNext)) {
+                return false;
+            }
             HasNext o = (HasNext) other;
             return hasNext.equals(o.hasNext);
         }
@@ -181,7 +195,9 @@ public abstract class TraversalTerminalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof TryNext)) return false;
+            if (!(other instanceof TryNext)) {
+                return false;
+            }
             TryNext o = (TryNext) other;
             return tryNext.equals(o.tryNext);
         }
@@ -212,7 +228,9 @@ public abstract class TraversalTerminalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Next)) return false;
+            if (!(other instanceof Next)) {
+                return false;
+            }
             Next o = (Next) other;
             return next.equals(o.next);
         }
@@ -243,7 +261,9 @@ public abstract class TraversalTerminalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ToList)) return false;
+            if (!(other instanceof ToList)) {
+                return false;
+            }
             ToList o = (ToList) other;
             return toList.equals(o.toList);
         }
@@ -274,7 +294,9 @@ public abstract class TraversalTerminalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ToSet)) return false;
+            if (!(other instanceof ToSet)) {
+                return false;
+            }
             ToSet o = (ToSet) other;
             return toSet.equals(o.toSet);
         }
@@ -305,7 +327,9 @@ public abstract class TraversalTerminalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ToBulkSet)) return false;
+            if (!(other instanceof ToBulkSet)) {
+                return false;
+            }
             ToBulkSet o = (ToBulkSet) other;
             return toBulkSet.equals(o.toBulkSet);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/TryNextMethod.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/TryNextMethod.java
index 527c949..ae4059f 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/TryNextMethod.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/methods/TryNextMethod.java
@@ -8,7 +8,9 @@ public class TryNextMethod {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof TryNextMethod)) return false;
+        if (!(other instanceof TryNextMethod)) {
+            return false;
+        }
         TryNextMethod o = (TryNextMethod) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Between.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Between.java
index 48659d5..b84a481 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Between.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Between.java
@@ -23,7 +23,9 @@ public class Between {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof Between)) return false;
+        if (!(other instanceof Between)) {
+            return false;
+        }
         Between o = (Between) other;
         return min.equals(o.min)
             && max.equals(o.max);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Containing.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Containing.java
index 6938108..5e3d864 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Containing.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Containing.java
@@ -15,7 +15,9 @@ public class Containing {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof Containing)) return false;
+        if (!(other instanceof Containing)) {
+            return false;
+        }
         Containing o = (Containing) other;
         return value.equals(o.value);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/EndingWith.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/EndingWith.java
index b177596..75c6150 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/EndingWith.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/EndingWith.java
@@ -15,7 +15,9 @@ public class EndingWith {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof EndingWith)) return false;
+        if (!(other instanceof EndingWith)) {
+            return false;
+        }
         EndingWith o = (EndingWith) other;
         return value.equals(o.value);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Eq.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Eq.java
index 1baf7f7..b9fe07e 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Eq.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Eq.java
@@ -17,7 +17,9 @@ public class Eq {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof Eq)) return false;
+        if (!(other instanceof Eq)) {
+            return false;
+        }
         Eq o = (Eq) other;
         return genericLiteral.equals(o.genericLiteral);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Gt.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Gt.java
index ec783f1..ad83e03 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Gt.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Gt.java
@@ -17,7 +17,9 @@ public class Gt {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof Gt)) return false;
+        if (!(other instanceof Gt)) {
+            return false;
+        }
         Gt o = (Gt) other;
         return genericLiteral.equals(o.genericLiteral);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Gte.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Gte.java
index e360e6b..6aaccc3 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Gte.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Gte.java
@@ -17,7 +17,9 @@ public class Gte {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof Gte)) return false;
+        if (!(other instanceof Gte)) {
+            return false;
+        }
         Gte o = (Gte) other;
         return genericLiteral.equals(o.genericLiteral);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Inside.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Inside.java
index 037968c..9007e70 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Inside.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Inside.java
@@ -23,7 +23,9 @@ public class Inside {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof Inside)) return false;
+        if (!(other instanceof Inside)) {
+            return false;
+        }
         Inside o = (Inside) other;
         return min.equals(o.min)
             && max.equals(o.max);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Lt.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Lt.java
index bfb5d65..2691733 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Lt.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Lt.java
@@ -17,7 +17,9 @@ public class Lt {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof Lt)) return false;
+        if (!(other instanceof Lt)) {
+            return false;
+        }
         Lt o = (Lt) other;
         return genericLiteral.equals(o.genericLiteral);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Lte.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Lte.java
index f172f81..fb49e20 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Lte.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Lte.java
@@ -17,7 +17,9 @@ public class Lte {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof Lte)) return false;
+        if (!(other instanceof Lte)) {
+            return false;
+        }
         Lte o = (Lte) other;
         return genericLiteral.equals(o.genericLiteral);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Neq.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Neq.java
index 7f0c4b6..ed81035 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Neq.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Neq.java
@@ -17,7 +17,9 @@ public class Neq {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof Neq)) return false;
+        if (!(other instanceof Neq)) {
+            return false;
+        }
         Neq o = (Neq) other;
         return genericLiteral.equals(o.genericLiteral);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Not.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Not.java
index 7beee3a..67c5ed3 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Not.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Not.java
@@ -15,7 +15,9 @@ public class Not {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof Not)) return false;
+        if (!(other instanceof Not)) {
+            return false;
+        }
         Not o = (Not) other;
         return value.equals(o.value);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/NotContaining.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/NotContaining.java
index 919c543..7cda246 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/NotContaining.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/NotContaining.java
@@ -15,7 +15,9 @@ public class NotContaining {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof NotContaining)) return false;
+        if (!(other instanceof NotContaining)) {
+            return false;
+        }
         NotContaining o = (NotContaining) other;
         return value.equals(o.value);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/NotEndingWith.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/NotEndingWith.java
index e3e538f..41bb9de7 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/NotEndingWith.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/NotEndingWith.java
@@ -15,7 +15,9 @@ public class NotEndingWith {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof NotEndingWith)) return false;
+        if (!(other instanceof NotEndingWith)) {
+            return false;
+        }
         NotEndingWith o = (NotEndingWith) other;
         return value.equals(o.value);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/NotStartingWith.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/NotStartingWith.java
index 3d10d6d..9f22cde 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/NotStartingWith.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/NotStartingWith.java
@@ -15,7 +15,9 @@ public class NotStartingWith {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof NotStartingWith)) return false;
+        if (!(other instanceof NotStartingWith)) {
+            return false;
+        }
         NotStartingWith o = (NotStartingWith) other;
         return value.equals(o.value);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Outside.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Outside.java
index eb80157..b927418 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Outside.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Outside.java
@@ -23,7 +23,9 @@ public class Outside {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof Outside)) return false;
+        if (!(other instanceof Outside)) {
+            return false;
+        }
         Outside o = (Outside) other;
         return min.equals(o.min)
             && max.equals(o.max);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/StartingWith.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/StartingWith.java
index d05cd51..ab99d70 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/StartingWith.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/StartingWith.java
@@ -15,7 +15,9 @@ public class StartingWith {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof StartingWith)) return false;
+        if (!(other instanceof StartingWith)) {
+            return false;
+        }
         StartingWith o = (StartingWith) other;
         return value.equals(o.value);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/TraversalPredicate.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/TraversalPredicate.java
index 3b646bb..9620613 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/TraversalPredicate.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/TraversalPredicate.java
@@ -57,78 +57,97 @@ public abstract class TraversalPredicate {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(Eq instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Neq instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Lt instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Lte instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Gt instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Gte instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Inside instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Outside instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Between instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Within instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Without instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Not instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(StartingWith instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(NotStartingWith instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(EndingWith instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Containing instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(And instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Or instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Negate instance) {
             return otherwise(instance);
         }
@@ -154,7 +173,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Eq)) return false;
+            if (!(other instanceof Eq)) {
+                return false;
+            }
             Eq o = (Eq) other;
             return eq.equals(o.eq);
         }
@@ -185,7 +206,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Neq)) return false;
+            if (!(other instanceof Neq)) {
+                return false;
+            }
             Neq o = (Neq) other;
             return neq.equals(o.neq);
         }
@@ -216,7 +239,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Lt)) return false;
+            if (!(other instanceof Lt)) {
+                return false;
+            }
             Lt o = (Lt) other;
             return lt.equals(o.lt);
         }
@@ -247,7 +272,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Lte)) return false;
+            if (!(other instanceof Lte)) {
+                return false;
+            }
             Lte o = (Lte) other;
             return lte.equals(o.lte);
         }
@@ -278,7 +305,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Gt)) return false;
+            if (!(other instanceof Gt)) {
+                return false;
+            }
             Gt o = (Gt) other;
             return gt.equals(o.gt);
         }
@@ -309,7 +338,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Gte)) return false;
+            if (!(other instanceof Gte)) {
+                return false;
+            }
             Gte o = (Gte) other;
             return gte.equals(o.gte);
         }
@@ -340,7 +371,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Inside)) return false;
+            if (!(other instanceof Inside)) {
+                return false;
+            }
             Inside o = (Inside) other;
             return inside.equals(o.inside);
         }
@@ -371,7 +404,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Outside)) return false;
+            if (!(other instanceof Outside)) {
+                return false;
+            }
             Outside o = (Outside) other;
             return outside.equals(o.outside);
         }
@@ -402,7 +437,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Between)) return false;
+            if (!(other instanceof Between)) {
+                return false;
+            }
             Between o = (Between) other;
             return between.equals(o.between);
         }
@@ -433,7 +470,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Within)) return false;
+            if (!(other instanceof Within)) {
+                return false;
+            }
             Within o = (Within) other;
             return within.equals(o.within);
         }
@@ -464,7 +503,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Without)) return false;
+            if (!(other instanceof Without)) {
+                return false;
+            }
             Without o = (Without) other;
             return without.equals(o.without);
         }
@@ -495,7 +536,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Not)) return false;
+            if (!(other instanceof Not)) {
+                return false;
+            }
             Not o = (Not) other;
             return not.equals(o.not);
         }
@@ -526,7 +569,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof StartingWith)) return false;
+            if (!(other instanceof StartingWith)) {
+                return false;
+            }
             StartingWith o = (StartingWith) other;
             return startingWith.equals(o.startingWith);
         }
@@ -557,7 +602,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof NotStartingWith)) return false;
+            if (!(other instanceof NotStartingWith)) {
+                return false;
+            }
             NotStartingWith o = (NotStartingWith) other;
             return notStartingWith.equals(o.notStartingWith);
         }
@@ -588,7 +635,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof EndingWith)) return false;
+            if (!(other instanceof EndingWith)) {
+                return false;
+            }
             EndingWith o = (EndingWith) other;
             return endingWith.equals(o.endingWith);
         }
@@ -619,7 +668,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Containing)) return false;
+            if (!(other instanceof Containing)) {
+                return false;
+            }
             Containing o = (Containing) other;
             return containing.equals(o.containing);
         }
@@ -650,7 +701,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof And)) return false;
+            if (!(other instanceof And)) {
+                return false;
+            }
             And o = (And) other;
             return and.equals(o.and);
         }
@@ -681,7 +734,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Or)) return false;
+            if (!(other instanceof Or)) {
+                return false;
+            }
             Or o = (Or) other;
             return or.equals(o.or);
         }
@@ -705,7 +760,9 @@ public abstract class TraversalPredicate {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Negate)) return false;
+            if (!(other instanceof Negate)) {
+                return false;
+            }
             Negate o = (Negate) other;
             return true;
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Within.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Within.java
index cbc1fbf..127640f 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Within.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Within.java
@@ -17,7 +17,9 @@ public class Within {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof Within)) return false;
+        if (!(other instanceof Within)) {
+            return false;
+        }
         Within o = (Within) other;
         return value.equals(o.value);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Without.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Without.java
index f2db1ac..c9e5bc0 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Without.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/predicates/Without.java
@@ -17,7 +17,9 @@ public class Without {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof Without)) return false;
+        if (!(other instanceof Without)) {
+            return false;
+        }
         Without o = (Without) other;
         return value.equals(o.value);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/query/Query.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/query/Query.java
index cfdd9d9..aa2d3aa 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/query/Query.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/query/Query.java
@@ -10,8 +10,14 @@ public abstract class Query {
     public abstract <R> R accept(Visitor<R> visitor) ;
     
     public static class WithRootValue {
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.RootTraversal
+         */
         public final RootTraversal root;
         
+        /**
+         * @type optional: org/apache/tinkerpop/gremlin/language/model/methods.TraversalTerminalMethod
+         */
         public final java.util.Optional<TraversalTerminalMethod> method;
         
         /**
@@ -24,7 +30,9 @@ public abstract class Query {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithRootValue)) return false;
+            if (!(other instanceof WithRootValue)) {
+                return false;
+            }
             WithRootValue o = (WithRootValue) other;
             return root.equals(o.root)
                 && method.equals(o.method);
@@ -52,8 +60,14 @@ public abstract class Query {
     }
     
     public static class WithSourceValue {
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.TraversalSource
+         */
         public final TraversalSource source;
         
+        /**
+         * @type optional: org/apache/tinkerpop/gremlin/language/model/query.TransactionPart
+         */
         public final java.util.Optional<TransactionPart> transactionPart;
         
         /**
@@ -66,7 +80,9 @@ public abstract class Query {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithSourceValue)) return false;
+            if (!(other instanceof WithSourceValue)) {
+                return false;
+            }
             WithSourceValue o = (WithSourceValue) other;
             return source.equals(o.source)
                 && transactionPart.equals(o.transactionPart);
@@ -115,18 +131,22 @@ public abstract class Query {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(WithSource instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(WithRoot instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ToString instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Empty instance) {
             return otherwise(instance);
         }
@@ -149,7 +169,9 @@ public abstract class Query {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithSource)) return false;
+            if (!(other instanceof WithSource)) {
+                return false;
+            }
             WithSource o = (WithSource) other;
             return withSource.equals(o.withSource);
         }
@@ -177,7 +199,9 @@ public abstract class Query {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithRoot)) return false;
+            if (!(other instanceof WithRoot)) {
+                return false;
+            }
             WithRoot o = (WithRoot) other;
             return withRoot.equals(o.withRoot);
         }
@@ -208,7 +232,9 @@ public abstract class Query {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ToString)) return false;
+            if (!(other instanceof ToString)) {
+                return false;
+            }
             ToString o = (ToString) other;
             return toString.equals(o.toString);
         }
@@ -232,7 +258,9 @@ public abstract class Query {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Empty)) return false;
+            if (!(other instanceof Empty)) {
+                return false;
+            }
             Empty o = (Empty) other;
             return true;
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AddEStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AddEStep.java
index f1a2aa9..fdadb40 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AddEStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AddEStep.java
@@ -25,10 +25,12 @@ public abstract class AddEStep {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(EdgeLabel instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(EdgeLabelTraversal instance) {
             return otherwise(instance);
         }
@@ -54,7 +56,9 @@ public abstract class AddEStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof EdgeLabel)) return false;
+            if (!(other instanceof EdgeLabel)) {
+                return false;
+            }
             EdgeLabel o = (EdgeLabel) other;
             return edgeLabel.equals(o.edgeLabel);
         }
@@ -85,7 +89,9 @@ public abstract class AddEStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof EdgeLabelTraversal)) return false;
+            if (!(other instanceof EdgeLabelTraversal)) {
+                return false;
+            }
             EdgeLabelTraversal o = (EdgeLabelTraversal) other;
             return edgeLabelTraversal.equals(o.edgeLabelTraversal);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AddVStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AddVStep.java
index 4a0c097..6604801 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AddVStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AddVStep.java
@@ -29,18 +29,22 @@ public abstract class AddVStep {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(Empty instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(VertexLabel instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Null instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(VertexLabelTraversal instance) {
             return otherwise(instance);
         }
@@ -59,7 +63,9 @@ public abstract class AddVStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Empty)) return false;
+            if (!(other instanceof Empty)) {
+                return false;
+            }
             Empty o = (Empty) other;
             return true;
         }
@@ -90,7 +96,9 @@ public abstract class AddVStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof VertexLabel)) return false;
+            if (!(other instanceof VertexLabel)) {
+                return false;
+            }
             VertexLabel o = (VertexLabel) other;
             return vertexLabel.equals(o.vertexLabel);
         }
@@ -114,7 +122,9 @@ public abstract class AddVStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Null)) return false;
+            if (!(other instanceof Null)) {
+                return false;
+            }
             Null o = (Null) other;
             return true;
         }
@@ -145,7 +155,9 @@ public abstract class AddVStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof VertexLabelTraversal)) return false;
+            if (!(other instanceof VertexLabelTraversal)) {
+                return false;
+            }
             VertexLabelTraversal o = (VertexLabelTraversal) other;
             return vertexLabelTraversal.equals(o.vertexLabelTraversal);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AggregateStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AggregateStep.java
index 168e931..74639a0 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AggregateStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AggregateStep.java
@@ -23,7 +23,9 @@ public class AggregateStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof AggregateStep)) return false;
+        if (!(other instanceof AggregateStep)) {
+            return false;
+        }
         AggregateStep o = (AggregateStep) other;
         return scope.equals(o.scope)
             && sideEffectKey.equals(o.sideEffectKey);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AndStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AndStep.java
index 86cdbe1..f805bd2 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AndStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AndStep.java
@@ -17,7 +17,9 @@ public class AndStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof AndStep)) return false;
+        if (!(other instanceof AndStep)) {
+            return false;
+        }
         AndStep o = (AndStep) other;
         return andTraversals.equals(o.andTraversals);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AsStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AsStep.java
index 1020830..4ced218 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AsStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/AsStep.java
@@ -21,7 +21,9 @@ public class AsStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof AsStep)) return false;
+        if (!(other instanceof AsStep)) {
+            return false;
+        }
         AsStep o = (AsStep) other;
         return stepLabel.equals(o.stepLabel)
             && stepLabels.equals(o.stepLabels);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BarrierStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BarrierStep.java
index d173c6b..1e94c9d 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BarrierStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BarrierStep.java
@@ -24,7 +24,9 @@ public class BarrierStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof BarrierStep)) return false;
+        if (!(other instanceof BarrierStep)) {
+            return false;
+        }
         BarrierStep o = (BarrierStep) other;
         return value.equals(o.value);
     }
@@ -57,15 +59,20 @@ public class BarrierStep {
                 throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
             }
             
+            @Override
             default R visit(BarrierConsumer instance) {
                 return otherwise(instance);
             }
             
+            @Override
             default R visit(MaxBarrierSize instance) {
                 return otherwise(instance);
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/methods.TraversalSackMethod
+         */
         public static final class BarrierConsumer extends Value {
             public final TraversalSackMethod barrierConsumer;
             
@@ -83,7 +90,9 @@ public class BarrierStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof BarrierConsumer)) return false;
+                if (!(other instanceof BarrierConsumer)) {
+                    return false;
+                }
                 BarrierConsumer o = (BarrierConsumer) other;
                 return barrierConsumer.equals(o.barrierConsumer);
             }
@@ -94,6 +103,9 @@ public class BarrierStep {
             }
         }
         
+        /**
+         * @type integer
+         */
         public static final class MaxBarrierSize extends Value {
             public final Integer maxBarrierSize;
             
@@ -111,7 +123,9 @@ public class BarrierStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof MaxBarrierSize)) return false;
+                if (!(other instanceof MaxBarrierSize)) {
+                    return false;
+                }
                 MaxBarrierSize o = (MaxBarrierSize) other;
                 return maxBarrierSize.equals(o.maxBarrierSize);
             }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BothEStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BothEStep.java
index f322b63..a6eb0a0 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BothEStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BothEStep.java
@@ -15,7 +15,9 @@ public class BothEStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof BothEStep)) return false;
+        if (!(other instanceof BothEStep)) {
+            return false;
+        }
         BothEStep o = (BothEStep) other;
         return edgeLabels.equals(o.edgeLabels);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BothStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BothStep.java
index c6d9e66..06f8e66 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BothStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BothStep.java
@@ -15,7 +15,9 @@ public class BothStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof BothStep)) return false;
+        if (!(other instanceof BothStep)) {
+            return false;
+        }
         BothStep o = (BothStep) other;
         return edgeLabels.equals(o.edgeLabels);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BothVStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BothVStep.java
index ad998d0..a046615 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BothVStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BothVStep.java
@@ -8,7 +8,9 @@ public class BothVStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof BothVStep)) return false;
+        if (!(other instanceof BothVStep)) {
+            return false;
+        }
         BothVStep o = (BothVStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BranchStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BranchStep.java
index d1ce5ec..a86ac99 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BranchStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/BranchStep.java
@@ -17,7 +17,9 @@ public class BranchStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof BranchStep)) return false;
+        if (!(other instanceof BranchStep)) {
+            return false;
+        }
         BranchStep o = (BranchStep) other;
         return branchTraversal.equals(o.branchTraversal);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ByStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ByStep.java
index 92feaa9..f240ff1 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ByStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ByStep.java
@@ -63,7 +63,9 @@ public class ByStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ByStep)) return false;
+        if (!(other instanceof ByStep)) {
+            return false;
+        }
         ByStep o = (ByStep) other;
         return value.equals(o.value);
     }
@@ -104,26 +106,32 @@ public class ByStep {
                 throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
             }
             
+            @Override
             default R visit(WithTraversal instance) {
                 return otherwise(instance);
             }
             
+            @Override
             default R visit(WithKey instance) {
                 return otherwise(instance);
             }
             
+            @Override
             default R visit(WithFunction instance) {
                 return otherwise(instance);
             }
             
+            @Override
             default R visit(Token instance) {
                 return otherwise(instance);
             }
             
+            @Override
             default R visit(Comparator instance) {
                 return otherwise(instance);
             }
             
+            @Override
             default R visit(Order instance) {
                 return otherwise(instance);
             }
@@ -146,7 +154,9 @@ public class ByStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof WithTraversal)) return false;
+                if (!(other instanceof WithTraversal)) {
+                    return false;
+                }
                 WithTraversal o = (WithTraversal) other;
                 return withTraversal.equals(o.withTraversal);
             }
@@ -174,7 +184,9 @@ public class ByStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof WithKey)) return false;
+                if (!(other instanceof WithKey)) {
+                    return false;
+                }
                 WithKey o = (WithKey) other;
                 return withKey.equals(o.withKey);
             }
@@ -202,7 +214,9 @@ public class ByStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof WithFunction)) return false;
+                if (!(other instanceof WithFunction)) {
+                    return false;
+                }
                 WithFunction o = (WithFunction) other;
                 return withFunction.equals(o.withFunction);
             }
@@ -213,6 +227,9 @@ public class ByStep {
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.TraversalToken
+         */
         public static final class Token extends Value {
             public final TraversalToken token;
             
@@ -230,7 +247,9 @@ public class ByStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof Token)) return false;
+                if (!(other instanceof Token)) {
+                    return false;
+                }
                 Token o = (Token) other;
                 return token.equals(o.token);
             }
@@ -241,6 +260,9 @@ public class ByStep {
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.TraversalComparator
+         */
         public static final class Comparator extends Value {
             public final TraversalComparator comparator;
             
@@ -258,7 +280,9 @@ public class ByStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof Comparator)) return false;
+                if (!(other instanceof Comparator)) {
+                    return false;
+                }
                 Comparator o = (Comparator) other;
                 return comparator.equals(o.comparator);
             }
@@ -269,6 +293,9 @@ public class ByStep {
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.TraversalOrder
+         */
         public static final class Order extends Value {
             public final TraversalOrder order;
             
@@ -286,7 +313,9 @@ public class ByStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof Order)) return false;
+                if (!(other instanceof Order)) {
+                    return false;
+                }
                 Order o = (Order) other;
                 return order.equals(o.order);
             }
@@ -299,8 +328,14 @@ public class ByStep {
     }
     
     public static class WithFunctionValue {
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.TraversalFunction
+         */
         public final TraversalFunction function;
         
+        /**
+         * @type optional: org/apache/tinkerpop/gremlin/language/model/traversal.TraversalComparator
+         */
         public final java.util.Optional<TraversalComparator> comparator;
         
         /**
@@ -313,7 +348,9 @@ public class ByStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithFunctionValue)) return false;
+            if (!(other instanceof WithFunctionValue)) {
+                return false;
+            }
             WithFunctionValue o = (WithFunctionValue) other;
             return function.equals(o.function)
                 && comparator.equals(o.comparator);
@@ -341,8 +378,14 @@ public class ByStep {
     }
     
     public static class WithKeyValue {
+        /**
+         * @type string
+         */
         public final String key;
         
+        /**
+         * @type optional: org/apache/tinkerpop/gremlin/language/model/traversal.TraversalComparator
+         */
         public final java.util.Optional<TraversalComparator> comparator;
         
         /**
@@ -355,7 +398,9 @@ public class ByStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithKeyValue)) return false;
+            if (!(other instanceof WithKeyValue)) {
+                return false;
+            }
             WithKeyValue o = (WithKeyValue) other;
             return key.equals(o.key)
                 && comparator.equals(o.comparator);
@@ -383,8 +428,14 @@ public class ByStep {
     }
     
     public static class WithTraversalValue {
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.NestedTraversal
+         */
         public final NestedTraversal traversal;
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.TraversalComparator
+         */
         public final TraversalComparator comparator;
         
         /**
@@ -397,7 +448,9 @@ public class ByStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithTraversalValue)) return false;
+            if (!(other instanceof WithTraversalValue)) {
+                return false;
+            }
             WithTraversalValue o = (WithTraversalValue) other;
             return traversal.equals(o.traversal)
                 && comparator.equals(o.comparator);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CapStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CapStep.java
index d71f9a2..1b2d4c5 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CapStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CapStep.java
@@ -21,7 +21,9 @@ public class CapStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof CapStep)) return false;
+        if (!(other instanceof CapStep)) {
+            return false;
+        }
         CapStep o = (CapStep) other;
         return sideEffectKey.equals(o.sideEffectKey)
             && sideEffectKeys.equals(o.sideEffectKeys);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ChooseStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ChooseStep.java
index 84a0d85..ca950ff 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ChooseStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ChooseStep.java
@@ -9,10 +9,19 @@ public abstract class ChooseStep {
     public abstract <R> R accept(Visitor<R> visitor) ;
     
     public static class WithPredicateValue {
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/predicates.TraversalPredicate
+         */
         public final TraversalPredicate traversalPredicate;
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/predicates.TraversalPredicate
+         */
         public final TraversalPredicate trueChoice;
         
+        /**
+         * @type optional: org/apache/tinkerpop/gremlin/language/model/predicates.TraversalPredicate
+         */
         public final java.util.Optional<TraversalPredicate> falseChoice;
         
         /**
@@ -26,7 +35,9 @@ public abstract class ChooseStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithPredicateValue)) return false;
+            if (!(other instanceof WithPredicateValue)) {
+                return false;
+            }
             WithPredicateValue o = (WithPredicateValue) other;
             return traversalPredicate.equals(o.traversalPredicate)
                 && trueChoice.equals(o.trueChoice)
@@ -63,10 +74,19 @@ public abstract class ChooseStep {
     }
     
     public static class WithTraversalValue {
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.NestedTraversal
+         */
         public final NestedTraversal traversalPredicate;
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/predicates.TraversalPredicate
+         */
         public final TraversalPredicate trueChoice;
         
+        /**
+         * @type optional: org/apache/tinkerpop/gremlin/language/model/predicates.TraversalPredicate
+         */
         public final java.util.Optional<TraversalPredicate> falseChoice;
         
         /**
@@ -80,7 +100,9 @@ public abstract class ChooseStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithTraversalValue)) return false;
+            if (!(other instanceof WithTraversalValue)) {
+                return false;
+            }
             WithTraversalValue o = (WithTraversalValue) other;
             return traversalPredicate.equals(o.traversalPredicate)
                 && trueChoice.equals(o.trueChoice)
@@ -136,14 +158,17 @@ public abstract class ChooseStep {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(ChoiceTraversal instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(WithTraversal instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(WithPredicate instance) {
             return otherwise(instance);
         }
@@ -169,7 +194,9 @@ public abstract class ChooseStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ChoiceTraversal)) return false;
+            if (!(other instanceof ChoiceTraversal)) {
+                return false;
+            }
             ChoiceTraversal o = (ChoiceTraversal) other;
             return choiceTraversal.equals(o.choiceTraversal);
         }
@@ -197,7 +224,9 @@ public abstract class ChooseStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithTraversal)) return false;
+            if (!(other instanceof WithTraversal)) {
+                return false;
+            }
             WithTraversal o = (WithTraversal) other;
             return withTraversal.equals(o.withTraversal);
         }
@@ -225,7 +254,9 @@ public abstract class ChooseStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithPredicate)) return false;
+            if (!(other instanceof WithPredicate)) {
+                return false;
+            }
             WithPredicate o = (WithPredicate) other;
             return withPredicate.equals(o.withPredicate);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CoalesceStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CoalesceStep.java
index bb30117..a43d0a4 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CoalesceStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CoalesceStep.java
@@ -17,7 +17,9 @@ public class CoalesceStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof CoalesceStep)) return false;
+        if (!(other instanceof CoalesceStep)) {
+            return false;
+        }
         CoalesceStep o = (CoalesceStep) other;
         return coalesceTraversals.equals(o.coalesceTraversals);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CoinStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CoinStep.java
index 2940385..4d293bc 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CoinStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CoinStep.java
@@ -15,7 +15,9 @@ public class CoinStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof CoinStep)) return false;
+        if (!(other instanceof CoinStep)) {
+            return false;
+        }
         CoinStep o = (CoinStep) other;
         return probability.equals(o.probability);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ConnectedComponentStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ConnectedComponentStep.java
index c36f578..d125027 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ConnectedComponentStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ConnectedComponentStep.java
@@ -8,7 +8,9 @@ public class ConnectedComponentStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ConnectedComponentStep)) return false;
+        if (!(other instanceof ConnectedComponentStep)) {
+            return false;
+        }
         ConnectedComponentStep o = (ConnectedComponentStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ConstantStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ConstantStep.java
index 0e4b668..a7f3d6a 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ConstantStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ConstantStep.java
@@ -17,7 +17,9 @@ public class ConstantStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ConstantStep)) return false;
+        if (!(other instanceof ConstantStep)) {
+            return false;
+        }
         ConstantStep o = (ConstantStep) other;
         return e.equals(o.e);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CountStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CountStep.java
index e850e29..c7e43ad 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CountStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CountStep.java
@@ -17,7 +17,9 @@ public class CountStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof CountStep)) return false;
+        if (!(other instanceof CountStep)) {
+            return false;
+        }
         CountStep o = (CountStep) other;
         return scope.equals(o.scope);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CyclicPathStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CyclicPathStep.java
index e7b144f..5c96df5 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CyclicPathStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/CyclicPathStep.java
@@ -8,7 +8,9 @@ public class CyclicPathStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof CyclicPathStep)) return false;
+        if (!(other instanceof CyclicPathStep)) {
+            return false;
+        }
         CyclicPathStep o = (CyclicPathStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/DedupStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/DedupStep.java
index 7c0bee8..341a5f9 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/DedupStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/DedupStep.java
@@ -23,7 +23,9 @@ public class DedupStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof DedupStep)) return false;
+        if (!(other instanceof DedupStep)) {
+            return false;
+        }
         DedupStep o = (DedupStep) other;
         return scope.equals(o.scope)
             && dedupLabels.equals(o.dedupLabels);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/DropStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/DropStep.java
index a0160c8..4776e2c 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/DropStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/DropStep.java
@@ -8,7 +8,9 @@ public class DropStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof DropStep)) return false;
+        if (!(other instanceof DropStep)) {
+            return false;
+        }
         DropStep o = (DropStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ElementMapStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ElementMapStep.java
index c38d009..6c8e18e 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ElementMapStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ElementMapStep.java
@@ -15,7 +15,9 @@ public class ElementMapStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ElementMapStep)) return false;
+        if (!(other instanceof ElementMapStep)) {
+            return false;
+        }
         ElementMapStep o = (ElementMapStep) other;
         return propertyKeys.equals(o.propertyKeys);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/EmitStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/EmitStep.java
index 0d84b17..a001c5e 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/EmitStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/EmitStep.java
@@ -25,7 +25,9 @@ public class EmitStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof EmitStep)) return false;
+        if (!(other instanceof EmitStep)) {
+            return false;
+        }
         EmitStep o = (EmitStep) other;
         return value.equals(o.value);
     }
@@ -58,15 +60,20 @@ public class EmitStep {
                 throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
             }
             
+            @Override
             default R visit(EmitPredicate instance) {
                 return otherwise(instance);
             }
             
+            @Override
             default R visit(EmitTraversal instance) {
                 return otherwise(instance);
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/predicates.TraversalPredicate
+         */
         public static final class EmitPredicate extends Value {
             public final TraversalPredicate emitPredicate;
             
@@ -84,7 +91,9 @@ public class EmitStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof EmitPredicate)) return false;
+                if (!(other instanceof EmitPredicate)) {
+                    return false;
+                }
                 EmitPredicate o = (EmitPredicate) other;
                 return emitPredicate.equals(o.emitPredicate);
             }
@@ -95,6 +104,9 @@ public class EmitStep {
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.NestedTraversal
+         */
         public static final class EmitTraversal extends Value {
             public final NestedTraversal emitTraversal;
             
@@ -112,7 +124,9 @@ public class EmitStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof EmitTraversal)) return false;
+                if (!(other instanceof EmitTraversal)) {
+                    return false;
+                }
                 EmitTraversal o = (EmitTraversal) other;
                 return emitTraversal.equals(o.emitTraversal);
             }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/FilterStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/FilterStep.java
index 54c49c8..110b47d 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/FilterStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/FilterStep.java
@@ -26,10 +26,12 @@ public abstract class FilterStep {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(Predicate instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(FilterTraversal instance) {
             return otherwise(instance);
         }
@@ -55,7 +57,9 @@ public abstract class FilterStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Predicate)) return false;
+            if (!(other instanceof Predicate)) {
+                return false;
+            }
             Predicate o = (Predicate) other;
             return predicate.equals(o.predicate);
         }
@@ -86,7 +90,9 @@ public abstract class FilterStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof FilterTraversal)) return false;
+            if (!(other instanceof FilterTraversal)) {
+                return false;
+            }
             FilterTraversal o = (FilterTraversal) other;
             return filterTraversal.equals(o.filterTraversal);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/FlatMapStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/FlatMapStep.java
index 8196286..c0ea55a 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/FlatMapStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/FlatMapStep.java
@@ -17,7 +17,9 @@ public class FlatMapStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof FlatMapStep)) return false;
+        if (!(other instanceof FlatMapStep)) {
+            return false;
+        }
         FlatMapStep o = (FlatMapStep) other;
         return flatMapTraversal.equals(o.flatMapTraversal);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/FoldStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/FoldStep.java
index 79ad466..99e4dec 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/FoldStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/FoldStep.java
@@ -25,7 +25,9 @@ public class FoldStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof FoldStep)) return false;
+        if (!(other instanceof FoldStep)) {
+            return false;
+        }
         FoldStep o = (FoldStep) other;
         return value.equals(o.value);
     }
@@ -36,8 +38,14 @@ public class FoldStep {
     }
     
     public static class Value {
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/literals.GenericLiteral
+         */
         public final GenericLiteral seed;
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.TraversalBiFunction
+         */
         public final TraversalBiFunction foldFunction;
         
         /**
@@ -50,7 +58,9 @@ public class FoldStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Value)) return false;
+            if (!(other instanceof Value)) {
+                return false;
+            }
             Value o = (Value) other;
             return seed.equals(o.seed)
                 && foldFunction.equals(o.foldFunction);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/FromStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/FromStep.java
index bae4f82..b9e4a8d 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/FromStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/FromStep.java
@@ -25,10 +25,12 @@ public abstract class FromStep {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(FromStepLabel instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(FromVertex instance) {
             return otherwise(instance);
         }
@@ -54,7 +56,9 @@ public abstract class FromStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof FromStepLabel)) return false;
+            if (!(other instanceof FromStepLabel)) {
+                return false;
+            }
             FromStepLabel o = (FromStepLabel) other;
             return fromStepLabel.equals(o.fromStepLabel);
         }
@@ -85,7 +89,9 @@ public abstract class FromStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof FromVertex)) return false;
+            if (!(other instanceof FromVertex)) {
+                return false;
+            }
             FromVertex o = (FromVertex) other;
             return fromVertex.equals(o.fromVertex);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/GroupCountStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/GroupCountStep.java
index a52dd21..da5ac02 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/GroupCountStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/GroupCountStep.java
@@ -15,7 +15,9 @@ public class GroupCountStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof GroupCountStep)) return false;
+        if (!(other instanceof GroupCountStep)) {
+            return false;
+        }
         GroupCountStep o = (GroupCountStep) other;
         return sideEffectKey.equals(o.sideEffectKey);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/GroupStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/GroupStep.java
index ed7e02e..b50cb97 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/GroupStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/GroupStep.java
@@ -15,7 +15,9 @@ public class GroupStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof GroupStep)) return false;
+        if (!(other instanceof GroupStep)) {
+            return false;
+        }
         GroupStep o = (GroupStep) other;
         return sideEffectKey.equals(o.sideEffectKey);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasIdStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasIdStep.java
index 9889ed0..3473b17 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasIdStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasIdStep.java
@@ -9,8 +9,14 @@ public abstract class HasIdStep {
     public abstract <R> R accept(Visitor<R> visitor) ;
     
     public static class WithIdsValue {
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/literals.GenericLiteral
+         */
         public final GenericLiteral id;
         
+        /**
+         * @type list: org/apache/tinkerpop/gremlin/language/model/literals.GenericLiteral
+         */
         public final java.util.List<GenericLiteral> otherIds;
         
         /**
@@ -23,7 +29,9 @@ public abstract class HasIdStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithIdsValue)) return false;
+            if (!(other instanceof WithIdsValue)) {
+                return false;
+            }
             WithIdsValue o = (WithIdsValue) other;
             return id.equals(o.id)
                 && otherIds.equals(o.otherIds);
@@ -68,10 +76,12 @@ public abstract class HasIdStep {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(Predicate instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(WithIds instance) {
             return otherwise(instance);
         }
@@ -97,7 +107,9 @@ public abstract class HasIdStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Predicate)) return false;
+            if (!(other instanceof Predicate)) {
+                return false;
+            }
             Predicate o = (Predicate) other;
             return predicate.equals(o.predicate);
         }
@@ -125,7 +137,9 @@ public abstract class HasIdStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithIds)) return false;
+            if (!(other instanceof WithIds)) {
+                return false;
+            }
             WithIds o = (WithIds) other;
             return withIds.equals(o.withIds);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasKeyStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasKeyStep.java
index b0d23c7..5746ec4 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasKeyStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasKeyStep.java
@@ -8,8 +8,14 @@ public abstract class HasKeyStep {
     public abstract <R> R accept(Visitor<R> visitor) ;
     
     public static class WithLabelsValue {
+        /**
+         * @type string
+         */
         public final String label;
         
+        /**
+         * @type list: string
+         */
         public final java.util.List<String> otherLabels;
         
         /**
@@ -22,7 +28,9 @@ public abstract class HasKeyStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithLabelsValue)) return false;
+            if (!(other instanceof WithLabelsValue)) {
+                return false;
+            }
             WithLabelsValue o = (WithLabelsValue) other;
             return label.equals(o.label)
                 && otherLabels.equals(o.otherLabels);
@@ -67,10 +75,12 @@ public abstract class HasKeyStep {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(Predicate instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(WithLabels instance) {
             return otherwise(instance);
         }
@@ -96,7 +106,9 @@ public abstract class HasKeyStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Predicate)) return false;
+            if (!(other instanceof Predicate)) {
+                return false;
+            }
             Predicate o = (Predicate) other;
             return predicate.equals(o.predicate);
         }
@@ -124,7 +136,9 @@ public abstract class HasKeyStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithLabels)) return false;
+            if (!(other instanceof WithLabels)) {
+                return false;
+            }
             WithLabels o = (WithLabels) other;
             return withLabels.equals(o.withLabels);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasLabelStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasLabelStep.java
index f1c8d54..967e530 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasLabelStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasLabelStep.java
@@ -8,8 +8,14 @@ public abstract class HasLabelStep {
     public abstract <R> R accept(Visitor<R> visitor) ;
     
     public static class WithLabelsValue {
+        /**
+         * @type string
+         */
         public final String label;
         
+        /**
+         * @type list: string
+         */
         public final java.util.List<String> otherLabels;
         
         /**
@@ -22,7 +28,9 @@ public abstract class HasLabelStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithLabelsValue)) return false;
+            if (!(other instanceof WithLabelsValue)) {
+                return false;
+            }
             WithLabelsValue o = (WithLabelsValue) other;
             return label.equals(o.label)
                 && otherLabels.equals(o.otherLabels);
@@ -67,10 +75,12 @@ public abstract class HasLabelStep {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(Predicate instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(WithLabels instance) {
             return otherwise(instance);
         }
@@ -96,7 +106,9 @@ public abstract class HasLabelStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Predicate)) return false;
+            if (!(other instanceof Predicate)) {
+                return false;
+            }
             Predicate o = (Predicate) other;
             return predicate.equals(o.predicate);
         }
@@ -124,7 +136,9 @@ public abstract class HasLabelStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithLabels)) return false;
+            if (!(other instanceof WithLabels)) {
+                return false;
+            }
             WithLabels o = (WithLabels) other;
             return withLabels.equals(o.withLabels);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasNotStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasNotStep.java
index 247cb7c..e0ef0e4 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasNotStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasNotStep.java
@@ -15,7 +15,9 @@ public class HasNotStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof HasNotStep)) return false;
+        if (!(other instanceof HasNotStep)) {
+            return false;
+        }
         HasNotStep o = (HasNotStep) other;
         return propertyKey.equals(o.propertyKey);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasStep.java
index 8e9b00a..fc3681e 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasStep.java
@@ -11,8 +11,14 @@ public abstract class HasStep {
     public abstract <R> R accept(Visitor<R> visitor) ;
     
     public static class WithLabelValue {
+        /**
+         * @type string
+         */
         public final String label;
         
+        /**
+         * @type string
+         */
         public final String propertyKey;
         
         public final WithLabelOtherValue other;
@@ -28,7 +34,9 @@ public abstract class HasStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithLabelValue)) return false;
+            if (!(other instanceof WithLabelValue)) {
+                return false;
+            }
             WithLabelValue o = (WithLabelValue) other;
             return label.equals(o.label)
                 && propertyKey.equals(o.propertyKey)
@@ -87,15 +95,20 @@ public abstract class HasStep {
                 throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
             }
             
+            @Override
             default R visit(Predicate instance) {
                 return otherwise(instance);
             }
             
+            @Override
             default R visit(Value instance) {
                 return otherwise(instance);
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/predicates.TraversalPredicate
+         */
         public static final class Predicate extends WithLabelOtherValue {
             public final TraversalPredicate predicate;
             
@@ -113,7 +126,9 @@ public abstract class HasStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof Predicate)) return false;
+                if (!(other instanceof Predicate)) {
+                    return false;
+                }
                 Predicate o = (Predicate) other;
                 return predicate.equals(o.predicate);
             }
@@ -124,6 +139,9 @@ public abstract class HasStep {
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/literals.GenericLiteral
+         */
         public static final class Value extends WithLabelOtherValue {
             public final GenericLiteral value;
             
@@ -141,7 +159,9 @@ public abstract class HasStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof Value)) return false;
+                if (!(other instanceof Value)) {
+                    return false;
+                }
                 Value o = (Value) other;
                 return value.equals(o.value);
             }
@@ -154,6 +174,9 @@ public abstract class HasStep {
     }
     
     public static class WithAccessorValue {
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.TraversalToken
+         */
         public final TraversalToken accessor;
         
         public final WithAccessorOtherValue other;
@@ -168,7 +191,9 @@ public abstract class HasStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithAccessorValue)) return false;
+            if (!(other instanceof WithAccessorValue)) {
+                return false;
+            }
             WithAccessorValue o = (WithAccessorValue) other;
             return accessor.equals(o.accessor)
                 && other.equals(o.other);
@@ -220,19 +245,25 @@ public abstract class HasStep {
                 throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
             }
             
+            @Override
             default R visit(Predicate instance) {
                 return otherwise(instance);
             }
             
+            @Override
             default R visit(Value instance) {
                 return otherwise(instance);
             }
             
+            @Override
             default R visit(Traversal instance) {
                 return otherwise(instance);
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/predicates.TraversalPredicate
+         */
         public static final class Predicate extends WithAccessorOtherValue {
             public final TraversalPredicate predicate;
             
@@ -250,7 +281,9 @@ public abstract class HasStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof Predicate)) return false;
+                if (!(other instanceof Predicate)) {
+                    return false;
+                }
                 Predicate o = (Predicate) other;
                 return predicate.equals(o.predicate);
             }
@@ -261,6 +294,9 @@ public abstract class HasStep {
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/literals.GenericLiteral
+         */
         public static final class Value extends WithAccessorOtherValue {
             public final GenericLiteral value;
             
@@ -278,7 +314,9 @@ public abstract class HasStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof Value)) return false;
+                if (!(other instanceof Value)) {
+                    return false;
+                }
                 Value o = (Value) other;
                 return value.equals(o.value);
             }
@@ -289,6 +327,9 @@ public abstract class HasStep {
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.NestedTraversal
+         */
         public static final class Traversal extends WithAccessorOtherValue {
             public final NestedTraversal traversal;
             
@@ -306,7 +347,9 @@ public abstract class HasStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof Traversal)) return false;
+                if (!(other instanceof Traversal)) {
+                    return false;
+                }
                 Traversal o = (Traversal) other;
                 return traversal.equals(o.traversal);
             }
@@ -319,8 +362,24 @@ public abstract class HasStep {
     }
     
     public static class WithPropertyKeyValue {
+        /**
+         * @type string
+         */
         public final String propertyKey;
         
+        /**
+         * @type optional:
+         *         union:
+         *         - index: 1
+         *           name: predicate
+         *           type: org/apache/tinkerpop/gremlin/language/model/predicates.TraversalPredicate
+         *         - index: 2
+         *           name: value
+         *           type: org/apache/tinkerpop/gremlin/language/model/literals.GenericLiteral
+         *         - index: 3
+         *           name: traversal
+         *           type: org/apache/tinkerpop/gremlin/language/model/traversal.NestedTraversal
+         */
         public final java.util.Optional<WithPropertyKeyOtherArgumentsValue> otherArguments;
         
         /**
@@ -333,7 +392,9 @@ public abstract class HasStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithPropertyKeyValue)) return false;
+            if (!(other instanceof WithPropertyKeyValue)) {
+                return false;
+            }
             WithPropertyKeyValue o = (WithPropertyKeyValue) other;
             return propertyKey.equals(o.propertyKey)
                 && otherArguments.equals(o.otherArguments);
@@ -385,19 +446,25 @@ public abstract class HasStep {
                 throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
             }
             
+            @Override
             default R visit(Predicate instance) {
                 return otherwise(instance);
             }
             
+            @Override
             default R visit(Value instance) {
                 return otherwise(instance);
             }
             
+            @Override
             default R visit(Traversal instance) {
                 return otherwise(instance);
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/predicates.TraversalPredicate
+         */
         public static final class Predicate extends WithPropertyKeyOtherArgumentsValue {
             public final TraversalPredicate predicate;
             
@@ -415,7 +482,9 @@ public abstract class HasStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof Predicate)) return false;
+                if (!(other instanceof Predicate)) {
+                    return false;
+                }
                 Predicate o = (Predicate) other;
                 return predicate.equals(o.predicate);
             }
@@ -426,6 +495,9 @@ public abstract class HasStep {
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/literals.GenericLiteral
+         */
         public static final class Value extends WithPropertyKeyOtherArgumentsValue {
             public final GenericLiteral value;
             
@@ -443,7 +515,9 @@ public abstract class HasStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof Value)) return false;
+                if (!(other instanceof Value)) {
+                    return false;
+                }
                 Value o = (Value) other;
                 return value.equals(o.value);
             }
@@ -454,6 +528,9 @@ public abstract class HasStep {
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.NestedTraversal
+         */
         public static final class Traversal extends WithPropertyKeyOtherArgumentsValue {
             public final NestedTraversal traversal;
             
@@ -471,7 +548,9 @@ public abstract class HasStep {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof Traversal)) return false;
+                if (!(other instanceof Traversal)) {
+                    return false;
+                }
                 Traversal o = (Traversal) other;
                 return traversal.equals(o.traversal);
             }
@@ -503,14 +582,17 @@ public abstract class HasStep {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(WithPropertyKey instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(WithAccessor instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(WithLabel instance) {
             return otherwise(instance);
         }
@@ -533,7 +615,9 @@ public abstract class HasStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithPropertyKey)) return false;
+            if (!(other instanceof WithPropertyKey)) {
+                return false;
+            }
             WithPropertyKey o = (WithPropertyKey) other;
             return withPropertyKey.equals(o.withPropertyKey);
         }
@@ -561,7 +645,9 @@ public abstract class HasStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithAccessor)) return false;
+            if (!(other instanceof WithAccessor)) {
+                return false;
+            }
             WithAccessor o = (WithAccessor) other;
             return withAccessor.equals(o.withAccessor);
         }
@@ -589,7 +675,9 @@ public abstract class HasStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithLabel)) return false;
+            if (!(other instanceof WithLabel)) {
+                return false;
+            }
             WithLabel o = (WithLabel) other;
             return withLabel.equals(o.withLabel);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasValueStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasValueStep.java
index 0e40ca9..15ce009 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasValueStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/HasValueStep.java
@@ -25,10 +25,12 @@ public abstract class HasValueStep {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(Predicate instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(WithValues instance) {
             return otherwise(instance);
         }
@@ -54,7 +56,9 @@ public abstract class HasValueStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Predicate)) return false;
+            if (!(other instanceof Predicate)) {
+                return false;
+            }
             Predicate o = (Predicate) other;
             return predicate.equals(o.predicate);
         }
@@ -78,7 +82,9 @@ public abstract class HasValueStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithValues)) return false;
+            if (!(other instanceof WithValues)) {
+                return false;
+            }
             WithValues o = (WithValues) other;
             return true;
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/IdStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/IdStep.java
index 37af10b..63bd5bb 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/IdStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/IdStep.java
@@ -8,7 +8,9 @@ public class IdStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof IdStep)) return false;
+        if (!(other instanceof IdStep)) {
+            return false;
+        }
         IdStep o = (IdStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/IdentityStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/IdentityStep.java
index e3a01b2..f4c0c5c 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/IdentityStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/IdentityStep.java
@@ -8,7 +8,9 @@ public class IdentityStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof IdentityStep)) return false;
+        if (!(other instanceof IdentityStep)) {
+            return false;
+        }
         IdentityStep o = (IdentityStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/InEStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/InEStep.java
index 1b730af..a89d35f 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/InEStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/InEStep.java
@@ -15,7 +15,9 @@ public class InEStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof InEStep)) return false;
+        if (!(other instanceof InEStep)) {
+            return false;
+        }
         InEStep o = (InEStep) other;
         return edgeLabels.equals(o.edgeLabels);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/InStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/InStep.java
index ddee660..0936894 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/InStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/InStep.java
@@ -15,7 +15,9 @@ public class InStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof InStep)) return false;
+        if (!(other instanceof InStep)) {
+            return false;
+        }
         InStep o = (InStep) other;
         return edgeLabels.equals(o.edgeLabels);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/InVStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/InVStep.java
index 47c9867..2b476a6 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/InVStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/InVStep.java
@@ -8,7 +8,9 @@ public class InVStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof InVStep)) return false;
+        if (!(other instanceof InVStep)) {
+            return false;
+        }
         InVStep o = (InVStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/IndexStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/IndexStep.java
index 030e429..70881e9 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/IndexStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/IndexStep.java
@@ -8,7 +8,9 @@ public class IndexStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof IndexStep)) return false;
+        if (!(other instanceof IndexStep)) {
+            return false;
+        }
         IndexStep o = (IndexStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/InjectStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/InjectStep.java
index 686bd1a..3c93570 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/InjectStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/InjectStep.java
@@ -17,7 +17,9 @@ public class InjectStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof InjectStep)) return false;
+        if (!(other instanceof InjectStep)) {
+            return false;
+        }
         InjectStep o = (InjectStep) other;
         return injections.equals(o.injections);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/IsStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/IsStep.java
index 27f08f6..72c795c 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/IsStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/IsStep.java
@@ -26,10 +26,12 @@ public abstract class IsStep {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(Predicate instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Value instance) {
             return otherwise(instance);
         }
@@ -55,7 +57,9 @@ public abstract class IsStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Predicate)) return false;
+            if (!(other instanceof Predicate)) {
+                return false;
+            }
             Predicate o = (Predicate) other;
             return predicate.equals(o.predicate);
         }
@@ -86,7 +90,9 @@ public abstract class IsStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Value)) return false;
+            if (!(other instanceof Value)) {
+                return false;
+            }
             Value o = (Value) other;
             return value.equals(o.value);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/KeyStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/KeyStep.java
index 6a631e2..b5d2865 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/KeyStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/KeyStep.java
@@ -8,7 +8,9 @@ public class KeyStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof KeyStep)) return false;
+        if (!(other instanceof KeyStep)) {
+            return false;
+        }
         KeyStep o = (KeyStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/LabelStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/LabelStep.java
index 798ba69..fe83136 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/LabelStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/LabelStep.java
@@ -8,7 +8,9 @@ public class LabelStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof LabelStep)) return false;
+        if (!(other instanceof LabelStep)) {
+            return false;
+        }
         LabelStep o = (LabelStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/LimitStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/LimitStep.java
index 92e2559..463abc3 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/LimitStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/LimitStep.java
@@ -23,7 +23,9 @@ public class LimitStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof LimitStep)) return false;
+        if (!(other instanceof LimitStep)) {
+            return false;
+        }
         LimitStep o = (LimitStep) other;
         return scope.equals(o.scope)
             && limit.equals(o.limit);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/LocalStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/LocalStep.java
index 389d452..fbd9175 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/LocalStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/LocalStep.java
@@ -17,7 +17,9 @@ public class LocalStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof LocalStep)) return false;
+        if (!(other instanceof LocalStep)) {
+            return false;
+        }
         LocalStep o = (LocalStep) other;
         return localTraversal.equals(o.localTraversal);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/LoopsStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/LoopsStep.java
index 57e2ba8..e3ac972 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/LoopsStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/LoopsStep.java
@@ -15,7 +15,9 @@ public class LoopsStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof LoopsStep)) return false;
+        if (!(other instanceof LoopsStep)) {
+            return false;
+        }
         LoopsStep o = (LoopsStep) other;
         return loopName.equals(o.loopName);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MapStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MapStep.java
index 6ee2f26..f36c4d3 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MapStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MapStep.java
@@ -17,7 +17,9 @@ public class MapStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof MapStep)) return false;
+        if (!(other instanceof MapStep)) {
+            return false;
+        }
         MapStep o = (MapStep) other;
         return mapTraversal.equals(o.mapTraversal);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MatchStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MatchStep.java
index d6dc336..d9fe54d 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MatchStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MatchStep.java
@@ -17,7 +17,9 @@ public class MatchStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof MatchStep)) return false;
+        if (!(other instanceof MatchStep)) {
+            return false;
+        }
         MatchStep o = (MatchStep) other;
         return matchTraversals.equals(o.matchTraversals);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MathStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MathStep.java
index 7b79f04..35c0d60 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MathStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MathStep.java
@@ -15,7 +15,9 @@ public class MathStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof MathStep)) return false;
+        if (!(other instanceof MathStep)) {
+            return false;
+        }
         MathStep o = (MathStep) other;
         return expression.equals(o.expression);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MaxStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MaxStep.java
index f75ab0d..6f87970 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MaxStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MaxStep.java
@@ -17,7 +17,9 @@ public class MaxStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof MaxStep)) return false;
+        if (!(other instanceof MaxStep)) {
+            return false;
+        }
         MaxStep o = (MaxStep) other;
         return scope.equals(o.scope);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MeanStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MeanStep.java
index d703193..653d192 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MeanStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MeanStep.java
@@ -17,7 +17,9 @@ public class MeanStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof MeanStep)) return false;
+        if (!(other instanceof MeanStep)) {
+            return false;
+        }
         MeanStep o = (MeanStep) other;
         return scope.equals(o.scope);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MinStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MinStep.java
index 7779030..8ef8aad 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MinStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/MinStep.java
@@ -17,7 +17,9 @@ public class MinStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof MinStep)) return false;
+        if (!(other instanceof MinStep)) {
+            return false;
+        }
         MinStep o = (MinStep) other;
         return scope.equals(o.scope);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/NotStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/NotStep.java
index 8d53944..b9ac709 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/NotStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/NotStep.java
@@ -17,7 +17,9 @@ public class NotStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof NotStep)) return false;
+        if (!(other instanceof NotStep)) {
+            return false;
+        }
         NotStep o = (NotStep) other;
         return notTraversal.equals(o.notTraversal);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OptionStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OptionStep.java
index e612b8c..579db1f 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OptionStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OptionStep.java
@@ -10,8 +10,14 @@ public abstract class OptionStep {
     public abstract <R> R accept(Visitor<R> visitor) ;
     
     public static class ObjectTraversalValue {
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/literals.GenericLiteral
+         */
         public final GenericLiteral object;
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.NestedTraversal
+         */
         public final NestedTraversal traversal;
         
         /**
@@ -24,7 +30,9 @@ public abstract class OptionStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ObjectTraversalValue)) return false;
+            if (!(other instanceof ObjectTraversalValue)) {
+                return false;
+            }
             ObjectTraversalValue o = (ObjectTraversalValue) other;
             return object.equals(o.object)
                 && traversal.equals(o.traversal);
@@ -52,8 +60,14 @@ public abstract class OptionStep {
     }
     
     public static class PredicateTraversalValue {
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/predicates.TraversalPredicate
+         */
         public final TraversalPredicate predicate;
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.NestedTraversal
+         */
         public final NestedTraversal traversal;
         
         /**
@@ -66,7 +80,9 @@ public abstract class OptionStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof PredicateTraversalValue)) return false;
+            if (!(other instanceof PredicateTraversalValue)) {
+                return false;
+            }
             PredicateTraversalValue o = (PredicateTraversalValue) other;
             return predicate.equals(o.predicate)
                 && traversal.equals(o.traversal);
@@ -113,14 +129,17 @@ public abstract class OptionStep {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(PredicateTraversal instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ObjectTraversal instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Traversal instance) {
             return otherwise(instance);
         }
@@ -143,7 +162,9 @@ public abstract class OptionStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof PredicateTraversal)) return false;
+            if (!(other instanceof PredicateTraversal)) {
+                return false;
+            }
             PredicateTraversal o = (PredicateTraversal) other;
             return predicateTraversal.equals(o.predicateTraversal);
         }
@@ -171,7 +192,9 @@ public abstract class OptionStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ObjectTraversal)) return false;
+            if (!(other instanceof ObjectTraversal)) {
+                return false;
+            }
             ObjectTraversal o = (ObjectTraversal) other;
             return objectTraversal.equals(o.objectTraversal);
         }
@@ -202,7 +225,9 @@ public abstract class OptionStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Traversal)) return false;
+            if (!(other instanceof Traversal)) {
+                return false;
+            }
             Traversal o = (Traversal) other;
             return traversal.equals(o.traversal);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OptionalStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OptionalStep.java
index 721a5f8..08d77bf 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OptionalStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OptionalStep.java
@@ -17,7 +17,9 @@ public class OptionalStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof OptionalStep)) return false;
+        if (!(other instanceof OptionalStep)) {
+            return false;
+        }
         OptionalStep o = (OptionalStep) other;
         return optionalTraversal.equals(o.optionalTraversal);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OrStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OrStep.java
index 81839ae..261fbdf 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OrStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OrStep.java
@@ -17,7 +17,9 @@ public class OrStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof OrStep)) return false;
+        if (!(other instanceof OrStep)) {
+            return false;
+        }
         OrStep o = (OrStep) other;
         return orTraversals.equals(o.orTraversals);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OrderStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OrderStep.java
index 5911fb9..c340b36 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OrderStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OrderStep.java
@@ -17,7 +17,9 @@ public class OrderStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof OrderStep)) return false;
+        if (!(other instanceof OrderStep)) {
+            return false;
+        }
         OrderStep o = (OrderStep) other;
         return scope.equals(o.scope);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OtherVStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OtherVStep.java
index 97df8fb..cf12d0d 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OtherVStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OtherVStep.java
@@ -8,7 +8,9 @@ public class OtherVStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof OtherVStep)) return false;
+        if (!(other instanceof OtherVStep)) {
+            return false;
+        }
         OtherVStep o = (OtherVStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OutEStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OutEStep.java
index d322db7..3028d7e 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OutEStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OutEStep.java
@@ -15,7 +15,9 @@ public class OutEStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof OutEStep)) return false;
+        if (!(other instanceof OutEStep)) {
+            return false;
+        }
         OutEStep o = (OutEStep) other;
         return edgeLabels.equals(o.edgeLabels);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OutStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OutStep.java
index c286c10..49250c8 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OutStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OutStep.java
@@ -15,7 +15,9 @@ public class OutStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof OutStep)) return false;
+        if (!(other instanceof OutStep)) {
+            return false;
+        }
         OutStep o = (OutStep) other;
         return edgeLabels.equals(o.edgeLabels);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OutVStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OutVStep.java
index 0bf2c98..d519076 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OutVStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/OutVStep.java
@@ -8,7 +8,9 @@ public class OutVStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof OutVStep)) return false;
+        if (!(other instanceof OutVStep)) {
+            return false;
+        }
         OutVStep o = (OutVStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PageRankStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PageRankStep.java
index 5a56999..86bf676 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PageRankStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PageRankStep.java
@@ -15,7 +15,9 @@ public class PageRankStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof PageRankStep)) return false;
+        if (!(other instanceof PageRankStep)) {
+            return false;
+        }
         PageRankStep o = (PageRankStep) other;
         return alpha.equals(o.alpha);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PathStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PathStep.java
index 41376f7..9014649 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PathStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PathStep.java
@@ -8,7 +8,9 @@ public class PathStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof PathStep)) return false;
+        if (!(other instanceof PathStep)) {
+            return false;
+        }
         PathStep o = (PathStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PeerPressureStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PeerPressureStep.java
index e98c6a1..d17cfaf 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PeerPressureStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PeerPressureStep.java
@@ -8,7 +8,9 @@ public class PeerPressureStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof PeerPressureStep)) return false;
+        if (!(other instanceof PeerPressureStep)) {
+            return false;
+        }
         PeerPressureStep o = (PeerPressureStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ProfileStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ProfileStep.java
index e9bb2ff..5843848 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ProfileStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ProfileStep.java
@@ -15,7 +15,9 @@ public class ProfileStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ProfileStep)) return false;
+        if (!(other instanceof ProfileStep)) {
+            return false;
+        }
         ProfileStep o = (ProfileStep) other;
         return sideEffectKey.equals(o.sideEffectKey);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ProjectStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ProjectStep.java
index a6280ad..c5fe234 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ProjectStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ProjectStep.java
@@ -21,7 +21,9 @@ public class ProjectStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ProjectStep)) return false;
+        if (!(other instanceof ProjectStep)) {
+            return false;
+        }
         ProjectStep o = (ProjectStep) other;
         return projectKey.equals(o.projectKey)
             && otherProjectKeys.equals(o.otherProjectKeys);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PropertiesStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PropertiesStep.java
index 89bd917..993fd00 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PropertiesStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PropertiesStep.java
@@ -15,7 +15,9 @@ public class PropertiesStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof PropertiesStep)) return false;
+        if (!(other instanceof PropertiesStep)) {
+            return false;
+        }
         PropertiesStep o = (PropertiesStep) other;
         return propertyKeys.equals(o.propertyKeys);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PropertyMapStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PropertyMapStep.java
index 77904ea..b26e142 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PropertyMapStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PropertyMapStep.java
@@ -15,7 +15,9 @@ public class PropertyMapStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof PropertyMapStep)) return false;
+        if (!(other instanceof PropertyMapStep)) {
+            return false;
+        }
         PropertyMapStep o = (PropertyMapStep) other;
         return propertyKeys.equals(o.propertyKeys);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PropertyStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PropertyStep.java
index 172e56a..563f051 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PropertyStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/PropertyStep.java
@@ -36,7 +36,9 @@ public class PropertyStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof PropertyStep)) return false;
+        if (!(other instanceof PropertyStep)) {
+            return false;
+        }
         PropertyStep o = (PropertyStep) other;
         return cardinality.equals(o.cardinality)
             && key.equals(o.key)
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/RangeStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/RangeStep.java
index 86ab753..d11bd62 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/RangeStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/RangeStep.java
@@ -29,7 +29,9 @@ public class RangeStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof RangeStep)) return false;
+        if (!(other instanceof RangeStep)) {
+            return false;
+        }
         RangeStep o = (RangeStep) other;
         return scope.equals(o.scope)
             && low.equals(o.low)
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ReadStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ReadStep.java
index 6f18661..b814fae 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ReadStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ReadStep.java
@@ -8,7 +8,9 @@ public class ReadStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ReadStep)) return false;
+        if (!(other instanceof ReadStep)) {
+            return false;
+        }
         ReadStep o = (ReadStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/RepeatStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/RepeatStep.java
index a43ddb4..426e0db 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/RepeatStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/RepeatStep.java
@@ -23,7 +23,9 @@ public class RepeatStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof RepeatStep)) return false;
+        if (!(other instanceof RepeatStep)) {
+            return false;
+        }
         RepeatStep o = (RepeatStep) other;
         return loopName.equals(o.loopName)
             && repeatTraversals.equals(o.repeatTraversals);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SackStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SackStep.java
index d534b91..8265b79 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SackStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SackStep.java
@@ -17,7 +17,9 @@ public class SackStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof SackStep)) return false;
+        if (!(other instanceof SackStep)) {
+            return false;
+        }
         SackStep o = (SackStep) other;
         return sackOperator.equals(o.sackOperator);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SampleStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SampleStep.java
index 669537b..9a2fa91 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SampleStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SampleStep.java
@@ -23,7 +23,9 @@ public class SampleStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof SampleStep)) return false;
+        if (!(other instanceof SampleStep)) {
+            return false;
+        }
         SampleStep o = (SampleStep) other;
         return scope.equals(o.scope)
             && amountToSample.equals(o.amountToSample);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SelectStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SelectStep.java
index 25d4ae1..516aa56 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SelectStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SelectStep.java
@@ -10,8 +10,14 @@ public abstract class SelectStep {
     public abstract <R> R accept(Visitor<R> visitor) ;
     
     public static class TraversalValue {
+        /**
+         * @type optional: org/apache/tinkerpop/gremlin/language/model/traversal.TraversalPop
+         */
         public final java.util.Optional<TraversalPop> pop;
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.NestedTraversal
+         */
         public final NestedTraversal traversal;
         
         /**
@@ -24,7 +30,9 @@ public abstract class SelectStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof TraversalValue)) return false;
+            if (!(other instanceof TraversalValue)) {
+                return false;
+            }
             TraversalValue o = (TraversalValue) other;
             return pop.equals(o.pop)
                 && traversal.equals(o.traversal);
@@ -52,12 +60,24 @@ public abstract class SelectStep {
     }
     
     public static class KeysValue {
+        /**
+         * @type optional: org/apache/tinkerpop/gremlin/language/model/traversal.TraversalPop
+         */
         public final java.util.Optional<TraversalPop> pop;
         
+        /**
+         * @type string
+         */
         public final String selectKey1;
         
+        /**
+         * @type string
+         */
         public final String selectKey2;
         
+        /**
+         * @type list: string
+         */
         public final java.util.List<String> otherSelectKeys;
         
         /**
@@ -72,7 +92,9 @@ public abstract class SelectStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof KeysValue)) return false;
+            if (!(other instanceof KeysValue)) {
+                return false;
+            }
             KeysValue o = (KeysValue) other;
             return pop.equals(o.pop)
                 && selectKey1.equals(o.selectKey1)
@@ -118,8 +140,14 @@ public abstract class SelectStep {
     }
     
     public static class KeyValue {
+        /**
+         * @type optional: org/apache/tinkerpop/gremlin/language/model/traversal.TraversalPop
+         */
         public final java.util.Optional<TraversalPop> pop;
         
+        /**
+         * @type string
+         */
         public final String selectKey;
         
         /**
@@ -132,7 +160,9 @@ public abstract class SelectStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof KeyValue)) return false;
+            if (!(other instanceof KeyValue)) {
+                return false;
+            }
             KeyValue o = (KeyValue) other;
             return pop.equals(o.pop)
                 && selectKey.equals(o.selectKey);
@@ -181,18 +211,22 @@ public abstract class SelectStep {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(Column instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Key instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Keys instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Traversal instance) {
             return otherwise(instance);
         }
@@ -218,7 +252,9 @@ public abstract class SelectStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Column)) return false;
+            if (!(other instanceof Column)) {
+                return false;
+            }
             Column o = (Column) other;
             return column.equals(o.column);
         }
@@ -246,7 +282,9 @@ public abstract class SelectStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Key)) return false;
+            if (!(other instanceof Key)) {
+                return false;
+            }
             Key o = (Key) other;
             return key.equals(o.key);
         }
@@ -274,7 +312,9 @@ public abstract class SelectStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Keys)) return false;
+            if (!(other instanceof Keys)) {
+                return false;
+            }
             Keys o = (Keys) other;
             return keys.equals(o.keys);
         }
@@ -302,7 +342,9 @@ public abstract class SelectStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Traversal)) return false;
+            if (!(other instanceof Traversal)) {
+                return false;
+            }
             Traversal o = (Traversal) other;
             return traversal.equals(o.traversal);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ShortestPathStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ShortestPathStep.java
index e5c3a3d..f13e072 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ShortestPathStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ShortestPathStep.java
@@ -8,7 +8,9 @@ public class ShortestPathStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ShortestPathStep)) return false;
+        if (!(other instanceof ShortestPathStep)) {
+            return false;
+        }
         ShortestPathStep o = (ShortestPathStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SideEffectStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SideEffectStep.java
index d7becd0..4e033a0 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SideEffectStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SideEffectStep.java
@@ -17,7 +17,9 @@ public class SideEffectStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof SideEffectStep)) return false;
+        if (!(other instanceof SideEffectStep)) {
+            return false;
+        }
         SideEffectStep o = (SideEffectStep) other;
         return sideEffectTraversal.equals(o.sideEffectTraversal);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SimplePathStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SimplePathStep.java
index c4643b6..149ba19 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SimplePathStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SimplePathStep.java
@@ -8,7 +8,9 @@ public class SimplePathStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof SimplePathStep)) return false;
+        if (!(other instanceof SimplePathStep)) {
+            return false;
+        }
         SimplePathStep o = (SimplePathStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SkipStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SkipStep.java
index 3bd0f27..7f9ebe32 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SkipStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SkipStep.java
@@ -23,7 +23,9 @@ public class SkipStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof SkipStep)) return false;
+        if (!(other instanceof SkipStep)) {
+            return false;
+        }
         SkipStep o = (SkipStep) other;
         return scope.equals(o.scope)
             && skip.equals(o.skip);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/StoreStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/StoreStep.java
index e66290a..a74eb94 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/StoreStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/StoreStep.java
@@ -15,7 +15,9 @@ public class StoreStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof StoreStep)) return false;
+        if (!(other instanceof StoreStep)) {
+            return false;
+        }
         StoreStep o = (StoreStep) other;
         return sideEffectKey.equals(o.sideEffectKey);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SubgraphStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SubgraphStep.java
index aa8ee73..692ea01 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SubgraphStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SubgraphStep.java
@@ -15,7 +15,9 @@ public class SubgraphStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof SubgraphStep)) return false;
+        if (!(other instanceof SubgraphStep)) {
+            return false;
+        }
         SubgraphStep o = (SubgraphStep) other;
         return sideEffectKey.equals(o.sideEffectKey);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SumStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SumStep.java
index 646a971..8393ec4 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SumStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/SumStep.java
@@ -17,7 +17,9 @@ public class SumStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof SumStep)) return false;
+        if (!(other instanceof SumStep)) {
+            return false;
+        }
         SumStep o = (SumStep) other;
         return scope.equals(o.scope);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TailStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TailStep.java
index abfe7a3..631ce3b 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TailStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TailStep.java
@@ -23,7 +23,9 @@ public class TailStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof TailStep)) return false;
+        if (!(other instanceof TailStep)) {
+            return false;
+        }
         TailStep o = (TailStep) other;
         return scope.equals(o.scope)
             && limit.equals(o.limit);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TimeLimitStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TimeLimitStep.java
index af9db95..5f693fc 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TimeLimitStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TimeLimitStep.java
@@ -15,7 +15,9 @@ public class TimeLimitStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof TimeLimitStep)) return false;
+        if (!(other instanceof TimeLimitStep)) {
+            return false;
+        }
         TimeLimitStep o = (TimeLimitStep) other;
         return timeLimit.equals(o.timeLimit);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TimesStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TimesStep.java
index 0664bd3..796881b 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TimesStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TimesStep.java
@@ -15,7 +15,9 @@ public class TimesStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof TimesStep)) return false;
+        if (!(other instanceof TimesStep)) {
+            return false;
+        }
         TimesStep o = (TimesStep) other;
         return maxLoops.equals(o.maxLoops);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ToEStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ToEStep.java
index e8e7466..c64ad37 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ToEStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ToEStep.java
@@ -23,7 +23,9 @@ public class ToEStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ToEStep)) return false;
+        if (!(other instanceof ToEStep)) {
+            return false;
+        }
         ToEStep o = (ToEStep) other;
         return direction.equals(o.direction)
             && edgeLabels.equals(o.edgeLabels);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ToStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ToStep.java
index 239977f..90735ad 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ToStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ToStep.java
@@ -9,8 +9,14 @@ public abstract class ToStep {
     public abstract <R> R accept(Visitor<R> visitor) ;
     
     public static class WithDirectionValue {
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.TraversalDirection
+         */
         public final TraversalDirection direction;
         
+        /**
+         * @type list: string
+         */
         public final java.util.List<String> edgeLabels;
         
         /**
@@ -23,7 +29,9 @@ public abstract class ToStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithDirectionValue)) return false;
+            if (!(other instanceof WithDirectionValue)) {
+                return false;
+            }
             WithDirectionValue o = (WithDirectionValue) other;
             return direction.equals(o.direction)
                 && edgeLabels.equals(o.edgeLabels);
@@ -70,14 +78,17 @@ public abstract class ToStep {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(WithDirection instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ToStepLabel instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ToVertex instance) {
             return otherwise(instance);
         }
@@ -100,7 +111,9 @@ public abstract class ToStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithDirection)) return false;
+            if (!(other instanceof WithDirection)) {
+                return false;
+            }
             WithDirection o = (WithDirection) other;
             return withDirection.equals(o.withDirection);
         }
@@ -131,7 +144,9 @@ public abstract class ToStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ToStepLabel)) return false;
+            if (!(other instanceof ToStepLabel)) {
+                return false;
+            }
             ToStepLabel o = (ToStepLabel) other;
             return toStepLabel.equals(o.toStepLabel);
         }
@@ -162,7 +177,9 @@ public abstract class ToStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ToVertex)) return false;
+            if (!(other instanceof ToVertex)) {
+                return false;
+            }
             ToVertex o = (ToVertex) other;
             return toVertex.equals(o.toVertex);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ToVStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ToVStep.java
index dc8ac43..052a697 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ToVStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ToVStep.java
@@ -17,7 +17,9 @@ public class ToVStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ToVStep)) return false;
+        if (!(other instanceof ToVStep)) {
+            return false;
+        }
         ToVStep o = (ToVStep) other;
         return direction.equals(o.direction);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TraversalMethod.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TraversalMethod.java
index 6e0da01..16f9df7 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TraversalMethod.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TraversalMethod.java
@@ -221,406 +221,507 @@ public abstract class TraversalMethod {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(V instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(AddE instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(AddV instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Aggregate instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(And instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(As instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Barrier instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Both instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(BothE instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(BothV instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Branch instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(By instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Cap instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Choose instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Coalesce instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Coin instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ConnectedComponent instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Constant instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Count instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(CyclicPath instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Dedup instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Drop instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ElementMap instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Emit instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Filter instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(FlatMap instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Fold instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(From instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Group instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(GroupCount instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Has instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(HasId instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(HasKey instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(HasLabel instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(HasNot instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(HasValue instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Id instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Identity instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(In instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(InE instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(InV instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Index instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Inject instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Is instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Key instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Label instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Limit instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Local instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Loops instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Map instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Match instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(MathEsc instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Max instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Mean instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Min instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Not instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Option instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Optional instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Or instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Order instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(OtherV instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Out instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(OutE instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(OutV instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(PageRank instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Path instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(PeerPressure instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Profile instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Project instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Properties instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Property instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(PropertyMap instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Range instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Read instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Repeat instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Sack instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Sample instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Select instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ShortestPath instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(SideEffect instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(SimplePath instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Skip instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Store instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Subgraph instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Sum instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Tail instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(TimeLimit instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Times instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(To instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ToE instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ToV instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Tree instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Unfold instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Union instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Until instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Value instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ValueMap instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Values instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Where instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(With instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Write instance) {
             return otherwise(instance);
         }
@@ -646,7 +747,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof V)) return false;
+            if (!(other instanceof V)) {
+                return false;
+            }
             V o = (V) other;
             return v.equals(o.v);
         }
@@ -677,7 +780,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof AddE)) return false;
+            if (!(other instanceof AddE)) {
+                return false;
+            }
             AddE o = (AddE) other;
             return addE.equals(o.addE);
         }
@@ -708,7 +813,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof AddV)) return false;
+            if (!(other instanceof AddV)) {
+                return false;
+            }
             AddV o = (AddV) other;
             return addV.equals(o.addV);
         }
@@ -739,7 +846,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Aggregate)) return false;
+            if (!(other instanceof Aggregate)) {
+                return false;
+            }
             Aggregate o = (Aggregate) other;
             return aggregate.equals(o.aggregate);
         }
@@ -770,7 +879,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof And)) return false;
+            if (!(other instanceof And)) {
+                return false;
+            }
             And o = (And) other;
             return and.equals(o.and);
         }
@@ -801,7 +912,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof As)) return false;
+            if (!(other instanceof As)) {
+                return false;
+            }
             As o = (As) other;
             return as.equals(o.as);
         }
@@ -832,7 +945,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Barrier)) return false;
+            if (!(other instanceof Barrier)) {
+                return false;
+            }
             Barrier o = (Barrier) other;
             return barrier.equals(o.barrier);
         }
@@ -863,7 +978,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Both)) return false;
+            if (!(other instanceof Both)) {
+                return false;
+            }
             Both o = (Both) other;
             return both.equals(o.both);
         }
@@ -894,7 +1011,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof BothE)) return false;
+            if (!(other instanceof BothE)) {
+                return false;
+            }
             BothE o = (BothE) other;
             return bothE.equals(o.bothE);
         }
@@ -925,7 +1044,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof BothV)) return false;
+            if (!(other instanceof BothV)) {
+                return false;
+            }
             BothV o = (BothV) other;
             return bothV.equals(o.bothV);
         }
@@ -956,7 +1077,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Branch)) return false;
+            if (!(other instanceof Branch)) {
+                return false;
+            }
             Branch o = (Branch) other;
             return branch.equals(o.branch);
         }
@@ -987,7 +1110,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof By)) return false;
+            if (!(other instanceof By)) {
+                return false;
+            }
             By o = (By) other;
             return by.equals(o.by);
         }
@@ -1018,7 +1143,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Cap)) return false;
+            if (!(other instanceof Cap)) {
+                return false;
+            }
             Cap o = (Cap) other;
             return cap.equals(o.cap);
         }
@@ -1049,7 +1176,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Choose)) return false;
+            if (!(other instanceof Choose)) {
+                return false;
+            }
             Choose o = (Choose) other;
             return choose.equals(o.choose);
         }
@@ -1080,7 +1209,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Coalesce)) return false;
+            if (!(other instanceof Coalesce)) {
+                return false;
+            }
             Coalesce o = (Coalesce) other;
             return coalesce.equals(o.coalesce);
         }
@@ -1111,7 +1242,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Coin)) return false;
+            if (!(other instanceof Coin)) {
+                return false;
+            }
             Coin o = (Coin) other;
             return coin.equals(o.coin);
         }
@@ -1142,7 +1275,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ConnectedComponent)) return false;
+            if (!(other instanceof ConnectedComponent)) {
+                return false;
+            }
             ConnectedComponent o = (ConnectedComponent) other;
             return connectedComponent.equals(o.connectedComponent);
         }
@@ -1173,7 +1308,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Constant)) return false;
+            if (!(other instanceof Constant)) {
+                return false;
+            }
             Constant o = (Constant) other;
             return constant.equals(o.constant);
         }
@@ -1204,7 +1341,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Count)) return false;
+            if (!(other instanceof Count)) {
+                return false;
+            }
             Count o = (Count) other;
             return count.equals(o.count);
         }
@@ -1235,7 +1374,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof CyclicPath)) return false;
+            if (!(other instanceof CyclicPath)) {
+                return false;
+            }
             CyclicPath o = (CyclicPath) other;
             return cyclicPath.equals(o.cyclicPath);
         }
@@ -1266,7 +1407,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Dedup)) return false;
+            if (!(other instanceof Dedup)) {
+                return false;
+            }
             Dedup o = (Dedup) other;
             return dedup.equals(o.dedup);
         }
@@ -1297,7 +1440,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Drop)) return false;
+            if (!(other instanceof Drop)) {
+                return false;
+            }
             Drop o = (Drop) other;
             return drop.equals(o.drop);
         }
@@ -1328,7 +1473,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ElementMap)) return false;
+            if (!(other instanceof ElementMap)) {
+                return false;
+            }
             ElementMap o = (ElementMap) other;
             return elementMap.equals(o.elementMap);
         }
@@ -1359,7 +1506,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Emit)) return false;
+            if (!(other instanceof Emit)) {
+                return false;
+            }
             Emit o = (Emit) other;
             return emit.equals(o.emit);
         }
@@ -1390,7 +1539,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Filter)) return false;
+            if (!(other instanceof Filter)) {
+                return false;
+            }
             Filter o = (Filter) other;
             return filter.equals(o.filter);
         }
@@ -1421,7 +1572,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof FlatMap)) return false;
+            if (!(other instanceof FlatMap)) {
+                return false;
+            }
             FlatMap o = (FlatMap) other;
             return flatMap.equals(o.flatMap);
         }
@@ -1452,7 +1605,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Fold)) return false;
+            if (!(other instanceof Fold)) {
+                return false;
+            }
             Fold o = (Fold) other;
             return fold.equals(o.fold);
         }
@@ -1483,7 +1638,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof From)) return false;
+            if (!(other instanceof From)) {
+                return false;
+            }
             From o = (From) other;
             return from.equals(o.from);
         }
@@ -1514,7 +1671,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Group)) return false;
+            if (!(other instanceof Group)) {
+                return false;
+            }
             Group o = (Group) other;
             return group.equals(o.group);
         }
@@ -1545,7 +1704,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof GroupCount)) return false;
+            if (!(other instanceof GroupCount)) {
+                return false;
+            }
             GroupCount o = (GroupCount) other;
             return groupCount.equals(o.groupCount);
         }
@@ -1576,7 +1737,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Has)) return false;
+            if (!(other instanceof Has)) {
+                return false;
+            }
             Has o = (Has) other;
             return has.equals(o.has);
         }
@@ -1607,7 +1770,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof HasId)) return false;
+            if (!(other instanceof HasId)) {
+                return false;
+            }
             HasId o = (HasId) other;
             return hasId.equals(o.hasId);
         }
@@ -1638,7 +1803,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof HasKey)) return false;
+            if (!(other instanceof HasKey)) {
+                return false;
+            }
             HasKey o = (HasKey) other;
             return hasKey.equals(o.hasKey);
         }
@@ -1669,7 +1836,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof HasLabel)) return false;
+            if (!(other instanceof HasLabel)) {
+                return false;
+            }
             HasLabel o = (HasLabel) other;
             return hasLabel.equals(o.hasLabel);
         }
@@ -1700,7 +1869,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof HasNot)) return false;
+            if (!(other instanceof HasNot)) {
+                return false;
+            }
             HasNot o = (HasNot) other;
             return hasNot.equals(o.hasNot);
         }
@@ -1731,7 +1902,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof HasValue)) return false;
+            if (!(other instanceof HasValue)) {
+                return false;
+            }
             HasValue o = (HasValue) other;
             return hasValue.equals(o.hasValue);
         }
@@ -1762,7 +1935,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Id)) return false;
+            if (!(other instanceof Id)) {
+                return false;
+            }
             Id o = (Id) other;
             return id.equals(o.id);
         }
@@ -1793,7 +1968,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Identity)) return false;
+            if (!(other instanceof Identity)) {
+                return false;
+            }
             Identity o = (Identity) other;
             return identity.equals(o.identity);
         }
@@ -1824,7 +2001,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof In)) return false;
+            if (!(other instanceof In)) {
+                return false;
+            }
             In o = (In) other;
             return in.equals(o.in);
         }
@@ -1855,7 +2034,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof InE)) return false;
+            if (!(other instanceof InE)) {
+                return false;
+            }
             InE o = (InE) other;
             return inE.equals(o.inE);
         }
@@ -1886,7 +2067,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof InV)) return false;
+            if (!(other instanceof InV)) {
+                return false;
+            }
             InV o = (InV) other;
             return inV.equals(o.inV);
         }
@@ -1917,7 +2100,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Index)) return false;
+            if (!(other instanceof Index)) {
+                return false;
+            }
             Index o = (Index) other;
             return index.equals(o.index);
         }
@@ -1948,7 +2133,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Inject)) return false;
+            if (!(other instanceof Inject)) {
+                return false;
+            }
             Inject o = (Inject) other;
             return inject.equals(o.inject);
         }
@@ -1979,7 +2166,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Is)) return false;
+            if (!(other instanceof Is)) {
+                return false;
+            }
             Is o = (Is) other;
             return is.equals(o.is);
         }
@@ -2010,7 +2199,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Key)) return false;
+            if (!(other instanceof Key)) {
+                return false;
+            }
             Key o = (Key) other;
             return key.equals(o.key);
         }
@@ -2041,7 +2232,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Label)) return false;
+            if (!(other instanceof Label)) {
+                return false;
+            }
             Label o = (Label) other;
             return label.equals(o.label);
         }
@@ -2072,7 +2265,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Limit)) return false;
+            if (!(other instanceof Limit)) {
+                return false;
+            }
             Limit o = (Limit) other;
             return limit.equals(o.limit);
         }
@@ -2103,7 +2298,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Local)) return false;
+            if (!(other instanceof Local)) {
+                return false;
+            }
             Local o = (Local) other;
             return local.equals(o.local);
         }
@@ -2134,7 +2331,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Loops)) return false;
+            if (!(other instanceof Loops)) {
+                return false;
+            }
             Loops o = (Loops) other;
             return loops.equals(o.loops);
         }
@@ -2165,7 +2364,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Map)) return false;
+            if (!(other instanceof Map)) {
+                return false;
+            }
             Map o = (Map) other;
             return map.equals(o.map);
         }
@@ -2196,7 +2397,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Match)) return false;
+            if (!(other instanceof Match)) {
+                return false;
+            }
             Match o = (Match) other;
             return match.equals(o.match);
         }
@@ -2227,7 +2430,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof MathEsc)) return false;
+            if (!(other instanceof MathEsc)) {
+                return false;
+            }
             MathEsc o = (MathEsc) other;
             return math.equals(o.math);
         }
@@ -2258,7 +2463,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Max)) return false;
+            if (!(other instanceof Max)) {
+                return false;
+            }
             Max o = (Max) other;
             return max.equals(o.max);
         }
@@ -2289,7 +2496,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Mean)) return false;
+            if (!(other instanceof Mean)) {
+                return false;
+            }
             Mean o = (Mean) other;
             return mean.equals(o.mean);
         }
@@ -2320,7 +2529,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Min)) return false;
+            if (!(other instanceof Min)) {
+                return false;
+            }
             Min o = (Min) other;
             return min.equals(o.min);
         }
@@ -2351,7 +2562,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Not)) return false;
+            if (!(other instanceof Not)) {
+                return false;
+            }
             Not o = (Not) other;
             return not.equals(o.not);
         }
@@ -2382,7 +2595,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Option)) return false;
+            if (!(other instanceof Option)) {
+                return false;
+            }
             Option o = (Option) other;
             return option.equals(o.option);
         }
@@ -2413,7 +2628,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Optional)) return false;
+            if (!(other instanceof Optional)) {
+                return false;
+            }
             Optional o = (Optional) other;
             return optional.equals(o.optional);
         }
@@ -2444,7 +2661,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Or)) return false;
+            if (!(other instanceof Or)) {
+                return false;
+            }
             Or o = (Or) other;
             return or.equals(o.or);
         }
@@ -2475,7 +2694,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Order)) return false;
+            if (!(other instanceof Order)) {
+                return false;
+            }
             Order o = (Order) other;
             return order.equals(o.order);
         }
@@ -2506,7 +2727,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof OtherV)) return false;
+            if (!(other instanceof OtherV)) {
+                return false;
+            }
             OtherV o = (OtherV) other;
             return otherV.equals(o.otherV);
         }
@@ -2537,7 +2760,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Out)) return false;
+            if (!(other instanceof Out)) {
+                return false;
+            }
             Out o = (Out) other;
             return out.equals(o.out);
         }
@@ -2568,7 +2793,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof OutE)) return false;
+            if (!(other instanceof OutE)) {
+                return false;
+            }
             OutE o = (OutE) other;
             return outE.equals(o.outE);
         }
@@ -2599,7 +2826,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof OutV)) return false;
+            if (!(other instanceof OutV)) {
+                return false;
+            }
             OutV o = (OutV) other;
             return outV.equals(o.outV);
         }
@@ -2630,7 +2859,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof PageRank)) return false;
+            if (!(other instanceof PageRank)) {
+                return false;
+            }
             PageRank o = (PageRank) other;
             return pageRank.equals(o.pageRank);
         }
@@ -2661,7 +2892,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Path)) return false;
+            if (!(other instanceof Path)) {
+                return false;
+            }
             Path o = (Path) other;
             return path.equals(o.path);
         }
@@ -2692,7 +2925,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof PeerPressure)) return false;
+            if (!(other instanceof PeerPressure)) {
+                return false;
+            }
             PeerPressure o = (PeerPressure) other;
             return peerPressure.equals(o.peerPressure);
         }
@@ -2723,7 +2958,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Profile)) return false;
+            if (!(other instanceof Profile)) {
+                return false;
+            }
             Profile o = (Profile) other;
             return profile.equals(o.profile);
         }
@@ -2754,7 +2991,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Project)) return false;
+            if (!(other instanceof Project)) {
+                return false;
+            }
             Project o = (Project) other;
             return project.equals(o.project);
         }
@@ -2785,7 +3024,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Properties)) return false;
+            if (!(other instanceof Properties)) {
+                return false;
+            }
             Properties o = (Properties) other;
             return properties.equals(o.properties);
         }
@@ -2816,7 +3057,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Property)) return false;
+            if (!(other instanceof Property)) {
+                return false;
+            }
             Property o = (Property) other;
             return property.equals(o.property);
         }
@@ -2847,7 +3090,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof PropertyMap)) return false;
+            if (!(other instanceof PropertyMap)) {
+                return false;
+            }
             PropertyMap o = (PropertyMap) other;
             return propertyMap.equals(o.propertyMap);
         }
@@ -2878,7 +3123,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Range)) return false;
+            if (!(other instanceof Range)) {
+                return false;
+            }
             Range o = (Range) other;
             return range.equals(o.range);
         }
@@ -2909,7 +3156,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Read)) return false;
+            if (!(other instanceof Read)) {
+                return false;
+            }
             Read o = (Read) other;
             return read.equals(o.read);
         }
@@ -2940,7 +3189,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Repeat)) return false;
+            if (!(other instanceof Repeat)) {
+                return false;
+            }
             Repeat o = (Repeat) other;
             return repeat.equals(o.repeat);
         }
@@ -2971,7 +3222,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Sack)) return false;
+            if (!(other instanceof Sack)) {
+                return false;
+            }
             Sack o = (Sack) other;
             return sack.equals(o.sack);
         }
@@ -3002,7 +3255,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Sample)) return false;
+            if (!(other instanceof Sample)) {
+                return false;
+            }
             Sample o = (Sample) other;
             return sample.equals(o.sample);
         }
@@ -3033,7 +3288,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Select)) return false;
+            if (!(other instanceof Select)) {
+                return false;
+            }
             Select o = (Select) other;
             return select.equals(o.select);
         }
@@ -3064,7 +3321,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ShortestPath)) return false;
+            if (!(other instanceof ShortestPath)) {
+                return false;
+            }
             ShortestPath o = (ShortestPath) other;
             return shortestPath.equals(o.shortestPath);
         }
@@ -3095,7 +3354,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof SideEffect)) return false;
+            if (!(other instanceof SideEffect)) {
+                return false;
+            }
             SideEffect o = (SideEffect) other;
             return sideEffect.equals(o.sideEffect);
         }
@@ -3126,7 +3387,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof SimplePath)) return false;
+            if (!(other instanceof SimplePath)) {
+                return false;
+            }
             SimplePath o = (SimplePath) other;
             return simplePath.equals(o.simplePath);
         }
@@ -3157,7 +3420,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Skip)) return false;
+            if (!(other instanceof Skip)) {
+                return false;
+            }
             Skip o = (Skip) other;
             return skip.equals(o.skip);
         }
@@ -3188,7 +3453,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Store)) return false;
+            if (!(other instanceof Store)) {
+                return false;
+            }
             Store o = (Store) other;
             return store.equals(o.store);
         }
@@ -3219,7 +3486,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Subgraph)) return false;
+            if (!(other instanceof Subgraph)) {
+                return false;
+            }
             Subgraph o = (Subgraph) other;
             return subgraph.equals(o.subgraph);
         }
@@ -3250,7 +3519,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Sum)) return false;
+            if (!(other instanceof Sum)) {
+                return false;
+            }
             Sum o = (Sum) other;
             return sum.equals(o.sum);
         }
@@ -3281,7 +3552,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Tail)) return false;
+            if (!(other instanceof Tail)) {
+                return false;
+            }
             Tail o = (Tail) other;
             return tail.equals(o.tail);
         }
@@ -3312,7 +3585,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof TimeLimit)) return false;
+            if (!(other instanceof TimeLimit)) {
+                return false;
+            }
             TimeLimit o = (TimeLimit) other;
             return timeLimit.equals(o.timeLimit);
         }
@@ -3343,7 +3618,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Times)) return false;
+            if (!(other instanceof Times)) {
+                return false;
+            }
             Times o = (Times) other;
             return times.equals(o.times);
         }
@@ -3374,7 +3651,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof To)) return false;
+            if (!(other instanceof To)) {
+                return false;
+            }
             To o = (To) other;
             return to.equals(o.to);
         }
@@ -3405,7 +3684,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ToE)) return false;
+            if (!(other instanceof ToE)) {
+                return false;
+            }
             ToE o = (ToE) other;
             return toE.equals(o.toE);
         }
@@ -3436,7 +3717,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ToV)) return false;
+            if (!(other instanceof ToV)) {
+                return false;
+            }
             ToV o = (ToV) other;
             return toV.equals(o.toV);
         }
@@ -3467,7 +3750,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Tree)) return false;
+            if (!(other instanceof Tree)) {
+                return false;
+            }
             Tree o = (Tree) other;
             return tree.equals(o.tree);
         }
@@ -3498,7 +3783,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Unfold)) return false;
+            if (!(other instanceof Unfold)) {
+                return false;
+            }
             Unfold o = (Unfold) other;
             return unfold.equals(o.unfold);
         }
@@ -3529,7 +3816,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Union)) return false;
+            if (!(other instanceof Union)) {
+                return false;
+            }
             Union o = (Union) other;
             return union.equals(o.union);
         }
@@ -3560,7 +3849,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Until)) return false;
+            if (!(other instanceof Until)) {
+                return false;
+            }
             Until o = (Until) other;
             return until.equals(o.until);
         }
@@ -3591,7 +3882,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Value)) return false;
+            if (!(other instanceof Value)) {
+                return false;
+            }
             Value o = (Value) other;
             return value.equals(o.value);
         }
@@ -3622,7 +3915,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ValueMap)) return false;
+            if (!(other instanceof ValueMap)) {
+                return false;
+            }
             ValueMap o = (ValueMap) other;
             return valueMap.equals(o.valueMap);
         }
@@ -3653,7 +3948,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Values)) return false;
+            if (!(other instanceof Values)) {
+                return false;
+            }
             Values o = (Values) other;
             return values.equals(o.values);
         }
@@ -3684,7 +3981,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Where)) return false;
+            if (!(other instanceof Where)) {
+                return false;
+            }
             Where o = (Where) other;
             return where.equals(o.where);
         }
@@ -3715,7 +4014,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof With)) return false;
+            if (!(other instanceof With)) {
+                return false;
+            }
             With o = (With) other;
             return with.equals(o.with);
         }
@@ -3746,7 +4047,9 @@ public abstract class TraversalMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Write)) return false;
+            if (!(other instanceof Write)) {
+                return false;
+            }
             Write o = (Write) other;
             return write.equals(o.write);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TreeStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TreeStep.java
index 0b47a41..37fa3c4 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TreeStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/TreeStep.java
@@ -15,7 +15,9 @@ public class TreeStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof TreeStep)) return false;
+        if (!(other instanceof TreeStep)) {
+            return false;
+        }
         TreeStep o = (TreeStep) other;
         return sideEffectKey.equals(o.sideEffectKey);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/UnfoldStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/UnfoldStep.java
index a8dd127..f1aa22c 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/UnfoldStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/UnfoldStep.java
@@ -8,7 +8,9 @@ public class UnfoldStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof UnfoldStep)) return false;
+        if (!(other instanceof UnfoldStep)) {
+            return false;
+        }
         UnfoldStep o = (UnfoldStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/UnionStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/UnionStep.java
index 07e7cd5..eb900c9 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/UnionStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/UnionStep.java
@@ -17,7 +17,9 @@ public class UnionStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof UnionStep)) return false;
+        if (!(other instanceof UnionStep)) {
+            return false;
+        }
         UnionStep o = (UnionStep) other;
         return unionTraversals.equals(o.unionTraversals);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/UntilStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/UntilStep.java
index b07a4d5..054b9ca 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/UntilStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/UntilStep.java
@@ -26,10 +26,12 @@ public abstract class UntilStep {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(UntilPredicate instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(UntilTraversal instance) {
             return otherwise(instance);
         }
@@ -55,7 +57,9 @@ public abstract class UntilStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof UntilPredicate)) return false;
+            if (!(other instanceof UntilPredicate)) {
+                return false;
+            }
             UntilPredicate o = (UntilPredicate) other;
             return untilPredicate.equals(o.untilPredicate);
         }
@@ -86,7 +90,9 @@ public abstract class UntilStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof UntilTraversal)) return false;
+            if (!(other instanceof UntilTraversal)) {
+                return false;
+            }
             UntilTraversal o = (UntilTraversal) other;
             return untilTraversal.equals(o.untilTraversal);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/VStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/VStep.java
index 9730a05..141d65e 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/VStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/VStep.java
@@ -17,7 +17,9 @@ public class VStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof VStep)) return false;
+        if (!(other instanceof VStep)) {
+            return false;
+        }
         VStep o = (VStep) other;
         return vertexIdsOrElements.equals(o.vertexIdsOrElements);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ValueMapStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ValueMapStep.java
index d06a5d1..9064ba1 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ValueMapStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ValueMapStep.java
@@ -21,7 +21,9 @@ public class ValueMapStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ValueMapStep)) return false;
+        if (!(other instanceof ValueMapStep)) {
+            return false;
+        }
         ValueMapStep o = (ValueMapStep) other;
         return includeTokens.equals(o.includeTokens)
             && propertyKeys.equals(o.propertyKeys);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ValueStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ValueStep.java
index fcc947d..0c183b2 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ValueStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ValueStep.java
@@ -8,7 +8,9 @@ public class ValueStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ValueStep)) return false;
+        if (!(other instanceof ValueStep)) {
+            return false;
+        }
         ValueStep o = (ValueStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ValuesStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ValuesStep.java
index bbbf8c1..12cccf5 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ValuesStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/ValuesStep.java
@@ -15,7 +15,9 @@ public class ValuesStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ValuesStep)) return false;
+        if (!(other instanceof ValuesStep)) {
+            return false;
+        }
         ValuesStep o = (ValuesStep) other;
         return propertyKeys.equals(o.propertyKeys);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/WhereStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/WhereStep.java
index 5c78cce..f84b316 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/WhereStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/WhereStep.java
@@ -9,8 +9,14 @@ public abstract class WhereStep {
     public abstract <R> R accept(Visitor<R> visitor) ;
     
     public static class WithPredicateValue {
+        /**
+         * @type optional: string
+         */
         public final java.util.Optional<String> startKey;
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/predicates.TraversalPredicate
+         */
         public final TraversalPredicate predicate;
         
         /**
@@ -23,7 +29,9 @@ public abstract class WhereStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithPredicateValue)) return false;
+            if (!(other instanceof WithPredicateValue)) {
+                return false;
+            }
             WithPredicateValue o = (WithPredicateValue) other;
             return startKey.equals(o.startKey)
                 && predicate.equals(o.predicate);
@@ -68,10 +76,12 @@ public abstract class WhereStep {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(WithPredicate instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(WhereTraversal instance) {
             return otherwise(instance);
         }
@@ -94,7 +104,9 @@ public abstract class WhereStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithPredicate)) return false;
+            if (!(other instanceof WithPredicate)) {
+                return false;
+            }
             WithPredicate o = (WithPredicate) other;
             return withPredicate.equals(o.withPredicate);
         }
@@ -125,7 +137,9 @@ public abstract class WhereStep {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WhereTraversal)) return false;
+            if (!(other instanceof WhereTraversal)) {
+                return false;
+            }
             WhereTraversal o = (WhereTraversal) other;
             return whereTraversal.equals(o.whereTraversal);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/WithStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/WithStep.java
index ab16ee7..298fdc1 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/WithStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/WithStep.java
@@ -23,7 +23,9 @@ public class WithStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof WithStep)) return false;
+        if (!(other instanceof WithStep)) {
+            return false;
+        }
         WithStep o = (WithStep) other;
         return key.equals(o.key)
             && value.equals(o.value);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/WriteStep.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/WriteStep.java
index bfe7dcf..d87623f 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/WriteStep.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/steps/WriteStep.java
@@ -8,7 +8,9 @@ public class WriteStep {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof WriteStep)) return false;
+        if (!(other instanceof WriteStep)) {
+            return false;
+        }
         WriteStep o = (WriteStep) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/ChainedParentOfGraphTraversal.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/ChainedParentOfGraphTraversal.java
index e14314f..1e306d9 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/ChainedParentOfGraphTraversal.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/ChainedParentOfGraphTraversal.java
@@ -23,7 +23,9 @@ public class ChainedParentOfGraphTraversal {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ChainedParentOfGraphTraversal)) return false;
+        if (!(other instanceof ChainedParentOfGraphTraversal)) {
+            return false;
+        }
         ChainedParentOfGraphTraversal o = (ChainedParentOfGraphTraversal) other;
         return first.equals(o.first)
             && rest.equals(o.rest);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/ChainedTraversal.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/ChainedTraversal.java
index 5bbc81a..679f0d4 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/ChainedTraversal.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/ChainedTraversal.java
@@ -30,7 +30,9 @@ public class ChainedTraversal {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof ChainedTraversal)) return false;
+        if (!(other instanceof ChainedTraversal)) {
+            return false;
+        }
         ChainedTraversal o = (ChainedTraversal) other;
         return first.equals(o.first)
             && rest.equals(o.rest);
@@ -79,15 +81,20 @@ public class ChainedTraversal {
                 throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
             }
             
+            @Override
             default R visit(Method instance) {
                 return otherwise(instance);
             }
             
+            @Override
             default R visit(ChainedParent instance) {
                 return otherwise(instance);
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/steps.TraversalMethod
+         */
         public static final class Method extends RestValue {
             public final TraversalMethod method;
             
@@ -105,7 +112,9 @@ public class ChainedTraversal {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof Method)) return false;
+                if (!(other instanceof Method)) {
+                    return false;
+                }
                 Method o = (Method) other;
                 return method.equals(o.method);
             }
@@ -116,6 +125,9 @@ public class ChainedTraversal {
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.ChainedParentOfGraphTraversal
+         */
         public static final class ChainedParent extends RestValue {
             public final ChainedParentOfGraphTraversal chainedParent;
             
@@ -133,7 +145,9 @@ public class ChainedTraversal {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof ChainedParent)) return false;
+                if (!(other instanceof ChainedParent)) {
+                    return false;
+                }
                 ChainedParent o = (ChainedParent) other;
                 return chainedParent.equals(o.chainedParent);
             }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/EdgeLabelVerificationStrategy.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/EdgeLabelVerificationStrategy.java
index f7f5fb6..b038087 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/EdgeLabelVerificationStrategy.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/EdgeLabelVerificationStrategy.java
@@ -23,10 +23,12 @@ public abstract class EdgeLabelVerificationStrategy {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(ThrowException instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(LogWarning instance) {
             return otherwise(instance);
         }
@@ -52,7 +54,9 @@ public abstract class EdgeLabelVerificationStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ThrowException)) return false;
+            if (!(other instanceof ThrowException)) {
+                return false;
+            }
             ThrowException o = (ThrowException) other;
             return throwException.equals(o.throwException);
         }
@@ -83,7 +87,9 @@ public abstract class EdgeLabelVerificationStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof LogWarning)) return false;
+            if (!(other instanceof LogWarning)) {
+                return false;
+            }
             LogWarning o = (LogWarning) other;
             return logWarning.equals(o.logWarning);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/NestedTraversal.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/NestedTraversal.java
index 60ee0fb..968ede1 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/NestedTraversal.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/NestedTraversal.java
@@ -6,8 +6,14 @@ public abstract class NestedTraversal {
     public abstract <R> R accept(Visitor<R> visitor) ;
     
     public static class ChainedValue {
+        /**
+         * @type boolean
+         */
         public final Boolean anonymous;
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.ChainedTraversal
+         */
         public final ChainedTraversal traversal;
         
         /**
@@ -20,7 +26,9 @@ public abstract class NestedTraversal {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ChainedValue)) return false;
+            if (!(other instanceof ChainedValue)) {
+                return false;
+            }
             ChainedValue o = (ChainedValue) other;
             return anonymous.equals(o.anonymous)
                 && traversal.equals(o.traversal);
@@ -65,10 +73,12 @@ public abstract class NestedTraversal {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(Root instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Chained instance) {
             return otherwise(instance);
         }
@@ -94,7 +104,9 @@ public abstract class NestedTraversal {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Root)) return false;
+            if (!(other instanceof Root)) {
+                return false;
+            }
             Root o = (Root) other;
             return root.equals(o.root);
         }
@@ -122,7 +134,9 @@ public abstract class NestedTraversal {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Chained)) return false;
+            if (!(other instanceof Chained)) {
+                return false;
+            }
             Chained o = (Chained) other;
             return chained.equals(o.chained);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/PartitionStrategy.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/PartitionStrategy.java
index c11dab7..4ade901 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/PartitionStrategy.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/PartitionStrategy.java
@@ -27,18 +27,22 @@ public abstract class PartitionStrategy {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(IncludeMetaProperties instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(WritePartition instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(PartitionKey instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ReadPartitions instance) {
             return otherwise(instance);
         }
@@ -64,7 +68,9 @@ public abstract class PartitionStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof IncludeMetaProperties)) return false;
+            if (!(other instanceof IncludeMetaProperties)) {
+                return false;
+            }
             IncludeMetaProperties o = (IncludeMetaProperties) other;
             return includeMetaProperties.equals(o.includeMetaProperties);
         }
@@ -95,7 +101,9 @@ public abstract class PartitionStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WritePartition)) return false;
+            if (!(other instanceof WritePartition)) {
+                return false;
+            }
             WritePartition o = (WritePartition) other;
             return writePartition.equals(o.writePartition);
         }
@@ -126,7 +134,9 @@ public abstract class PartitionStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof PartitionKey)) return false;
+            if (!(other instanceof PartitionKey)) {
+                return false;
+            }
             PartitionKey o = (PartitionKey) other;
             return partitionKey.equals(o.partitionKey);
         }
@@ -157,7 +167,9 @@ public abstract class PartitionStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ReadPartitions)) return false;
+            if (!(other instanceof ReadPartitions)) {
+                return false;
+            }
             ReadPartitions o = (ReadPartitions) other;
             return readPartitions.equals(o.readPartitions);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/ReservedKeysVerificationStrategy.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/ReservedKeysVerificationStrategy.java
index 813e7a5..27a825d 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/ReservedKeysVerificationStrategy.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/ReservedKeysVerificationStrategy.java
@@ -25,14 +25,17 @@ public abstract class ReservedKeysVerificationStrategy {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(Keys instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ThrowException instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(LogWarning instance) {
             return otherwise(instance);
         }
@@ -58,7 +61,9 @@ public abstract class ReservedKeysVerificationStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Keys)) return false;
+            if (!(other instanceof Keys)) {
+                return false;
+            }
             Keys o = (Keys) other;
             return keys.equals(o.keys);
         }
@@ -89,7 +94,9 @@ public abstract class ReservedKeysVerificationStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ThrowException)) return false;
+            if (!(other instanceof ThrowException)) {
+                return false;
+            }
             ThrowException o = (ThrowException) other;
             return throwException.equals(o.throwException);
         }
@@ -120,7 +127,9 @@ public abstract class ReservedKeysVerificationStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof LogWarning)) return false;
+            if (!(other instanceof LogWarning)) {
+                return false;
+            }
             LogWarning o = (LogWarning) other;
             return logWarning.equals(o.logWarning);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/RootTraversal.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/RootTraversal.java
index ce3403c..745b11a 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/RootTraversal.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/RootTraversal.java
@@ -34,7 +34,9 @@ public class RootTraversal {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof RootTraversal)) return false;
+        if (!(other instanceof RootTraversal)) {
+            return false;
+        }
         RootTraversal o = (RootTraversal) other;
         return source.equals(o.source)
             && spawnMethod.equals(o.spawnMethod)
@@ -92,15 +94,20 @@ public class RootTraversal {
                 throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
             }
             
+            @Override
             default R visit(Chained instance) {
                 return otherwise(instance);
             }
             
+            @Override
             default R visit(Parent instance) {
                 return otherwise(instance);
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.ChainedTraversal
+         */
         public static final class Chained extends RestValue {
             public final ChainedTraversal chained;
             
@@ -118,7 +125,9 @@ public class RootTraversal {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof Chained)) return false;
+                if (!(other instanceof Chained)) {
+                    return false;
+                }
                 Chained o = (Chained) other;
                 return chained.equals(o.chained);
             }
@@ -129,6 +138,9 @@ public class RootTraversal {
             }
         }
         
+        /**
+         * @type org/apache/tinkerpop/gremlin/language/model/traversal.ChainedParentOfGraphTraversal
+         */
         public static final class Parent extends RestValue {
             public final ChainedParentOfGraphTraversal parent;
             
@@ -146,7 +158,9 @@ public class RootTraversal {
             
             @Override
             public boolean equals(Object other) {
-                if (!(other instanceof Parent)) return false;
+                if (!(other instanceof Parent)) {
+                    return false;
+                }
                 Parent o = (Parent) other;
                 return parent.equals(o.parent);
             }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/SubgraphStrategy.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/SubgraphStrategy.java
index dd6065b..f771c9b 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/SubgraphStrategy.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/SubgraphStrategy.java
@@ -27,18 +27,22 @@ public abstract class SubgraphStrategy {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(Vertices instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Edges instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(VertexProperties instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(CheckAdjacentVertixes instance) {
             return otherwise(instance);
         }
@@ -64,7 +68,9 @@ public abstract class SubgraphStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Vertices)) return false;
+            if (!(other instanceof Vertices)) {
+                return false;
+            }
             Vertices o = (Vertices) other;
             return vertices.equals(o.vertices);
         }
@@ -95,7 +101,9 @@ public abstract class SubgraphStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Edges)) return false;
+            if (!(other instanceof Edges)) {
+                return false;
+            }
             Edges o = (Edges) other;
             return edges.equals(o.edges);
         }
@@ -126,7 +134,9 @@ public abstract class SubgraphStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof VertexProperties)) return false;
+            if (!(other instanceof VertexProperties)) {
+                return false;
+            }
             VertexProperties o = (VertexProperties) other;
             return vertexProperties.equals(o.vertexProperties);
         }
@@ -157,7 +167,9 @@ public abstract class SubgraphStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof CheckAdjacentVertixes)) return false;
+            if (!(other instanceof CheckAdjacentVertixes)) {
+                return false;
+            }
             CheckAdjacentVertixes o = (CheckAdjacentVertixes) other;
             return checkAdjacentVertixes.equals(o.checkAdjacentVertixes);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalBiFunction.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalBiFunction.java
index a1cfd52b..f239c55 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalBiFunction.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalBiFunction.java
@@ -15,7 +15,9 @@ public class TraversalBiFunction {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof TraversalBiFunction)) return false;
+        if (!(other instanceof TraversalBiFunction)) {
+            return false;
+        }
         TraversalBiFunction o = (TraversalBiFunction) other;
         return traversalOperator.equals(o.traversalOperator);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalComparator.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalComparator.java
index c74ac03..7a8467f 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalComparator.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalComparator.java
@@ -15,7 +15,9 @@ public class TraversalComparator {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof TraversalComparator)) return false;
+        if (!(other instanceof TraversalComparator)) {
+            return false;
+        }
         TraversalComparator o = (TraversalComparator) other;
         return traversalOrder.equals(o.traversalOrder);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalFunction.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalFunction.java
index ddfef43..e4e7a34 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalFunction.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalFunction.java
@@ -23,10 +23,12 @@ public abstract class TraversalFunction {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(Token instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Column instance) {
             return otherwise(instance);
         }
@@ -52,7 +54,9 @@ public abstract class TraversalFunction {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Token)) return false;
+            if (!(other instanceof Token)) {
+                return false;
+            }
             Token o = (Token) other;
             return token.equals(o.token);
         }
@@ -83,7 +87,9 @@ public abstract class TraversalFunction {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Column)) return false;
+            if (!(other instanceof Column)) {
+                return false;
+            }
             Column o = (Column) other;
             return column.equals(o.column);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalSource.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalSource.java
index 4f0eb67..ba04b99 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalSource.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalSource.java
@@ -15,7 +15,9 @@ public class TraversalSource {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof TraversalSource)) return false;
+        if (!(other instanceof TraversalSource)) {
+            return false;
+        }
         TraversalSource o = (TraversalSource) other;
         return value.equals(o.value);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalSourceSelfMethod.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalSourceSelfMethod.java
index 0941203..b0eeb9e 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalSourceSelfMethod.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalSourceSelfMethod.java
@@ -31,26 +31,32 @@ public abstract class TraversalSourceSelfMethod {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(WithBulk instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(WithPath instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(WithSack instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(WithSideEffect instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(WithStrategies instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(With instance) {
             return otherwise(instance);
         }
@@ -76,7 +82,9 @@ public abstract class TraversalSourceSelfMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithBulk)) return false;
+            if (!(other instanceof WithBulk)) {
+                return false;
+            }
             WithBulk o = (WithBulk) other;
             return withBulk.equals(o.withBulk);
         }
@@ -107,7 +115,9 @@ public abstract class TraversalSourceSelfMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithPath)) return false;
+            if (!(other instanceof WithPath)) {
+                return false;
+            }
             WithPath o = (WithPath) other;
             return withPath.equals(o.withPath);
         }
@@ -138,7 +148,9 @@ public abstract class TraversalSourceSelfMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithSack)) return false;
+            if (!(other instanceof WithSack)) {
+                return false;
+            }
             WithSack o = (WithSack) other;
             return withSack.equals(o.withSack);
         }
@@ -169,7 +181,9 @@ public abstract class TraversalSourceSelfMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithSideEffect)) return false;
+            if (!(other instanceof WithSideEffect)) {
+                return false;
+            }
             WithSideEffect o = (WithSideEffect) other;
             return withSideEffect.equals(o.withSideEffect);
         }
@@ -200,7 +214,9 @@ public abstract class TraversalSourceSelfMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof WithStrategies)) return false;
+            if (!(other instanceof WithStrategies)) {
+                return false;
+            }
             WithStrategies o = (WithStrategies) other;
             return withStrategies.equals(o.withStrategies);
         }
@@ -231,7 +247,9 @@ public abstract class TraversalSourceSelfMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof With)) return false;
+            if (!(other instanceof With)) {
+                return false;
+            }
             With o = (With) other;
             return with.equals(o.with);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalSourceSpawnMethod.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalSourceSpawnMethod.java
index 9a60e8a..77f49de 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalSourceSpawnMethod.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalSourceSpawnMethod.java
@@ -36,26 +36,32 @@ public abstract class TraversalSourceSpawnMethod {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(AddE instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(AddV instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(E instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(V instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Inject instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Io instance) {
             return otherwise(instance);
         }
@@ -81,7 +87,9 @@ public abstract class TraversalSourceSpawnMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof AddE)) return false;
+            if (!(other instanceof AddE)) {
+                return false;
+            }
             AddE o = (AddE) other;
             return addE.equals(o.addE);
         }
@@ -112,7 +120,9 @@ public abstract class TraversalSourceSpawnMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof AddV)) return false;
+            if (!(other instanceof AddV)) {
+                return false;
+            }
             AddV o = (AddV) other;
             return addV.equals(o.addV);
         }
@@ -136,7 +146,9 @@ public abstract class TraversalSourceSpawnMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof E)) return false;
+            if (!(other instanceof E)) {
+                return false;
+            }
             E o = (E) other;
             return true;
         }
@@ -167,7 +179,9 @@ public abstract class TraversalSourceSpawnMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof V)) return false;
+            if (!(other instanceof V)) {
+                return false;
+            }
             V o = (V) other;
             return v.equals(o.v);
         }
@@ -198,7 +212,9 @@ public abstract class TraversalSourceSpawnMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Inject)) return false;
+            if (!(other instanceof Inject)) {
+                return false;
+            }
             Inject o = (Inject) other;
             return inject.equals(o.inject);
         }
@@ -222,7 +238,9 @@ public abstract class TraversalSourceSpawnMethod {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Io)) return false;
+            if (!(other instanceof Io)) {
+                return false;
+            }
             Io o = (Io) other;
             return true;
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalStrategy.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalStrategy.java
index 06b6908..c3da480 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalStrategy.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/TraversalStrategy.java
@@ -29,22 +29,27 @@ public abstract class TraversalStrategy {
             throw new IllegalStateException("Non-exhaustive patterns when matching: " + instance);
         }
         
+        @Override
         default R visit(Partition instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(Subgraph instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(EdgeLabelVerification instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ReadOnly instance) {
             return otherwise(instance);
         }
         
+        @Override
         default R visit(ReservedKeysVerification instance) {
             return otherwise(instance);
         }
@@ -70,7 +75,9 @@ public abstract class TraversalStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Partition)) return false;
+            if (!(other instanceof Partition)) {
+                return false;
+            }
             Partition o = (Partition) other;
             return partition.equals(o.partition);
         }
@@ -101,7 +108,9 @@ public abstract class TraversalStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof Subgraph)) return false;
+            if (!(other instanceof Subgraph)) {
+                return false;
+            }
             Subgraph o = (Subgraph) other;
             return subgraph.equals(o.subgraph);
         }
@@ -132,7 +141,9 @@ public abstract class TraversalStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof EdgeLabelVerification)) return false;
+            if (!(other instanceof EdgeLabelVerification)) {
+                return false;
+            }
             EdgeLabelVerification o = (EdgeLabelVerification) other;
             return edgeLabelVerification.equals(o.edgeLabelVerification);
         }
@@ -156,7 +167,9 @@ public abstract class TraversalStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ReadOnly)) return false;
+            if (!(other instanceof ReadOnly)) {
+                return false;
+            }
             ReadOnly o = (ReadOnly) other;
             return true;
         }
@@ -187,7 +200,9 @@ public abstract class TraversalStrategy {
         
         @Override
         public boolean equals(Object other) {
-            if (!(other instanceof ReservedKeysVerification)) return false;
+            if (!(other instanceof ReservedKeysVerification)) {
+                return false;
+            }
             ReservedKeysVerification o = (ReservedKeysVerification) other;
             return reservedKeysVerification.equals(o.reservedKeysVerification);
         }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/With.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/With.java
index 0307552..feaeb78 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/With.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/With.java
@@ -23,7 +23,9 @@ public class With {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof With)) return false;
+        if (!(other instanceof With)) {
+            return false;
+        }
         With o = (With) other;
         return key.equals(o.key)
             && value.equals(o.value);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithBulk.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithBulk.java
index 16525b5..f3811ed 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithBulk.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithBulk.java
@@ -15,7 +15,9 @@ public class WithBulk {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof WithBulk)) return false;
+        if (!(other instanceof WithBulk)) {
+            return false;
+        }
         WithBulk o = (WithBulk) other;
         return useBulk.equals(o.useBulk);
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithPath.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithPath.java
index e186fb9..8574239 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithPath.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithPath.java
@@ -8,7 +8,9 @@ public class WithPath {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof WithPath)) return false;
+        if (!(other instanceof WithPath)) {
+            return false;
+        }
         WithPath o = (WithPath) other;
         return true;
     }
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithSack.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithSack.java
index 80c4e95..80c7547 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithSack.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithSack.java
@@ -23,7 +23,9 @@ public class WithSack {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof WithSack)) return false;
+        if (!(other instanceof WithSack)) {
+            return false;
+        }
         WithSack o = (WithSack) other;
         return initialValue.equals(o.initialValue)
             && operator.equals(o.operator);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithSideEffect.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithSideEffect.java
index 0566174..c4bda41 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithSideEffect.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithSideEffect.java
@@ -24,7 +24,9 @@ public class WithSideEffect {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof WithSideEffect)) return false;
+        if (!(other instanceof WithSideEffect)) {
+            return false;
+        }
         WithSideEffect o = (WithSideEffect) other;
         return key.equals(o.key)
             && initialValue.equals(o.initialValue);
diff --git a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithStrategies.java b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithStrategies.java
index 26e31f9..16e7e47 100644
--- a/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithStrategies.java
+++ b/gremlin-language/src/gen/java/org/apache/tinkerpop/gremlin/language/model/traversal/WithStrategies.java
@@ -15,7 +15,9 @@ public class WithStrategies {
     
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof WithStrategies)) return false;
+        if (!(other instanceof WithStrategies)) {
+            return false;
+        }
         WithStrategies o = (WithStrategies) other;
         return traversalStrategies.equals(o.traversalStrategies);
     }

[tinkerpop] 02/03: Rename rdf to rdf11concepts for clarity

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joshsh pushed a commit to branch TINKERPOP-2563-language
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 18c37148b6ff25bf52ae800ee63ca85d183e939c
Author: Joshua Shinavier <jo...@uber.com>
AuthorDate: Thu Jun 3 06:50:15 2021 -0700

    Rename rdf to rdf11concepts for clarity
---
 .../main/yaml/org/apache/tinkerpop/rdf/{rdf.yaml => rdf11concepts.yaml}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gremlin-language/src/main/yaml/org/apache/tinkerpop/rdf/rdf.yaml b/gremlin-language/src/main/yaml/org/apache/tinkerpop/rdf/rdf11concepts.yaml
similarity index 100%
rename from gremlin-language/src/main/yaml/org/apache/tinkerpop/rdf/rdf.yaml
rename to gremlin-language/src/main/yaml/org/apache/tinkerpop/rdf/rdf11concepts.yaml