tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [09/50] [abbrv] tinkerpop git commit: Removed deprecated withBindings() and Bindings() constructor.
Date Wed, 12 Jul 2017 16:32:37 GMT
Removed deprecated withBindings() and Bindings() constructor.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/76e73d39
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/76e73d39
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/76e73d39

Branch: refs/heads/TINKERPOP-1427
Commit: 76e73d39be2eecea354b901b13386c636bf549ea
Parents: 79d138a
Author: Marko A. Rodriguez <okrammarko@gmail.com>
Authored: Tue Jul 11 09:09:07 2017 -0600
Committer: Marko A. Rodriguez <okrammarko@gmail.com>
Committed: Tue Jul 11 09:09:07 2017 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc                                  |  2 ++
 docs/src/upgrade/release-3.3.x.asciidoc             |  5 ++++-
 .../gremlin/process/traversal/Bindings.java         |  8 +-------
 .../gremlin/process/traversal/TraversalSource.java  | 16 ----------------
 .../traversal/dsl/graph/GraphTraversalSource.java   |  6 ------
 gremlin-python/pom.xml                              |  1 -
 6 files changed, 7 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/76e73d39/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8c08d5d..a104ae5 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+* Removed previously deprecated `Bindings` constructor. It is now a private constructor.
+* Removed previously deprecated `TraversalSource.withBindings()`.
 * Established the Gryo 3.0 format.
 * `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`.
 * `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that
for providers to extend in `AbstractGryoClassResolver`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/76e73d39/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 e02bc6e..f77aa20 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -216,6 +216,8 @@ 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.Bindings()`
+** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource#withBindings(Bindings)`
 ** `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`
@@ -309,7 +311,8 @@ link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612],
 link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622],
 link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651],
 link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694],
-link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700]
+link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700],
+link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721]
 
 Gremlin-server.sh and Init Scripts
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/76e73d39/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
index 37d2bb8..cd82078 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Bindings.java
@@ -44,13 +44,7 @@ public final class Bindings {
     private static final Bindings INSTANCE = new Bindings();
     private static final ThreadLocal<Map<Object, String>> MAP = new ThreadLocal<>();
 
-    /**
-     * @deprecated As of release 3.2.4, replaced by {@link Bindings#instance()}.
-     */
-    @Deprecated
-    public Bindings() {
-
-    }
+    private Bindings() {}
 
     public <V> V of(final String variable, final V value) {
         Map<Object, String> map = MAP.get();

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/76e73d39/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
index 62a688c..2421a78 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
@@ -29,7 +29,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SideEf
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.util.function.ConstantSupplier;
 
-import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.util.Optional;
 import java.util.function.BinaryOperator;
@@ -84,8 +83,6 @@ public interface TraversalSource extends Cloneable, AutoCloseable {
             // static fields only
         }
 
-        @Deprecated
-        public static final String withBindings = "withBindings";
         public static final String withSack = "withSack";
         public static final String withStrategies = "withStrategies";
         public static final String withoutStrategies = "withoutStrategies";
@@ -129,19 +126,6 @@ public interface TraversalSource extends Cloneable, AutoCloseable {
     }
 
     /**
-     * Using the provided {@link Bindings} to create {@link org.apache.tinkerpop.gremlin.process.traversal.Bytecode.Binding}.
-     * The bindings serve as a relay for ensure bound arguments are encoded as {@link org.apache.tinkerpop.gremlin.process.traversal.Bytecode.Binding}
in {@link Bytecode}.
-     *
-     * @param bindings the bindings instance to use
-     * @return a new traversal source with set bindings
-     * @deprecated As of release 3.2.4, replaced by use of {@link Bindings} without reference
to a {@link TraversalSource}.
-     */
-    @Deprecated
-    public default TraversalSource withBindings(final Bindings bindings) {
-        return this;
-    }
-
-    /**
      * Add a {@link Computer} that will generate a {@link GraphComputer} from the {@link
Graph} that will be used to execute the traversal.
      * This adds a {@link VertexProgramStrategy} to the strategies.
      *

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/76e73d39/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index bb56767..c5b2da5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -134,12 +134,6 @@ public class GraphTraversalSource implements TraversalSource {
     }
 
     @Override
-    @Deprecated
-    public GraphTraversalSource withBindings(final Bindings bindings) {
-        return (GraphTraversalSource) TraversalSource.super.withBindings(bindings);
-    }
-
-    @Override
     public GraphTraversalSource withComputer(final Computer computer) {
         return (GraphTraversalSource) TraversalSource.super.withComputer(computer);
     }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/76e73d39/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index 7c1db0f..8cda16d 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -526,7 +526,6 @@ def binding = ["enums": CoreImports.getClassImports()
                                         findAll { GraphTraversalSource.class.equals(it.returnType)
}.
                                         findAll {
                                             !it.name.equals("clone") &&
-                                                    !it.name.equals(TraversalSource.Symbols.withBindings)
&&
                                                     !it.name.equals(TraversalSource.Symbols.withRemote)
&&
                                                     !it.name.equals(TraversalSource.Symbols.withComputer)
                                         }.


Mime
View raw message