[tinkerpop] branch master updated: Reverted TINKERPOP-2201 given discussion on #1117

[sp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


The following commit(s) were added to refs/heads/master by this push:
     new 1d7ffd0  Reverted TINKERPOP-2201 given discussion on #1117
1d7ffd0 is described below

commit 1d7ffd0e3d2b3bc12ba5c0a21a7883f987ef5106
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon May 20 08:21:30 2019 -0400

    Reverted TINKERPOP-2201 given discussion on #1117
    
    Basically, we shouldn't be altering the signatures of the GraphTraversal API to help suit the sandbox. Rather, the sandbox should be altered to better support the GraphTraversal API. Created TINKERPOP-2222 CTR
---
 CHANGELOG.asciidoc                                                    | 1 -
 .../tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 96d26bc..b08900d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,7 +26,6 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 This release also includes changes from <<release-3-3-7, 3.3.7>>.
 
 * Allow a `Traversal` to know what `TraversalSource` it spawned from.
-* Changed definition of generic in signature of `from(Traversal)` and `to(Traversal)` steps to use a wildcard rather than `Vertex`.
 * Fixed problem with connection pool sizing and retry.
 * Changed `:>` in Gremlin Console to submit the client-side timeout on each request.
 * Provided method to override the request identifier with `RequestOptions`.
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 db5cd35..204cc37 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
@@ -1103,7 +1103,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step" target="_blank">Reference Documentation - From Step</a>
      * @since 3.1.0-incubating
      */
-    public default GraphTraversal<S, E> to(final Traversal<?, ?> toVertex) {
+    public default GraphTraversal<S, E> to(final Traversal<?, Vertex> toVertex) {
         this.asAdmin().getBytecode().addStep(Symbols.to, toVertex);
         ((FromToModulating) this.asAdmin().getEndStep()).addTo(toVertex.asAdmin());
         return this;
@@ -1118,7 +1118,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
      * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#addedge-step" target="_blank">Reference Documentation - From Step</a>
      * @since 3.1.0-incubating
      */
-    public default GraphTraversal<S, E> from(final Traversal<?, ?> fromVertex) {
+    public default GraphTraversal<S, E> from(final Traversal<?, Vertex> fromVertex) {
         this.asAdmin().getBytecode().addStep(Symbols.from, fromVertex);
         ((FromToModulating) this.asAdmin().getEndStep()).addFrom(fromVertex.asAdmin());
         return this;