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 2017/01/09 18:50:30 UTC
tinkerpop git commit: Various __ steps can be hard typed. For
instance out() is actually out(). Went through and tweaked typing accordingly. This is going to
master as it might cause some users to have to remove <> explicit typin
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1116 [created] 32fe2ea6c
Various __ steps can be hard typed. For instance <A,Vertex>out() is actually <Vertex,Vertex>out(). Went through and tweaked typing accordingly. This is going to master as it might cause some users to have to remove <> explicit typing.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/32fe2ea6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/32fe2ea6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/32fe2ea6
Branch: refs/heads/TINKERPOP-1116
Commit: 32fe2ea6c6205d867f67ed8527c51f55a08ff644
Parents: b2cde4e
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jan 9 11:50:25 2017 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jan 9 11:50:25 2017 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../traversal/dsl/graph/GraphTraversal.java | 12 ++--
.../gremlin/process/traversal/dsl/graph/__.java | 73 ++++++++++----------
.../process/traversal/CoreTraversalTest.java | 2 +-
4 files changed, 45 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/32fe2ea6/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 12bc44e..d6037dd 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Added more specific typing to various `__` traversal steps. E.g. `<A,Vertex>out()` is `<Vertex,Vertex>out()`.
* Updated Docker build scripts to include Python dependencies (NOTE: users should remove any previously generated TinkerPop Docker images).
* Added "attachment requisite" `VertexProperty.element()` and `Property.element()` data in GraphSON serialization.
* Added `Vertex`, `Edge`, `VertexProperty`, and `Property` serializers to Gremlin-Python and exposed tests that use graph object arguments.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/32fe2ea6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 7ffee40..46803a4 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -987,12 +987,12 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
public default GraphTraversal<S, E> has(final String propertyKey) {
this.asAdmin().getBytecode().addStep(Symbols.has, propertyKey);
- return this.asAdmin().addStep(new TraversalFilterStep<>(this.asAdmin(), __.values(propertyKey)));
+ return this.asAdmin().addStep(new TraversalFilterStep(this.asAdmin(), __.values(propertyKey)));
}
public default GraphTraversal<S, E> hasNot(final String propertyKey) {
this.asAdmin().getBytecode().addStep(Symbols.hasNot, propertyKey);
- return this.asAdmin().addStep(new NotStep<>(this.asAdmin(), __.values(propertyKey)));
+ return this.asAdmin().addStep(new NotStep(this.asAdmin(), __.values(propertyKey)));
}
public default GraphTraversal<S, E> hasLabel(final String label, final String... otherLabels) {
@@ -1577,15 +1577,15 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
////
- public default <M, E2> GraphTraversal<S, E> option(final M pickToken, final Traversal<E, E2> traversalOption) {
+ public default <M, E2> GraphTraversal<S, E> option(final M pickToken, final Traversal<?, E2> traversalOption) {
this.asAdmin().getBytecode().addStep(Symbols.option, pickToken, traversalOption);
- ((TraversalOptionParent<M, E, E2>) this.asAdmin().getEndStep()).addGlobalChildOption(pickToken, traversalOption.asAdmin());
+ ((TraversalOptionParent<M, E, E2>) this.asAdmin().getEndStep()).addGlobalChildOption(pickToken, (Traversal.Admin<E, E2>) traversalOption.asAdmin());
return this;
}
- public default <E2> GraphTraversal<S, E> option(final Traversal<E, E2> traversalOption) {
+ public default <E2> GraphTraversal<S, E> option(final Traversal<?, E2> traversalOption) {
this.asAdmin().getBytecode().addStep(Symbols.option, traversalOption);
- ((TraversalOptionParent<Object, E, E2>) this.asAdmin().getEndStep()).addGlobalChildOption(TraversalOptionParent.Pick.any, traversalOption.asAdmin());
+ ((TraversalOptionParent<Object, E, E2>) this.asAdmin().getEndStep()).addGlobalChildOption(TraversalOptionParent.Pick.any, (Traversal.Admin<E, E2>) traversalOption.asAdmin());
return this;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/32fe2ea6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
index 2ec0d0a..fc6462d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
@@ -29,6 +29,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSe
import org.apache.tinkerpop.gremlin.structure.Column;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -108,14 +109,14 @@ public class __ {
/**
* @see GraphTraversal#label()
*/
- public static <A> GraphTraversal<A, String> label() {
+ public static <A extends Element> GraphTraversal<A, String> label() {
return __.<A>start().label();
}
/**
* @see GraphTraversal#id()
*/
- public static <A> GraphTraversal<A, Object> id() {
+ public static <A extends Element> GraphTraversal<A, Object> id() {
return __.<A>start().id();
}
@@ -129,92 +130,92 @@ public class __ {
/**
* @see GraphTraversal#to(Direction, String...)
*/
- public static <A> GraphTraversal<A, Vertex> to(final Direction direction, final String... edgeLabels) {
- return __.<A>start().to(direction, edgeLabels);
+ public static GraphTraversal<Vertex, Vertex> to(final Direction direction, final String... edgeLabels) {
+ return __.<Vertex>start().to(direction, edgeLabels);
}
/**
* @see GraphTraversal#out(String...)
*/
- public static <A> GraphTraversal<A, Vertex> out(final String... edgeLabels) {
- return __.<A>start().out(edgeLabels);
+ public static GraphTraversal<Vertex, Vertex> out(final String... edgeLabels) {
+ return __.<Vertex>start().out(edgeLabels);
}
/**
* @see GraphTraversal#in(String...)
*/
- public static <A> GraphTraversal<A, Vertex> in(final String... edgeLabels) {
- return __.<A>start().in(edgeLabels);
+ public static GraphTraversal<Vertex, Vertex> in(final String... edgeLabels) {
+ return __.<Vertex>start().in(edgeLabels);
}
/**
* @see GraphTraversal#both(String...)
*/
- public static <A> GraphTraversal<A, Vertex> both(final String... edgeLabels) {
- return __.<A>start().both(edgeLabels);
+ public static GraphTraversal<Vertex, Vertex> both(final String... edgeLabels) {
+ return __.<Vertex>start().both(edgeLabels);
}
/**
* @see GraphTraversal#toE(Direction, String...)
*/
- public static <A> GraphTraversal<A, Edge> toE(final Direction direction, final String... edgeLabels) {
- return __.<A>start().toE(direction, edgeLabels);
+ public static GraphTraversal<Vertex, Edge> toE(final Direction direction, final String... edgeLabels) {
+ return __.<Vertex>start().toE(direction, edgeLabels);
}
/**
* @see GraphTraversal#outE(String...)
*/
- public static <A> GraphTraversal<A, Edge> outE(final String... edgeLabels) {
- return __.<A>start().outE(edgeLabels);
+ public static GraphTraversal<Vertex, Edge> outE(final String... edgeLabels) {
+ return __.<Vertex>start().outE(edgeLabels);
}
/**
* @see GraphTraversal#inE(String...)
*/
- public static <A> GraphTraversal<A, Edge> inE(final String... edgeLabels) {
- return __.<A>start().inE(edgeLabels);
+ public static GraphTraversal<Vertex, Edge> inE(final String... edgeLabels) {
+ return __.<Vertex>start().inE(edgeLabels);
}
/**
* @see GraphTraversal#bothE(String...)
*/
- public static <A> GraphTraversal<A, Edge> bothE(final String... edgeLabels) {
- return __.<A>start().bothE(edgeLabels);
+ public static GraphTraversal<Vertex, Edge> bothE(final String... edgeLabels) {
+ return __.<Vertex>start().bothE(edgeLabels);
}
/**
* @see GraphTraversal#toV(Direction)
*/
- public static <A> GraphTraversal<A, Vertex> toV(final Direction direction) {
- return __.<A>start().toV(direction);
+ public static GraphTraversal<Edge, Vertex> toV(final Direction direction) {
+ return __.<Edge>start().toV(direction);
}
/**
* @see GraphTraversal#inV()
*/
- public static <A> GraphTraversal<A, Vertex> inV() {
- return __.<A>start().inV();
+ public static GraphTraversal<Edge, Vertex> inV() {
+ return __.<Edge>start().inV();
}
/**
* @see GraphTraversal#outV()
*/
- public static <A> GraphTraversal<A, Vertex> outV() {
- return __.<A>start().outV();
+ public static GraphTraversal<Edge, Vertex> outV() {
+ return __.<Edge>start().outV();
}
/**
* @see GraphTraversal#bothV()
*/
- public static <A> GraphTraversal<A, Vertex> bothV() {
- return __.<A>start().bothV();
+ public static GraphTraversal<Edge, Vertex> bothV() {
+ return __.<Edge>start().bothV();
}
/**
* @see GraphTraversal#otherV()
*/
- public static <A> GraphTraversal<A, Vertex> otherV() {
- return __.<A>start().otherV();
+ public static GraphTraversal<Edge, Vertex> otherV() {
+ return __.<Edge>start().otherV();
}
/**
@@ -234,35 +235,35 @@ public class __ {
/**
* @see GraphTraversal#properties(String...)
*/
- public static <A, B> GraphTraversal<A, ? extends Property<B>> properties(final String... propertyKeys) {
- return __.<A>start().properties(propertyKeys);
+ public static <A extends Element, B> GraphTraversal<A, ? extends Property<B>> properties(final String... propertyKeys) {
+ return __.<A>start().<B>properties(propertyKeys);
}
/**
* @see GraphTraversal#values(String...)
*/
- public static <A, B> GraphTraversal<A, B> values(final String... propertyKeys) {
+ public static <A extends Element, B> GraphTraversal<A, B> values(final String... propertyKeys) {
return __.<A>start().values(propertyKeys);
}
/**
* @see GraphTraversal#propertyMap(String...)
*/
- public static <A, B> GraphTraversal<A, Map<String, B>> propertyMap(final String... propertyKeys) {
+ public static <A extends Element, B> GraphTraversal<A, Map<String, B>> propertyMap(final String... propertyKeys) {
return __.<A>start().propertyMap(propertyKeys);
}
/**
* @see GraphTraversal#valueMap(String...)
*/
- public static <A, B> GraphTraversal<A, Map<String, B>> valueMap(final String... propertyKeys) {
+ public static <A extends Element, B> GraphTraversal<A, Map<String, B>> valueMap(final String... propertyKeys) {
return __.<A>start().valueMap(propertyKeys);
}
/**
* @see GraphTraversal#valueMap(boolean, String...)
*/
- public static <A, B> GraphTraversal<A, Map<Object, B>> valueMap(final boolean includeTokens, final String... propertyKeys) {
+ public static <A extends Element, B> GraphTraversal<A, Map<Object, B>> valueMap(final boolean includeTokens, final String... propertyKeys) {
return __.<A>start().valueMap(includeTokens, propertyKeys);
}
@@ -299,14 +300,14 @@ public class __ {
/**
* @see GraphTraversal#key()
*/
- public static <A> GraphTraversal<A, String> key() {
+ public static <A extends Property> GraphTraversal<A, String> key() {
return __.<A>start().key();
}
/**
* @see GraphTraversal#value()
*/
- public static <A, B> GraphTraversal<A, B> value() {
+ public static <A extends Property, B> GraphTraversal<A, B> value() {
return __.<A>start().value();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/32fe2ea6/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
index cefbf39..566301b 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
@@ -219,7 +219,7 @@ public class CoreTraversalTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void shouldAddStartsProperly() {
- final Traversal<Object, Vertex> traversal = out().out();
+ final Traversal<Vertex, Vertex> traversal = out().out();
assertFalse(traversal.hasNext());
traversal.asAdmin().addStarts(traversal.asAdmin().getTraverserGenerator().generateIterator(g.V(), traversal.asAdmin().getSteps().get(0), 1l));
assertTrue(traversal.hasNext());