THRIFT-5863: Add method for customizing the TConfiguration in TServerTransport

Author: dengzhhu653

lib/java/src/main/java/org/apache/thrift/TConfiguration.java

@@ -62,6 +62,14 @@ public void setRecursionLimit(int recursionLimit) {
     this.recursionLimit = recursionLimit;
   }
 
+  public void deepCopy(TConfiguration configuration) {
+    if (configuration != null) {
+      setMaxMessageSize(configuration.getMaxMessageSize());
+      setRecursionLimit(configuration.getRecursionLimit());
+      setMaxFrameSize(configuration.getMaxFrameSize());
+    }
+  }
+
   public static final TConfiguration DEFAULT = new Builder().build();
 
   public static TConfiguration.Builder custom() {

lib/java/src/main/java/org/apache/thrift/transport/TNonblockingServerSocket.java

@@ -46,8 +46,7 @@ public class TNonblockingServerSocket extends TNonblockingServerTransport {
   /** Timeout for client sockets from accept */
   private int clientTimeout_ = 0;
 
-  /** Limit for client sockets request size */
-  private int maxFrameSize_ = 0;
+  private final TConfiguration configuration_;
 
   public static class NonblockingAbstractServerSocketArgs
       extends AbstractServerTransportArgs<NonblockingAbstractServerSocketArgs> {}
@@ -92,7 +91,7 @@ public TNonblockingServerSocket(InetSocketAddress bindAddr, int clientTimeout, i
   public TNonblockingServerSocket(NonblockingAbstractServerSocketArgs args)
       throws TTransportException {
     clientTimeout_ = args.clientTimeout;
-    maxFrameSize_ = args.maxFrameSize;
+    configuration_ = args.configuration;
     try {
       serverSocketChannel = ServerSocketChannel.open();
       serverSocketChannel.configureBlocking(false);
@@ -132,10 +131,7 @@ public TNonblockingSocket accept() throws TTransportException {
         return null;
       }
 
-      TNonblockingSocket tsocket = new TNonblockingSocket(socketChannel);
-      tsocket.setTimeout(clientTimeout_);
-      tsocket.setMaxFrameSize(maxFrameSize_);
-      return tsocket;
+      return new TNonblockingSocket(configuration_, socketChannel, clientTimeout_, null);
     } catch (IOException iox) {
       throw new TTransportException(iox);
     }

lib/java/src/main/java/org/apache/thrift/transport/TNonblockingSocket.java

@@ -74,7 +74,7 @@ private TNonblockingSocket(SocketChannel socketChannel, int timeout, SocketAddre
     this(new TConfiguration(), socketChannel, timeout, socketAddress);
   }
 
-  private TNonblockingSocket(
+  public TNonblockingSocket(
       TConfiguration config, SocketChannel socketChannel, int timeout, SocketAddress socketAddress)
       throws IOException, TTransportException {
     super(config);

lib/java/src/main/java/org/apache/thrift/transport/TServerSocket.java

@@ -24,6 +24,7 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
+import org.apache.thrift.TConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,6 +39,8 @@ public class TServerSocket extends TServerTransport {
   /** Timeout for client sockets from accept */
   private int clientTimeout_ = 0;
 
+  private final TConfiguration configuration_;
+
   public static class ServerSocketTransportArgs
       extends AbstractServerTransportArgs<ServerSocketTransportArgs> {
     ServerSocket serverSocket;
@@ -78,6 +81,7 @@ public TServerSocket(InetSocketAddress bindAddr, int clientTimeout) throws TTran
 
   public TServerSocket(ServerSocketTransportArgs args) throws TTransportException {
     clientTimeout_ = args.clientTimeout;
+    configuration_ = args.configuration;
     if (args.serverSocket != null) {
       this.serverSocket_ = args.serverSocket;
       return;
@@ -121,7 +125,7 @@ public TSocket accept() throws TTransportException {
     if (result == null) {
       throw new TTransportException("Blocking server's accept() may not return NULL");
     }
-    TSocket socket = new TSocket(result);
+    TSocket socket = new TSocket(result, configuration_);
     socket.setTimeout(clientTimeout_);
     return socket;
   }

lib/java/src/main/java/org/apache/thrift/transport/TServerTransport.java

@@ -31,7 +31,7 @@ public abstract static class AbstractServerTransportArgs<
     int backlog = 0; // A value of 0 means the default value will be used (currently set at 50)
     int clientTimeout = 0;
     InetSocketAddress bindAddr;
-    int maxFrameSize = TConfiguration.DEFAULT_MAX_FRAME_SIZE;
+    TConfiguration configuration = new TConfiguration();
 
     public T backlog(int backlog) {
       this.backlog = backlog;
@@ -54,7 +54,12 @@ public T bindAddr(InetSocketAddress bindAddr) {
     }
 
     public T maxFrameSize(int maxFrameSize) {
-      this.maxFrameSize = maxFrameSize;
+      configuration.setMaxFrameSize(maxFrameSize);
+      return (T) this;
+    }
+
+    public T setTConfiguration(TConfiguration configuration_) {
+      configuration.deepCopy(configuration_);
       return (T) this;
     }
   }

lib/java/src/main/java/org/apache/thrift/transport/TSocket.java

@@ -56,7 +56,18 @@ public class TSocket extends TIOStreamTransport {
    * @throws TTransportException if there is an error setting up the streams
    */
   public TSocket(Socket socket) throws TTransportException {
-    super(new TConfiguration());
+    this(socket, new TConfiguration());
+  }
+
+  /**
+   * Constructor that takes an already created socket.
+   *
+   * @param socket Already created socket object
+   * @param configuration Customized configuration for this transport
+   * @throws TTransportException if there is an error setting up the streams
+   */
+  public TSocket(Socket socket, TConfiguration configuration) throws TTransportException {
+    super(configuration);
     socket_ = socket;
     try {
       socket_.setSoLinger(false, 0);