TINKERPOP-1954 Removed Gremlin Server deprecated methods Specifically, removed deprecated GraphManager and Handler/OpProcessor
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1e0bc5fc Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1e0bc5fc Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1e0bc5fc Branch: refs/heads/master Commit: 1e0bc5fc9f3753697621b2b54a0e6a1021363fb6 Parents: f123758 Author: Stephen Mallette <[email protected]> Authored: Thu Apr 26 06:58:27 2018 -0400 Committer: Stephen Mallette <[email protected]> Committed: Thu Apr 26 06:58:27 2018 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 5 +++- docs/src/upgrade/release-3.4.x.asciidoc | 17 +++++++----- .../tinkerpop/gremlin/server/GraphManager.java | 22 ---------------- .../server/handler/OpSelectorHandler.java | 9 ------- .../gremlin/server/op/AbstractOpProcessor.java | 11 +------- .../server/util/DefaultGraphManager.java | 27 -------------------- 6 files changed, 16 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e0bc5fc/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 84ecdc4..a405ba0 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -32,10 +32,13 @@ This release also includes changes from <<release-3-3-3, 3.3.3>>. * Changed the order of `select()` scopes. The order is now: maps, side-effects, paths. * Removed previously deprecated Credentials DSL infrastructure. * Moved `TraversalEngine` to `gremlin-test` as it has long been only used in testing infrastructure. +* Removed previously deprecated `OpSelectorHandler` constructor. +* Removed previously deprecated `AbstractOpProcessor#makeFrame()` method. +* Removed previously deprecated `AuthenticationSettings.className` configuration option in Gremlin Server. +* Removed previously deprecated `GraphManager` methods `getGraphs()` and `getTraversalSources()`. * Removed previously deprecated Gremlin Server setting for `serializedResponseTimeout`. * Removed previously deprecated Structure API exceptions related to "element not found" situations. * Removed previously deprecated `rebindings` options from the Java driver API. -* Removed previously deprecated `AuthenticationSettings.className` configuration option in Gremlin Server. * Removed support for Giraph. == TinkerPop 3.3.0 (Gremlin Symphony #40 in G Minor) http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e0bc5fc/docs/src/upgrade/release-3.4.x.asciidoc ---------------------------------------------------------------------- diff --git a/docs/src/upgrade/release-3.4.x.asciidoc b/docs/src/upgrade/release-3.4.x.asciidoc index c486df8..a3de9e7 100644 --- a/docs/src/upgrade/release-3.4.x.asciidoc +++ b/docs/src/upgrade/release-3.4.x.asciidoc @@ -84,16 +84,20 @@ The following deprecated classes, methods or fields have been removed in this ve * `gremlin-core` ** `org.apache.tinkerpop.gremlin.process.traversal.engine.*` ** `org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine` -** `org.apache.tinkerpop.gremlin.structure.Element.Exceptions.elementAlreadyRemoved(Class, Object)` -** `org.apache.tinkerpop.gremlin.structure.Graph.Exceptions.elementNotFound(Class, Object)` -** `org.apache.tinkerpop.gremlin.structure.Graph.Exceptions.elementNotFound(Class, Object, Exception)` +** `org.apache.tinkerpop.gremlin.structure.Element.Exceptions#elementAlreadyRemoved(Class, Object)` +** `org.apache.tinkerpop.gremlin.structure.Graph.Exceptions#elementNotFound(Class, Object)` +** `org.apache.tinkerpop.gremlin.structure.Graph.Exceptions#elementNotFound(Class, Object, Exception)` * `gremlin-driver` ** `org.apache.tinkerpop.gremlin.driver.Client#rebind(String)` ** `org.apache.tinkerpop.gremlin.driver.Client.ReboundClusterdClient` ** `org.apache.tinkerpop.gremlin.driver.Tokens#ARGS_REBINDINGS` * `gremlin-server` -** `org.apache.tinkerpop.gremlin.server.Settings.serializedResponseTimeout` -** `org.apache.tinkerpop.gremlin.server.Settings.AuthenticationSettings.className` +** `org.apache.tinkerpop.gremlin.server.GraphManager#getGraphs()` +** `org.apache.tinkerpop.gremlin.server.GraphManager#getTraversalSources()` +** `org.apache.tinkerpop.gremlin.server.Settings#serializedResponseTimeout` +** `org.apache.tinkerpop.gremlin.server.Settings.AuthenticationSettings#className` +** `org.apache.tinkerpop.gremlin.server.handler.OpSelectorHandler(Settings, GraphManager, GremlinExecutor, ScheduledExecutorService)` +** `org.apache.tinkerpop.gremlin.server.op.AbstractOpProcessor#makeFrame(ChannelHandlerContext, RequestMessage, MessageSerializer serializer, boolean, List, ResponseStatusCode code)` Please see the javadoc deprecation notes or upgrade documentation specific to when the deprecation took place to understand how to resolve this breaking change. @@ -101,7 +105,8 @@ understand how to resolve this breaking change. See: link:https://issues.apache.org/jira/browse/TINKERPOP-1143[TINKERPOP-1143], link:https://issues.apache.org/jira/browse/TINKERPOP-1296[TINKERPOP-1296], link:https://issues.apache.org/jira/browse/TINKERPOP-1705[TINKERPOP-1705], -link:https://issues.apache.org/jira/browse/TINKERPOP-1707[TINKERPOP-1707] +link:https://issues.apache.org/jira/browse/TINKERPOP-1707[TINKERPOP-1707], +link:https://issues.apache.org/jira/browse/TINKERPOP-1954[TINKERPOP-1954] ==== Modifications to reducing barrier steps http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e0bc5fc/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java index bcb4a8e..b64bba4 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java @@ -35,16 +35,6 @@ import java.util.function.Function; * the interface also defines similar features for {@link TraversalSource} objects. */ public interface GraphManager { - /** - * Get a list of the {@link Graph} instances and their binding names. - * - * @return a {@code Map} where the key is the name of the {@link Graph} and the value is the {@link Graph} itself - * @deprecated As of release 3.2.5, replaced by a combination of {@link #getGraphNames()} and - * {@link #getGraph(String)} - note that the expectation is this method return an immutable {@code Map} which was - * not the expectation prior to 3.2.5. - */ - @Deprecated - public Map<String, Graph> getGraphs(); /** * Get a {@link Set} of {@link String} graphNames corresponding to names stored in the graph's @@ -65,18 +55,6 @@ public interface GraphManager { public void putGraph(final String graphName, final Graph g); /** - * Get a list of the {@link TraversalSource} instances and their binding names - * - * @return a {@link Map} where the key is the name of the {@link TraversalSource} and the value is the - * {@link TraversalSource} itself - * @deprecated As of release 3.2.5, replaced by a combination of {@link #getTraversalSourceNames()} and - * {@link #getTraversalSource(String)} - note that the expectation is this method return an immutable - * {@code Map} which was not the expectation prior to 3.2.5. - */ - @Deprecated - public Map<String, TraversalSource> getTraversalSources(); - - /** * Get a {@code Set} of the names of the the stored {@link TraversalSource} instances. */ public Set<String> getTraversalSourceNames(); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e0bc5fc/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java index 0f14293..75d44e8 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java @@ -56,15 +56,6 @@ public class OpSelectorHandler extends MessageToMessageDecoder<RequestMessage> { private final ScheduledExecutorService scheduledExecutorService; private final Channelizer channelizer; - /** - * @deprecated As of release 3.2.8, replaced by {@link #OpSelectorHandler(Settings, GraphManager, GremlinExecutor, ScheduledExecutorService, Channelizer)} - */ - @Deprecated - public OpSelectorHandler(final Settings settings, final GraphManager graphManager, final GremlinExecutor gremlinExecutor, - final ScheduledExecutorService scheduledExecutorService) { - this(settings, graphManager, gremlinExecutor, scheduledExecutorService, null); - } - public OpSelectorHandler(final Settings settings, final GraphManager graphManager, final GremlinExecutor gremlinExecutor, final ScheduledExecutorService scheduledExecutorService, final Channelizer channelizer) { this.settings = settings; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e0bc5fc/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java index 8e4c1c2..bb368c5 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java @@ -228,18 +228,9 @@ public abstract class AbstractOpProcessor implements OpProcessor { return Collections.emptyMap(); } - /** - * @deprecated As of release 3.2.2, replaced by {@link #makeFrame(ChannelHandlerContext, RequestMessage, MessageSerializer, boolean, List, ResponseStatusCode, Map)}. - */ protected static Frame makeFrame(final ChannelHandlerContext ctx, final RequestMessage msg, final MessageSerializer serializer, final boolean useBinary, final List<Object> aggregate, - final ResponseStatusCode code) throws Exception { - return makeFrame(ctx, msg, serializer, useBinary, aggregate, code, Collections.emptyMap()); - } - - protected static Frame makeFrame(final ChannelHandlerContext ctx, final RequestMessage msg, - final MessageSerializer serializer, final boolean useBinary, final List<Object> aggregate, - final ResponseStatusCode code, final Map<String,Object> responseMetaData) throws Exception { + final ResponseStatusCode code, final Map<String,Object> responseMetaData) throws Exception { try { if (useBinary) { return new Frame(serializer.serializeResponseAsBinary(ResponseMessage.build(msg) http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e0bc5fc/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java index 9b5668f..a9e9902 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java @@ -65,19 +65,6 @@ public final class DefaultGraphManager implements GraphManager { }); } - /** - * Get a list of the {@link Graph} instances and their binding names as defined in the Gremlin Server - * configuration file. - * - * @return a {@code Map} where the key is the name of the {@link Graph} and the value is the {@link Graph} itself - * @deprecated As of release 3.2.5, replaced by a combination of {@link #getGraphNames()} and - * {@link #getGraph(String)} - */ - @Deprecated - public final Map<String, Graph> getGraphs() { - return graphs; - } - public final Set<String> getGraphNames() { return graphs.keySet(); } @@ -90,20 +77,6 @@ public final class DefaultGraphManager implements GraphManager { graphs.put(graphName, g); } - /** - * Get a list of the {@link TraversalSource} instances and their binding names as defined by Gremlin Server - * initialization scripts. - * - * @return a {@code Map} where the key is the name of the {@link TraversalSource} and the value is the - * {@link TraversalSource} itself - * @deprecated As of release 3.2.5, replaced by a combination of {@link #getTraversalSourceNames()} and - * {@link #getTraversalSource(String)} - */ - @Deprecated - public final Map<String, TraversalSource> getTraversalSources() { - return traversalSources; - } - public final Set<String> getTraversalSourceNames() { return traversalSources.keySet(); }
