From ae100b3083e9a9d5b323b47ea11d31c1f1e5b92a Mon Sep 17 00:00:00 2001 From: "Marko A. Rodriguez" Date: Mon, 10 Jul 2017 08:54:52 -0600 Subject: [PATCH 1/2] removed deprecated Order enums keyDecr, valueDecr, keyIncr, and valueIncr. These were replaced long ago by Column.keys and Column.values using respective Order.incr and Order.decr ordering enums. --- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc | 4 ++ .../gremlin/process/traversal/Order.java | 61 ------------------- 3 files changed, 5 insertions(+), 61 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index bfdd43d7a5a..2486b948882 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 deprecatd `Order` enums of `keyIncr`, `keyDecr`, `valueIncr`, and `valueDecr.` * Removed previously deprecated `TraversalSource.Builder` class. * Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors. * Removed previously deprecated `TraversalScriptFunction` class. diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index d729da870a0..3f1289166ca 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -211,6 +211,10 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyDecr` +** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD` diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java index 4e3801a99ba..ce69715bb2f 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java @@ -19,7 +19,6 @@ package org.apache.tinkerpop.gremlin.process.traversal; import java.util.Comparator; -import java.util.Map; import java.util.Random; /** @@ -47,66 +46,6 @@ public int compare(final Object first, final Object second) { public Order reversed() { return incr; } - }, - /** - * @deprecated Use {@link org.apache.tinkerpop.gremlin.structure.Column#keys}; - */ - @Deprecated - keyIncr { - @Override - public int compare(final Object first, final Object second) { - return Comparator.naturalOrder().compare(((Map.Entry) first).getKey(), ((Map.Entry) second).getKey()); - } - - @Override - public Order reversed() { - return keyDecr; - } - }, - /** - * @deprecated Use {@link org.apache.tinkerpop.gremlin.structure.Column#values}; - */ - @Deprecated - valueIncr { - @Override - public int compare(final Object first, final Object second) { - return Comparator.naturalOrder().compare(((Map.Entry) first).getValue(), ((Map.Entry) second).getValue()); - } - - @Override - public Order reversed() { - return valueDecr; - } - }, - /** - * @deprecated Use {@link org.apache.tinkerpop.gremlin.structure.Column#keys}; - */ - @Deprecated - keyDecr { - @Override - public int compare(final Object first, final Object second) { - return Comparator.reverseOrder().compare(((Map.Entry) first).getKey(), ((Map.Entry) second).getKey()); - } - - @Override - public Order reversed() { - return keyIncr; - } - }, - /** - * @deprecated Use {@link org.apache.tinkerpop.gremlin.structure.Column#values}; - */ - @Deprecated - valueDecr { - @Override - public int compare(final Object first, final Object second) { - return Comparator.reverseOrder().compare(((Map.Entry) first).getValue(), ((Map.Entry) second).getValue()); - } - - @Override - public Order reversed() { - return valueIncr; - } }, shuffle { @Override public int compare(final Object first, final Object second) { From 8cf3173b8a519af62e8a4621daf89f0a8412d7ed Mon Sep 17 00:00:00 2001 From: "Marko A. Rodriguez" Date: Mon, 10 Jul 2017 08:57:01 -0600 Subject: [PATCH 2/2] removed valueIncr, valueDecr, keyIncr, and keyDecr from Gremlin-Python enums. --- .../src/main/jython/gremlin_python/process/traversal.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py index 1afaa6c5d80..6e88d0204aa 100644 --- a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py +++ b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py @@ -148,14 +148,10 @@ def process(f): statics.add_static('addAll', Operator.addAll) statics.add_static('sumLong', Operator.sumLong) -Order = Enum('Order', ' decr incr keyDecr keyIncr shuffle valueDecr valueIncr') +Order = Enum('Order', ' decr incr shuffle') statics.add_static('incr', Order.incr) statics.add_static('decr', Order.decr) -statics.add_static('keyIncr', Order.keyIncr) -statics.add_static('valueIncr', Order.valueIncr) -statics.add_static('keyDecr', Order.keyDecr) -statics.add_static('valueDecr', Order.valueDecr) statics.add_static('shuffle', Order.shuffle) Pick = Enum('Pick', ' any none')