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 2021/04/23 09:57:35 UTC
[tinkerpop] branch master updated (4772c4c -> ea085b1)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 4772c4c Merge branch '3.4-dev'
add d46417d TINKERPOP-2547 Add a way to supply a callback on handshake with java driver
add b226f97 Merge branch 'TINKERPOP-2547' into 3.4-dev
new ea085b1 Merge branch '3.4-dev'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 1 +
.../tinkerpop/gremlin/driver/Channelizer.java | 8 ++--
.../apache/tinkerpop/gremlin/driver/Cluster.java | 17 ++++++-
.../gremlin/driver/HandshakeInterceptor.java} | 26 +++++------
.../driver/handler/WebSocketClientHandler.java | 35 ++++++++++++++-
.../gremlin/server/GremlinDriverIntegrateTest.java | 52 +++++++++++++++-------
6 files changed, 103 insertions(+), 36 deletions(-)
copy gremlin-driver/src/{test/java/org/apache/tinkerpop/gremlin/driver/TokensTest.java => main/java/org/apache/tinkerpop/gremlin/driver/HandshakeInterceptor.java} (56%)
[tinkerpop] 01/01: Merge branch '3.4-dev'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit ea085b1f1b5d72cf5c0b682497f5f9a1b05eab5d
Merge: 4772c4c b226f97
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri Apr 23 05:57:11 2021 -0400
Merge branch '3.4-dev'
CHANGELOG.asciidoc | 1 +
.../tinkerpop/gremlin/driver/Channelizer.java | 8 ++--
.../apache/tinkerpop/gremlin/driver/Cluster.java | 17 ++++++-
.../gremlin/driver/HandshakeInterceptor.java | 36 +++++++++++++++
.../driver/handler/WebSocketClientHandler.java | 35 ++++++++++++++-
.../gremlin/server/GremlinDriverIntegrateTest.java | 52 +++++++++++++++-------
6 files changed, 128 insertions(+), 21 deletions(-)
diff --cc gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
index ce7bcd2,b0f43b8..bccf947
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
@@@ -27,11 -32,8 +27,10 @@@ import io.netty.channel.ChannelHandler
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelPipeline;
import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.http.EmptyHttpHeaders;
+import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
import io.netty.handler.codec.http.HttpClientCodec;
import io.netty.handler.codec.http.HttpObjectAggregator;
- import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakerFactory;
import io.netty.handler.codec.http.websocketx.WebSocketVersion;
import io.netty.handler.codec.http.websocketx.extensions.compression.WebSocketClientCompressionHandler;
import io.netty.handler.ssl.SslContext;
@@@ -180,12 -229,12 +179,13 @@@ public interface Channelizer extends Ch
final int maxContentLength = cluster.connectionPoolSettings().maxContentLength;
handler = new WebSocketClientHandler(
- WebSocketClientHandshakerFactory.newHandshaker(
- connection.getUri(), WebSocketVersion.V13, null, /*allow extensions*/ true,
- EmptyHttpHeaders.INSTANCE, maxContentLength), cluster.getConnectionSetupTimeout());
+ new WebSocketClientHandler.InterceptedWebSocketClientHandshaker13(
+ connection.getUri(), WebSocketVersion.V13, null,true,
+ EmptyHttpHeaders.INSTANCE, maxContentLength, true, false, -1,
+ cluster.getHandshakeInterceptor()), cluster.getConnectionSetupTimeout());
- final int keepAliveInterval = toIntExact(TimeUnit.SECONDS.convert(cluster.connectionPoolSettings().keepAliveInterval, TimeUnit.MILLISECONDS));
+ final int keepAliveInterval = toIntExact(TimeUnit.SECONDS.convert(
+ cluster.connectionPoolSettings().keepAliveInterval, TimeUnit.MILLISECONDS));
pipeline.addLast("http-codec", new HttpClientCodec());
pipeline.addLast("aggregator", new HttpObjectAggregator(maxContentLength));
diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 2ddaaf5,0e03486..7a5d097
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@@ -33,15 -34,14 +33,14 @@@ import org.apache.tinkerpop.gremlin.dri
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
+import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
+ import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0;
import org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer;
- import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
import org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin;
- import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.server.channel.NioChannelizer;
import org.apache.tinkerpop.gremlin.server.handler.OpExecutorHandler;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.io.Storage;
@@@ -49,14 -49,12 +48,13 @@@ import org.apache.tinkerpop.gremlin.str
import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceVertex;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
import org.apache.tinkerpop.gremlin.util.Log4jRecordingAppender;
- import org.apache.tinkerpop.gremlin.util.TimeUtil;
import groovy.json.JsonBuilder;
+ import org.apache.tinkerpop.gremlin.util.TimeUtil;
import org.apache.tinkerpop.gremlin.util.function.FunctionUtils;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
- import org.hamcrest.core.IsInstanceOf;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;