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/04/24 22:49:36 UTC
[5/8] incubator-tinkerpop git commit: organized GraphTraversal steps
with new P work.
organized GraphTraversal steps with new P work.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/83fec556
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/83fec556
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/83fec556
Branch: refs/heads/master
Commit: 83fec556549490a665de96a8444fb7a5a674d5d4
Parents: 4be24b6
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Apr 24 14:16:17 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Apr 24 14:16:17 2015 -0600
----------------------------------------------------------------------
.../traversal/dsl/graph/GraphTraversal.java | 26 ++++++++++----------
.../gremlin/process/traversal/dsl/graph/__.java | 20 +++++++--------
2 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/83fec556/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 7547faf..b57baae 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
@@ -471,22 +471,18 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
return this.asAdmin().addStep(new HasStep(this.asAdmin(), new HasContainer(key, predicate.getBiPredicate(), predicate.getValue())));
}
- public default GraphTraversal<S, E> has(final String key) {
- return this.has(key, P.within());
- }
-
public default GraphTraversal<S, E> has(final String key, final Object value) {
return this.has(key, P.eq(value));
}
- public default GraphTraversal<S, E> has(final T accessor, final Object value) {
- return this.has(accessor.getAccessor(), value);
- }
-
public default GraphTraversal<S, E> has(final T accessor, final P<?> predicate) {
return this.has(accessor.getAccessor(), predicate);
}
+ public default GraphTraversal<S, E> has(final T accessor, final Object value) {
+ return this.has(accessor.getAccessor(), value);
+ }
+
public default GraphTraversal<S, E> has(final String label, final String key, final Object value) {
return this.has(label, key, P.eq(value));
}
@@ -495,24 +491,28 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
return this.has(T.label, label).has(key, predicate);
}
+ public default GraphTraversal<S, E> has(final String key) {
+ return this.has(key, P.within());
+ }
+
public default GraphTraversal<S, E> hasNot(final String key) {
return this.has(key, P.without());
}
public default GraphTraversal<S, E> hasLabel(final String... labels) {
- return labels.length == 1 ? this.has(T.label, labels[0]) : this.has(T.label.getAccessor(), P.within(labels));
+ return labels.length == 1 ? this.has(T.label, labels[0]) : this.has(T.label, P.within(labels));
}
public default GraphTraversal<S, E> hasId(final Object... ids) {
- return ids.length == 1 ? this.has(T.id, ids[0]) : this.has(T.id.getAccessor(), P.within(ids));
+ return ids.length == 1 ? this.has(T.id, ids[0]) : this.has(T.id, P.within(ids));
}
public default GraphTraversal<S, E> hasKey(final String... keys) {
- return keys.length == 1 ? this.has(T.key, keys[0]) : this.has(T.key.getAccessor(), P.within(keys));
+ return keys.length == 1 ? this.has(T.key, keys[0]) : this.has(T.key, P.within(keys));
}
public default GraphTraversal<S, E> hasValue(final Object... values) {
- return values.length == 1 ? this.has(T.value, values[0]) : this.has(T.value.getAccessor(), P.within(values));
+ return values.length == 1 ? this.has(T.value, values[0]) : this.has(T.value, P.within(values));
}
public default GraphTraversal<S, E> is(final P<E> predicate) {
@@ -520,7 +520,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
}
public default GraphTraversal<S, E> is(final Object value) {
- return this.is((P<E>)P.eq(value));
+ return this.is((P<E>) P.eq(value));
}
public default GraphTraversal<S, E> coin(final double probability) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/83fec556/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 f13b313..eb512df 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
@@ -318,26 +318,22 @@ public class __ {
return __.<A>start().hasNot(hasNotNextTraversal);
}
- public static <A> GraphTraversal<A, A> has(final String key) {
- return __.<A>start().has(key);
+ public static <A> GraphTraversal<A, A> has(final String key, final P<?> predicate) {
+ return __.<A>start().has(key, predicate);
}
public static <A> GraphTraversal<A, A> has(final String key, final Object value) {
return __.<A>start().has(key, value);
}
- public static <A> GraphTraversal<A, A> has(final T accessor, final Object value) {
- return __.<A>start().has(accessor, value);
- }
-
- public static <A> GraphTraversal<A, A> has(final String key, final P<?> predicate) {
- return __.<A>start().has(key, predicate);
- }
-
public static <A> GraphTraversal<A, A> has(final T accessor, final P<?> predicate) {
return __.<A>start().has(accessor, predicate);
}
+ public static <A> GraphTraversal<A, A> has(final T accessor, final Object value) {
+ return __.<A>start().has(accessor, value);
+ }
+
public static <A> GraphTraversal<A, A> has(final String label, final String key, final Object value) {
return __.<A>start().has(label, key, value);
}
@@ -346,6 +342,10 @@ public class __ {
return __.<A>start().has(label, key, predicate);
}
+ public static <A> GraphTraversal<A, A> has(final String key) {
+ return __.<A>start().has(key);
+ }
+
public static <A> GraphTraversal<A, A> hasNot(final String key) {
return __.<A>start().hasNot(key);
}