Finalized some variables CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a546d260 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a546d260 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a546d260 Branch: refs/heads/TINKERPOP-1996 Commit: a546d260073e7c39435dbb367fa326c3e5fe5658 Parents: fe104ac Author: Stephen Mallette <[email protected]> Authored: Tue Jul 17 13:13:53 2018 -0400 Committer: Stephen Mallette <[email protected]> Committed: Tue Jul 17 13:13:53 2018 -0400 ---------------------------------------------------------------------- .../process/traversal/dsl/graph/GraphTraversal.java | 2 +- .../gremlin/process/traversal/dsl/graph/__.java | 2 +- .../process/traversal/step/map/LoopsStep.java | 4 ++-- .../traverser/B_LP_NL_O_P_S_SE_SL_Traverser.java | 16 ++++++++-------- .../traverser/B_LP_NL_O_S_SE_SL_Traverser.java | 16 ++++++++-------- .../traverser/B_NL_O_S_SE_SL_Traverser.java | 16 ++++++++-------- .../traverser/LP_NL_O_OB_P_S_SE_SL_Traverser.java | 16 ++++++++-------- .../traverser/LP_NL_O_OB_S_SE_SL_Traverser.java | 16 ++++++++-------- .../traverser/NL_O_OB_S_SE_SL_Traverser.java | 16 ++++++++-------- .../traversal/traverser/ProjectedTraverser.java | 2 +- .../traversal/traverser/util/LabelledCounter.java | 2 +- 11 files changed, 54 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a546d260/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java index 0a7eb95..63aa65d 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java @@ -658,7 +658,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> { * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#loops-step"; target="_blank">Reference Documentation - Loops Step</a> * @since 3.4.0 */ - public default GraphTraversal<S, Integer> loops(String loopName) { + public default GraphTraversal<S, Integer> loops(final String loopName) { this.asAdmin().getBytecode().addStep(Symbols.loops, loopName); return this.asAdmin().addStep(new LoopsStep<>(this.asAdmin(), loopName)); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a546d260/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java index ae5c829..02eee79 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java @@ -326,7 +326,7 @@ public class __ { /** * @see GraphTraversal#loops(String) */ - public static <A> GraphTraversal<A, Integer> loops(String loopName) { + public static <A> GraphTraversal<A, Integer> loops(final String loopName) { return __.<A>start().loops(loopName); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a546d260/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LoopsStep.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LoopsStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LoopsStep.java index 0a9167c..11d8729 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LoopsStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LoopsStep.java @@ -39,12 +39,12 @@ public final class LoopsStep<S> extends MapStep<S, Integer> { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) return true; if (!(o instanceof LoopsStep)) return false; if (!super.equals(o)) return false; - LoopsStep<?> loopsStep = (LoopsStep<?>) o; + final LoopsStep<?> loopsStep = (LoopsStep<?>) o; return loopName != null ? loopName.equals(loopsStep.loopName) : loopsStep.loopName == null; } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a546d260/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_P_S_SE_SL_Traverser.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_P_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_P_S_SE_SL_Traverser.java index 04ba98a..1af9dbe 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_P_S_SE_SL_Traverser.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_P_S_SE_SL_Traverser.java @@ -60,7 +60,7 @@ public class B_LP_NL_O_P_S_SE_SL_Traverser<T> extends B_LP_O_P_S_SE_SL_Traverser @Override public void initialiseLoops(final String stepLabel, final String loopName) { if (this.nestedLoops.empty() || !this.nestedLoops.peek().hasLabel(stepLabel)) { - LabelledCounter lc = new LabelledCounter(stepLabel, (short) 0); + final LabelledCounter lc = new LabelledCounter(stepLabel, (short) 0); this.nestedLoops.push(lc); if (loopName != null) this.loopNames.put(loopName, lc); @@ -89,11 +89,11 @@ public class B_LP_NL_O_P_S_SE_SL_Traverser<T> extends B_LP_O_P_S_SE_SL_Traverser if (this.loopNames != null) { clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK); - Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); + final Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); while (loopNamesIterator.hasNext()) { - ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); + final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); - int idx = this.nestedLoops.indexOf(pair.getValue()); + final int idx = this.nestedLoops.indexOf(pair.getValue()); if (idx != -1) clone.loopNames.put(pair.getKey(), clone.nestedLoops.get(idx)); } @@ -112,11 +112,11 @@ public class B_LP_NL_O_P_S_SE_SL_Traverser<T> extends B_LP_O_P_S_SE_SL_Traverser if (this.loopNames != null) { clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK); - Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); + final Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); while (loopNamesIterator.hasNext()) { - ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); + final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); - int idx = this.nestedLoops.indexOf(pair.getValue()); + final int idx = this.nestedLoops.indexOf(pair.getValue()); if (idx != -1) clone.loopNames.put(pair.getKey(), clone.nestedLoops.get(idx)); } @@ -138,7 +138,7 @@ public class B_LP_NL_O_P_S_SE_SL_Traverser<T> extends B_LP_O_P_S_SE_SL_Traverser if (!(o instanceof B_LP_NL_O_P_S_SE_SL_Traverser)) return false; if (!super.equals(o)) return false; - B_LP_NL_O_P_S_SE_SL_Traverser<?> that = (B_LP_NL_O_P_S_SE_SL_Traverser<?>) o; + final B_LP_NL_O_P_S_SE_SL_Traverser<?> that = (B_LP_NL_O_P_S_SE_SL_Traverser<?>) o; if (!this.nestedLoops.equals(that.nestedLoops)) return false; return this.loopNames != null ? this.loopNames.equals(that.loopNames) : that.loopNames == null; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a546d260/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_S_SE_SL_Traverser.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_S_SE_SL_Traverser.java index 8ddd9fc..59287ac 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_S_SE_SL_Traverser.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_LP_NL_O_S_SE_SL_Traverser.java @@ -59,7 +59,7 @@ public class B_LP_NL_O_S_SE_SL_Traverser<T> extends B_LP_O_S_SE_SL_Traverser<T> @Override public void initialiseLoops(final String stepLabel, final String loopName) { if (this.nestedLoops.empty() || !this.nestedLoops.peek().hasLabel(stepLabel)) { - LabelledCounter lc = new LabelledCounter(stepLabel, (short) 0); + final LabelledCounter lc = new LabelledCounter(stepLabel, (short) 0); this.nestedLoops.push(lc); if (loopName != null) this.loopNames.put(loopName, lc); @@ -88,11 +88,11 @@ public class B_LP_NL_O_S_SE_SL_Traverser<T> extends B_LP_O_S_SE_SL_Traverser<T> if (this.loopNames != null) { clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK); - Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); + final Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); while (loopNamesIterator.hasNext()) { - ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); + final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); - int idx = this.nestedLoops.indexOf(pair.getValue()); + final int idx = this.nestedLoops.indexOf(pair.getValue()); if (idx != -1) clone.loopNames.put(pair.getKey(), clone.nestedLoops.get(idx)); } @@ -111,11 +111,11 @@ public class B_LP_NL_O_S_SE_SL_Traverser<T> extends B_LP_O_S_SE_SL_Traverser<T> if (this.loopNames != null) { clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK); - Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); + final Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); while (loopNamesIterator.hasNext()) { - ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); + final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); - int idx = this.nestedLoops.indexOf(pair.getValue()); + final int idx = this.nestedLoops.indexOf(pair.getValue()); if (idx != -1) clone.loopNames.put(pair.getKey(), clone.nestedLoops.get(idx)); } @@ -137,7 +137,7 @@ public class B_LP_NL_O_S_SE_SL_Traverser<T> extends B_LP_O_S_SE_SL_Traverser<T> if (!(o instanceof B_LP_NL_O_S_SE_SL_Traverser)) return false; if (!super.equals(o)) return false; - B_LP_NL_O_S_SE_SL_Traverser<?> that = (B_LP_NL_O_S_SE_SL_Traverser<?>) o; + final B_LP_NL_O_S_SE_SL_Traverser<?> that = (B_LP_NL_O_S_SE_SL_Traverser<?>) o; if (!this.nestedLoops.equals(that.nestedLoops)) return false; return this.loopNames != null ? this.loopNames.equals(that.loopNames) : that.loopNames == null; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a546d260/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_NL_O_S_SE_SL_Traverser.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_NL_O_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_NL_O_S_SE_SL_Traverser.java index 0eee799..20ed1be 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_NL_O_S_SE_SL_Traverser.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/B_NL_O_S_SE_SL_Traverser.java @@ -60,7 +60,7 @@ public class B_NL_O_S_SE_SL_Traverser<T> extends B_O_S_SE_SL_Traverser<T> { @Override public void initialiseLoops(final String stepLabel, final String loopName) { if (this.nestedLoops.empty() || !this.nestedLoops.peek().hasLabel(stepLabel)) { - LabelledCounter lc = new LabelledCounter(stepLabel, (short) 0); + final LabelledCounter lc = new LabelledCounter(stepLabel, (short) 0); this.nestedLoops.push(lc); if (loopName != null) this.loopNames.put(loopName, lc); @@ -90,11 +90,11 @@ public class B_NL_O_S_SE_SL_Traverser<T> extends B_O_S_SE_SL_Traverser<T> { if (this.loopNames != null) { clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK); - Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); + final Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); while (loopNamesIterator.hasNext()) { - ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); + final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); - int idx = this.nestedLoops.indexOf(pair.getValue()); + final int idx = this.nestedLoops.indexOf(pair.getValue()); if (idx != -1) clone.loopNames.put(pair.getKey(), clone.nestedLoops.get(idx)); } @@ -114,11 +114,11 @@ public class B_NL_O_S_SE_SL_Traverser<T> extends B_O_S_SE_SL_Traverser<T> { if (this.loopNames != null) { clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK); - Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); + final Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); while (loopNamesIterator.hasNext()) { - ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); + final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); - int idx = this.nestedLoops.indexOf(pair.getValue()); + final int idx = this.nestedLoops.indexOf(pair.getValue()); if (idx != -1) clone.loopNames.put(pair.getKey(), clone.nestedLoops.get(idx)); } @@ -140,7 +140,7 @@ public class B_NL_O_S_SE_SL_Traverser<T> extends B_O_S_SE_SL_Traverser<T> { if (!(o instanceof B_NL_O_S_SE_SL_Traverser)) return false; if (!super.equals(o)) return false; - B_NL_O_S_SE_SL_Traverser<?> that = (B_NL_O_S_SE_SL_Traverser<?>) o; + final B_NL_O_S_SE_SL_Traverser<?> that = (B_NL_O_S_SE_SL_Traverser<?>) o; if (!this.nestedLoops.equals(that.nestedLoops)) return false; return this.loopNames != null ? this.loopNames.equals(that.loopNames) : that.loopNames == null; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a546d260/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_P_S_SE_SL_Traverser.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_P_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_P_S_SE_SL_Traverser.java index c7b42c6..3cb1dd3 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_P_S_SE_SL_Traverser.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_P_S_SE_SL_Traverser.java @@ -60,7 +60,7 @@ public class LP_NL_O_OB_P_S_SE_SL_Traverser<T> extends LP_O_OB_P_S_SE_SL_Travers @Override public void initialiseLoops(final String stepLabel, final String loopName) { if (this.nestedLoops.empty() || !this.nestedLoops.peek().hasLabel(stepLabel)) { - LabelledCounter lc = new LabelledCounter(stepLabel, (short) 0); + final LabelledCounter lc = new LabelledCounter(stepLabel, (short) 0); this.nestedLoops.push(lc); if (loopName != null) this.loopNames.put(loopName, lc); @@ -89,11 +89,11 @@ public class LP_NL_O_OB_P_S_SE_SL_Traverser<T> extends LP_O_OB_P_S_SE_SL_Travers if (this.loopNames != null) { clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK); - Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); + final Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); while (loopNamesIterator.hasNext()) { - ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); + final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); - int idx = this.nestedLoops.indexOf(pair.getValue()); + final int idx = this.nestedLoops.indexOf(pair.getValue()); if (idx != -1) clone.loopNames.put(pair.getKey(), clone.nestedLoops.get(idx)); } @@ -112,11 +112,11 @@ public class LP_NL_O_OB_P_S_SE_SL_Traverser<T> extends LP_O_OB_P_S_SE_SL_Travers if (this.loopNames != null) { clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK); - Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); + final Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); while (loopNamesIterator.hasNext()) { - ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); + final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); - int idx = this.nestedLoops.indexOf(pair.getValue()); + final int idx = this.nestedLoops.indexOf(pair.getValue()); if (idx != -1) clone.loopNames.put(pair.getKey(), clone.nestedLoops.get(idx)); } @@ -138,7 +138,7 @@ public class LP_NL_O_OB_P_S_SE_SL_Traverser<T> extends LP_O_OB_P_S_SE_SL_Travers if (!(o instanceof LP_NL_O_OB_P_S_SE_SL_Traverser)) return false; if (!super.equals(o)) return false; - LP_NL_O_OB_P_S_SE_SL_Traverser<?> that = (LP_NL_O_OB_P_S_SE_SL_Traverser<?>) o; + final LP_NL_O_OB_P_S_SE_SL_Traverser<?> that = (LP_NL_O_OB_P_S_SE_SL_Traverser<?>) o; if (!this.nestedLoops.equals(that.nestedLoops)) return false; return this.loopNames != null ? this.loopNames.equals(that.loopNames) : that.loopNames == null; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a546d260/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_S_SE_SL_Traverser.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_S_SE_SL_Traverser.java index 7e61841..a9cd7fb 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_S_SE_SL_Traverser.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/LP_NL_O_OB_S_SE_SL_Traverser.java @@ -60,7 +60,7 @@ public class LP_NL_O_OB_S_SE_SL_Traverser<T> extends LP_O_OB_S_SE_SL_Traverser<T @Override public void initialiseLoops(final String stepLabel, final String loopName) { if (this.nestedLoops.empty() || !this.nestedLoops.peek().hasLabel(stepLabel)) { - LabelledCounter lc = new LabelledCounter(stepLabel, (short) 0); + final LabelledCounter lc = new LabelledCounter(stepLabel, (short) 0); this.nestedLoops.push(lc); if (loopName != null) this.loopNames.put(loopName, lc); @@ -89,11 +89,11 @@ public class LP_NL_O_OB_S_SE_SL_Traverser<T> extends LP_O_OB_S_SE_SL_Traverser<T if (this.loopNames != null) { clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK); - Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); + final Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); while (loopNamesIterator.hasNext()) { - ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); + final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); - int idx = this.nestedLoops.indexOf(pair.getValue()); + final int idx = this.nestedLoops.indexOf(pair.getValue()); if (idx != -1) clone.loopNames.put(pair.getKey(), clone.nestedLoops.get(idx)); } @@ -112,11 +112,11 @@ public class LP_NL_O_OB_S_SE_SL_Traverser<T> extends LP_O_OB_S_SE_SL_Traverser<T if (this.loopNames != null) { clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK); - Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); + final Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); while (loopNamesIterator.hasNext()) { - ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); + final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); - int idx = this.nestedLoops.indexOf(pair.getValue()); + final int idx = this.nestedLoops.indexOf(pair.getValue()); if (idx != -1) clone.loopNames.put(pair.getKey(), clone.nestedLoops.get(idx)); } @@ -138,7 +138,7 @@ public class LP_NL_O_OB_S_SE_SL_Traverser<T> extends LP_O_OB_S_SE_SL_Traverser<T if (!(o instanceof LP_NL_O_OB_S_SE_SL_Traverser)) return false; if (!super.equals(o)) return false; - LP_NL_O_OB_S_SE_SL_Traverser<?> that = (LP_NL_O_OB_S_SE_SL_Traverser<?>) o; + final LP_NL_O_OB_S_SE_SL_Traverser<?> that = (LP_NL_O_OB_S_SE_SL_Traverser<?>) o; if (!this.nestedLoops.equals(that.nestedLoops)) return false; return this.loopNames != null ? this.loopNames.equals(that.loopNames) : that.loopNames == null; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a546d260/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/NL_O_OB_S_SE_SL_Traverser.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/NL_O_OB_S_SE_SL_Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/NL_O_OB_S_SE_SL_Traverser.java index 9bbd94a..72f43fe 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/NL_O_OB_S_SE_SL_Traverser.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/NL_O_OB_S_SE_SL_Traverser.java @@ -60,7 +60,7 @@ public class NL_O_OB_S_SE_SL_Traverser<T> extends O_OB_S_SE_SL_Traverser<T> { @Override public void initialiseLoops(final String stepLabel, final String loopName) { if (this.nestedLoops.empty() || !this.nestedLoops.peek().hasLabel(stepLabel)) { - LabelledCounter lc = new LabelledCounter(stepLabel, (short) 0); + final LabelledCounter lc = new LabelledCounter(stepLabel, (short) 0); this.nestedLoops.push(lc); if (loopName != null) this.loopNames.put(loopName, lc); @@ -89,11 +89,11 @@ public class NL_O_OB_S_SE_SL_Traverser<T> extends O_OB_S_SE_SL_Traverser<T> { if (this.loopNames != null) { clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK); - Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); + final Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); while (loopNamesIterator.hasNext()) { - ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); + final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); - int idx = this.nestedLoops.indexOf(pair.getValue()); + final int idx = this.nestedLoops.indexOf(pair.getValue()); if (idx != -1) clone.loopNames.put(pair.getKey(), clone.nestedLoops.get(idx)); } @@ -112,11 +112,11 @@ public class NL_O_OB_S_SE_SL_Traverser<T> extends O_OB_S_SE_SL_Traverser<T> { if (this.loopNames != null) { clone.loopNames = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK); - Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); + final Iterator loopNamesIterator = this.loopNames.entrySet().iterator(); while (loopNamesIterator.hasNext()) { - ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); + final ReferenceMap.Entry pair = (ReferenceMap.Entry) loopNamesIterator.next(); - int idx = this.nestedLoops.indexOf(pair.getValue()); + final int idx = this.nestedLoops.indexOf(pair.getValue()); if (idx != -1) clone.loopNames.put(pair.getKey(), clone.nestedLoops.get(idx)); } @@ -138,7 +138,7 @@ public class NL_O_OB_S_SE_SL_Traverser<T> extends O_OB_S_SE_SL_Traverser<T> { if (!(o instanceof NL_O_OB_S_SE_SL_Traverser)) return false; if (!super.equals(o)) return false; - NL_O_OB_S_SE_SL_Traverser<?> that = (NL_O_OB_S_SE_SL_Traverser<?>) o; + final NL_O_OB_S_SE_SL_Traverser<?> that = (NL_O_OB_S_SE_SL_Traverser<?>) o; if (!this.nestedLoops.equals(that.nestedLoops)) return false; return this.loopNames != null ? this.loopNames.equals(that.loopNames) : that.loopNames == null; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a546d260/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/ProjectedTraverser.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/ProjectedTraverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/ProjectedTraverser.java index ad3712b..7cef844 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/ProjectedTraverser.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/ProjectedTraverser.java @@ -172,7 +172,7 @@ public final class ProjectedTraverser<T, P> implements Traverser.Admin<T> { } @Override - public int loops(String loopName) { + public int loops(final String loopName) { return this.baseTraverser.loops(loopName); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a546d260/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/util/LabelledCounter.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/util/LabelledCounter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/util/LabelledCounter.java index 0021699..d607361 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/util/LabelledCounter.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/util/LabelledCounter.java @@ -64,7 +64,7 @@ public class LabelledCounter implements Serializable, Cloneable { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) return true; if (!(o instanceof LabelledCounter)) return false;
