(tinkerpop) 01/01: Merge branch '3.6-dev' into 3.7-dev

[colegreer]

This is an automated email from the ASF dual-hosted git repository.

colegreer pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit ed7570d06f0f28db3dce9c0bd7a5cbe0496533ff
Merge: d8906996ac d95d83bef3
Author: Cole-Greer <cole.gr...@improving.com>
AuthorDate: Fri Nov 17 09:19:50 2023 -0800

    Merge branch '3.6-dev' into 3.7-dev

 CHANGELOG.asciidoc                                 |  1 +
 docs/src/upgrade/release-3.6.x.asciidoc            |  3 +
 .../tinkerpop/gremlin/driver/Channelizer.java      |  7 +--
 .../driver/handler/HttpGremlinRequestEncoder.java  | 15 ++++-
 .../gremlin/server/AbstractChannelizer.java        |  2 +-
 .../gremlin/server/channel/HttpChannelizer.java    |  3 +
 .../server/handler/HttpUserAgentHandler.java       | 67 ++++++++++++++++++++++
 .../handler/WsAndHttpChannelizerHandler.java       | 29 ++++++----
 .../gremlin/server/GremlinServerIntegrateTest.java | 63 ++++++++++++++++++--
 ...stChannelizer.java => HttpTestChannelizer.java} | 12 ++--
 .../gremlin/server/channel/TestChannelizer.java    |  6 ++
 .../server/channel/UnifiedTestChannelizer.java     |  6 +-
 .../server/channel/WebSocketTestChannelizer.java   |  6 +-
 ...nnelizer.java => WsAndHttpTestChannelizer.java} | 11 +++-
 14 files changed, 199 insertions(+), 32 deletions(-)

diff --cc 
gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
index c29dd1ddaa,606549a535..67f7e3d95c
--- 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
+++ 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/HttpGremlinRequestEncoder.java
@@@ -27,12 -27,13 +27,13 @@@ import io.netty.handler.codec.http.Full
  import io.netty.handler.codec.http.HttpHeaderNames;
  import io.netty.handler.codec.http.HttpMethod;
  import io.netty.handler.codec.http.HttpVersion;
 -import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
+ import org.apache.tinkerpop.gremlin.driver.UserAgent;
  import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
 -import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
 -import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
 -import org.apache.tinkerpop.gremlin.driver.ser.SerTokens;
  import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 +import org.apache.tinkerpop.gremlin.util.MessageSerializer;
 +import org.apache.tinkerpop.gremlin.util.message.RequestMessage;
 +import org.apache.tinkerpop.gremlin.util.message.ResponseStatusCode;
 +import org.apache.tinkerpop.gremlin.util.ser.SerTokens;
  
  import java.util.List;
  import java.util.function.UnaryOperator;