Finalize some variables to maintain code consistency.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/37d5b9f7 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/37d5b9f7 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/37d5b9f7 Branch: refs/heads/TINKERPOP-1278 Commit: 37d5b9f7a8145502cdde42763ccb875cd9338dbe Parents: cc59062 Author: Stephen Mallette <[email protected]> Authored: Wed Jul 13 12:41:00 2016 -0400 Committer: Stephen Mallette <[email protected]> Committed: Wed Jul 13 12:41:00 2016 -0400 ---------------------------------------------------------------------- .../process/traversal/step/filter/WherePredicateStep.java | 2 +- .../process/traversal/step/filter/WhereTraversalStep.java | 2 +- .../gremlin/process/traversal/step/map/PathStep.java | 2 +- .../gremlin/process/traversal/step/map/SelectOneStep.java | 2 +- .../gremlin/process/traversal/step/map/SelectStep.java | 2 +- .../gremlin/process/traversal/step/map/TreeStep.java | 2 +- .../traversal/step/sideEffect/TreeSideEffectStep.java | 2 +- .../gremlin/process/traversal/step/map/MatchStepTest.java | 10 +++++----- 8 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/37d5b9f7/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java index bea9aad..898a42a 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java @@ -124,7 +124,7 @@ public final class WherePredicateStep<S> extends FilterStep<S> implements Scopin } @Override - public void setKeepLabels(Set<String> labels) { + public void setKeepLabels(final Set<String> labels) { this.keepLabels = labels; } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/37d5b9f7/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTraversalStep.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTraversalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTraversalStep.java index 762dfed..1dd92e2 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTraversalStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTraversalStep.java @@ -140,7 +140,7 @@ public final class WhereTraversalStep<S> extends FilterStep<S> implements Traver } @Override - public void setKeepLabels(Set<String> keepLabels) { + public void setKeepLabels(final Set<String> keepLabels) { this.keepLabels = keepLabels; } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/37d5b9f7/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PathStep.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PathStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PathStep.java index c4b2534..6dca028 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PathStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PathStep.java @@ -104,7 +104,7 @@ public final class PathStep<S> extends MapStep<S, Path> implements TraversalPare } @Override - public void setKeepLabels(Set<String> labels) { + public void setKeepLabels(final Set<String> labels) { this.keepLabels = labels; } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/37d5b9f7/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectOneStep.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectOneStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectOneStep.java index 87a3f9b..a51a8d2 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectOneStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectOneStep.java @@ -118,7 +118,7 @@ public final class SelectOneStep<S, E> extends MapStep<S, E> implements Traversa } @Override - public void setKeepLabels(Set<String> labels) { + public void setKeepLabels(final Set<String> labels) { this.keepLabels = labels; } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/37d5b9f7/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java index b875a79..7c54708 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java @@ -144,7 +144,7 @@ public final class SelectStep<S, E> extends MapStep<S, Map<String, E>> implement } @Override - public void setKeepLabels(Set<String> labels) { + public void setKeepLabels(final Set<String> labels) { this.keepLabels = labels; } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/37d5b9f7/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TreeStep.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TreeStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TreeStep.java index a3fb054..8bdc692 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TreeStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TreeStep.java @@ -113,7 +113,7 @@ public final class TreeStep<S> extends ReducingBarrierStep<S, Tree> implements T } @Override - public void setKeepLabels(Set<String> labels) { + public void setKeepLabels(final Set<String> labels) { this.keepLabels = labels; } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/37d5b9f7/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeSideEffectStep.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeSideEffectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeSideEffectStep.java index 4ef5544..9996c83 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeSideEffectStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeSideEffectStep.java @@ -123,7 +123,7 @@ public final class TreeSideEffectStep<S> extends SideEffectStep<S> implements Si } @Override - public void setKeepLabels(Set<String> labels) { + public void setKeepLabels(final Set<String> labels) { this.keepLabels = labels; } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/37d5b9f7/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStepTest.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStepTest.java index df85f16..9061258 100644 --- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStepTest.java +++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchStepTest.java @@ -120,7 +120,7 @@ public class MatchStepTest extends StepTest { __.match(as("a").out().as("b"), as("c").path().as("d").and().as("e").barrier()).asAdmin()); assertEquals(1, new HashSet<>(traversals).size()); // the two patterns should pre-compile to the same traversal traversals.forEach(traversal -> { - MatchStep<?, ?> matchStep = (MatchStep<?, ?>) traversal.getStartStep(); + final MatchStep<?, ?> matchStep = (MatchStep<?, ?>) traversal.getStartStep(); assertEquals(2, matchStep.getGlobalChildren().size()); Traversal.Admin<Object, Object> pattern = matchStep.getGlobalChildren().get(0); assertEquals("a", ((MatchStep.MatchStartStep) pattern.getStartStep()).getSelectKey().get()); @@ -146,7 +146,7 @@ public class MatchStepTest extends StepTest { __.match(as("a").out().as("b"), where(as("c").in().as("d"))).asAdmin()); assertEquals(1, new HashSet<>(traversals).size()); // the two patterns should pre-compile to the same traversal traversals.forEach(traversal -> { - MatchStep<?, ?> matchStep = (MatchStep<?, ?>) traversal.getStartStep(); + final MatchStep<?, ?> matchStep = (MatchStep<?, ?>) traversal.getStartStep(); //assertFalse(matchStep.getStartLabel().isPresent()); assertEquals(2, matchStep.getGlobalChildren().size()); Traversal.Admin<Object, Object> pattern = matchStep.getGlobalChildren().get(0); @@ -177,7 +177,7 @@ public class MatchStepTest extends StepTest { __.match(as("a").out().as("b"), where("c", P.neq("d"))).asAdmin()); assertEquals(1, new HashSet<>(traversals).size()); // the two patterns should pre-compile to the same traversal traversals.forEach(traversal -> { - MatchStep<?, ?> matchStep = (MatchStep<?, ?>) traversal.getStartStep(); + final MatchStep<?, ?> matchStep = (MatchStep<?, ?>) traversal.getStartStep(); //assertFalse(matchStep.getStartLabel().isPresent()); assertEquals(2, matchStep.getGlobalChildren().size()); Traversal.Admin<Object, Object> pattern = matchStep.getGlobalChildren().get(0); @@ -325,7 +325,7 @@ public class MatchStepTest extends StepTest { // MAKE SURE OLAP JOBS ARE BIASED TOWARDS STAR GRAPH DATA final Consumer doNothing = s -> { }; - Traversal.Admin<?, ?> traversal = __.match( + final Traversal.Admin<?, ?> traversal = __.match( as("a").sideEffect(doNothing).as("b"), // 1 as("b").sideEffect(doNothing).as("c"), // 2 as("a").sideEffect(doNothing).as("d"), // 5 @@ -333,7 +333,7 @@ public class MatchStepTest extends StepTest { as("c").sideEffect(doNothing).as("f")) // 3 .asAdmin(); traversal.applyStrategies(); // necessary to enure step ids are unique - MatchStep.CountMatchAlgorithm countMatchAlgorithm = new MatchStep.CountMatchAlgorithm(); + final MatchStep.CountMatchAlgorithm countMatchAlgorithm = new MatchStep.CountMatchAlgorithm(); countMatchAlgorithm.initialize(TraversalEngine.Type.COMPUTER, ((MatchStep<?, ?>) traversal.getStartStep()).getGlobalChildren()); Traversal.Admin<Object, Object> firstPattern = ((MatchStep<?, ?>) traversal.getStartStep()).getGlobalChildren().get(0); Traversal.Admin<Object, Object> secondPattern = ((MatchStep<?, ?>) traversal.getStartStep()).getGlobalChildren().get(1);
