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/13 23:40:04 UTC
incubator-tinkerpop git commit: cleanup around the TraversalEngine
work.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 9024bbd1a -> 446df04f0
cleanup around the TraversalEngine work.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/446df04f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/446df04f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/446df04f
Branch: refs/heads/master
Commit: 446df04f03f1d49e86c8d665a689f9e86ce953ed
Parents: 9024bbd
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Feb 13 15:39:59 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Feb 13 15:39:59 2015 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
.../traversal/TraversalVertexProgram.java | 6 ++---
.../traversal/step/map/ComputerResultStep.java | 26 +++++++++++++++-----
.../computer/util/DefaultComputerResult.java | 1 -
.../tinkerpop/gremlin/structure/Graph.java | 16 +++++++++++-
.../structure/strategy/StrategyGraph.java | 4 +--
.../structure/util/batch/BatchGraph.java | 2 +-
.../structure/util/empty/EmptyGraph.java | 2 +-
.../tinkerpop/gremlin/AbstractGremlinTest.java | 14 +++++++++--
.../groovy/plugin/HadoopRemoteAcceptor.java | 12 ++++-----
.../gremlin/hadoop/structure/HadoopGraph.java | 5 ++--
.../gremlin/hadoop/HadoopGraphProvider.java | 1 +
.../gremlin/neo4j/structure/Neo4jGraph.java | 6 ++---
.../tinkergraph/structure/TinkerGraph.java | 4 +--
.../tinkergraph/TinkerGraphGraphProvider.java | 2 +-
15 files changed, 69 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/446df04f/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8a32d56..85e4362 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,7 +26,7 @@ TinkerPop 3.0.0.M8 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* `TraversalStrategy.apply(traversal)` is the new method signature as the `TraversalEngine` can be retrieved from the `Traversal`.
-* `TraversalEngine` is now an interface and provided by the graph to the traversal at construction. `Graph` methods added to set the desired traversal engine to use.
+* `TraversalEngine` is now an interface and provided to the traversal by the graph. `Graph` methods added to set the desired traversal engine to use.
* Added `count(local)`, `sum(local)`, `max(local)`, `min(local)`, and `mean(local)` operating on the local object (e.g. collection, map, etc.)
* `TraversalComparator` exists which allows for `order().by(outE().count(),decr)`.
* Added Apache Rat plugin to detect the proper inclusion of license headers in files.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/446df04f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
index be22349..cf9a00f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
@@ -108,10 +108,8 @@ public final class TraversalVertexProgram implements VertexProgram<TraverserSet<
throw new IllegalArgumentException("The configuration does not have a traversal supplier");
}
this.traversal = this.traversalSupplier.get().get();
- if (!this.traversal.isLocked())
- this.traversal.applyStrategies();
-
- ((ComputerResultStep) this.traversal.getEndStep()).asIdentity = true;
+ if (!this.traversal.isLocked()) this.traversal.applyStrategies();
+ ((ComputerResultStep) this.traversal.getEndStep()).byPass();
this.traversalMatrix = new TraversalMatrix<>(this.traversal);
for (final MapReducer<?, ?, ?, ?, ?> mapReducer : TraversalHelper.getStepsOfAssignableClassRecurssively(MapReducer.class, this.traversal)) {
this.mapReducers.add(mapReducer.getMapReduce());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/446df04f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
index 744805b..2f03b9a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
@@ -26,6 +26,7 @@ import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
import org.apache.tinkerpop.gremlin.process.computer.traversal.step.sideEffect.mapreduce.TraverserMapReduce;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.SideEffectCapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.step.AbstractStep;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement;
@@ -46,25 +47,33 @@ import java.util.Set;
public final class ComputerResultStep<S> extends AbstractStep<S, S> {
private final transient GraphComputer graphComputer;
+ private final transient ComputerResult computerResult;
private Iterator<Traverser.Admin<S>> traversers;
private Graph graph;
private final boolean attachElements; // should be part of graph computer with "propagate properties"
- public boolean first = true;
- public boolean asIdentity = false;
+ private boolean first = true;
+ private boolean byPass = false;
public ComputerResultStep(final Traversal.Admin traversal, final GraphComputer graphComputer, final boolean attachElements) {
super(traversal);
this.attachElements = attachElements;
this.graphComputer = graphComputer;
+ this.computerResult = null;
+ }
+
+ public ComputerResultStep(final Traversal.Admin traversal, final ComputerResult computerResult, final boolean attachElements) {
+ super(traversal);
+ this.attachElements = attachElements;
+ this.graphComputer = null;
+ this.computerResult = computerResult;
+ this.populateTraversers(this.computerResult);
}
@Override
public Traverser<S> processNextStart() {
- if (this.asIdentity) {
- return this.starts.next();
- }
- if (this.first) {
+ if (this.byPass) return this.starts.next();
+ if (this.first && null == this.computerResult) {
try {
final TraversalVertexProgram vertexProgram = TraversalVertexProgram.build().traversal(this.getTraversal()).create();
populateTraversers(this.graphComputer.program(vertexProgram).submit().get());
@@ -82,6 +91,7 @@ public final class ComputerResultStep<S> extends AbstractStep<S, S> {
public void populateTraversers(final ComputerResult result) {
this.graph = result.graph();
+ this.graph.engine(StandardTraversalEngine.instance());
result.memory().keys().forEach(key -> this.getTraversal().getSideEffects().set(key, result.memory().get(key)));
final Step endStep = this.getPreviousStep();
if (endStep instanceof SideEffectCapStep) {
@@ -101,6 +111,10 @@ public final class ComputerResultStep<S> extends AbstractStep<S, S> {
this.first = false;
}
+ public void byPass() {
+ this.byPass = true;
+ }
+
@Override
public String toString() {
return TraversalHelper.makeStepString(this);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/446df04f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/DefaultComputerResult.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/DefaultComputerResult.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/DefaultComputerResult.java
index 86dd200..66873fb 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/DefaultComputerResult.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/DefaultComputerResult.java
@@ -37,7 +37,6 @@ public class DefaultComputerResult implements ComputerResult {
public DefaultComputerResult(final Graph graph, final Memory memory) {
this.graph = graph;
- this.graph.engine(StandardTraversalEngine.instance());
this.memory = memory;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/446df04f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
index d03b666..87661c5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
@@ -26,6 +26,7 @@ import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
import org.apache.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversal;
import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep;
+import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
import org.apache.tinkerpop.gremlin.structure.io.DefaultIo;
import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLReader;
import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLWriter;
@@ -179,10 +180,23 @@ public interface Graph extends AutoCloseable {
*/
public GraphComputer compute(final Class... graphComputerClass);
+ /**
+ * Get the declared {@link TraversalEngine} used by all {@link Traversal}s spawned from the graph or its elements.
+ *
+ * @return the current {@link TraversalEngine}
+ */
public TraversalEngine engine();
- public void engine(final TraversalEngine engine);
+ /**
+ * Set the {@link TraversalEngine} to use for all {@link Traversal}s spawned off the graph or its elements.
+ *
+ * @param traversalEngine the new traversal engine to use.
+ */
+ public void engine(final TraversalEngine traversalEngine);
+ /* TODO ?? public default void standard() {
+ this.engine(StandardTraversalEngine.instance());
+ }*/
/**
* Configure and control the transactions for those graphs that support this feature.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/446df04f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyGraph.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyGraph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyGraph.java
index 4f0ebd0..726e4fb 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyGraph.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/strategy/StrategyGraph.java
@@ -134,8 +134,8 @@ public class StrategyGraph implements Graph, Graph.Iterators, StrategyWrapped, W
}
@Override
- public void engine(final TraversalEngine engine) {
- this.baseGraph.engine(engine);
+ public void engine(final TraversalEngine traversalEngine) {
+ this.baseGraph.engine(traversalEngine);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/446df04f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchGraph.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchGraph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchGraph.java
index f4387a9..017d29d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchGraph.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchGraph.java
@@ -261,7 +261,7 @@ public class BatchGraph<G extends Graph> implements Graph, Graph.Iterators {
}
@Override
- public void engine(final TraversalEngine engine) {
+ public void engine(final TraversalEngine traversalEngine) {
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/446df04f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/empty/EmptyGraph.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/empty/EmptyGraph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/empty/EmptyGraph.java
index 1e543a0..d3ac960 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/empty/EmptyGraph.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/empty/EmptyGraph.java
@@ -81,7 +81,7 @@ public final class EmptyGraph implements Graph, Graph.Iterators {
}
@Override
- public void engine(final TraversalEngine engine) {
+ public void engine(final TraversalEngine traversalEngine) {
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/446df04f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
index 65e2eda..8485a0e 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin;
import org.apache.commons.configuration.Configuration;
import org.apache.tinkerpop.gremlin.process.Traversal;
+import org.apache.tinkerpop.gremlin.process.TraversalEngine;
+import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -161,7 +163,11 @@ public abstract class AbstractGremlinTest {
public Vertex convertToVertex(final Graph g, final String vertexName) {
// all test graphs have "name" as a unique id which makes it easy to hardcode this...works for now
- return g.V().has("name", vertexName).next();
+ final TraversalEngine temp = g.engine();
+ g.engine(StandardTraversalEngine.instance());
+ final Vertex vertex = g.V().has("name", vertexName).next();
+ g.engine(temp);
+ return vertex;
}
public Object convertToEdgeId(final String outVertexName, String edgeLabel, final String inVertexName) {
@@ -169,7 +175,11 @@ public abstract class AbstractGremlinTest {
}
public Object convertToEdgeId(final Graph g, final String outVertexName, String edgeLabel, final String inVertexName) {
- return g.V().has("name", outVertexName).outE(edgeLabel).as("e").inV().has("name", inVertexName).<Edge>back("e").next().id();
+ final TraversalEngine temp = g.engine();
+ g.engine(StandardTraversalEngine.instance());
+ final Object edgeId = g.V().has("name", outVertexName).outE(edgeLabel).as("e").inV().has("name", inVertexName).<Edge>back("e").next().id();
+ g.engine(temp);
+ return edgeId;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/446df04f/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java
index b3dc132..1b1314a 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java
@@ -18,19 +18,18 @@
*/
package org.apache.tinkerpop.gremlin.hadoop.groovy.plugin;
+import org.apache.commons.configuration.BaseConfiguration;
+import org.apache.commons.configuration.FileConfiguration;
+import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.tinkerpop.gremlin.groovy.engine.GroovyTraversalScript;
import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor;
import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteException;
import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph;
import org.apache.tinkerpop.gremlin.process.computer.ComputerResult;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ComputerResultStep;
import org.apache.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversal;
import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal;
import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.commons.configuration.BaseConfiguration;
-import org.apache.commons.configuration.FileConfiguration;
-import org.apache.commons.configuration.PropertiesConfiguration;
import org.codehaus.groovy.tools.shell.Groovysh;
import java.io.File;
@@ -105,9 +104,8 @@ public class HadoopRemoteAcceptor implements RemoteAcceptor {
final ComputerResult computerResult = traversal.result().get();
this.shell.getInterp().getContext().setProperty(RESULT, computerResult);
- final GraphTraversal.Admin traversal2 = new DefaultGraphTraversal<>(Graph.class);
- final ComputerResultStep computerResultStep = new ComputerResultStep(traversal2,null,false);
- computerResultStep.populateTraversers(computerResult);
+ final GraphTraversal.Admin<?, ?> traversal2 = new DefaultGraphTraversal<>(Graph.class);
+ traversal2.addStep(new ComputerResultStep<>(traversal2, computerResult, false));
traversal2.range(0, 19);
return traversal2;
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/446df04f/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
index d95b656..8b56407 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
@@ -175,8 +175,9 @@ public class HadoopGraph implements Graph, Graph.Iterators {
}
@Override
- public void engine(final TraversalEngine engine) {
- this.traversalEngine = engine;
+ public void engine(final TraversalEngine traversalEngine) {
+ this.traversalEngine = traversalEngine;
+ this.traversalEngine.setGraph(this);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/446df04f/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
index d269fcc..61ea411 100644
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
@@ -96,6 +96,7 @@ public class HadoopGraphProvider extends AbstractGraphProvider {
@Override
public Map<String, Object> getBaseConfiguration(final String graphName, final Class<?> test, final String testMethodName) {
return new HashMap<String, Object>() {{
+ put("computer", test.getSimpleName().contains("Computer")); // TODO: REMOVE!
put("gremlin.graph", HadoopGraph.class.getName());
put(Constants.GREMLIN_HADOOP_GRAPH_INPUT_FORMAT, KryoInputFormat.class.getCanonicalName());
put(Constants.GREMLIN_HADOOP_GRAPH_OUTPUT_FORMAT, KryoOutputFormat.class.getCanonicalName());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/446df04f/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
index 9bf995e..c072004 100644
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
+++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
@@ -258,9 +258,9 @@ public class Neo4jGraph implements Graph, Graph.Iterators, WrappedGraph<GraphDat
}
@Override
- public void engine(final TraversalEngine engine) {
- if (!engine.getClass().equals(StandardTraversalEngine.class))
- throw new IllegalArgumentException("The provided traversal engine is not supported by this graph: " + engine.getClass().getCanonicalName());
+ public void engine(final TraversalEngine traversalEngine) {
+ if (!traversalEngine.getClass().equals(StandardTraversalEngine.class))
+ throw new IllegalArgumentException("The provided traversal engine is not supported by this graph: " + traversalEngine.getClass().getCanonicalName());
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/446df04f/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
index ac20431..d964f08 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
@@ -163,8 +163,8 @@ public class TinkerGraph implements Graph, Graph.Iterators {
}
@Override
- public void engine(final TraversalEngine engine) {
- this.engine = engine;
+ public void engine(final TraversalEngine traversalEngine) {
+ this.engine = traversalEngine;
this.engine.setGraph(this);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/446df04f/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphGraphProvider.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphGraphProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphGraphProvider.java
index 9f554b4..8241486 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphGraphProvider.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphGraphProvider.java
@@ -52,7 +52,7 @@ public class TinkerGraphGraphProvider extends AbstractGraphProvider {
@Override
public Map<String, Object> getBaseConfiguration(final String graphName, final Class<?> test, final String testMethodName) {
return new HashMap<String, Object>() {{
- put("computer", test.getSimpleName().contains("Computer"));
+ put("computer", test.getSimpleName().contains("Computer")); // TODO: REMOVE!
put(Graph.GRAPH, TinkerGraph.class.getName());
}};
}