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/11 13:36:20 UTC
incubator-tinkerpop git commit: some cosmetic changes as I went
through trying to solve the next/hasNext compilation 'problem'.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 75c7ee067 -> 23fd81f33
some cosmetic changes as I went through trying to solve the next/hasNext compilation 'problem'.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/23fd81f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/23fd81f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/23fd81f3
Branch: refs/heads/master
Commit: 23fd81f33ca476ee0b38044d6eced228daf04afb
Parents: 75c7ee0
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Feb 11 05:36:16 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Feb 11 05:36:16 2015 -0700
----------------------------------------------------------------------
.../src/main/java/com/tinkerpop/gremlin/process/Traversal.java | 2 ++
.../process/graph/traversal/step/sideEffect/StartStep.java | 4 ++--
.../src/main/java/com/tinkerpop/gremlin/AbstractGremlinTest.java | 4 ++--
.../gremlin/process/graph/traversal/step/filter/RetainTest.java | 2 +-
.../tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java | 3 ++-
5 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/23fd81f3/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Traversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Traversal.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Traversal.java
index 6ec802f..cb42693 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Traversal.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/Traversal.java
@@ -226,6 +226,7 @@ public interface Traversal<S, E> extends Iterator<E>, Cloneable {
* @param starts an iterators of traversers
*/
public default void addStarts(final Iterator<Traverser<S>> starts) {
+ if(!this.getEngine().isPresent()) this.applyStrategies(TraversalEngine.STANDARD);
this.getStartStep().addStarts(starts);
}
@@ -236,6 +237,7 @@ public interface Traversal<S, E> extends Iterator<E>, Cloneable {
* @param start a traverser to add to the traversal
*/
public default void addStart(final Traverser<S> start) {
+ if(!this.getEngine().isPresent()) this.applyStrategies(TraversalEngine.STANDARD);
this.getStartStep().addStart(start);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/23fd81f3/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StartStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StartStep.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StartStep.java
index 12be68a..c9bc624 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StartStep.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/StartStep.java
@@ -61,9 +61,9 @@ public class StartStep<S> extends AbstractStep<S, S> implements Reversible {
if (this.first) {
if (null != this.start) {
if (this.start instanceof Iterator)
- this.starts.add(this.getTraversal().asAdmin().getTraverserGenerator().generateIterator((Iterator<S>) this.start, this, 1l));
+ this.starts.add(this.getTraversal().getTraverserGenerator().generateIterator((Iterator<S>) this.start, this, 1l));
else
- this.starts.add(this.getTraversal().asAdmin().getTraverserGenerator().generate((S) this.start, this, 1l));
+ this.starts.add(this.getTraversal().getTraverserGenerator().generate((S) this.start, this, 1l));
}
this.first = false;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/23fd81f3/gremlin-test/src/main/java/com/tinkerpop/gremlin/AbstractGremlinTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/AbstractGremlinTest.java b/gremlin-test/src/main/java/com/tinkerpop/gremlin/AbstractGremlinTest.java
index 2f6f35f..6cf3cf6 100644
--- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/AbstractGremlinTest.java
+++ b/gremlin-test/src/main/java/com/tinkerpop/gremlin/AbstractGremlinTest.java
@@ -162,7 +162,7 @@ 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 ((Vertex) g.V().has("name", vertexName).next());
+ return g.V().has("name", vertexName).next();
}
public Object convertToEdgeId(final String outVertexName, String edgeLabel, final String inVertexName) {
@@ -170,7 +170,7 @@ public abstract class AbstractGremlinTest {
}
public Object convertToEdgeId(final Graph g, final String outVertexName, String edgeLabel, final String inVertexName) {
- return ((Edge) g.V().has("name", outVertexName).outE(edgeLabel).as("e").inV().has("name", inVertexName).back("e").next()).id();
+ return g.V().has("name", outVertexName).outE(edgeLabel).as("e").inV().has("name", inVertexName).<Edge>back("e").next().id();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/23fd81f3/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainTest.java b/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainTest.java
index bacaa5f..ca6cbea 100644
--- a/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainTest.java
+++ b/gremlin-test/src/main/java/com/tinkerpop/gremlin/process/graph/traversal/step/filter/RetainTest.java
@@ -60,7 +60,7 @@ public abstract class RetainTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_retainXaX_name() {
+ public void g_VX1X_asXaX_outXcreatedX_inXcreatedX_retainXaX_name() {
final Traversal<Vertex, String> traversal = get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_retainXaX_name(convertToVertexId("marko"));
printTraversalForm(traversal);
assertEquals("marko", traversal.next());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/23fd81f3/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java b/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index 719660e..a5ce515 100644
--- a/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@ -135,7 +135,8 @@ public class TinkerGraphTest {
@Ignore
public void testPlay3() throws Exception {
Graph g = TinkerFactory.createModern();
- g.V().has(T.label, "person").choose(t -> t.<String>value("name").length()).option(5, in()).option(4, out()).option(3, both()).values("name").submit(g.compute());
+ Traversal t = g.V().has("name","marko");
+ t.next();
}
@Test