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/03/10 15:17:34 UTC

incubator-tinkerpop git commit: random tweaks with @spmallette.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/newapi b4880b189 -> 7db4bf83f


random tweaks with @spmallette.


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

Branch: refs/heads/newapi
Commit: 7db4bf83fb4eefb973839f509855c92bffb8f72d
Parents: b4880b1
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Mar 10 08:17:19 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Mar 10 08:17:30 2015 -0600

----------------------------------------------------------------------
 .../gremlin/process/TraversalContext.java       |  1 +
 .../graph/traversal/GraphTraversalContext.java  |  2 +-
 .../process/traversal/DefaultTraversal.java     |  2 +-
 .../engine/StandardTraversalEngine.java         |  2 +-
 .../lambda/AbstractLambdaTraversal.java         |  2 +-
 .../process/traversal/util/EmptyTraversal.java  |  2 +-
 .../tinkerpop/gremlin/structure/Edge.java       | 22 +++++++++++++++++++-
 .../tinkerpop/gremlin/structure/Element.java    |  3 +--
 .../tinkerpop/gremlin/structure/Vertex.java     |  1 -
 .../tinkerpop/gremlin/AbstractGremlinSuite.java |  2 +-
 .../gremlin/process/ProcessStandardSuite.java   |  2 +-
 .../gremlin/hadoop/HadoopGraphProvider.java     |  4 ++--
 .../neo4j/AbstractNeo4jGraphProvider.java       |  6 +++---
 .../process/computer/TinkerGraphComputer.java   |  6 ++++++
 .../tinkergraph/structure/TinkerGraph.java      |  2 +-
 .../tinkergraph/TinkerGraphGraphProvider.java   |  3 +++
 .../tinkergraph/structure/TinkerGraphTest.java  |  2 +-
 17 files changed, 46 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7db4bf83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalContext.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalContext.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalContext.java
index df77651..6b11324 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalContext.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalContext.java
@@ -26,6 +26,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph;
 public interface TraversalContext {
 
     public interface Builder<C extends TraversalContext> {
+
         public Builder engine(final TraversalEngine engine);
 
         public Builder strategy(final TraversalStrategy strategy);

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7db4bf83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversalContext.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversalContext.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversalContext.java
index 9244b49..ad03fc4 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversalContext.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversalContext.java
@@ -73,7 +73,7 @@ public class GraphTraversalContext implements TraversalContext {
 
     public static class Builder implements TraversalContext.Builder<GraphTraversalContext> {
 
-        private TraversalEngine engine = StandardTraversalEngine.standard;
+        private TraversalEngine engine = StandardTraversalEngine.instance();
         private List<TraversalStrategy> strategies = new ArrayList<>();
 
         public Builder engine(final TraversalEngine engine) {

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7db4bf83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversal.java
index 0277074..e0c6e8f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/DefaultTraversal.java
@@ -77,7 +77,7 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> {
                 }
                 for (final Traversal.Admin<?, ?> localChild : ((TraversalParent) step).getLocalChildren()) {
                     localChild.setStrategies(this.strategies);
-                    localChild.setEngine(StandardTraversalEngine.standard);
+                    localChild.setEngine(StandardTraversalEngine.instance());
                     localChild.applyStrategies();
                 }
             }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7db4bf83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/engine/StandardTraversalEngine.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/engine/StandardTraversalEngine.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/engine/StandardTraversalEngine.java
index 5cf30ec..8be5fc4 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/engine/StandardTraversalEngine.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/engine/StandardTraversalEngine.java
@@ -27,7 +27,7 @@ import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
  */
 public final class StandardTraversalEngine implements TraversalEngine {
 
-    public static final StandardTraversalEngine standard = new StandardTraversalEngine();
+    private static final StandardTraversalEngine standard = new StandardTraversalEngine();
 
     private StandardTraversalEngine() {
 

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7db4bf83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
index 63bd910..186a19b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/AbstractLambdaTraversal.java
@@ -67,7 +67,7 @@ public abstract class AbstractLambdaTraversal<S, E> implements Traversal.Admin<S
 
     @Override
     public TraversalEngine getEngine() {
-        return StandardTraversalEngine.standard;
+        return StandardTraversalEngine.instance();
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7db4bf83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversal.java
index 988b7a9..f78a8b6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversal.java
@@ -82,7 +82,7 @@ public class EmptyTraversal<S, E> implements Traversal.Admin<S, E> {
 
     @Override
     public TraversalEngine getEngine() {
-        return StandardTraversalEngine.standard;
+        return StandardTraversalEngine.instance();
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7db4bf83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Edge.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Edge.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Edge.java
index 9f074dd..ca80bab 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Edge.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Edge.java
@@ -43,7 +43,6 @@ public interface Edge extends Element {
      */
     public static final String DEFAULT_LABEL = "edge";
 
-
     /**
      * Retrieve the vertex (or vertices) associated with this edge as defined by the direction.
      * If the direction is {@link Direction#BOTH} then the iterator order is: {@link Direction#OUT} then {@link Direction#IN}.
@@ -53,15 +52,36 @@ public interface Edge extends Element {
      */
     public Iterator<Vertex> vertices(final Direction direction);
 
+    /**
+     * Get the outgoing/tail vertex of this edge.
+     *
+     * @return the outgoing vertex of the edge
+     */
     public default Vertex outVertex() {
         return this.vertices(Direction.OUT).next();
     }
 
+    /**
+     * Get the incoming/head vertex of this edge.
+     *
+     * @return the incoming vertex of the edge
+     */
     public default Vertex inVertex() {
         return this.vertices(Direction.IN).next();
     }
 
     /**
+     * Get both the outgoing and incoming vertices of this edge.
+     * The first vertex in the iterator is the outgoing vertex.
+     * The second vertex in the iterator is the incoming vertex.
+     *
+     * @return an iterator of the two vertices of this edge
+     */
+    public default Iterator<Vertex> bothVertices() {
+        return this.vertices(Direction.BOTH);
+    }
+
+    /**
      * {@inheritDoc}
      */
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7db4bf83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java
index 313eef8..4769157 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java
@@ -92,8 +92,7 @@ public abstract interface Element {
      */
     @Graph.Helper
     public default <V> V value(final String key) throws NoSuchElementException {
-        final Property<V> property = this.property(key);
-        return property.orElseThrow(() -> Property.Exceptions.propertyDoesNotExist(key));
+        return this.<V>property(key).orElseThrow(() -> Property.Exceptions.propertyDoesNotExist(key));
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7db4bf83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Vertex.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Vertex.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Vertex.java
index 19b6e39..e2cc6b2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Vertex.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Vertex.java
@@ -105,7 +105,6 @@ public interface Vertex extends Element {
         }
     }
 
-
     /**
      * Gets an {@link Iterator} of incident edges.
      *

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7db4bf83/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java
index 739979f..77818b1 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java
@@ -106,7 +106,7 @@ public abstract class AbstractGremlinSuite extends Suite {
 
     public AbstractGremlinSuite(final Class<?> klass, final RunnerBuilder builder, final Class<?>[] testsToExecute, final Class<?>[] testsToEnforce,
                                 final boolean gremlinFlavorSuite) throws InitializationError {
-        this(klass, builder, testsToExecute, testsToEnforce, gremlinFlavorSuite, StandardTraversalEngine.standard);
+        this(klass, builder, testsToExecute, testsToEnforce, gremlinFlavorSuite, StandardTraversalEngine.instance());
     }
 
     public AbstractGremlinSuite(final Class<?> klass, final RunnerBuilder builder, final Class<?>[] testsToExecute, final Class<?>[] testsToEnforce,

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7db4bf83/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
index 0e11ecd..562bbe0 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
@@ -168,7 +168,7 @@ public class ProcessStandardSuite extends AbstractGremlinSuite {
     }
 
     public ProcessStandardSuite(final Class<?> klass, final RunnerBuilder builder, final Class<?>[] testsToExecute, final Class<?>[] testsToEnforce, final boolean gremlinFlavorSuite) throws InitializationError {
-        super(klass, builder, testsToExecute, testsToEnforce, gremlinFlavorSuite, StandardTraversalEngine.standard);
+        super(klass, builder, testsToExecute, testsToEnforce, gremlinFlavorSuite, StandardTraversalEngine.instance());
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7db4bf83/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 69c0b36..f114baa 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
@@ -109,8 +109,8 @@ public class HadoopGraphProvider extends AbstractGraphProvider {
     }
 
     @Override
-    public void loadGraphData(final Graph g, final LoadGraphWith loadGraphWith, final Class testClass, final String testName) {
-        if (loadGraphWith != null) this.loadGraphDataViaHadoopConfig(g, loadGraphWith.value());
+    public void loadGraphData(final Graph graph, final LoadGraphWith loadGraphWith, final Class testClass, final String testName) {
+        if (loadGraphWith != null) this.loadGraphDataViaHadoopConfig(graph, loadGraphWith.value());
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7db4bf83/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
index 7a397d2..4bf533c 100644
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
+++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
@@ -66,9 +66,9 @@ public abstract class AbstractNeo4jGraphProvider extends AbstractGraphProvider {
     }
 
     @Override
-    public void loadGraphData(final Graph g, final LoadGraphWith loadGraphWith, final Class testClass, final String testName) {
-        if (loadGraphWith != null) this.createIndices((Neo4jGraph) g, loadGraphWith.value());
-        super.loadGraphData(g, loadGraphWith, testClass, testName);
+    public void loadGraphData(final Graph graph, final LoadGraphWith loadGraphWith, final Class testClass, final String testName) {
+        if (loadGraphWith != null) this.createIndices((Neo4jGraph) graph, loadGraphWith.value());
+        super.loadGraphData(graph, loadGraphWith, testClass, testName);
     }
 
     private void createIndices(final Neo4jGraph g, final LoadGraphWith.GraphData graphData) {

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7db4bf83/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputer.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputer.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputer.java
index 1fbd152..d527b67 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputer.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerGraphComputer.java
@@ -18,12 +18,14 @@
  */
 package org.apache.tinkerpop.gremlin.tinkergraph.process.computer;
 
+import org.apache.tinkerpop.gremlin.process.TraversalEngine;
 import org.apache.tinkerpop.gremlin.process.computer.ComputerResult;
 import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
 import org.apache.tinkerpop.gremlin.process.computer.MapReduce;
 import org.apache.tinkerpop.gremlin.process.computer.VertexProgram;
 import org.apache.tinkerpop.gremlin.process.computer.util.ComputerDataStrategy;
 import org.apache.tinkerpop.gremlin.process.computer.util.GraphComputerHelper;
+import org.apache.tinkerpop.gremlin.process.traversal.engine.ComputerTraversalEngine;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
@@ -56,6 +58,10 @@ public class TinkerGraphComputer implements GraphComputer {
         this.graph = graph;
     }
 
+    public static TraversalEngine engine() {
+        return null;
+    }
+
     @Override
     public GraphComputer isolation(final Isolation isolation) {
         this.isolation = isolation;

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7db4bf83/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 3b62c8d..4c0d594 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
@@ -86,7 +86,7 @@ public class TinkerGraph implements Graph {
     protected TinkerIndex<TinkerVertex> vertexIndex = new TinkerIndex<>(this, TinkerVertex.class);
     protected TinkerIndex<TinkerEdge> edgeIndex = new TinkerIndex<>(this, TinkerEdge.class);
 
-    protected TraversalEngine engine = StandardTraversalEngine.standard;
+    protected TraversalEngine engine = StandardTraversalEngine.instance();
 
     /**
      * An empty private constructor that initializes {@link TinkerGraph} with no {@link org.apache.tinkerpop.gremlin.structure.strategy.GraphStrategy}.  Primarily

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7db4bf83/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 3086164..a1373e9 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
@@ -20,6 +20,9 @@ package org.apache.tinkerpop.gremlin.tinkergraph;
 
 import org.apache.commons.configuration.Configuration;
 import org.apache.tinkerpop.gremlin.AbstractGraphProvider;
+import org.apache.tinkerpop.gremlin.process.TraversalContext;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversalContext;
+import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerEdge;
 import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerElement;

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7db4bf83/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index a24b1d8..1cc0a10 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@ -146,7 +146,7 @@ public class TinkerGraphTest {
     @Ignore
     public void testPlay3() throws Exception {
         Graph graph = TinkerFactory.createModern();
-        GraphTraversalContext g = graph.traversal(GraphTraversalContext.of().engine(StandardTraversalEngine.standard));
+        GraphTraversalContext g = graph.traversal(GraphTraversalContext.of().engine(StandardTraversalEngine.instance()));
         g.V().out().out().values("name").forEachRemaining(System.out::println);
     }