You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/04/29 22:24:00 UTC

incubator-tinkerpop git commit: Finalize a bunch of variables for code consistency.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master cd2cf0fc9 -> cf1594ce0


Finalize a bunch of variables for code consistency.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/cf1594ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/cf1594ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/cf1594ce

Branch: refs/heads/master
Commit: cf1594ce0388baf2a418b6bbad9681ee4e72d632
Parents: cd2cf0f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 29 16:23:41 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 29 16:23:41 2015 -0400

----------------------------------------------------------------------
 .../process/traversal/step/branch/BranchTest.java |  4 ++--
 .../process/traversal/step/branch/ChooseTest.java |  2 +-
 .../process/traversal/step/branch/RepeatTest.java |  6 +++---
 .../traversal/step/filter/CyclicPathTest.java     |  2 +-
 .../process/traversal/step/filter/ExceptTest.java | 18 +++++++++---------
 .../process/traversal/step/filter/FilterTest.java |  8 ++++----
 .../process/traversal/step/filter/HasNotTest.java |  4 ++--
 .../process/traversal/step/filter/HasTest.java    |  6 +++---
 .../process/traversal/step/filter/IsTest.java     | 10 +++++-----
 .../process/traversal/step/filter/WhereTest.java  |  8 ++++----
 .../process/traversal/step/map/CoalesceTest.java  | 18 +++++++++---------
 .../process/traversal/step/map/FoldTest.java      |  6 +++---
 .../process/traversal/step/map/MapTest.java       |  2 +-
 .../process/traversal/step/map/SelectTest.java    | 10 +++++-----
 .../process/traversal/step/map/VertexTest.java    |  4 ++--
 .../traversal/step/sideEffect/AggregateTest.java  | 10 +++++-----
 .../traversal/step/sideEffect/GroupCountTest.java |  4 ++--
 .../traversal/step/sideEffect/GroupTest.java      |  2 +-
 .../traversal/step/sideEffect/InjectTest.java     |  2 +-
 .../traversal/step/sideEffect/ProfileTest.java    |  4 ++--
 .../step/sideEffect/SideEffectCapTest.java        |  2 +-
 .../traversal/step/sideEffect/StoreTest.java      |  4 ++--
 .../traversal/step/sideEffect/SubgraphTest.java   |  4 ++--
 .../traversal/step/sideEffect/TreeTest.java       |  6 +++---
 24 files changed, 73 insertions(+), 73 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchTest.java
index 4149fb5..c4286e8 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchTest.java
@@ -46,7 +46,7 @@ public abstract class BranchTest extends AbstractGremlinProcessTest {
     @LoadGraphWith(MODERN)
     @IgnoreEngine(TraversalEngine.Type.COMPUTER)
     public void g_V_branchXlabel_eq_person__a_bX_optionXa__ageX_optionXb__langX_optionXb__nameX() {
-        Traversal<Vertex, Object> traversal = get_g_V_branchXlabel_eq_person__a_bX_optionXa__ageX_optionXb__langX_optionXb__nameX();
+        final Traversal<Vertex, Object> traversal = get_g_V_branchXlabel_eq_person__a_bX_optionXa__ageX_optionXb__langX_optionXb__nameX();
         printTraversalForm(traversal);
         checkResults(Arrays.asList("java", "java", "lop", "ripple", 29, 27, 32, 35), traversal);
     }
@@ -54,7 +54,7 @@ public abstract class BranchTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_branchXlabelX_optionXperson__ageX_optionXsoftware__langX_optionXsoftware__nameX() {
-        Traversal<Vertex, Object> traversal = get_g_V_branchXlabelX_optionXperson__ageX_optionXsoftware__langX_optionXsoftware__nameX();
+        final Traversal<Vertex, Object> traversal = get_g_V_branchXlabelX_optionXperson__ageX_optionXsoftware__langX_optionXsoftware__nameX();
         printTraversalForm(traversal);
         checkResults(Arrays.asList("java", "java", "lop", "ripple", 29, 27, 32, 35), traversal);
     }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/ChooseTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/ChooseTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/ChooseTest.java
index be5e192..2104d08 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/ChooseTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/ChooseTest.java
@@ -48,7 +48,7 @@ public abstract class ChooseTest extends AbstractGremlinProcessTest {
     public void g_V_chooseXout_countX_optionX2L__nameX_optionX3L__valueMapX() {
         final Traversal<Vertex, Object> traversal = get_g_V_chooseXout_countX_optionX2L__nameX_optionX3L__valueMapX();
         printTraversalForm(traversal);
-        Map<String, Long> counts = new HashMap<>();
+        final Map<String, Long> counts = new HashMap<>();
         int counter = 0;
         while (traversal.hasNext()) {
             MapHelper.incr(counts, traversal.next().toString(), 1l);

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
index c48da8b..b90afcd 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
@@ -134,9 +134,9 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
         traversals.add(get_g_V_repeatXoutX_timesX2X_emit());
         traversals.forEach(traversal -> {
             printTraversalForm(traversal);
-            Map<String, Long> map = new HashMap<>();
+            final Map<String, Long> map = new HashMap<>();
             while (traversal.hasNext()) {
-                Vertex vertex = traversal.next();
+                final Vertex vertex = traversal.next();
                 MapHelper.incr(map, vertex.value("name"), 1l);
             }
             assertEquals(4, map.size());
@@ -245,7 +245,7 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
         }
 
         @Override
-        public Traversal<Vertex, String> get_g_VX1X_timesX2X_repeatXoutX_name(Object v1Id) {
+        public Traversal<Vertex, String> get_g_VX1X_timesX2X_repeatXoutX_name(final Object v1Id) {
             return g.V(v1Id).times(2).repeat(out()).values("name");
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CyclicPathTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CyclicPathTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CyclicPathTest.java
index 6dce036..4a8b49f 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CyclicPathTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CyclicPathTest.java
@@ -63,7 +63,7 @@ public abstract class CyclicPathTest extends AbstractGremlinProcessTest {
         int counter = 0;
         while (traversal.hasNext()) {
             counter++;
-            Path path = traversal.next();
+            final Path path = traversal.next();
             assertFalse(path.isSimple());
         }
         assertEquals(1, counter);

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ExceptTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ExceptTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ExceptTest.java
index b863f42..7d466c5 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ExceptTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ExceptTest.java
@@ -64,10 +64,10 @@ public abstract class ExceptTest extends AbstractGremlinProcessTest {
         final Traversal<Vertex, Vertex> traversal = get_g_VX1X_out_exceptXg_v2X(convertToVertexId("marko"), convertToVertexId("vadas"));
         printTraversalForm(traversal);
         int counter = 0;
-        Set<Vertex> vertices = new HashSet<>();
+        final Set<Vertex> vertices = new HashSet<>();
         while (traversal.hasNext()) {
             counter++;
-            Vertex vertex = traversal.next();
+            final Vertex vertex = traversal.next();
             vertices.add(vertex);
             assertTrue(vertex.value("name").equals("josh") || vertex.value("name").equals("lop"));
         }
@@ -78,7 +78,7 @@ public abstract class ExceptTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_VX1X_out_aggregateXxX_out_exceptXxX() {
-        Traversal<Vertex, Vertex> traversal = get_g_VX1X_out_aggregateXxX_out_exceptXxX(convertToVertexId("marko"));
+        final Traversal<Vertex, Vertex> traversal = get_g_VX1X_out_aggregateXxX_out_exceptXxX(convertToVertexId("marko"));
         printTraversalForm(traversal);
         assertEquals("ripple", traversal.next().<String>value("name"));
         assertFalse(traversal.hasNext());
@@ -88,9 +88,9 @@ public abstract class ExceptTest extends AbstractGremlinProcessTest {
     @LoadGraphWith(MODERN)
     @IgnoreEngine(TraversalEngine.Type.COMPUTER)
     public void g_VX1X_outXcreatedX_inXcreatedX_exceptXg_v1X_name() {
-        Traversal<Vertex, String> traversal = get_g_VX1X_outXcreatedX_inXcreatedX_exceptXg_v1X_name(convertToVertexId("marko"));
+        final Traversal<Vertex, String> traversal = get_g_VX1X_outXcreatedX_inXcreatedX_exceptXg_v1X_name(convertToVertexId("marko"));
         printTraversalForm(traversal);
-        List<String> names = Arrays.asList(traversal.next(), traversal.next());
+        final List<String> names = Arrays.asList(traversal.next(), traversal.next());
         assertFalse(traversal.hasNext());
         assertEquals(2, names.size());
         assertTrue(names.contains("peter"));
@@ -101,7 +101,7 @@ public abstract class ExceptTest extends AbstractGremlinProcessTest {
     @LoadGraphWith(MODERN)
     @IgnoreEngine(TraversalEngine.Type.COMPUTER)
     public void g_V_exceptXg_V_toListX() {
-        Traversal<Vertex, Vertex> traversal = get_g_V_exceptXg_V_toListX();
+        final Traversal<Vertex, Vertex> traversal = get_g_V_exceptXg_V_toListX();
         printTraversalForm(traversal);
         final List<Vertex> vertices = traversal.toList();
         assertEquals(0, vertices.size());
@@ -112,7 +112,7 @@ public abstract class ExceptTest extends AbstractGremlinProcessTest {
     @LoadGraphWith(MODERN)
     @IgnoreEngine(TraversalEngine.Type.COMPUTER)
     public void g_V_exceptXX() {
-        Traversal<Vertex, Vertex> traversal = get_g_V_exceptXX();
+        final Traversal<Vertex, Vertex> traversal = get_g_V_exceptXX();
         printTraversalForm(traversal);
         final List<Vertex> vertices = traversal.toList();
         assertEquals(6, vertices.size());
@@ -122,7 +122,7 @@ public abstract class ExceptTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_VX1X_repeatXbothEXcreatedX_exceptXeX_aggregateXeX_otherVX_emit_path() {
-        Traversal<Vertex, Path> traversal = get_g_VX1X_repeatXbothEXcreatedX_exceptXeX_aggregateXeX_otherVX_emit_path(convertToVertexId("marko"));
+        final Traversal<Vertex, Path> traversal = get_g_VX1X_repeatXbothEXcreatedX_exceptXeX_aggregateXeX_otherVX_emit_path(convertToVertexId("marko"));
         printTraversalForm(traversal);
         final List<Path> paths = traversal.toList();
         assertEquals(4, paths.size());
@@ -136,7 +136,7 @@ public abstract class ExceptTest extends AbstractGremlinProcessTest {
     @LoadGraphWith(MODERN)
     @IgnoreEngine(TraversalEngine.Type.COMPUTER)
     public void g_VX1X_repeatXbothEXcreatedX_dedup_otherVX_emit_path() {
-        Traversal<Vertex, Path> traversal = get_g_VX1X_repeatXbothEXcreatedX_dedup_otherVX_emit_path(convertToVertexId("marko"));
+        final Traversal<Vertex, Path> traversal = get_g_VX1X_repeatXbothEXcreatedX_dedup_otherVX_emit_path(convertToVertexId("marko"));
         printTraversalForm(traversal);
         final List<Path> paths = traversal.toList();
         assertEquals(4, paths.size());

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/FilterTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/FilterTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/FilterTest.java
index eff88b8..ce78f93 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/FilterTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/FilterTest.java
@@ -90,10 +90,10 @@ public abstract class FilterTest extends AbstractGremlinProcessTest {
         final Traversal<Vertex, Vertex> traversal = get_g_V_filterXlang_eq_javaX();
         printTraversalForm(traversal);
         int counter = 0;
-        Set<Vertex> vertices = new HashSet<>();
+        final Set<Vertex> vertices = new HashSet<>();
         while (traversal.hasNext()) {
             counter++;
-            Vertex vertex = traversal.next();
+            final Vertex vertex = traversal.next();
             vertices.add(vertex);
             assertTrue(vertex.value("name").equals("ripple") ||
                     vertex.value("name").equals("lop"));
@@ -132,10 +132,10 @@ public abstract class FilterTest extends AbstractGremlinProcessTest {
         final Traversal<Vertex, Vertex> traversal = get_g_V_filterXname_startsWith_m_OR_name_startsWith_pX();
         printTraversalForm(traversal);
         int counter = 0;
-        Set<Vertex> vertices = new HashSet<>();
+        final Set<Vertex> vertices = new HashSet<>();
         while (traversal.hasNext()) {
             counter++;
-            Vertex vertex = traversal.next();
+            final Vertex vertex = traversal.next();
             vertices.add(vertex);
             assertTrue(vertex.value("name").equals("marko") ||
                     vertex.value("name").equals("peter"));

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasNotTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasNotTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasNotTest.java
index 370a1a6..5e9eea0 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasNotTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasNotTest.java
@@ -60,7 +60,7 @@ public abstract class HasNotTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_hasNotXprop() {
-        Traversal<Vertex, Vertex> traversal = get_g_V_hasNotXprop("circumference");
+        final Traversal<Vertex, Vertex> traversal = get_g_V_hasNotXprop("circumference");
         printTraversalForm(traversal);
         final List<Vertex> list = traversal.toList();
         assertEquals(6, list.size());
@@ -69,7 +69,7 @@ public abstract class HasNotTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_hasNotXoutXcreatedXX() {
-        Traversal<Vertex, String> traversal = get_g_V_hasNotXoutXcreatedXX();
+        final Traversal<Vertex, String> traversal = get_g_V_hasNotXoutXcreatedXX();
         checkResults(Arrays.asList("vadas", "lop", "ripple"), traversal);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java
index 3ec0001..34d1f80 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java
@@ -81,7 +81,7 @@ public abstract class HasTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_outXknowsX_hasXoutXcreatedXX_valuesXnameX() {
-        Traversal<Vertex, String> traversal = get_g_V_outXknowsX_hasXoutXcreatedXX_name();
+        final Traversal<Vertex, String> traversal = get_g_V_outXknowsX_hasXoutXcreatedXX_name();
         printTraversalForm(traversal);
         checkResults(Arrays.asList("josh"), traversal);
     }
@@ -174,7 +174,7 @@ public abstract class HasTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_hasXblahX() {
-        assumeTrue(graphMeetsTestRequirements());
+        //assumeTrue(graphMeetsTestRequirements());
         final Traversal<Vertex, Vertex> traversal = get_g_V_hasXblahX();
         printTraversalForm(traversal);
         assertFalse(traversal.hasNext());
@@ -185,7 +185,7 @@ public abstract class HasTest extends AbstractGremlinProcessTest {
     @LoadGraphWith(MODERN)
     public void g_EX7X_hasXlabelXknowsX() {
         //System.out.println(convertToEdgeId("marko", "knows", "vadas"));
-        Traversal<Edge, Edge> traversal = get_g_EX7X_hasLabelXknowsX(convertToEdgeId("marko", "knows", "vadas"));
+        final Traversal<Edge, Edge> traversal = get_g_EX7X_hasLabelXknowsX(convertToEdgeId("marko", "knows", "vadas"));
         printTraversalForm(traversal);
         int counter = 0;
         while (traversal.hasNext()) {

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsTest.java
index eb5b9ea..74add2c 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsTest.java
@@ -52,7 +52,7 @@ public abstract class IsTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_valuesXageX_isX32X() {
-        Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_isX32X();
+        final Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_isX32X();
         printTraversalForm(traversal);
         assertTrue(traversal.hasNext());
         assertEquals(Integer.valueOf(32), traversal.next());
@@ -62,7 +62,7 @@ public abstract class IsTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_valuesXageX_isXlte_30X() {
-        Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_isXlte_30X();
+        final Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_isXlte_30X();
         printTraversalForm(traversal);
         checkResults(Arrays.asList(27, 29), traversal);
     }
@@ -70,7 +70,7 @@ public abstract class IsTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_valuesXageX_isXgte_29X_isXlt_34X() {
-        Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_isXgte_29X_isXlt_34X();
+        final Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_isXgte_29X_isXlt_34X();
         printTraversalForm(traversal);
         checkResults(Arrays.asList(29, 32), traversal);
     }
@@ -78,7 +78,7 @@ public abstract class IsTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX() {
-        Traversal<Vertex, String> traversal = get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX();
+        final Traversal<Vertex, String> traversal = get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX();
         printTraversalForm(traversal);
         assertTrue(traversal.hasNext());
         assertEquals("ripple", traversal.next());
@@ -88,7 +88,7 @@ public abstract class IsTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_hasXinXcreatedX_count_isXgte_2XX_valuesXnameX() {
-        Traversal<Vertex, String> traversal = get_g_V_hasXinXcreatedX_count_isXgte_2XX_valuesXnameX();
+        final Traversal<Vertex, String> traversal = get_g_V_hasXinXcreatedX_count_isXgte_2XX_valuesXnameX();
         printTraversalForm(traversal);
         assertTrue(traversal.hasNext());
         assertEquals("lop", traversal.next());

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
index 112626d..37f9839 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
@@ -55,7 +55,7 @@ public abstract class WhereTest extends AbstractGremlinProcessTest {
         int counter = 0;
         while (traversal.hasNext()) {
             counter++;
-            Map<String, Object> map = traversal.next();
+            final Map<String, Object> map = traversal.next();
             assertEquals(2, map.size());
             assertTrue(map.containsKey("a"));
             assertTrue(map.containsKey("b"));
@@ -73,7 +73,7 @@ public abstract class WhereTest extends AbstractGremlinProcessTest {
         int counter = 0;
         while (traversal.hasNext()) {
             counter++;
-            Map<String, Object> map = traversal.next();
+            final Map<String, Object> map = traversal.next();
             assertEquals(2, map.size());
             assertTrue(map.containsKey("a"));
             assertTrue(map.containsKey("b"));
@@ -99,7 +99,7 @@ public abstract class WhereTest extends AbstractGremlinProcessTest {
         int markoCounter = 0;
         while (traversal.hasNext()) {
             counter++;
-            Map<String, Object> map = traversal.next();
+            final Map<String, Object> map = traversal.next();
             assertEquals(2, map.size());
             assertTrue(map.containsKey("a"));
             assertTrue(map.containsKey("b"));
@@ -123,7 +123,7 @@ public abstract class WhereTest extends AbstractGremlinProcessTest {
         int counter = 0;
         while (traversal.hasNext()) {
             counter++;
-            Map<String, Object> map = traversal.next();
+            final Map<String, Object> map = traversal.next();
             assertEquals(2, map.size());
             assertTrue(map.containsKey("a"));
             assertTrue(map.containsKey("b"));

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CoalesceTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CoalesceTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CoalesceTest.java
index d1f3571..9b7c851 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CoalesceTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CoalesceTest.java
@@ -56,7 +56,7 @@ public abstract class CoalesceTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_coalesceXoutXfooX_outXbarXX() {
-        Traversal<Vertex, Vertex> traversal = get_g_V_coalesceXoutXfooX_outXbarXX();
+        final Traversal<Vertex, Vertex> traversal = get_g_V_coalesceXoutXfooX_outXbarXX();
         printTraversalForm(traversal);
         assertFalse(traversal.hasNext());
     }
@@ -64,7 +64,7 @@ public abstract class CoalesceTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_VX1X_coalesceXoutXknowsX_outXcreatedXX_valuesXnameX() {
-        Traversal<Vertex, String> traversal = get_g_VX1X_coalesceXoutXknowsX_outXcreatedXX_valuesXnameX(convertToVertexId("marko"));
+        final Traversal<Vertex, String> traversal = get_g_VX1X_coalesceXoutXknowsX_outXcreatedXX_valuesXnameX(convertToVertexId("marko"));
         printTraversalForm(traversal);
         checkResults(Arrays.asList("josh", "vadas"), traversal);
     }
@@ -72,7 +72,7 @@ public abstract class CoalesceTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_VX1X_coalesceXoutXcreatedX_outXknowsXX_valuesXnameX() {
-        Traversal<Vertex, String> traversal = get_g_VX1X_coalesceXoutXcreatedX_outXknowsXX_valuesXnameX(convertToVertexId("marko"));
+        final Traversal<Vertex, String> traversal = get_g_VX1X_coalesceXoutXcreatedX_outXknowsXX_valuesXnameX(convertToVertexId("marko"));
         printTraversalForm(traversal);
         assertTrue(traversal.hasNext());
         assertEquals("lop", traversal.next());
@@ -82,10 +82,10 @@ public abstract class CoalesceTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_coalesceXoutXlikesX_outXknowsX_inXcreatedXX_groupCount_byXnameX() {
-        Traversal<Vertex, Map<String, Long>> traversal = get_g_V_coalesceXoutXlikesX_outXknowsX_inXcreatedXX_groupCount_byXnameX();
+        final Traversal<Vertex, Map<String, Long>> traversal = get_g_V_coalesceXoutXlikesX_outXknowsX_inXcreatedXX_groupCount_byXnameX();
         printTraversalForm(traversal);
         assertTrue(traversal.hasNext());
-        Map<String, Long> result = traversal.next();
+        final Map<String, Long> result = traversal.next();
         assertEquals(4, result.size());
         assertTrue(result.containsKey("josh") && result.containsKey("lop") && result.containsKey("ripple") && result.containsKey("vadas"));
         assertEquals(1L, (long) result.get("josh"));
@@ -99,14 +99,14 @@ public abstract class CoalesceTest extends AbstractGremlinProcessTest {
     @IgnoreEngine(TraversalEngine.Type.COMPUTER)
     @LoadGraphWith(MODERN)
     public void g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX() {
-        Traversal<Vertex, Path> traversal = get_g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX();
+        final Traversal<Vertex, Path> traversal = get_g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX();
         printTraversalForm(traversal);
-        Map<String, Integer> first = new HashMap<>();
-        Map<String, Integer> last = new HashMap<>();
+        final Map<String, Integer> first = new HashMap<>();
+        final Map<String, Integer> last = new HashMap<>();
         int counter = 0;
         while (traversal.hasNext()) {
             counter++;
-            Path path = traversal.next();
+            final Path path = traversal.next();
             first.compute(path.<String>get(0), (k, v) -> v != null ? v + 1 : 1);
             last.compute(path.<String>get(2), (k, v) -> v != null ? v + 1 : 1);
             assertEquals(3, path.size());

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldTest.java
index 58d84a9..4932988 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldTest.java
@@ -53,9 +53,9 @@ public abstract class FoldTest extends AbstractGremlinProcessTest {
     public void g_V_fold() {
         final Traversal<Vertex, List<Vertex>> traversal = get_g_V_fold();
         printTraversalForm(traversal);
-        List<Vertex> list = traversal.next();
+        final List<Vertex> list = traversal.next();
         assertFalse(traversal.hasNext());
-        Set<Vertex> vertices = new HashSet<>(list);
+        final Set<Vertex> vertices = new HashSet<>(list);
         assertEquals(6, vertices.size());
     }
 
@@ -66,7 +66,7 @@ public abstract class FoldTest extends AbstractGremlinProcessTest {
         final Traversal<Vertex, Vertex> traversal = get_g_V_fold_unfold();
         printTraversalForm(traversal);
         int count = 0;
-        Set<Vertex> vertices = new HashSet<>();
+        final Set<Vertex> vertices = new HashSet<>();
         while (traversal.hasNext()) {
             vertices.add(traversal.next());
             count++;

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapTest.java
index 0b18f3d..7282a43 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapTest.java
@@ -62,7 +62,7 @@ public abstract class MapTest extends AbstractGremlinProcessTest {
     public void g_VX1X_outE_label_mapXlengthX() {
         final Traversal<Vertex, Integer> traversal = get_g_VX1X_outE_label_mapXlengthX(convertToVertexId("marko"));
         printTraversalForm(traversal);
-        List<Integer> lengths = traversal.toList();
+        final List<Integer> lengths = traversal.toList();
         assertTrue(lengths.contains("created".length()));
         assertTrue(lengths.contains("knows".length()));
         assertEquals(lengths.size(), 3);

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
index 7cb07f1..b9dba83 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
@@ -95,7 +95,7 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
         int counter = 0;
         while (traversal.hasNext()) {
             counter++;
-            Map<String, Vertex> bindings = traversal.next();
+            final Map<String, Vertex> bindings = traversal.next();
             assertEquals(2, bindings.size());
             assertEquals(convertToVertexId("marko"), (bindings.get("a")).id());
             assertTrue((bindings.get("b")).id().equals(convertToVertexId("vadas")) || bindings.get("b").id().equals(convertToVertexId("josh")));
@@ -112,7 +112,7 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
         int counter = 0;
         while (traversal.hasNext()) {
             counter++;
-            Map<String, String> bindings = traversal.next();
+            final Map<String, String> bindings = traversal.next();
             assertEquals(2, bindings.size());
             assertEquals("marko", bindings.get("a"));
             assertTrue(bindings.get("b").equals("josh") || bindings.get("b").equals("vadas"));
@@ -128,7 +128,7 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
         int counter = 0;
         while (traversal.hasNext()) {
             counter++;
-            Vertex vertex = traversal.next();
+            final Vertex vertex = traversal.next();
             assertEquals(convertToVertexId("marko"), vertex.id());
         }
         assertEquals(2, counter);
@@ -354,7 +354,7 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_asXhereXout_name_selectXhereX() {
-        Traversal<Vertex, Vertex> traversal = get_g_V_asXhereXout_name_selectXhereX();
+        final Traversal<Vertex, Vertex> traversal = get_g_V_asXhereXout_name_selectXhereX();
         printTraversalForm(traversal);
         super.checkResults(new HashMap<Vertex, Long>() {{
             put(convertToVertex(graph, "marko"), 3l);
@@ -367,7 +367,7 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
     @LoadGraphWith(MODERN)
     @IgnoreEngine(TraversalEngine.Type.STANDARD)  // TODO: dkuppitz this fails on OLTP, but passes on OLAP
     public void g_V_outXcreatedX_unionXasXprojectX_inXcreatedX_hasXname_markoX_selectXprojectX__asXprojectX_inXcreatedX_inXknowsX_hasXname_markoX_selectXprojectXX_groupCount_byXnameX() {
-        List<Traversal<Vertex, Map<String, Long>>> traversals = Arrays.asList(get_g_V_outXcreatedX_unionXasXprojectX_inXcreatedX_hasXname_markoX_selectXprojectX__asXprojectX_inXcreatedX_inXknowsX_hasXname_markoX_selectXprojectXX_groupCount_byXnameX());
+        final List<Traversal<Vertex, Map<String, Long>>> traversals = Arrays.asList(get_g_V_outXcreatedX_unionXasXprojectX_inXcreatedX_hasXname_markoX_selectXprojectX__asXprojectX_inXcreatedX_inXknowsX_hasXname_markoX_selectXprojectXX_groupCount_byXnameX());
         traversals.forEach(traversal -> {
             printTraversalForm(traversal);
             assertTrue(traversal.hasNext());

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
index 1aa2bab..311b6db 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
@@ -128,7 +128,7 @@ public abstract class VertexTest extends AbstractGremlinProcessTest {
         final Set<Vertex> vertices = new HashSet<>();
         while (traversal.hasNext()) {
             counter++;
-            Vertex vertex = traversal.next();
+            final Vertex vertex = traversal.next();
             vertices.add(vertex);
             assertTrue(vertex.value("name").equals("vadas") ||
                     vertex.value("name").equals("josh") ||
@@ -305,7 +305,7 @@ public abstract class VertexTest extends AbstractGremlinProcessTest {
         final Map<Object, Integer> counts = new HashMap<>();
         while (traversal.hasNext()) {
             final Object id = traversal.next().id();
-            int previousCount = counts.getOrDefault(id, 0);
+            final int previousCount = counts.getOrDefault(id, 0);
             counts.put(id, previousCount + 1);
             counter++;
         }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateTest.java
index 19e632f..ed8c8a4 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateTest.java
@@ -54,7 +54,7 @@ public abstract class AggregateTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_valueXnameX_aggregateXxX_capXxX() {
-        Traversal<Vertex, List<String>> traversal = get_g_V_name_aggregateXxX_capXxX();
+        final Traversal<Vertex, List<String>> traversal = get_g_V_name_aggregateXxX_capXxX();
         printTraversalForm(traversal);
         final Collection<String> names = traversal.next();
         assertFalse(traversal.hasNext());
@@ -64,7 +64,7 @@ public abstract class AggregateTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_aggregateXxX_byXnameX_capXxX() {
-        Traversal<Vertex, List<String>> traversal = get_g_V_aggregateXxX_byXnameX_capXxX();
+        final Traversal<Vertex, List<String>> traversal = get_g_V_aggregateXxX_byXnameX_capXxX();
         printTraversalForm(traversal);
         final Collection<String> names = traversal.next();
         assertFalse(traversal.hasNext());
@@ -91,9 +91,9 @@ public abstract class AggregateTest extends AbstractGremlinProcessTest {
         final Map<String, Long> secondStepCounts = new HashMap<>();
         while (traversal.hasNext()) {
             count++;
-            Path path = traversal.next();
-            String first = path.get(0).toString();
-            String second = path.get(1).toString();
+            final Path path = traversal.next();
+            final String first = path.get(0).toString();
+            final String second = path.get(1).toString();
             assertThat(first, not(second));
             MapHelper.incr(firstStepCounts, first, 1l);
             MapHelper.incr(secondStepCounts, second, 1l);

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountTest.java
index eda73f7..1d6d95c 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountTest.java
@@ -99,7 +99,7 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_repeatXout_groupCountXaX_byXnameXX_timesX2X_capXaX() {
-        List<Traversal<Vertex, Map<String, Long>>> traversals = new ArrayList<>();
+        final List<Traversal<Vertex, Map<String, Long>>> traversals = new ArrayList<>();
         traversals.add(get_g_V_repeatXout_groupCountXaX_byXnameXX_timesX2X_capXaX());
         traversals.forEach(traversal -> {
             printTraversalForm(traversal);
@@ -116,7 +116,7 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_unionXrepeatXoutX_timesX2X_groupCountXmX_byXlangXX__repeatXinX_timesX2X_groupCountXmX_byXnameXX_capXmX() {
-        List<Traversal<Vertex, Map<String, Long>>> traversals = new ArrayList<>();
+        final List<Traversal<Vertex, Map<String, Long>>> traversals = new ArrayList<>();
         traversals.add(get_g_V_unionXrepeatXoutX_timesX2X_groupCountXmX_byXlangXX__repeatXinX_timesX2X_groupCountXmX_byXnameXX_capXmX());
         traversals.forEach(traversal -> {
             printTraversalForm(traversal);

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java
index 3b59720..4fe3799 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java
@@ -94,7 +94,7 @@ public abstract class GroupTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_repeatXout_groupXaX_byXnameX_byXitX_byXsizeXX_timesX2X_capXaX() {
-        List<Traversal<Vertex, Map<String, Long>>> traversals = new ArrayList<>();
+        final List<Traversal<Vertex, Map<String, Long>>> traversals = new ArrayList<>();
         traversals.add(get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX());
         traversals.forEach(traversal -> {
             printTraversalForm(traversal);

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectTest.java
index 6c67d72..e9bd6ef 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectTest.java
@@ -51,7 +51,7 @@ public abstract class InjectTest extends AbstractGremlinProcessTest {
     public void g_VX1X_out_injectXv2X_name() {
         final Traversal<Vertex, String> traversal = get_g_VX1X_out_injectXv2X_name(convertToVertexId("marko"), convertToVertexId("vadas"));
         printTraversalForm(traversal);
-        Map<String, Long> counter = new HashMap<>();
+        final Map<String, Long> counter = new HashMap<>();
         while (traversal.hasNext()) {
             MapHelper.incr(counter, traversal.next(), 1l);
         }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
index d99490b..eeea89e 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
@@ -185,13 +185,13 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
         assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
 
         // Test the nested global metrics of the repeat step
-        Metrics vertexStepNestedInRepeat = (Metrics) metrics.getNested().toArray()[0];
+        final Metrics vertexStepNestedInRepeat = (Metrics) metrics.getNested().toArray()[0];
         assertEquals(114, vertexStepNestedInRepeat.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
         assertNotEquals(0, vertexStepNestedInRepeat.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
         assertTrue("Count should be greater than traversers.", vertexStepNestedInRepeat.getCount(TraversalMetrics.ELEMENT_COUNT_ID) > vertexStepNestedInRepeat.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
         assertTrue("Times should be positive.", vertexStepNestedInRepeat.getDuration(TimeUnit.MICROSECONDS) > 0);
 
-        Metrics repeatEndStepNestedInRepeat = (Metrics) metrics.getNested().toArray()[1];
+        final Metrics repeatEndStepNestedInRepeat = (Metrics) metrics.getNested().toArray()[1];
         assertEquals(72, repeatEndStepNestedInRepeat.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
         assertNotEquals(0, repeatEndStepNestedInRepeat.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
         assertTrue("Count should be greater than traversers.", repeatEndStepNestedInRepeat.getCount(TraversalMetrics.ELEMENT_COUNT_ID) > repeatEndStepNestedInRepeat.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapTest.java
index a65e068..6aecc83 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapTest.java
@@ -61,7 +61,7 @@ public abstract class SideEffectCapTest extends AbstractGremlinProcessTest {
         final Traversal<Vertex, Map<String, Map<Object, Long>>> traversal = get_g_V_chooseXlabel_person__age_groupCountXaX__name_groupCountXbXX_capXa_bX();
         printTraversalForm(traversal);
         assertTrue(traversal.hasNext());
-        Map<String, Map<Object, Long>> map = traversal.next();
+        final Map<String, Map<Object, Long>> map = traversal.next();
         assertFalse(traversal.hasNext());
         assertEquals(2, map.size());
         assertTrue(map.containsKey("a"));

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreTest.java
index 16c724e..7de826e 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreTest.java
@@ -53,7 +53,7 @@ public abstract class StoreTest extends AbstractGremlinProcessTest {
     public void g_V_storeXa_nameX_out_capXaX() {
         final Traversal<Vertex, Collection> traversal = get_g_V_storeXaX_byXnameX_out_capXaX();
         printTraversalForm(traversal);
-        Collection names = traversal.next();
+        final Collection names = traversal.next();
         assertEquals(6, names.size());
         assertTrue(names.contains("marko"));
         assertTrue(names.contains("josh"));
@@ -69,7 +69,7 @@ public abstract class StoreTest extends AbstractGremlinProcessTest {
     public void g_VX1X_storeXaX_byXnameX_out_storeXaX_byXnameX_name_capXaX() {
         final Traversal<Vertex, Collection> traversal = get_g_VX1X_storeXaX_byXnameX_out_storeXaX_byXnameX_name_capXaX(convertToVertexId("marko"));
         printTraversalForm(traversal);
-        Collection names = traversal.next();
+        final Collection names = traversal.next();
         assertEquals(4, names.size());
         assertTrue(names.contains("marko"));
         assertTrue(names.contains("josh"));

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
index 3305538..bdcf436 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
@@ -59,7 +59,7 @@ public abstract class SubgraphTest extends AbstractGremlinProcessTest {
         graphProvider.clear(config);
         Graph subgraph = graphProvider.openTestGraph(config);
         /////
-        Traversal<Vertex, Graph> traversal = get_g_V_withSideEffectXsgX_outEXknowsX_subgraphXsgX_name_capXsgX(convertToVertexId("marko"), subgraph);
+        final Traversal<Vertex, Graph> traversal = get_g_V_withSideEffectXsgX_outEXknowsX_subgraphXsgX_name_capXsgX(convertToVertexId("marko"), subgraph);
         printTraversalForm(traversal);
         subgraph = traversal.next();
         assertVertexEdgeCounts(3, 2).accept(subgraph);
@@ -91,7 +91,7 @@ public abstract class SubgraphTest extends AbstractGremlinProcessTest {
         graphProvider.clear(config);
         final Graph subgraph = graphProvider.openTestGraph(config);
         /////
-        Traversal<Vertex, String> traversal = get_g_V_withSideEffectXsgX_repeatXbothEXcreatedX_subgraphXsgX_outVX_timesX5X_name_dedup(subgraph);
+        final Traversal<Vertex, String> traversal = get_g_V_withSideEffectXsgX_repeatXbothEXcreatedX_subgraphXsgX_outVX_timesX5X_name_dedup(subgraph);
         printTraversalForm(traversal);
         checkResults(Arrays.asList("marko", "josh", "peter"), traversal);
         final Graph subGraph = traversal.asAdmin().getSideEffects().get("sg");

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeTest.java
index 14e0e3a..efd0144 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeTest.java
@@ -56,7 +56,7 @@ public abstract class TreeTest extends AbstractGremlinProcessTest {
     @IgnoreEngine(TraversalEngine.Type.COMPUTER)
     @LoadGraphWith(MODERN)
     public void g_VX1X_out_out_tree_byXnameX() {
-        List<Traversal<Vertex, Tree>> traversals = Arrays.asList(
+        final List<Traversal<Vertex, Tree>> traversals = Arrays.asList(
                 get_g_VX1X_out_out_tree_byXnameX(convertToVertexId("marko")),
                 get_g_VX1X_out_out_treeXaX_byXnameX_both_both_capXaX(convertToVertexId("marko")));
         traversals.forEach(traversal -> {
@@ -75,7 +75,7 @@ public abstract class TreeTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_out_out_tree_byXidX() {
-        List<Traversal<Vertex, Tree>> traversals = Arrays.asList(get_g_V_out_out_tree_byXidX(), get_g_V_out_out_treeXaX_byXidX_capXaX());
+        final List<Traversal<Vertex, Tree>> traversals = Arrays.asList(get_g_V_out_out_tree_byXidX(), get_g_V_out_out_treeXaX_byXidX_capXaX());
         traversals.forEach(traversal -> {
             printTraversalForm(traversal);
             final Tree tree = traversal.next();
@@ -92,7 +92,7 @@ public abstract class TreeTest extends AbstractGremlinProcessTest {
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_out_out_treeXaX_capXaX() {
-        List<Traversal<Vertex, Tree>> traversals = Arrays.asList(get_g_V_out_out_tree(), get_g_V_out_out_treeXaX_capXaX());
+        final List<Traversal<Vertex, Tree>> traversals = Arrays.asList(get_g_V_out_out_tree(), get_g_V_out_out_treeXaX_capXaX());
         traversals.forEach(traversal -> {
             printTraversalForm(traversal);
             final Tree tree = traversal.next();