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 2016/01/19 23:57:05 UTC
incubator-tinkerpop git commit: @dkuppitz found a missing
GraphTraversal method. Added. CTR.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master d54d666a6 -> bb275d9d7
@dkuppitz found a missing GraphTraversal method. Added. CTR.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/bb275d9d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/bb275d9d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/bb275d9d
Branch: refs/heads/master
Commit: bb275d9d7d65fd2b0b917804087c5c5dc6cd1734
Parents: d54d666
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jan 19 15:57:09 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jan 19 15:57:09 2016 -0700
----------------------------------------------------------------------
.../process/traversal/dsl/graph/GraphTraversal.java | 11 ++++++++++-
.../gremlin/process/traversal/dsl/graph/__.java | 7 +++++++
2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/bb275d9d/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 a70a1c2..473628f 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
@@ -812,7 +812,12 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
}
public default GraphTraversal<S, E> has(final String propertyKey, final Object value) {
- return this.has(propertyKey, value instanceof P ? (P) value : P.eq(value));
+ if (value instanceof P)
+ return this.has(propertyKey, (P) value);
+ else if (value instanceof Traversal)
+ return this.has(propertyKey, (Traversal) value);
+ else
+ return this.has(propertyKey, P.eq(value));
}
public default GraphTraversal<S, E> has(final T accessor, final Object value) {
@@ -827,6 +832,10 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
return this.has(T.label, label).has(propertyKey, value);
}
+ public default GraphTraversal<S, E> has(final T accessor, final Traversal<?, ?> propertyTraversal) {
+ return this.has(accessor.getAccessor(), propertyTraversal);
+ }
+
public default GraphTraversal<S, E> has(final String propertyKey, final Traversal<?, ?> propertyTraversal) {
return this.filter(propertyTraversal.asAdmin().addStep(0, new PropertiesStep(propertyTraversal.asAdmin(), PropertyType.VALUE, propertyKey)));
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/bb275d9d/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 53d9a62..befae78 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
@@ -628,6 +628,13 @@ public class __ {
}
/**
+ * @see GraphTraversal#has(T, Traversal)
+ */
+ public static <A> GraphTraversal<A, A> has(final T accessor, final Traversal<?, ?> propertyTraversal) {
+ return __.<A>start().has(accessor, propertyTraversal);
+ }
+
+ /**
* @see GraphTraversal#has(String, Traversal)
*/
public static <A> GraphTraversal<A, A> has(final String propertyKey, final Traversal<?, ?> propertyTraversal) {