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/05/19 23:50:18 UTC
incubator-tinkerpop git commit: consistency on typing in __ and
GraphTraversal.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 406aac223 -> f1db8b3a1
consistency on typing in __ and GraphTraversal.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/f1db8b3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/f1db8b3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/f1db8b3a
Branch: refs/heads/master
Commit: f1db8b3a1df6d14ba9e93b7e715673cda08ea995
Parents: 406aac2
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue May 19 15:50:29 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue May 19 15:50:29 2015 -0600
----------------------------------------------------------------------
.../gremlin/process/traversal/dsl/graph/GraphTraversal.java | 8 ++++----
.../tinkerpop/gremlin/process/traversal/dsl/graph/__.java | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f1db8b3a/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 c353984..b2f2d77 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
@@ -284,7 +284,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
return this.asAdmin().addStep(new PathStep<>(this.asAdmin()));
}
- public default <E2> GraphTraversal<S, Map<String, E2>> match(final String startLabel, final Traversal... traversals) {
+ public default <E2> GraphTraversal<S, Map<String, E2>> match(final String startLabel, final Traversal<?,?>... traversals) {
return (GraphTraversal) this.asAdmin().addStep(new MatchStep<E, Map<String, E2>>(this.asAdmin(), startLabel, traversals));
}
@@ -451,7 +451,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
return this.where(scope, null, predicate);
}
- public default GraphTraversal<S, E> where(final Scope scope, final Traversal whereTraversal) {
+ public default GraphTraversal<S, E> where(final Scope scope, final Traversal<?,?> whereTraversal) {
return this.where(scope, P.traversal(whereTraversal));
}
@@ -463,7 +463,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
return this.where(Scope.global, null, predicate);
}
- public default GraphTraversal<S, E> where(final Traversal whereTraversal) {
+ public default GraphTraversal<S, E> where(final Traversal<?,?> whereTraversal) {
return this.where(Scope.global, whereTraversal);
}
@@ -491,7 +491,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
return this.has(T.label, label).has(key, value);
}
- public default GraphTraversal<S, E> has(final String key, final Traversal propertyTraversal) {
+ public default GraphTraversal<S, E> has(final String key, final Traversal<?,?> propertyTraversal) {
return this.has(key, P.traversal(propertyTraversal));
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f1db8b3a/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 de39d3d..9ee23e7 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
@@ -172,7 +172,7 @@ public class __ {
return __.<A>start().path();
}
- public static <A, B> GraphTraversal<A, Map<String, B>> match(final String startLabel, final Traversal... traversals) {
+ public static <A, B> GraphTraversal<A, Map<String, B>> match(final String startLabel, final Traversal<?,?>... traversals) {
return __.<A>start().match(startLabel, traversals);
}
@@ -350,7 +350,7 @@ public class __ {
return __.<A>start().has(label, key, predicate);
}
- public static <A> GraphTraversal<A, A> has(final String key, final Traversal propertyTraversal) {
+ public static <A> GraphTraversal<A, A> has(final String key, final Traversal<?,?> propertyTraversal) {
return __.<A>start().has(key, propertyTraversal);
}
@@ -386,7 +386,7 @@ public class __ {
return __.<A>start().where(scope, predicate);
}
- public static <A> GraphTraversal<A, A> where(final Scope scope, final Traversal whereTraversal) {
+ public static <A> GraphTraversal<A, A> where(final Scope scope, final Traversal<?,?> whereTraversal) {
return __.<A>start().where(scope, whereTraversal);
}
@@ -398,7 +398,7 @@ public class __ {
return __.<A>start().where(predicate);
}
- public static <A> GraphTraversal<A, A> where(final Traversal whereTraversal) {
+ public static <A> GraphTraversal<A, A> where(final Traversal<?,?> whereTraversal) {
return __.<A>start().where(whereTraversal);
}