[tinkerpop] 01/01: Merge branch 'tp34'

[spmallette]

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 5dfb28a021b9ce0e3cd7d3d0a0eb380864b16ec6
Merge: 454f11c e02a551
Author: stephen <spmalle...@gmail.com>
AuthorDate: Wed Dec 18 06:40:25 2019 -0500

    Merge branch 'tp34'

 CHANGELOG.asciidoc                                                    | 1 +
 docs/src/reference/gremlin-applications.asciidoc                      | 2 +-
 .../main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java    | 4 ++++
 .../tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java    | 3 +++
 .../tinkerpop/gremlin/driver/handler/NioGremlinResponseDecoder.java   | 3 +++
 .../java/org/apache/tinkerpop/gremlin/driver/simple/NioClient.java    | 2 ++
 .../main/java/org/apache/tinkerpop/gremlin/server/Channelizer.java    | 2 +-
 .../org/apache/tinkerpop/gremlin/server/channel/NioChannelizer.java   | 3 +++
 .../gremlin/server/handler/NioGremlinBinaryRequestDecoder.java        | 4 ++++
 .../gremlin/server/handler/NioGremlinResponseFrameEncoder.java        | 3 +++
 10 files changed, 25 insertions(+), 2 deletions(-)

diff --cc 
gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java
index b76b96b,1330a7e..be99226
--- 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java
+++ 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java
@@@ -27,12 -27,18 +27,15 @@@ import io.netty.buffer.ByteBuf
  import io.netty.channel.ChannelHandlerContext;
  import io.netty.handler.codec.MessageToByteEncoder;
  import io.netty.util.CharsetUtil;
+ import org.apache.tinkerpop.gremlin.driver.simple.WebSocketClient;
 -import org.slf4j.Logger;
 -import org.slf4j.LoggerFactory;
  
  /**
   * @author Stephen Mallette (http://stephen.genoprime.com)
+  * @deprecated As of release 3.3.10, not replaced, use {@link 
WebSocketClient}.
   */
+ @Deprecated
  public final class NioGremlinRequestEncoder extends 
MessageToByteEncoder<Object> {
 -    private boolean binaryEncoding = false;
 +    private boolean binaryEncoding;
  
      private final MessageSerializer serializer;