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/cd9cf9da Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cd9cf9da Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cd9cf9da Branch: refs/heads/master Commit: cd9cf9dad072c280d5a774c0fcba7c5678905946 Parents: ea7b6d95 c59393f Author: Stephen Mallette <sp...@genoprime.com> Authored: Mon Sep 11 13:29:47 2017 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Mon Sep 11 13:29:47 2017 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../upgrade/release-3.2.x-incubating.asciidoc | 17 ++++- .../remote/EmbeddedRemoteConnection.java | 75 ++++++++++++++++++++ .../traversal/EmbeddedRemoteTraversal.java | 56 +++++++++++++++ .../EmbeddedRemoteTraversalSideEffects.java | 47 ++++++++++++ .../process/traversal/CoreTraversalTest.java | 18 ++++- 6 files changed, 209 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd9cf9da/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd9cf9da/docs/src/upgrade/release-3.2.x-incubating.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd9cf9da/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java ---------------------------------------------------------------------- diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java index 566301b,6cffe2c..9893f01 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java @@@ -22,10 -22,11 +22,12 @@@ import org.apache.tinkerpop.gremlin.Exc import org.apache.tinkerpop.gremlin.FeatureRequirement; import org.apache.tinkerpop.gremlin.LoadGraphWith; import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; + import org.apache.tinkerpop.gremlin.process.remote.EmbeddedRemoteConnection; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; + import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet; +import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.VerificationException; import org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementException; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Graph; @@@ -307,12 -296,12 +310,12 @@@ public class CoreTraversalTest extends public void shouldThrowFastNoSuchElementExceptionInNestedTraversals() { //The nested traversal should throw a regular FastNoSuchElementException - GraphTraversal<Object, Object> nestedTraversal = __.has("name", "foo"); - GraphTraversal<Vertex, Object> traversal = g.V().has("name", "marko").branch(nestedTraversal); + final GraphTraversal<Object, Object> nestedTraversal = __.has("name", "foo"); + final GraphTraversal<Vertex, Object> traversal = g.V().has("name", "marko").branch(nestedTraversal); - GraphTraversal.Admin<Object, Object> nestedTraversalAdmin = nestedTraversal.asAdmin(); + final GraphTraversal.Admin<Object, Object> nestedTraversalAdmin = nestedTraversal.asAdmin(); nestedTraversalAdmin.reset(); - nestedTraversalAdmin.addStart(nestedTraversalAdmin.getTraverserGenerator().generate(g.V().has("name", "marko").next(), (Step)traversal.asAdmin().getStartStep(), 1l)); + nestedTraversalAdmin.addStart(nestedTraversalAdmin.getTraverserGenerator().generate(g.V().has("name", "marko").next(), (Step) traversal.asAdmin().getStartStep(), 1l)); try { nestedTraversal.next();
