tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [07/50] [abbrv] tinkerpop git commit: removed deprecated TraversalSource.Builder.
Date Mon, 10 Jul 2017 18:18:36 GMT
removed deprecated TraversalSource.Builder.


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

Branch: refs/heads/TINKERPOP-1698
Commit: c795b098d15ff4b2bb4a7a767a027d4f1485daa5
Parents: e5022c3
Author: Marko A. Rodriguez <okrammarko@gmail.com>
Authored: Fri Jun 30 15:09:58 2017 -0600
Committer: Marko A. Rodriguez <okrammarko@gmail.com>
Committed: Fri Jun 30 15:09:58 2017 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 docs/src/upgrade/release-3.3.x.asciidoc         |  1 +
 .../process/traversal/TraversalSource.java      | 31 -------
 .../dsl/graph/GraphTraversalSource.java         | 95 --------------------
 .../tinkerpop/gremlin/structure/Graph.java      | 13 ---
 5 files changed, 2 insertions(+), 139 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c795b098/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 956a725..42fc7b7 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 `TraversalSource.Builder` class.
 * 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/c795b098/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 0f71714..f04f564 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -202,6 +202,7 @@ The following deprecated classes, methods or fields have been removed
in this ve
 ** `org.apache.tinkerpop.gremlin.jsr223.SingleGremlinScriptEngineManager#getInstance()`
 ** `org.apache.tinkerpop.gremlin.jsr223.GremlinScriptEngineManager#addModule(GremlinModule)`
 ** `org.apache.tinkerpop.gremlin.jsr223.console.PluginAcceptor`
+** `org.apache.tinkerpop.gremlin.process.traversal.TraversalSource.Builder`
 ** `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/c795b098/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 d20ce10..62a688c 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
@@ -413,35 +413,4 @@ public interface TraversalSource extends Cloneable, AutoCloseable {
         // do nothing
     }
 
-    /**
-     * @deprecated As of release 3.2.0. Please use {@link Graph#traversal(Class)}.
-     */
-    @Deprecated
-    public interface Builder<C extends TraversalSource> extends Serializable {
-
-        /**
-         * @deprecated As of release 3.2.0. Please use {@link Graph#traversal(Class)}.
-         */
-        @Deprecated
-        public Builder engine(final TraversalEngine.Builder engine);
-
-        /**
-         * @deprecated As of release 3.2.0. Please use {@link Graph#traversal(Class)}.
-         */
-        @Deprecated
-        public Builder with(final TraversalStrategy strategy);
-
-        /**
-         * @deprecated As of release 3.2.0. Please use {@link Graph#traversal(Class)}.
-         */
-        @Deprecated
-        public Builder without(final Class<? extends TraversalStrategy> strategyClass);
-
-        /**
-         * @deprecated As of release 3.2.0. Please use {@link Graph#traversal(Class)}.
-         */
-        @Deprecated
-        public C create(final Graph graph);
-    }
-
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c795b098/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 1b6a218..bb56767 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
@@ -330,99 +330,4 @@ public class GraphTraversalSource implements TraversalSource {
         return StringFactory.traversalSourceString(this);
     }
 
-    //////////////////
-    // DEPRECATION //
-    /////////////////
-
-    /**
-     * @deprecated As of release 3.2.0. Please use {@link Graph#traversal(Class)}.
-     */
-    @Deprecated
-    public static Builder build() {
-        return new Builder();
-    }
-
-    /**
-     * @deprecated As of release 3.2.0. Please use {@link Graph#traversal(Class)}.
-     */
-    @Deprecated
-    public static Builder standard() {
-        return GraphTraversalSource.build().engine(StandardTraversalEngine.build());
-    }
-
-    /**
-     * @deprecated As of release 3.2.0. Please use {@link Graph#traversal(Class)}.
-     */
-    @Deprecated
-    public static Builder computer() {
-        return GraphTraversalSource.build().engine(ComputerTraversalEngine.build());
-    }
-
-    /**
-     * @deprecated As of release 3.2.0. Please use {@link Graph#traversal(Class)}.
-     */
-    @Deprecated
-    public static Builder computer(final Class<? extends GraphComputer> graphComputerClass)
{
-        return GraphTraversalSource.build().engine(ComputerTraversalEngine.build().computer(graphComputerClass));
-    }
-
-    /**
-     * @deprecated As of release 3.2.0. Please use {@link Graph#traversal(Class)}.
-     */
-    @Deprecated
-    public final static class Builder implements TraversalSource.Builder<GraphTraversalSource>
{
-
-        private TraversalEngine.Builder engineBuilder = StandardTraversalEngine.build();
-        private List<TraversalStrategy> withStrategies = new ArrayList<>();
-        private List<Class<? extends TraversalStrategy>> withoutStrategies =
new ArrayList<>();
-
-        private Builder() {
-        }
-
-        /**
-         * @deprecated As of release 3.2.0. Please use {@link Graph#traversal(Class)}.
-         */
-        @Deprecated
-        @Override
-        public Builder engine(final TraversalEngine.Builder engineBuilder) {
-            this.engineBuilder = engineBuilder;
-            return this;
-        }
-
-        /**
-         * @deprecated As of release 3.2.0. Please use {@link Graph#traversal(Class)}.
-         */
-        @Deprecated
-        @Override
-        public Builder with(final TraversalStrategy strategy) {
-            this.withStrategies.add(strategy);
-            return this;
-        }
-
-        /**
-         * @deprecated As of release 3.2.0. Please use {@link Graph#traversal(Class)}.
-         */
-        @Deprecated
-        @Override
-        public TraversalSource.Builder without(final Class<? extends TraversalStrategy>
strategyClass) {
-            this.withoutStrategies.add(strategyClass);
-            return this;
-        }
-
-        /**
-         * @deprecated As of release 3.2.0. Please use {@link Graph#traversal(Class)}.
-         */
-        @Deprecated
-        @Override
-        public GraphTraversalSource create(final Graph graph) {
-            GraphTraversalSource traversalSource = new GraphTraversalSource(graph);
-            if (!this.withStrategies.isEmpty())
-                traversalSource = traversalSource.withStrategies(this.withStrategies.toArray(new
TraversalStrategy[this.withStrategies.size()]));
-            if (!this.withoutStrategies.isEmpty())
-                traversalSource = traversalSource.withoutStrategies(this.withoutStrategies.toArray(new
Class[this.withoutStrategies.size()]));
-            if (this.engineBuilder instanceof ComputerTraversalEngine.Builder)
-                traversalSource = (GraphTraversalSource) ((ComputerTraversalEngine.Builder)
this.engineBuilder).create(traversalSource);
-            return traversalSource;
-        }
-    }
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c795b098/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
index 3e32113..5dec1a5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
@@ -161,19 +161,6 @@ public interface Graph extends AutoCloseable, Host {
     }
 
     /**
-     * Generate a {@link TraversalSource} using the specified {@code TraversalSource.Builder}.
-     * The reusable {@link TraversalSource} provides methods for spawning {@link Traversal}
instances.
-     *
-     * @param sourceBuilder The traversal source builder to use
-     * @param <C>           The traversal source class
-     * @deprecated As of release 3.2.0. Please use {@link Graph#traversal(Class)}.
-     */
-    @Deprecated
-    public default <C extends TraversalSource> C traversal(final TraversalSource.Builder<C>
sourceBuilder) {
-        return sourceBuilder.create(this);
-    }
-
-    /**
      * Generate a reusable {@link GraphTraversalSource} instance.
      * The {@link GraphTraversalSource} provides methods for creating
      * {@link org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal} instances.


Mime
View raw message