[tinkerpop] 03/03: Merge branch '3.6-dev'

[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 3e0fa8f600971781982ab6e661e1e986eeb68fe0
Merge: c067697f66 9613c1e37d
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Jun 15 08:22:22 2023 -0400

    Merge branch '3.6-dev'

 .../gremlin/driver/simple/WebSocketClient.java     | 29 ++++++++++++++-
 .../server/GremlinServerSslIntegrateTest.java      | 43 ++++++++++++++++++++--
 .../gremlin/server/TestClientFactory.java          |  5 +++
 3 files changed, 72 insertions(+), 5 deletions(-)

diff --cc gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java
index 2f38978afc,2337b0e749..a5de7fb82e
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java
@@@ -21,7 -21,10 +21,10 @@@ package org.apache.tinkerpop.gremlin.dr
  import io.netty.buffer.PooledByteBufAllocator;
  import io.netty.channel.ChannelOption;
  import io.netty.handler.codec.http.EmptyHttpHeaders;
+ import io.netty.handler.ssl.SslContext;
+ import io.netty.handler.ssl.SslContextBuilder;
+ import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
 -import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
 +import org.apache.tinkerpop.gremlin.util.MessageSerializer;
  import org.apache.tinkerpop.gremlin.driver.handler.WebSocketClientHandler;
  import org.apache.tinkerpop.gremlin.driver.handler.WebSocketGremlinRequestEncoder;
  import org.apache.tinkerpop.gremlin.driver.handler.WebSocketGremlinResponseDecoder;
diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java
index f051fc54ce,8c40e1fd9a..ba2a238155
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java
@@@ -24,19 -24,28 +24,27 @@@ import io.netty.handler.ssl.SslContextB
  import io.netty.handler.ssl.SslProvider;
  import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
  import io.netty.handler.ssl.util.SelfSignedCertificate;
 -import org.apache.tinkerpop.gremlin.driver.Tokens;
 -import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
 -import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+ import org.apache.tinkerpop.gremlin.driver.simple.SimpleClient;
  import org.apache.tinkerpop.gremlin.util.ExceptionHelper;
  import org.apache.tinkerpop.gremlin.driver.Client;
  import org.apache.tinkerpop.gremlin.driver.Cluster;
  import org.apache.tinkerpop.gremlin.driver.exception.NoHostAvailableException;
++import org.apache.tinkerpop.gremlin.util.Tokens;
++import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
++import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
  import org.junit.Test;
  
  import javax.net.ssl.SSLException;
- import javax.net.ssl.SSLHandshakeException;
- import java.nio.channels.ClosedChannelException;
  import java.util.Arrays;
  import java.util.Collections;
- import java.util.concurrent.TimeoutException;
+ import java.util.HashMap;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.concurrent.CountDownLatch;
+ import java.util.concurrent.TimeUnit;
 -import java.util.concurrent.TimeoutException;
+ import java.util.concurrent.atomic.AtomicBoolean;
  
+ import static org.hamcrest.CoreMatchers.is;
  import static org.hamcrest.MatcherAssert.assertThat;
  import static org.hamcrest.core.IsInstanceOf.instanceOf;
  import static org.junit.Assert.assertEquals;