Merge pull request #20 from trym-moeller/upgrade-libthrift

Upgrade libthrift

Author: YORYOR

pom.xml

@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
-            <version>0.12.0</version>
+            <version>0.20.0</version>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
@@ -57,11 +57,16 @@
             <artifactId>guava</artifactId>
             <version>19.0</version>
         </dependency>
-	<dependency>
-	    <groupId>javax.annotation</groupId>
-	    <artifactId>javax.annotation-api</artifactId>
-	    <version>1.3.2</version>
-	</dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.35</version>
+        </dependency>
     </dependencies>
 
 
@@ -100,6 +105,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.11.2</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>

thrift-mock-server/src/main/java/com/didiglobal/thriftmock/server/AsyncThriftMockServer.java

@@ -5,7 +5,6 @@
 import org.apache.thrift.TProcessor;
 import org.apache.thrift.server.TNonblockingServer;
 import org.apache.thrift.server.TServer;
-import org.apache.thrift.transport.TFramedTransport;
 import org.apache.thrift.transport.TNonblockingServerSocket;
 import org.apache.thrift.transport.TTransportException;
 import org.slf4j.Logger;
@@ -40,7 +39,6 @@ public void start() {
     TNonblockingServer.Args serverArgs = new TNonblockingServer.Args(serverTransport);
     serverArgs.processor(tProcessor);
     serverArgs.protocolFactory(serverConfig.getTProtocolFactory());
-    serverArgs.transportFactory(new TFramedTransport.Factory());
     tServer = new TNonblockingServer(serverArgs);
     tServer.serve();
   }

thrift-mock-server/src/main/java/com/didiglobal/thriftmock/server/ProcessFunctionMock.java

@@ -65,6 +65,6 @@ public TBase getResult(Object iface, TBase args) throws TException {
 
   @Override
   public TBase getEmptyArgsInstance() {
-    return isPrimitive ? mockResultFunction.apply(args) :   new MockResult(methodName, mockResultFunction.apply(args));
+    return args;
   }
 }

thrift-mock-test-source/src/main/java/com/didiglobal/thriftmock/test/source/TProtocolUtil.java

@@ -1,6 +1,7 @@
 package com.didiglobal.thriftmock.test.source;
 
 
+import org.apache.thrift.TConfiguration;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.transport.TSocket;
@@ -22,7 +23,7 @@ public static TProtocol initTProtocol(String host, int port,
     if (timeout == null || timeout <= 0){
       transport = new TSocket(host, port);
     } else {
-      transport = new TSocket(host, port, timeout);
+      transport = new TSocket(new TConfiguration(), host, port, timeout);
     }
     transport.open();
     return new TBinaryProtocol(transport);