You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/02/08 19:06:40 UTC
incubator-tinkerpop git commit: Worked on issues reported by static
code analysis.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master e6aba8437 -> fdd5e1854
Worked on issues reported by static code analysis.
Only 19 issues left (all in the category Object allocation in a loop), but they all can be seen as a hint. The code looks good to me, not worth (or even possible) to change anything.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/fdd5e185
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/fdd5e185
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/fdd5e185
Branch: refs/heads/master
Commit: fdd5e18542ffae43845d6b632a48fe2ce908b583
Parents: e6aba84
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Sun Feb 8 02:18:08 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Sun Feb 8 02:18:08 2015 +0100
----------------------------------------------------------------------
.../gremlin/process/TraversalStrategies.java | 2 +-
.../process/computer/ComputerResult.java | 2 +-
.../gremlin/process/computer/MapReduce.java | 2 +-
.../computer/traversal/TraverserExecutor.java | 21 +++++++++++---------
.../graph/traversal/lambda/LoopTraversal.java | 2 +-
.../graph/traversal/step/branch/RepeatStep.java | 4 ++--
.../graph/traversal/step/filter/RangeStep.java | 2 +-
.../graph/traversal/step/map/CountStep.java | 8 +++-----
.../graph/traversal/step/map/FoldStep.java | 9 ++++++---
.../graph/traversal/step/map/MeanStep.java | 7 +++----
.../graph/traversal/step/map/SumStep.java | 9 ++++-----
.../traversal/step/map/match/Bindings.java | 4 ++--
.../traversal/step/map/match/MatchStep.java | 12 +++++------
.../traversal/step/sideEffect/AddEdgeStep.java | 9 ++++-----
.../step/sideEffect/SackElementValueStep.java | 9 ++++-----
.../step/sideEffect/SackObjectStep.java | 7 +++----
.../step/sideEffect/SideEffectCapStep.java | 8 ++++----
.../traversal/step/sideEffect/SubgraphStep.java | 21 ++++++--------------
.../process/graph/util/HasContainer.java | 6 +++---
.../gremlin/process/traversal/StepPosition.java | 4 ++--
.../traversal/lambda/ElementValueTraversal.java | 2 +-
.../step/ElementFunctionComparator.java | 2 +-
.../traversal/step/ElementValueComparator.java | 2 +-
.../process/traversal/step/TraversalParent.java | 4 ++--
.../process/traversal/util/TraversalHelper.java | 6 +++---
.../B_O_PA_S_SE_SL_TraverserGenerator.java | 7 +++----
.../B_O_P_PA_S_SE_SL_TraverserGenerator.java | 7 +++----
.../traverser/B_O_TraverserGenerator.java | 7 +++----
.../process/util/metric/MutableMetrics.java | 2 +-
.../util/metric/StandardTraversalMetrics.java | 12 +++++------
.../com/tinkerpop/gremlin/structure/Vertex.java | 2 +-
.../structure/io/graphml/GraphMLWriter.java | 6 +++---
.../io/graphml/GraphMLWriterHelper.java | 6 +++---
.../structure/server/IntervalVertexRange.java | 2 +-
.../gremlin/structure/util/GraphFactory.java | 2 +-
.../util/detached/DetachedFactory.java | 2 +-
36 files changed, 102 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalStrategies.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalStrategies.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalStrategies.java
index 94ef1bf..cdc0f16 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalStrategies.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/TraversalStrategies.java
@@ -132,7 +132,7 @@ public interface TraversalStrategies extends Cloneable {
boolean s2Before = MultiMap.containsEntry(dependencyMap, s2.getClass(), s1.getClass());
if (s1Before && s2Before)
throw new IllegalStateException("Cyclic dependency between traversal strategies: ["
- + s1.getClass().getName() + ", " + s2.getClass().getName() + "]");
+ + s1.getClass().getName() + ", " + s2.getClass().getName() + ']');
if (s1Before) return -1;
else if (s2Before) return 1;
else return 0;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ComputerResult.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ComputerResult.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ComputerResult.java
index 7c8e292..e7ea801 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ComputerResult.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ComputerResult.java
@@ -37,6 +37,6 @@ public final class ComputerResult {
}
public String toString() {
- return "result[" + this.graph + "," + this.memory + "]";
+ return "result[" + this.graph + ',' + this.memory + ']';
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/MapReduce.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/MapReduce.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/MapReduce.java
index b475ed6..47d54bd 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/MapReduce.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/MapReduce.java
@@ -231,7 +231,7 @@ public interface MapReduce<MK, MV, RK, RV, R> extends Cloneable {
*/
public static class NullObject implements Comparable<NullObject>, Serializable {
private static final NullObject INSTANCE = new NullObject();
- private static final String NULL_OBJECT = new String();
+ private static final String NULL_OBJECT = "";
public static NullObject instance() {
return INSTANCE;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/TraverserExecutor.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/TraverserExecutor.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/TraverserExecutor.java
index c91ab99..71aef04 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/TraverserExecutor.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/traversal/TraverserExecutor.java
@@ -70,14 +70,17 @@ public final class TraverserExecutor {
return voteToHalt.get();
}
- private final static Vertex getHostingVertex(final Object object) {
- if (object instanceof Vertex)
- return (Vertex) object;
- else if (object instanceof Edge)
- return ((Edge) object).iterators().vertexIterator(Direction.OUT).next();
- else if (object instanceof Property)
- return getHostingVertex(((Property) object).element());
- else
- throw new IllegalStateException("The host of the object is unknown: " + object.toString() + ":" + object.getClass().getCanonicalName());
+ private static Vertex getHostingVertex(final Object object) {
+ Object obj = object;
+ while (true) {
+ if (obj instanceof Vertex)
+ return (Vertex) obj;
+ else if (obj instanceof Edge)
+ return ((Edge) obj).iterators().vertexIterator(Direction.OUT).next();
+ else if (obj instanceof Property)
+ obj = ((Property) obj).element();
+ else
+ throw new IllegalStateException("The host of the object is unknown: " + obj.toString() + ':' + obj.getClass().getCanonicalName());
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/lambda/LoopTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/lambda/LoopTraversal.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/lambda/LoopTraversal.java
index 5fada23..b8388b3 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/lambda/LoopTraversal.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/lambda/LoopTraversal.java
@@ -27,6 +27,6 @@ public final class LoopTraversal<S, E> extends AbstractLambdaTraversal<S, E> {
@Override
public String toString() {
- return "loops(" + this.maxLoops + ")";
+ return "loops(" + this.maxLoops + ')';
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatStep.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatStep.java
index 6453b5e..b0a6d72 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatStep.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/branch/RepeatStep.java
@@ -92,11 +92,11 @@ public final class RepeatStep<S> extends ComputerAwareStep<S, S> implements Trav
}
private final String untilString() {
- return null == this.untilTraversal ? "until(false)" : "until(" + this.untilTraversal + ")";
+ return null == this.untilTraversal ? "until(false)" : "until(" + this.untilTraversal + ')';
}
private final String emitString() {
- return null == this.emitTraversal ? "emit(false)" : "emit(" + this.emitTraversal + ")";
+ return null == this.emitTraversal ? "emit(false)" : "emit(" + this.emitTraversal + ')';
}
/////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeStep.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeStep.java
index 31a6488..415beda 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeStep.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RangeStep.java
@@ -23,7 +23,7 @@ public final class RangeStep<S> extends FilterStep<S> implements Ranging {
public RangeStep(final Traversal.Admin traversal, final long low, final long high) {
super(traversal);
if (low != -1 && high != -1 && low > high) {
- throw new IllegalArgumentException("Not a legal range: [" + low + ", " + high + "]");
+ throw new IllegalArgumentException("Not a legal range: [" + low + ", " + high + ']');
}
this.low = low;
this.high = high;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/CountStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/CountStep.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/CountStep.java
index c0e9579..fa38ec6 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/CountStep.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/CountStep.java
@@ -2,13 +2,11 @@ package com.tinkerpop.gremlin.process.graph.traversal.step.map;
import com.tinkerpop.gremlin.process.Traversal;
import com.tinkerpop.gremlin.process.Traverser;
-import com.tinkerpop.gremlin.process.traversal.step.Reducing;
import com.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep;
+import com.tinkerpop.gremlin.process.traversal.step.Reducing;
import com.tinkerpop.gremlin.process.traverser.TraverserRequirement;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
+import java.util.EnumSet;
import java.util.Set;
/**
@@ -16,7 +14,7 @@ import java.util.Set;
*/
public final class CountStep<S> extends ReducingBarrierStep<S, Long> implements Reducing<Long, Traverser<S>> {
- private static final Set<TraverserRequirement> REQUIREMENTS = new HashSet<>(Collections.singletonList(TraverserRequirement.BULK));
+ private static final Set<TraverserRequirement> REQUIREMENTS = EnumSet.of(TraverserRequirement.BULK);
public CountStep(final Traversal.Admin traversal) {
super(traversal);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/FoldStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/FoldStep.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/FoldStep.java
index 89f22ad..9f81f33 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/FoldStep.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/FoldStep.java
@@ -1,11 +1,14 @@
package com.tinkerpop.gremlin.process.graph.traversal.step.map;
import com.tinkerpop.gremlin.process.Traversal;
-import com.tinkerpop.gremlin.process.traversal.step.Reducing;
import com.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep;
+import com.tinkerpop.gremlin.process.traversal.step.Reducing;
import com.tinkerpop.gremlin.process.traverser.TraverserRequirement;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
import java.util.function.BiFunction;
import java.util.function.Supplier;
@@ -14,7 +17,7 @@ import java.util.function.Supplier;
*/
public final class FoldStep<S, E> extends ReducingBarrierStep<S, E> implements Reducing<E, S> {
- private static final Set<TraverserRequirement> REQUIREMENTS = new HashSet<>(Collections.singletonList(TraverserRequirement.OBJECT));
+ private static final Set<TraverserRequirement> REQUIREMENTS = EnumSet.of(TraverserRequirement.OBJECT);
public FoldStep(final Traversal.Admin traversal) {
this(traversal, () -> (E) new ArrayList<S>(), (seed, start) -> {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MeanStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MeanStep.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MeanStep.java
index 62fc494..5786623 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MeanStep.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/MeanStep.java
@@ -2,12 +2,11 @@ package com.tinkerpop.gremlin.process.graph.traversal.step.map;
import com.tinkerpop.gremlin.process.Traversal;
import com.tinkerpop.gremlin.process.Traverser;
-import com.tinkerpop.gremlin.process.traversal.step.Reducing;
import com.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep;
+import com.tinkerpop.gremlin.process.traversal.step.Reducing;
import com.tinkerpop.gremlin.process.traverser.TraverserRequirement;
-import java.util.Arrays;
-import java.util.HashSet;
+import java.util.EnumSet;
import java.util.Set;
/**
@@ -15,7 +14,7 @@ import java.util.Set;
*/
public final class MeanStep<S extends Number, E extends Number> extends ReducingBarrierStep<S, E> implements Reducing<E, Traverser<S>> {
- private static final Set<TraverserRequirement> REQUIREMENTS = new HashSet<>(Arrays.asList(TraverserRequirement.OBJECT, TraverserRequirement.BULK));
+ private static final Set<TraverserRequirement> REQUIREMENTS = EnumSet.of(TraverserRequirement.OBJECT, TraverserRequirement.BULK);
public MeanStep(final Traversal.Admin traversal) {
super(traversal);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SumStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SumStep.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SumStep.java
index d13ae2c..ed00187 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SumStep.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/SumStep.java
@@ -2,12 +2,11 @@ package com.tinkerpop.gremlin.process.graph.traversal.step.map;
import com.tinkerpop.gremlin.process.Traversal;
import com.tinkerpop.gremlin.process.Traverser;
-import com.tinkerpop.gremlin.process.traversal.step.Reducing;
import com.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep;
+import com.tinkerpop.gremlin.process.traversal.step.Reducing;
import com.tinkerpop.gremlin.process.traverser.TraverserRequirement;
-import java.util.Arrays;
-import java.util.HashSet;
+import java.util.EnumSet;
import java.util.Set;
/**
@@ -15,10 +14,10 @@ import java.util.Set;
*/
public final class SumStep extends ReducingBarrierStep<Number, Double> implements Reducing<Double, Traverser<Number>> {
- private static final Set<TraverserRequirement> REQUIREMENTS = new HashSet<>(Arrays.asList(
+ private static final Set<TraverserRequirement> REQUIREMENTS = EnumSet.of(
TraverserRequirement.BULK,
TraverserRequirement.OBJECT
- ));
+ );
public SumStep(final Traversal.Admin traversal) {
super(traversal);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/Bindings.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/Bindings.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/Bindings.java
index 164f042..4701c2e 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/Bindings.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/Bindings.java
@@ -32,9 +32,9 @@ public class Bindings<T> {
for (Map.Entry<String, T> entry : map.entrySet()) {
if (first) first = false;
else sb.append(", ");
- sb.append(entry.getKey()).append(":").append(entry.getValue());
+ sb.append(entry.getKey()).append(':').append(entry.getValue());
}
- sb.append("}");
+ sb.append('}');
return sb.toString();
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/MatchStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/MatchStep.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/MatchStep.java
index b9b7773..352efd5 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/MatchStep.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/map/match/MatchStep.java
@@ -136,7 +136,7 @@ public final class MatchStep<S, E> extends AbstractStep<S, Map<String, E>> imple
.append(this.startLabel)
.append("\":\t")
.append(findCost(this.startLabel))
- .append("\n");
+ .append('\n');
summarize(this.startLabel, sb, new HashSet<>(), 1);
return sb.toString();
}
@@ -150,11 +150,11 @@ public final class MatchStep<S, E> extends AbstractStep<S, Map<String, E>> imple
final List<TraversalWrapper<S, S>> outs = traversalsByStartAs.get(outLabel);
if (null != outs) {
for (final TraversalWrapper<S, S> w : outs) {
- for (int i = 0; i < indent; i++) sb.append("\t");
+ for (int i = 0; i < indent; i++) sb.append('\t');
sb.append(outLabel).append("->").append(w.endLabel).append(":\t");
sb.append(findCost(w));
- sb.append("\t").append(w);
- sb.append("\n");
+ sb.append('\t').append(w);
+ sb.append('\n');
summarize(w.endLabel, sb, visited, indent + 1);
}
}
@@ -202,7 +202,7 @@ public final class MatchStep<S, E> extends AbstractStep<S, Map<String, E>> imple
countTraversals++;
if (pathSet.contains(tw.endLabel)) {
throw new IllegalArgumentException("The provided traversal set contains a cycle due to '"
- + tw.endLabel + "'");
+ + tw.endLabel + '\'');
}
stack.push(tw.endLabel);
}
@@ -224,7 +224,7 @@ public final class MatchStep<S, E> extends AbstractStep<S, Map<String, E>> imple
// note: this won't happen so long as the anon prefix is the same as Traversal.UNDERSCORE
if (isAnonymousAs(as)) {
throw new IllegalArgumentException("The step named '" + as + "' uses reserved prefix '"
- + ANON_LABEL_PREFIX + "'");
+ + ANON_LABEL_PREFIX + '\'');
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeStep.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeStep.java
index cbe338d..b38fcb0 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeStep.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/AddEdgeStep.java
@@ -2,13 +2,12 @@ package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect;
import com.tinkerpop.gremlin.process.Traversal;
import com.tinkerpop.gremlin.process.traversal.step.Reversible;
-import com.tinkerpop.gremlin.process.traverser.TraverserRequirement;
import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+import com.tinkerpop.gremlin.process.traverser.TraverserRequirement;
import com.tinkerpop.gremlin.structure.Direction;
import com.tinkerpop.gremlin.structure.Vertex;
-import java.util.Arrays;
-import java.util.HashSet;
+import java.util.EnumSet;
import java.util.Set;
/**
@@ -16,10 +15,10 @@ import java.util.Set;
*/
public final class AddEdgeStep extends SideEffectStep<Vertex> implements Reversible {
- private static final Set<TraverserRequirement> REQUIREMENTS = new HashSet<>(Arrays.asList(
+ private static final Set<TraverserRequirement> REQUIREMENTS = EnumSet.of(
TraverserRequirement.PATH,
TraverserRequirement.OBJECT
- ));
+ );
// TODO: Weight key based on Traverser.getCount() ?
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackElementValueStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackElementValueStep.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackElementValueStep.java
index 8f4ad26..77fa8a5 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackElementValueStep.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackElementValueStep.java
@@ -1,12 +1,11 @@
package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect;
import com.tinkerpop.gremlin.process.Traversal;
-import com.tinkerpop.gremlin.process.traverser.TraverserRequirement;
import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+import com.tinkerpop.gremlin.process.traverser.TraverserRequirement;
import com.tinkerpop.gremlin.structure.Element;
-import java.util.Arrays;
-import java.util.HashSet;
+import java.util.EnumSet;
import java.util.Set;
import java.util.function.BinaryOperator;
@@ -15,10 +14,10 @@ import java.util.function.BinaryOperator;
*/
public final class SackElementValueStep<S extends Element, V> extends SideEffectStep<S> {
- private static final Set<TraverserRequirement> REQUIREMENTS = new HashSet<>(Arrays.asList(
+ private static final Set<TraverserRequirement> REQUIREMENTS = EnumSet.of(
TraverserRequirement.SACK,
TraverserRequirement.OBJECT
- ));
+ );
private BinaryOperator<V> operator;
private final String propertyKey;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackObjectStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackObjectStep.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackObjectStep.java
index dac7caf..0b17d58 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackObjectStep.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SackObjectStep.java
@@ -3,8 +3,7 @@ package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect;
import com.tinkerpop.gremlin.process.Traversal;
import com.tinkerpop.gremlin.process.traverser.TraverserRequirement;
-import java.util.Arrays;
-import java.util.HashSet;
+import java.util.EnumSet;
import java.util.Set;
import java.util.function.BiFunction;
@@ -13,10 +12,10 @@ import java.util.function.BiFunction;
*/
public final class SackObjectStep<S, V> extends SideEffectStep<S> {
- private static final Set<TraverserRequirement> REQUIREMENTS = new HashSet<>(Arrays.asList(
+ private static final Set<TraverserRequirement> REQUIREMENTS = EnumSet.of(
TraverserRequirement.SACK,
TraverserRequirement.OBJECT
- ));
+ );
private BiFunction<V, S, V> operator;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapStep.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapStep.java
index 252f15f..6f0cadd 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapStep.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SideEffectCapStep.java
@@ -2,10 +2,10 @@ package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect;
import com.tinkerpop.gremlin.process.Traversal;
import com.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable;
-import com.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar;
import com.tinkerpop.gremlin.process.graph.traversal.step.util.SupplyingBarrierStep;
-import com.tinkerpop.gremlin.process.traverser.TraverserRequirement;
+import com.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar;
import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+import com.tinkerpop.gremlin.process.traverser.TraverserRequirement;
import java.util.*;
@@ -14,10 +14,10 @@ import java.util.*;
*/
public final class SideEffectCapStep<S, E> extends SupplyingBarrierStep<S, E> implements SideEffectRegistrar {
- private static final Set<TraverserRequirement> REQUIREMENTS = new HashSet<>(Arrays.asList(
+ private static final Set<TraverserRequirement> REQUIREMENTS = EnumSet.of(
TraverserRequirement.SIDE_EFFECTS,
TraverserRequirement.OBJECT
- ));
+ );
private List<String> sideEffectKeys;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphStep.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphStep.java
index 45a0243..3d1fca5 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphStep.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphStep.java
@@ -2,24 +2,15 @@ package com.tinkerpop.gremlin.process.graph.traversal.step.sideEffect;
import com.tinkerpop.gremlin.process.T;
import com.tinkerpop.gremlin.process.Traversal;
-import com.tinkerpop.gremlin.process.traversal.step.Reversible;
import com.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable;
+import com.tinkerpop.gremlin.process.traversal.step.Reversible;
import com.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar;
-import com.tinkerpop.gremlin.process.traverser.TraverserRequirement;
import com.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
-import com.tinkerpop.gremlin.structure.Direction;
-import com.tinkerpop.gremlin.structure.Edge;
-import com.tinkerpop.gremlin.structure.Graph;
-import com.tinkerpop.gremlin.structure.Vertex;
-import com.tinkerpop.gremlin.structure.VertexProperty;
+import com.tinkerpop.gremlin.process.traverser.TraverserRequirement;
+import com.tinkerpop.gremlin.structure.*;
import com.tinkerpop.gremlin.structure.util.GraphFactory;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
/**
* A side-effect step that produces an edge induced subgraph.
@@ -29,10 +20,10 @@ import java.util.Set;
*/
public final class SubgraphStep extends SideEffectStep<Edge> implements SideEffectCapable, SideEffectRegistrar, Reversible {
- private static final Set<TraverserRequirement> REQUIREMENTS = new HashSet<>(Arrays.asList(
+ private static final Set<TraverserRequirement> REQUIREMENTS = EnumSet.of(
TraverserRequirement.OBJECT,
TraverserRequirement.SIDE_EFFECTS
- ));
+ );
private Graph subgraph;
private String sideEffectKey;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/util/HasContainer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/util/HasContainer.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/util/HasContainer.java
index 719c130..6e67ef5 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/util/HasContainer.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/util/HasContainer.java
@@ -88,8 +88,8 @@ public final class HasContainer {
public String toString() {
return this.value == null ?
(this.predicate == Contains.within ?
- "[" + this.key + "]" :
- "[!" + this.key + "]") :
- "[" + this.key + "," + this.predicate + "," + this.value + "]";
+ '[' + this.key + ']' :
+ "[!" + this.key + ']') :
+ '[' + this.key + ',' + this.predicate + ',' + this.value + ']';
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/StepPosition.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/StepPosition.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/StepPosition.java
index 294f49c..6926310 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/StepPosition.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/StepPosition.java
@@ -22,11 +22,11 @@ public final class StepPosition {
}
public String nextXId() {
- return this.x++ + "." + this.y + "." + this.z + "(" + this.parentId + ")";
+ return this.x++ + "." + this.y + '.' + this.z + '(' + this.parentId + ')';
}
@Override
public String toString() {
- return this.x + "." + this.y + "." + this.z + "(" + this.parentId + ")";
+ return this.x + "." + this.y + '.' + this.z + '(' + this.parentId + ')';
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/ElementValueTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/ElementValueTraversal.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/ElementValueTraversal.java
index 6a033f4..e06ed70 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/ElementValueTraversal.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/lambda/ElementValueTraversal.java
@@ -31,6 +31,6 @@ public final class ElementValueTraversal<V> extends AbstractLambdaTraversal<Elem
@Override
public String toString() {
- return "value(" + this.propertyKey + ")";
+ return "value(" + this.propertyKey + ')';
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ElementFunctionComparator.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ElementFunctionComparator.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ElementFunctionComparator.java
index ce9f412..8d8a96d 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ElementFunctionComparator.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ElementFunctionComparator.java
@@ -33,6 +33,6 @@ public class ElementFunctionComparator<V> implements Comparator<Element> {
@Override
public String toString() {
- return this.elementFunction + "(" + this.valueComparator + ")";
+ return this.elementFunction + "(" + this.valueComparator + ')';
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ElementValueComparator.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ElementValueComparator.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ElementValueComparator.java
index ebba541..a618ca7 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ElementValueComparator.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/ElementValueComparator.java
@@ -32,6 +32,6 @@ public class ElementValueComparator<V> implements Comparator<Element> {
@Override
public String toString() {
- return this.propertyKey + "(" + this.valueComparator + ")";
+ return this.propertyKey + '(' + this.valueComparator + ')';
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/TraversalParent.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/TraversalParent.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/TraversalParent.java
index 9faf759..1939385 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/TraversalParent.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/step/TraversalParent.java
@@ -6,7 +6,7 @@ import com.tinkerpop.gremlin.process.TraversalStrategies;
import com.tinkerpop.gremlin.process.traverser.TraverserRequirement;
import java.util.Collections;
-import java.util.HashSet;
+import java.util.EnumSet;
import java.util.List;
import java.util.Set;
@@ -46,7 +46,7 @@ public interface TraversalParent {
}
public default Set<TraverserRequirement> getSelfAndChildRequirements(final TraverserRequirement... selfRequirements) {
- final Set<TraverserRequirement> requirements = new HashSet<>();
+ final Set<TraverserRequirement> requirements = EnumSet.noneOf(TraverserRequirement.class);
Collections.addAll(requirements, selfRequirements);
for (final Traversal.Admin<?, ?> local : this.getLocalChildren()) {
requirements.addAll(local.getTraverserRequirements());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
index efb58d4..72e2a55 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
@@ -148,11 +148,11 @@ public final class TraversalHelper {
return string.contains("$") ? "lambda" : string;
}).collect(Collectors.toList());
if (strings.size() > 0) {
- builder.append("(");
+ builder.append('(');
builder.append(String.join(",", strings));
- builder.append(")");
+ builder.append(')');
}
- step.getLabel().ifPresent(label -> builder.append("@").append(label));
+ step.getLabel().ifPresent(label -> builder.append('@').append(label));
// builder.append("^").append(step.getId());
return builder.toString();
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_TraverserGenerator.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_TraverserGenerator.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_TraverserGenerator.java
index 036ffd5..54cb0de 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_TraverserGenerator.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_PA_S_SE_SL_TraverserGenerator.java
@@ -4,8 +4,7 @@ import com.tinkerpop.gremlin.process.Step;
import com.tinkerpop.gremlin.process.Traverser;
import com.tinkerpop.gremlin.process.TraverserGenerator;
-import java.util.Arrays;
-import java.util.HashSet;
+import java.util.EnumSet;
import java.util.Set;
/**
@@ -15,13 +14,13 @@ public class B_O_PA_S_SE_SL_TraverserGenerator implements TraverserGenerator {
private static final B_O_PA_S_SE_SL_TraverserGenerator INSTANCE = new B_O_PA_S_SE_SL_TraverserGenerator();
- private static final Set<TraverserRequirement> REQUIREMENTS = new HashSet<>(Arrays.asList(
+ private static final Set<TraverserRequirement> REQUIREMENTS = EnumSet.of(
TraverserRequirement.OBJECT,
TraverserRequirement.BULK,
TraverserRequirement.SINGLE_LOOP,
TraverserRequirement.PATH_ACCESS,
TraverserRequirement.SACK,
- TraverserRequirement.SIDE_EFFECTS));
+ TraverserRequirement.SIDE_EFFECTS);
private B_O_PA_S_SE_SL_TraverserGenerator() {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_TraverserGenerator.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_TraverserGenerator.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_TraverserGenerator.java
index 725ec13..83f760a 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_TraverserGenerator.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_P_PA_S_SE_SL_TraverserGenerator.java
@@ -4,8 +4,7 @@ import com.tinkerpop.gremlin.process.Step;
import com.tinkerpop.gremlin.process.Traverser;
import com.tinkerpop.gremlin.process.TraverserGenerator;
-import java.util.Arrays;
-import java.util.HashSet;
+import java.util.EnumSet;
import java.util.Set;
/**
@@ -14,14 +13,14 @@ import java.util.Set;
public class B_O_P_PA_S_SE_SL_TraverserGenerator implements TraverserGenerator {
private static final B_O_P_PA_S_SE_SL_TraverserGenerator INSTANCE = new B_O_P_PA_S_SE_SL_TraverserGenerator();
- private static final Set<TraverserRequirement> REQUIREMENTS = new HashSet<>(Arrays.asList(
+ private static final Set<TraverserRequirement> REQUIREMENTS = EnumSet.of(
TraverserRequirement.OBJECT,
TraverserRequirement.BULK,
TraverserRequirement.SINGLE_LOOP,
TraverserRequirement.PATH_ACCESS,
TraverserRequirement.PATH,
TraverserRequirement.SACK,
- TraverserRequirement.SIDE_EFFECTS));
+ TraverserRequirement.SIDE_EFFECTS);
private B_O_P_PA_S_SE_SL_TraverserGenerator() {
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_TraverserGenerator.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_TraverserGenerator.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_TraverserGenerator.java
index d353fd5..8c94a80 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_TraverserGenerator.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traverser/B_O_TraverserGenerator.java
@@ -4,8 +4,7 @@ import com.tinkerpop.gremlin.process.Step;
import com.tinkerpop.gremlin.process.Traverser;
import com.tinkerpop.gremlin.process.TraverserGenerator;
-import java.util.Arrays;
-import java.util.HashSet;
+import java.util.EnumSet;
import java.util.Set;
/**
@@ -13,9 +12,9 @@ import java.util.Set;
*/
public class B_O_TraverserGenerator implements TraverserGenerator {
- private static final Set<TraverserRequirement> REQUIREMENTS = new HashSet<>(Arrays.asList(
+ private static final Set<TraverserRequirement> REQUIREMENTS = EnumSet.of(
TraverserRequirement.OBJECT,
- TraverserRequirement.BULK));
+ TraverserRequirement.BULK);
private static final B_O_TraverserGenerator INSTANCE = new B_O_TraverserGenerator();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/MutableMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/MutableMetrics.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/MutableMetrics.java
index 7a36a3b..6a451a9 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/MutableMetrics.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/MutableMetrics.java
@@ -61,7 +61,7 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
final List<String> existingValues = Arrays.asList(existing.split(","));
if (!existingValues.contains(p.getValue())) {
// New value. Append to comma-separated list.
- this.annotations.put(p.getKey(), existing + "," + p.getValue());
+ this.annotations.put(p.getKey(), existing + ',' + p.getValue());
}
} else {
this.annotations.put(p.getKey(), p.getValue());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/StandardTraversalMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/StandardTraversalMetrics.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/StandardTraversalMetrics.java
index e3aa18b..f33956f 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/StandardTraversalMetrics.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/util/metric/StandardTraversalMetrics.java
@@ -1,5 +1,7 @@
package com.tinkerpop.gremlin.process.util.metric;
+import org.apache.commons.lang.StringUtils;
+
import java.io.Serializable;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -77,17 +79,13 @@ public final class StandardTraversalMetrics implements TraversalMetrics, Seriali
// Build a pretty table of metrics data.
// Append headers
- final StringBuilder sb = new StringBuilder();
- sb.append("Traversal Metrics\n").append(String.format("%28s %21s %11s %15s %8s", HEADERS));
+ final StringBuilder sb = new StringBuilder("Traversal Metrics\n")
+ .append(String.format("%28s %21s %11s %15s %8s", HEADERS));
// Append each StepMetric's row. indexToLabelMap values are ordered by index.
for (String label : indexToLabelMap.values()) {
final ImmutableMetrics s = computedMetrics.get(label);
- String rowName = s.getName();
-
- if (rowName.length() > 28)
- rowName = rowName.substring(0, 28 - 3) + "...";
-
+ final String rowName = StringUtils.abbreviate(s.getName(), 28);
final long itemCount = s.getNested(ELEMENT_COUNT_ID).getCount();
sb.append(String.format("%n%28s %21d %11d %15.3f %8.2f",
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Vertex.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Vertex.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Vertex.java
index 524ea1a..327594c 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Vertex.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/Vertex.java
@@ -131,7 +131,7 @@ public interface Vertex extends Element, VertexTraversal {
}
public static IllegalStateException multiplePropertiesExistForProvidedKey(final String propertyKey) {
- return new IllegalStateException("Multiple properties exist for the provided key, use Vertex.properties(" + propertyKey + ")");
+ return new IllegalStateException("Multiple properties exist for the provided key, use Vertex.properties(" + propertyKey + ')');
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
index 2b2c541..6270ae0 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
@@ -287,11 +287,11 @@ public class GraphMLWriter implements GraphWriter {
writer.writeAttribute(GraphMLTokens.XMLNS, GraphMLTokens.GRAPHML_XMLNS);
//XML Schema instance namespace definition (xsi)
- writer.writeAttribute(XMLConstants.XMLNS_ATTRIBUTE + ":" + GraphMLTokens.XML_SCHEMA_NAMESPACE_TAG,
+ writer.writeAttribute(XMLConstants.XMLNS_ATTRIBUTE + ':' + GraphMLTokens.XML_SCHEMA_NAMESPACE_TAG,
XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI);
//XML Schema location
- writer.writeAttribute(GraphMLTokens.XML_SCHEMA_NAMESPACE_TAG + ":" + GraphMLTokens.XML_SCHEMA_LOCATION_ATTRIBUTE,
- GraphMLTokens.GRAPHML_XMLNS + " " + this.xmlSchemaLocation.orElse(GraphMLTokens.DEFAULT_GRAPHML_SCHEMA_LOCATION));
+ writer.writeAttribute(GraphMLTokens.XML_SCHEMA_NAMESPACE_TAG + ':' + GraphMLTokens.XML_SCHEMA_LOCATION_ATTRIBUTE,
+ GraphMLTokens.GRAPHML_XMLNS + ' ' + this.xmlSchemaLocation.orElse(GraphMLTokens.DEFAULT_GRAPHML_SCHEMA_LOCATION));
}
private static Map<String, String> determineVertexTypes(final Graph graph) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
index 860280d..ac18574 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
@@ -1,5 +1,7 @@
package com.tinkerpop.gremlin.structure.io.graphml;
+import org.apache.commons.lang.StringUtils;
+
import javax.xml.namespace.NamespaceContext;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
@@ -227,9 +229,7 @@ class GraphMLWriterHelper {
* @deprecated Should use the version that takes string.
*/
public void setIndentStep(int indentStep) {
- final StringBuilder s = new StringBuilder();
- for (; indentStep > 0; indentStep--) s.append(' ');
- this.indentStep = s.toString();
+ this.indentStep = StringUtils.repeat(" ", indentStep);
}
public void setIndentStep(final String s) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/server/IntervalVertexRange.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/server/IntervalVertexRange.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/server/IntervalVertexRange.java
index 8c63688..a118765 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/server/IntervalVertexRange.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/server/IntervalVertexRange.java
@@ -62,6 +62,6 @@ public class IntervalVertexRange<V extends Comparable<V>> implements VertexRange
@Override
public String toString() {
- return "ElementRange[start=" + startRange + ", end=" + endRange + "]";
+ return "ElementRange[start=" + startRange + ", end=" + endRange + ']';
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/GraphFactory.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/GraphFactory.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/GraphFactory.java
index 0970031..1eb4128 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/GraphFactory.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/GraphFactory.java
@@ -93,7 +93,7 @@ public class GraphFactory {
try {
final String fileName = configurationFile.getName();
- final String fileExtension = fileName.substring(fileName.lastIndexOf(".") + 1);
+ final String fileExtension = fileName.substring(fileName.lastIndexOf('.') + 1);
switch (fileExtension) {
case "yml":
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fdd5e185/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedFactory.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedFactory.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedFactory.java
index d493c01..7144cb7 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedFactory.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/structure/util/detached/DetachedFactory.java
@@ -39,7 +39,7 @@ public class DetachedFactory {
else if (element instanceof VertexProperty)
return detach((VertexProperty) element, withProperties);
else
- throw new IllegalArgumentException("The provided argument is an unknown element: " + element + ":" + element.getClass());
+ throw new IllegalArgumentException("The provided argument is an unknown element: " + element + ':' + element.getClass());
}
public static <D> D detach(final Object object, final boolean withProperties) {