You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/05/08 12:27:46 UTC
[1/4] tinkerpop git commit: TINKERPOP-1296 Removed deprecated
serializedResponseTimeout from Gremlin Server
Repository: tinkerpop
Updated Branches:
refs/heads/master 9bff0f439 -> 1818c8933
TINKERPOP-1296 Removed deprecated serializedResponseTimeout from Gremlin Server
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f1237587
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f1237587
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f1237587
Branch: refs/heads/master
Commit: f1237587ea4d691f691f55c6b6c42de1f7c52a9d
Parents: 908107c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 25 21:34:43 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 26 06:37:30 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.4.x.asciidoc | 2 ++
.../src/test/resources/gremlin-server.yaml | 1 -
.../tinkerpop/gremlin/server/Settings.java | 9 -------
.../gremlin/server/op/AbstractOpProcessor.java | 25 ++------------------
.../op/traversal/TraversalOpProcessor.java | 9 -------
.../server/GremlinServerIntegrateTest.java | 24 -------------------
7 files changed, 5 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1237587/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 3248bf1..84ecdc4 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -32,6 +32,7 @@ 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 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.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1237587/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 6f47646..c486df8 100644
--- a/docs/src/upgrade/release-3.4.x.asciidoc
+++ b/docs/src/upgrade/release-3.4.x.asciidoc
@@ -92,12 +92,14 @@ The following deprecated classes, methods or fields have been removed in this ve
** `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`
Please see the javadoc deprecation notes or upgrade documentation specific to when the deprecation took place to
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]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1237587/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
index f5613ef..fb5e140 100644
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
+++ b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/src/test/resources/gremlin-server.yaml
@@ -20,7 +20,6 @@ port: 45940
threadPoolWorker: 1
gremlinPool: 8
scriptEvaluationTimeout: 30000
-serializedResponseTimeout: 30000
graphs: {
graph: conf/tinkergraph-empty.properties}
scriptEngines: {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1237587/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
index 66fcd86..3066b2c 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
@@ -104,15 +104,6 @@ public class Settings {
public long scriptEvaluationTimeout = 30000L;
/**
- * Time in milliseconds to wait while an evaluated script serializes its results. This value represents the
- * total serialization time allowed for the request. Defaults to 0 which disables this setting.
- *
- * @deprecated As of release 3.2.1, replaced wholly by {@link #scriptEvaluationTimeout}.
- */
- @Deprecated
- public long serializedResponseTimeout = 0L;
-
- /**
* Number of items in a particular resultset to iterate and serialize prior to pushing the data down the wire
* to the client.
*/
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1237587/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 fd2d27f..8e4c1c2 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
@@ -19,7 +19,6 @@
package org.apache.tinkerpop.gremlin.server.op;
import io.netty.channel.ChannelHandlerContext;
-import org.apache.commons.lang.time.StopWatch;
import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
import org.apache.tinkerpop.gremlin.driver.Tokens;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
@@ -43,7 +42,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
/**
* A base {@link OpProcessor} implementation that processes an {@code Iterator} of results in a generalized way while
@@ -64,16 +62,12 @@ public abstract class AbstractOpProcessor implements OpProcessor {
}
/**
- * Provides a generic way of iterating a result set back to the client. Implementers should respect the
- * {@link Settings#serializedResponseTimeout} configuration and break the serialization process if
- * it begins to take too long to do so, throwing a {@link java.util.concurrent.TimeoutException} in such
- * cases.
+ * Provides a generic way of iterating a result set back to the client.
*
* @param context The Gremlin Server {@link Context} object containing settings, request message, etc.
* @param itty The result to iterator
- * @throws TimeoutException if the time taken to serialize the entire result set exceeds the allowable time.
*/
- protected void handleIterator(final Context context, final Iterator itty) throws TimeoutException, InterruptedException {
+ protected void handleIterator(final Context context, final Iterator itty) throws InterruptedException {
final ChannelHandlerContext ctx = context.getChannelHandlerContext();
final RequestMessage msg = context.getRequestMessage();
final Settings settings = context.getSettings();
@@ -96,10 +90,6 @@ public abstract class AbstractOpProcessor implements OpProcessor {
return;
}
- // timer for the total serialization time
- final StopWatch stopWatch = new StopWatch();
- stopWatch.start();
-
// the batch size can be overridden by the request
final int resultIterationBatchSize = (Integer) msg.optionalArgs(Tokens.ARGS_BATCH_SIZE)
.orElse(settings.resultIterationBatchSize);
@@ -204,18 +194,7 @@ public abstract class AbstractOpProcessor implements OpProcessor {
// this isn't blocking the IO thread - just a worker.
TimeUnit.MILLISECONDS.sleep(10);
}
-
- stopWatch.split();
- if (settings.serializedResponseTimeout > 0 && stopWatch.getSplitTime() > settings.serializedResponseTimeout) {
- final String timeoutMsg = String.format("Serialization of the entire response exceeded the 'serializeResponseTimeout' setting %s",
- warnOnce ? "[Gremlin Server paused writes to client as messages were not being consumed quickly enough]" : "");
- throw new TimeoutException(timeoutMsg.trim());
- }
-
- stopWatch.unsplit();
}
-
- stopWatch.stop();
}
/**
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1237587/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
index 9025108..ca035c7 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
@@ -68,7 +68,6 @@ import java.util.UUID;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
import static com.codahale.metrics.MetricRegistry.name;
@@ -301,14 +300,6 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
}
handleIterator(context, new SideEffectIterator(sideEffects.get(sideEffectKey.get()), sideEffectKey.get()));
- } catch (TimeoutException ex) {
- final String errorMessage = String.format("Response iteration exceeded the configured threshold for request [%s] - %s", msg.getRequestId(), ex.getMessage());
- logger.warn(errorMessage);
- ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT)
- .statusMessage(errorMessage)
- .statusAttributeException(ex).create());
- onError(graph, context);
- return;
} catch (Exception ex) {
logger.warn(String.format("Exception processing a side-effect on iteration for request [%s].", msg.getRequestId()), ex);
ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f1237587/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 10bca7e..08b8526 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -59,7 +59,6 @@ import org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.apache.tinkerpop.gremlin.util.Log4jRecordingAppender;
import org.apache.tinkerpop.gremlin.util.function.Lambda;
@@ -70,7 +69,6 @@ import org.junit.Test;
import java.lang.reflect.Field;
import java.nio.channels.ClosedChannelException;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -92,7 +90,6 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.hamcrest.core.IsNot.not;
-import static org.hamcrest.core.StringEndsWith.endsWith;
import static org.hamcrest.core.StringStartsWith.startsWith;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -177,9 +174,6 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
case "shouldReceiveFailureTimeOutOnScriptEval":
settings.scriptEvaluationTimeout = 1000;
break;
- case "shouldReceiveFailureTimeOutOnTotalSerialization":
- settings.serializedResponseTimeout = 1;
- break;
case "shouldBlockRequestWhenTooBig":
settings.maxContentLength = 1024;
break;
@@ -811,24 +805,6 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
}
}
- /**
- * @deprecated As of release 3.2.1, replaced by tests covering {@link Settings#scriptEvaluationTimeout}.
- */
- @Test
- @SuppressWarnings("unchecked")
- @Deprecated
- public void shouldReceiveFailureTimeOutOnTotalSerialization() throws Exception {
- try (SimpleClient client = TestClientFactory.createWebSocketClient()){
- final List<ResponseMessage> responses = client.submit("(0..<100000)");
-
- // the last message should contain the error
- assertThat(responses.get(responses.size() - 1).getStatus().getMessage(), endsWith("Serialization of the entire response exceeded the 'serializeResponseTimeout' setting"));
-
- // validate that we can still send messages to the server
- assertEquals(2, ((List<Integer>) client.submit("1+1").get(0).getResult().getData()).get(0).intValue());
- }
- }
-
@Test
@SuppressWarnings("unchecked")
public void shouldLoadInitScript() throws Exception {
[3/4] tinkerpop git commit: TINKERPOP-1954 Removed Gremlin Server
deprecated methods
Posted by sp...@apache.org.
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 <sp...@genoprime.com>
Authored: Thu Apr 26 06:58:27 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
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();
}
[2/4] tinkerpop git commit: TINKERPOP-1707 Removed deprecated
AuthenticationSettings.className
Posted by sp...@apache.org.
TINKERPOP-1707 Removed deprecated AuthenticationSettings.className
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/908107c5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/908107c5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/908107c5
Branch: refs/heads/master
Commit: 908107c56a4ccbcdb4e160bf43d3c437fd1f20e2
Parents: 4e46f71
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 25 19:44:37 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 26 06:37:30 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.4.x.asciidoc | 5 ++++-
.../tinkerpop/gremlin/server/AbstractChannelizer.java | 7 +------
.../org/apache/tinkerpop/gremlin/server/Settings.java | 12 +-----------
.../server/GremlinServerAuditLogIntegrateTest.java | 2 +-
.../gremlin/server/GremlinServerAuthIntegrateTest.java | 2 +-
.../server/GremlinServerAuthKrb5IntegrateTest.java | 2 +-
7 files changed, 10 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/908107c5/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 833d0e5..3248bf1 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -34,6 +34,7 @@ This release also includes changes from <<release-3-3-3, 3.3.3>>.
* Moved `TraversalEngine` to `gremlin-test` as it has long been only used in testing infrastructure.
* 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/908107c5/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 cae8917..6f47646 100644
--- a/docs/src/upgrade/release-3.4.x.asciidoc
+++ b/docs/src/upgrade/release-3.4.x.asciidoc
@@ -91,12 +91,15 @@ The following deprecated classes, methods or fields have been removed in this ve
** `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.AuthenticationSettings.className`
Please see the javadoc deprecation notes or upgrade documentation specific to when the deprecation took place to
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-1705[TINKERPOP-1705]
+link:https://issues.apache.org/jira/browse/TINKERPOP-1705[TINKERPOP-1705],
+link:https://issues.apache.org/jira/browse/TINKERPOP-1707[TINKERPOP-1707]
==== Modifications to reducing barrier steps
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/908107c5/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
index e7f299b..388bf0b 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
@@ -179,12 +179,7 @@ public abstract class AbstractChannelizer extends ChannelInitializer<SocketChann
}
private Authenticator createAuthenticator(final Settings.AuthenticationSettings config) {
- String authenticatorClass = null;
- if (config.authenticator == null) {
- authenticatorClass = config.className;
- } else {
- authenticatorClass = config.authenticator;
- }
+ final String authenticatorClass = config.authenticator;
try {
final Class<?> clazz = Class.forName(authenticatorClass);
final Authenticator authenticator = (Authenticator) clazz.newInstance();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/908107c5/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
index 9921817..66fcd86 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
@@ -30,7 +30,6 @@ import org.apache.tinkerpop.gremlin.server.auth.Authenticator;
import org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer;
import org.apache.tinkerpop.gremlin.server.handler.AbstractAuthenticationHandler;
import org.apache.tinkerpop.gremlin.server.util.DefaultGraphManager;
-import info.ganglia.gmetric4j.gmetric.GMetric;
import org.apache.tinkerpop.gremlin.server.util.LifeCycleHook;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.yaml.snakeyaml.TypeDescription;
@@ -411,16 +410,7 @@ public class Settings {
* used to load the implementation from the classpath. Defaults to {@link AllowAllAuthenticator} when
* not specified.
*/
- public String authenticator = null;
-
- /**
- * The fully qualified class name of the {@link Authenticator} implementation. This class name will be
- * used to load the implementation from the classpath. Defaults to {@link AllowAllAuthenticator} when
- * not specified.
- * @deprecated As of release 3.2.5, replaced by {@link #authenticator}.
- */
- @Deprecated
- public String className = AllowAllAuthenticator.class.getName();
+ public String authenticator = AllowAllAuthenticator.class.getName();
/**
* The fully qualified class name of the {@link AbstractAuthenticationHandler} implementation.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/908107c5/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
index c31ee69..ce58c62 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
@@ -115,7 +115,7 @@ public class GremlinServerAuditLogIntegrateTest extends AbstractGremlinServerInt
final Settings.AuthenticationSettings authSettings = new Settings.AuthenticationSettings();
settings.authentication = authSettings;
authSettings.enableAuditLog = AUDIT_LOG_ENABLED;
- authSettings.className = Krb5Authenticator.class.getName();
+ authSettings.authenticator = Krb5Authenticator.class.getName();
final Map<String,Object> authConfig = new HashMap<>();
authSettings.config = authConfig;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/908107c5/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
index 6dda40b..2fc7b22 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
@@ -54,7 +54,7 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
@Override
public Settings overrideSettings(final Settings settings) {
final Settings.AuthenticationSettings authSettings = new Settings.AuthenticationSettings();
- authSettings.className = SimpleAuthenticator.class.getName();
+ authSettings.authenticator = SimpleAuthenticator.class.getName();
// use a credentials graph with one user in it: stephen/password
final Map<String,Object> authConfig = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/908107c5/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
index 5a02d0a..cda97d7 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java
@@ -97,7 +97,7 @@ public class GremlinServerAuthKrb5IntegrateTest extends AbstractGremlinServerInt
settings.ssl = sslConfig;
final Settings.AuthenticationSettings authSettings = new Settings.AuthenticationSettings();
settings.authentication = authSettings;
- authSettings.className = Krb5Authenticator.class.getName();
+ authSettings.authenticator = Krb5Authenticator.class.getName();
final Map<String,Object> authConfig = new HashMap<>();
authConfig.put("principal", kdcServer.serverPrincipal);
authConfig.put("keytab", kdcServer.serviceKeytabFile.getAbsolutePath());
[4/4] tinkerpop git commit: Merge branch 'TINKERPOP-1296'
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1296'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1818c893
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1818c893
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1818c893
Branch: refs/heads/master
Commit: 1818c8933da53a7749b705ce71bfe3de587a5d38
Parents: 9bff0f4 1e0bc5f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue May 8 08:27:28 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue May 8 08:27:28 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 5 +++
docs/src/upgrade/release-3.4.x.asciidoc | 18 +++++++---
.../src/test/resources/gremlin-server.yaml | 1 -
.../gremlin/server/AbstractChannelizer.java | 7 +---
.../tinkerpop/gremlin/server/GraphManager.java | 22 ------------
.../tinkerpop/gremlin/server/Settings.java | 21 +-----------
.../server/handler/OpSelectorHandler.java | 9 -----
.../gremlin/server/op/AbstractOpProcessor.java | 36 ++------------------
.../op/traversal/TraversalOpProcessor.java | 9 -----
.../server/util/DefaultGraphManager.java | 27 ---------------
.../GremlinServerAuditLogIntegrateTest.java | 2 +-
.../server/GremlinServerAuthIntegrateTest.java | 2 +-
.../GremlinServerAuthKrb5IntegrateTest.java | 2 +-
.../server/GremlinServerIntegrateTest.java | 24 -------------
14 files changed, 27 insertions(+), 158 deletions(-)
----------------------------------------------------------------------