From e0de2b8a84ab43a7cdfce8152c8f4c381f9ce7b6 Mon Sep 17 00:00:00 2001 From: "Marko A. Rodriguez" Date: Fri, 14 Jul 2017 11:11:36 -0600 Subject: [PATCH 1/2] removed deprecated selectV3d0() select step. Updated CHANGELOG and release notes accordingly. --- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc | 4 +++- .../traversal/dsl/graph/GraphTraversal.java | 23 ------------------- .../process/traversal/dsl/graph/__.java | 16 ------------- 4 files changed, 4 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index e9bd81ebae1..55cd94f2ace 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* Removed previously deprecated `GraphTraversal.selectV3d0()` step. * Removed previously deprecated `DetachedEdge(Object,String,Map,Pair,Pair)` constructor. * Removed previously deprecated `Bindings` constructor. It is now a private constructor. * Removed previously deprecated `TraversalSource.withBindings()`. diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index bddcebcc72a..10fdc904f23 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -235,6 +235,7 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addE(Direction, String, String, Object...)` ** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addOutE(String, String, Object...)` ** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addInV(String, String, Object...)` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#selectV3d2()` ** `org.apache.tinkerpop.gremlin.process.traversal.Bindings()` ** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource#withBindings(Bindings)` ** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)` @@ -360,7 +361,8 @@ link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721], link:https://issues.apache.org/jira/browse/TINKERPOP-1719[TINKERPOP-1719], link:https://issues.apache.org/jira/browse/TINKERPOP-1720[TINKERPOP-1720], link:https://issues.apache.org/jira/browse/TINKERPOP-880[TINKERPOP-880], -link:https://issues.apache.org/jira/browse/TINKERPOP-1170[TINKERPOP-1170] +link:https://issues.apache.org/jira/browse/TINKERPOP-1170[TINKERPOP-1170], +link:https://issues.apache.org/jira/browse/TINKERPOP-1729[TINKERPOP-1729] Gremlin-server.sh and Init Scripts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 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 be46413c6fd..dcee4675bae 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 @@ -731,29 +731,6 @@ public default GraphTraversal select(final String selectKey) { return this.asAdmin().addStep(new SelectOneStep<>(this.asAdmin(), Pop.last, selectKey)); } - /** - * @deprecated As of release 3.3.0, replaced by {@link GraphTraversal#select(Pop, String)} with {@link Pop#mixed}. - */ - @Deprecated - public default GraphTraversal selectV3d2(final String selectKey) { - this.asAdmin().getBytecode().addStep(Symbols.selectV3d2, selectKey); - return this.asAdmin().addStep(new SelectOneStep<>(this.asAdmin(), Pop.mixed, selectKey)); - } - - /** - * @deprecated As of release 3.3.0, replaced by {@link GraphTraversal#select(Pop, String, String, String...)} with {@link Pop#mixed}. - */ - @Deprecated - public default GraphTraversal> selectV3d2(final String selectKey1, final String selectKey2, String... otherSelectKeys) { - final String[] selectKeys = new String[otherSelectKeys.length + 2]; - selectKeys[0] = selectKey1; - selectKeys[1] = selectKey2; - System.arraycopy(otherSelectKeys, 0, selectKeys, 2, otherSelectKeys.length); - this.asAdmin().getBytecode().addStep(Symbols.selectV3d2, selectKey1, selectKey2, otherSelectKeys); - return this.asAdmin().addStep(new SelectStep<>(this.asAdmin(), Pop.mixed, selectKeys)); - } - - /** * A version of {@code select} that allows for the extraction of a {@link Column} from objects in the traversal. * 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 82c7651766a..a1b40e39b9f 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 @@ -337,14 +337,6 @@ public static GraphTraversal select(final String selectKey) { return __.start().select(selectKey); } - /** - * @see GraphTraversal#selectV3d2(String) - */ - @Deprecated - public static GraphTraversal selectV3d2(final String selectKey) { - return __.start().selectV3d2(selectKey); - } - /** * @see GraphTraversal#select(Pop, String, String, String...) */ @@ -359,14 +351,6 @@ public static GraphTraversal> select(final String selec return __.start().select(selectKey1, selectKey2, otherSelectKeys); } - /** - * @see GraphTraversal#selectV3d2(String, String, String...) - */ - @Deprecated - public static GraphTraversal> selectV3d2(final String selectKey1, final String selectKey2, final String... otherSelectKeys) { - return __.start().selectV3d2(selectKey1, selectKey2, otherSelectKeys); - } - /** * @see GraphTraversal#unfold() */ From e00902b4ab75d5247402876f298f69462883024b Mon Sep 17 00:00:00 2001 From: "Marko A. Rodriguez" Date: Fri, 14 Jul 2017 11:22:49 -0600 Subject: [PATCH 2/2] pushed updated graph_traversal.py from template construction. --- .../jython/gremlin_python/process/graph_traversal.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py index fe8d2de24b8..ea4afc69bff 100644 --- a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py +++ b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py @@ -416,10 +416,6 @@ def select(self, *args): self.bytecode.add_step("select", *args) return self - def selectV3d2(self, *args): - self.bytecode.add_step("selectV3d2", *args) - return self - def sideEffect(self, *args): self.bytecode.add_step("sideEffect", *args) return self @@ -779,10 +775,6 @@ def sample(cls, *args): def select(cls, *args): return cls.graph_traversal(None, None, Bytecode()).select(*args) - @classmethod - def selectV3d2(cls, *args): - return cls.graph_traversal(None, None, Bytecode()).selectV3d2(*args) - @classmethod def sideEffect(cls, *args): return cls.graph_traversal(None, None, Bytecode()).sideEffect(*args) @@ -1133,10 +1125,6 @@ def select(*args): return __.select(*args) statics.add_static('select', select) -def selectV3d2(*args): - return __.selectV3d2(*args) -statics.add_static('selectV3d2', selectV3d2) - def sideEffect(*args): return __.sideEffect(*args) statics.add_static('sideEffect', sideEffect)