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/08/26 19:03:34 UTC

[5/8] incubator-tinkerpop git commit: add GraphTraversalSource.inject().

add GraphTraversalSource.inject().


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/0d0ba7b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/0d0ba7b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/0d0ba7b5

Branch: refs/heads/master
Commit: 0d0ba7b5c9b2c758358774648f5d181efb40e74e
Parents: 085cd16
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Aug 25 20:06:28 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Aug 25 20:06:28 2015 -0600

----------------------------------------------------------------------
 .../process/traversal/dsl/graph/GraphTraversalSource.java   | 9 +++++++++
 .../gremlin/tinkergraph/structure/TinkerGraphTest.java      | 5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0d0ba7b5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index 799aca3..ddb8076 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -90,6 +90,10 @@ public class GraphTraversalSource implements TraversalSource {
         return traversal;
     }
 
+    public <S> GraphTraversal<S, S> inject(S... starts) {
+        return (GraphTraversal<S, S>) this.generateTraversal().inject(starts);
+    }
+
     /**
      * @deprecated As of release 3.1.0, replaced by {@link #addV()}
      */
@@ -244,6 +248,11 @@ public class GraphTraversalSource implements TraversalSource {
             this.withPaths = withPaths;
         }
 
+        public <S> GraphTraversal<S, S> inject(S... starts) {
+            this.traversal.inject(starts);
+            return ((this.withPaths) ? this.traversal.addStep(new PathIdentityStep<>(this.traversal)) : this.traversal);
+        }
+
         /**
          * @deprecated As of release 3.1.0, replaced by {@link #addV()}
          */

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0d0ba7b5/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index 194fbe5..96815ac 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@ -169,9 +169,10 @@ public class TinkerGraphTest {
         graph.createIndex("name",Vertex.class);
         graph.io(GraphMLIo.build()).readGraph("/Users/marko/software/tinkerpop/tinkerpop3/data/grateful-dead.xml");*/
         //System.out.println(g.V().properties().key().groupCount().next());
-        TinkerGraph graph = TinkerFactory.createModern();
+        TinkerGraph graph = TinkerGraph.open();
         GraphTraversalSource g = graph.traversal(GraphTraversalSource.standard());
-        g.V().as("a").addV("animal").property("age",select("a").by("age")).forEachRemaining(System.out::println);
+        g.inject("alice", "bob", "charlie").as("a").addV("person").property("name", select("a")).forEachRemaining(System.out::println);
+        g.V().valueMap().forEachRemaining(System.out::println);
         /*final List<Supplier<GraphTraversal<?,?>>> traversals = Arrays.asList(
                 () -> g.V().out().as("v").match(
                         __.as("v").outE().count().as("outDegree"),