You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2017/02/21 19:23:19 UTC
[3/4] tinkerpop git commit: Merge branch 'tp32'
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6d084f97
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6d084f97
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6d084f97
Branch: refs/heads/master
Commit: 6d084f97ea9c5ab2b7e396b07ce9c1c6ffd34755
Parents: d9659cd c12e6ae
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Feb 21 14:22:06 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Feb 21 14:22:06 2017 -0500
----------------------------------------------------------------------
.../traversal/dsl/graph/GraphTraversal.java | 177 ++++++++++++++++++-
1 file changed, 176 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6d084f97/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index c8786ab,8070538..e673e14
--- 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
@@@ -536,9 -563,10 +564,10 @@@ public interface GraphTraversal<S, E> e
* @param propertyKeys the properties to retrieve
* @param <E2> the value type of the returned properties
* @return the traversal with an appended {@link PropertyMapStep}.
+ * @since 3.0.0-incubating
* @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#valuemap-step" target="_blank">Reference Documentation - ValueMap Step</a>
*/
- public default <E2> GraphTraversal<S, Map<String, E2>> valueMap(final boolean includeTokens, final String... propertyKeys) {
+ public default <E2> GraphTraversal<S, Map<Object, E2>> valueMap(final boolean includeTokens, final String... propertyKeys) {
this.asAdmin().getBytecode().addStep(Symbols.valueMap, includeTokens, propertyKeys);
return this.asAdmin().addStep(new PropertyMapStep<>(this.asAdmin(), includeTokens, PropertyType.VALUE, propertyKeys));
}
@@@ -2529,10 -2647,12 +2700,12 @@@
* @param pickToken the token that would trigger this option
* @param traversalOption the option as a traversal
* @return the traversal with the modulated step
+ * @since 3.0.0-incubating
+ * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#choose-step" target="_blank">Reference Documentation - Choose Step</a>
*/
- 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;
}
@@@ -2541,11 -2661,12 +2714,13 @@@
*
* @param traversalOption the option as a traversal
* @return the traversal with the modulated step
+ * @since 3.0.0-incubating
+ * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#choose-step" target="_blank">Reference Documentation - Choose Step</a>
*/
- 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);
- return this.option(TraversalOptionParent.Pick.any, traversalOption.asAdmin());
+ ((TraversalOptionParent<Object, E, E2>) this.asAdmin().getEndStep()).addGlobalChildOption(TraversalOptionParent.Pick.any, (Traversal.Admin<E, E2>) traversalOption.asAdmin());
+ return this;
}
////