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.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ae100b30 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ae100b30 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ae100b30 Branch: refs/heads/TINKERPOP-1427 Commit: ae100b3083e9a9d5b323b47ea11d31c1f1e5b92a Parents: c3cfaea Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Mon Jul 10 08:54:52 2017 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Mon Jul 10 08:54:52 2017 -0600 ---------------------------------------------------------------------- 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae100b30/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index bfdd43d..2486b94 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. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae100b30/docs/src/upgrade/release-3.3.x.asciidoc ---------------------------------------------------------------------- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index d729da8..3f12891 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` http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae100b30/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java ---------------------------------------------------------------------- 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 4e3801a..ce69715 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 enum Order implements Comparator<Object> { 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.<Comparable>naturalOrder().compare(((Map.Entry<Comparable, ?>) first).getKey(), ((Map.Entry<Comparable, ?>) 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.<Comparable>naturalOrder().compare(((Map.Entry<?, Comparable>) first).getValue(), ((Map.Entry<?, Comparable>) 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.<Comparable>reverseOrder().compare(((Map.Entry<Comparable, ?>) first).getKey(), ((Map.Entry<Comparable, ?>) 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.<Comparable>reverseOrder().compare(((Map.Entry<?, Comparable>) first).getValue(), ((Map.Entry<?, Comparable>) second).getValue()); - } - - @Override - public Order reversed() { - return valueIncr; - } }, shuffle { @Override public int compare(final Object first, final Object second) {