Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1289 [created] 6f554ec31
removed deprecated AndP/OrP/ConnectiveP constructors. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6f554ec3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6f554ec3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6f554ec3 Branch: refs/heads/TINKERPOP-1289 Commit: 6f554ec3161cca6c09ed21302170ee21e40b9df3 Parents: e5022c3 Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Fri Jun 30 14:51:57 2017 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Fri Jun 30 14:51:57 2017 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../tinkerpop/gremlin/process/traversal/util/AndP.java | 8 -------- .../gremlin/process/traversal/util/ConnectiveP.java | 8 -------- .../apache/tinkerpop/gremlin/process/traversal/util/OrP.java | 8 -------- 4 files changed, 1 insertion(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f554ec3/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 956a725..9c116b6 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 `ConnectiveP`, `AndP`, `OrP` constructors. * Graphite and Ganglia are no longer packaged with the Gremlin Server distribution. * `TransactionException` is no longer a class of `AbstractTransaction` and it extends `RuntimeException`. * Included an ellipse on long property names that are truncated. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f554ec3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java index cb001ff..fc42461 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/AndP.java @@ -40,14 +40,6 @@ public final class AndP<V> extends ConnectiveP<V> { this.biPredicate = new AndBiPredicate(this); } - @Deprecated - /** - * @deprecated As of release 3.2.0-incubating, replaced by {@link AndP(List)} - */ - public AndP(final P<V>... predicates) { - this(Arrays.asList(predicates)); - } - @Override public P<V> and(final Predicate<? super V> predicate) { if (!(predicate instanceof P)) http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f554ec3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConnectiveP.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConnectiveP.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConnectiveP.java index 855fc06..48433e1 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConnectiveP.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ConnectiveP.java @@ -39,14 +39,6 @@ public abstract class ConnectiveP<V> extends P<V> { throw new IllegalArgumentException("The provided " + this.getClass().getSimpleName() + " array must have at least two arguments: " + predicates.size()); } - @Deprecated - /** - * @deprecated As of release 3.2.0-incubating, replaced by {@link ConnectiveP(List)} - */ - public ConnectiveP(final P<V>... predicates) { - this(Arrays.asList(predicates)); - } - public List<P<V>> getPredicates() { return Collections.unmodifiableList(this.predicates); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f554ec3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java index f7363b4..6bf906f 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/OrP.java @@ -40,14 +40,6 @@ public final class OrP<V> extends ConnectiveP<V> { this.biPredicate = new OrBiPredicate(this); } - @Deprecated - /** - * @deprecated As of release 3.2.0-incubating, replaced by {@link OrP(List)} - */ - public OrP(final P<V>... predicates) { - this(Arrays.asList(predicates)); - } - @Override public P<V> or(final Predicate<? super V> predicate) { if (!(predicate instanceof P))
