[fix bug] When there are no callback. There is no need to re-constru…

…ct callbackWarp
TarsCloud · May 14, 2020 · 155f0b5 · 155f0b5
1 parent 75fe41c
commit 155f0b5
Show file tree

Hide file tree

Showing 35 changed files with 63 additions and 62 deletions.
diff --git a/core/client.pom.xml b/core/client.pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.tencent.tars</groupId>
 		<artifactId>tars-parent</artifactId>
-		<version>1.6.2</version>
+		<version>1.6.3</version>
 	</parent>
 	<artifactId>tars-client</artifactId>
 	<name>${project.artifactId}</name>

diff --git a/core/pom.xml b/core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.tencent.tars</groupId>
 		<artifactId>tars-parent</artifactId>
-		<version>1.6.2</version>
+		<version>1.6.3</version>
 	</parent>
 	<artifactId>tars-core</artifactId>
 	<name>${project.artifactId}</name>

diff --git a/core/server.pom.xml b/core/server.pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.tencent.tars</groupId>
 		<artifactId>tars-parent</artifactId>
-		<version>1.6.2</version>
+		<version>1.6.3</version>
 	</parent>
 	<artifactId>tars-server</artifactId>
 	<name>${project.artifactId}</name>

diff --git a/core/src/main/java/com/qq/tars/client/rpc/tars/TarsInvoker.java b/core/src/main/java/com/qq/tars/client/rpc/tars/TarsInvoker.java
@@ -188,8 +188,9 @@ private void invokeWithAsync(Method method, Object args[], Map<String, String> c
             request.setStatus(status);
 
         }
-        FilterChain filterChain = new TarsClientFilterChain(filters, objName, FilterKind.CLIENT, client, 1,
-                new TarsCallbackWrapper(config, request.getFunctionName(), getUrl().getHost(), getUrl().getPort(), request.getBornTime(), request, callback, this));
+        TarsCallbackWrapper tarsCallbackWrapper = callback == null ?
+                null : new TarsCallbackWrapper(config, request.getFunctionName(), getUrl().getHost(), getUrl().getPort(), request.getBornTime(), request, callback, this);
+        FilterChain filterChain = new TarsClientFilterChain(filters, objName, FilterKind.CLIENT, client, InvokeStatus.ASYNC_CALL.ordinal(), tarsCallbackWrapper);
         filterChain.doFilter(request, response);
     }
 

diff --git a/core/src/main/java/com/qq/tars/common/ClientVersion.java b/core/src/main/java/com/qq/tars/common/ClientVersion.java
@@ -23,7 +23,7 @@ public final class ClientVersion {
 //    public static final String build = "1";
 
     public static String getVersion() {
-        return "1.6.2";
+        return "1.6.3";
     }
 
     public String toString() {

diff --git a/distributedContext/pom.xml b/distributedContext/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.tencent.tars</groupId>
 		<artifactId>tars-parent</artifactId>
-		<version>1.6.2</version>
+		<version>1.6.3</version>
 	</parent>
 
 	<artifactId>tars-context</artifactId>

diff --git a/docs-en/tars_java_quickstart.md b/docs-en/tars_java_quickstart.md
@@ -48,7 +48,7 @@ Add a dependency jar package by modifying pom.xml
 <dependency>
 		<groupId>com.tencent.tars</groupId>
      	<artifactId>tars-server</artifactId>
-     	<version>1.6.2</version>
+     	<version>1.6.3</version>
      	<type>jar</type>
 </dependency>
 ```
@@ -59,7 +59,7 @@ Add a dependency jar package by modifying pom.xml
 <plugin>
 	<groupId>com.tencent.tars</groupId>
    	<artifactId>tars-maven-plugin</artifactId>
-   	<version>1.6.2</version>
+   	<version>1.6.3</version>
   	<configuration>
    		<tars2JavaConfig>
   			<tarsFiles>
@@ -102,7 +102,7 @@ Tars provides plugins to compile and generate java code, only need to add java f
 <plugin>
 	<groupId>com.tencent.tars</groupId>
 	<artifactId>tars-maven-plugin</artifactId>
-	<version>1.6.2</version>
+	<version>1.6.3</version>
 	<configuration>
 		<tars2JavaConfig>
 			<!-- tars file location -->
@@ -179,7 +179,7 @@ Execute "mvn package" in the project root directory to generate the war package,
 <dependency>
 	<groupId>com.tencent.tars</groupId>
    	<artifactId>tars-client</artifactId>
-   	<version>1.6.2</version>
+   	<version>1.6.3</version>
    	<type>jar</type>
 </dependency>
 ```
@@ -190,7 +190,7 @@ Execute "mvn package" in the project root directory to generate the war package,
   <plugin>
    	<groupId>com.tencent.tars</groupId>
    	<artifactId>tars-maven-plugin</artifactId>
-   	<version>1.6.2</version>
+   	<version>1.6.3</version>
    	<configuration>
    		<tars2JavaConfig>
    			<!-- tars file location -->

diff --git a/docs-en/tars_java_spring.md b/docs-en/tars_java_spring.md
@@ -12,7 +12,7 @@ Using this function requires adding a dependency jar package and adding the foll
 <dependency>
       <groupId>com.tencent.tars</groupId>
       <artifactId>tars-spring</artifactId>
-      <version>1.6.2</version>
+      <version>1.6.3</version>
 </dependency>
 ```
 

diff --git a/docs-en/tars_java_spring_cloud.md b/docs-en/tars_java_spring_cloud.md
@@ -21,7 +21,7 @@ Here are the steps to create and publish a service:
 <dependency>
     <groupId>com.tencent.tars</groupId>
     <artifactId>tars-spring-cloud-starter</artifactId>
-    <version>1.6.2</version>
+    <version>1.6.3</version>
 </dependency>
 ```
 
@@ -109,7 +109,7 @@ Here's how to discover and access a service.
 <dependency>
     <groupId>com.tencent.tars</groupId>
     <artifactId>tars-spring-cloud-starter</artifactId>
-    <version>1.6.2</version>
+    <version>1.6.3</version>
 </dependency>
 ```
 

diff --git a/docs-en/tars_java_user_guide.md b/docs-en/tars_java_user_guide.md
@@ -21,7 +21,7 @@ Add dependent jar packages in the build project **pom.xml**
 <dependency>
     <groupId>com.tencent.tars</groupId>
     <artifactId>tars-server</artifactId>
-    <version>1.6.2</version>
+    <version>1.6.3</version>
     <type>jar</type>
 </dependency>
 ```
@@ -30,7 +30,7 @@ Add dependent jar packages in the build project **pom.xml**
 <plugin>
     <groupId>com.tencent.tars</groupId>
     <artifactId>tars-maven-plugin</artifactId>
-    <version>1.6.2</version>
+    <version>1.6.3</version>
     <configuration>
 	<tars2JavaConfig>
 	    <tarsFiles>
@@ -65,7 +65,7 @@ Provide plug-in compile to generate java code, add java file configuration in ta
 <plugin>
 	<groupId>com.tencent.tars</groupId>
 	<artifactId>tars-maven-plugin</artifactId>
-	<version>1.6.2</version>
+	<version>1.6.3</version>
 	<configuration>
 		<tars2JavaConfig>
 			<!-- Tars file location -->

diff --git a/docs-en/tars_tracing.md b/docs-en/tars_tracing.md
@@ -93,7 +93,7 @@ The integrated zipkin system is built in the framework, users can query call cha
 
 ## Tars-java Usage
 
-At present, tars-java supports the call chain from version 1.6.2, and the cpp version is about to be released. The following is an example of integrated zipkin.
+At present, tars-java supports the call chain from version 1.6.3, and the cpp version is about to be released. The following is an example of integrated zipkin.
 
 ### Enable the call chain 
 
@@ -137,7 +137,7 @@ Notes:
 >   <dependency>
 >         <groupId>com.tencent.tars</groupId>
 >         <artifactId>tars-core</artifactId>
->         <version>1.6.2</version>
+>         <version>1.6.3</version>
 >         <exclusions>  
 >         	<exclusion>  
 >         		<groupId>org.apache.kafka</groupId>  

diff --git a/docs/tars_java_quickstart.md b/docs/tars_java_quickstart.md
@@ -46,7 +46,7 @@
 <dependency>
 	<groupId>com.tencent.tars</groupId>
      	<artifactId>tars-server</artifactId>
-     	<version>1.6.2</version>
+     	<version>1.6.3</version>
      	<type>jar</type>
 </dependency>
 ```
@@ -55,7 +55,7 @@
 <plugin>
 	<groupId>com.tencent.tars</groupId>
    	<artifactId>tars-maven-plugin</artifactId>
-   	<version>1.6.2</version>
+   	<version>1.6.3</version>
   	<configuration>
    		<tars2JavaConfig>
   			<tarsFiles>
@@ -91,7 +91,7 @@ module TestApp
 <plugin>
 	<groupId>com.tencent.tars</groupId>
 	<artifactId>tars-maven-plugin</artifactId>
-	<version>1.6.2</version>
+	<version>1.6.3</version>
 	<configuration>
 		<tars2JavaConfig>
 			<!-- tars文件位置 -->
@@ -159,7 +159,7 @@ public class HelloServantImpl implements HelloServant {
 <dependency>
 	<groupId>com.tencent.tars</groupId>
    	<artifactId>tars-client</artifactId>
-   	<version>1.6.2</version>
+   	<version>1.6.3</version>
    	<type>jar</type>
 </dependency>    
 ```
@@ -168,7 +168,7 @@ public class HelloServantImpl implements HelloServant {
   <plugin>
    	<groupId>com.tencent.tars</groupId>
    	<artifactId>tars-maven-plugin</artifactId>
-   	<version>1.6.2</version>
+   	<version>1.6.3</version>
    	<configuration>
    		<tars2JavaConfig>
    			<!-- tars文件位置 -->

diff --git a/docs/tars_java_spring.md b/docs/tars_java_spring.md
@@ -12,7 +12,7 @@ Tars支持使用Spring配置servant，使用此功能需要依赖tars-spring.jar
 <dependency>
       <groupId>com.tencent.tars</groupId>
       <artifactId>tars-spring</artifactId>
-      <version>1.6.2</version>
+      <version>1.6.3</version>
 </dependency>
 ```
 

diff --git a/docs/tars_java_spring_boot.md b/docs/tars_java_spring_boot.md
@@ -31,7 +31,7 @@ demo工程参考[demo工程](https://github.com/Tencent/Tars/tree/master/java/ex
         <dependency>
             <groupId>com.tencent.tars</groupId>
             <artifactId>tars-spring-boot-starter</artifactId>
-            <version>1.6.2</version>
+            <version>1.6.3</version>
         </dependency>
     </dependencies>
 ```
@@ -167,7 +167,7 @@ public @interface TarsClient {
 
 ## 版本升级指南
 
-如需使用tars-spring-boot的新功能需要将tars升级到1.6.2版本及以上版本，本次改动相对较大，附上版本升级指南：
+如需使用tars-spring-boot的新功能需要将tars升级到1.6.3版本及以上版本，本次改动相对较大，附上版本升级指南：
 1. 管理平台需要重新编译升级。
 2. tars-node需要升级到新版本。
 3. 模板选择需要选tars.tarsjava.springboot模版。如果不是重新搭建环境可自行添加模板，父模板选择tars.tarsjava.default，内容如下：

diff --git a/docs/tars_java_spring_cloud.md b/docs/tars_java_spring_cloud.md
@@ -22,7 +22,7 @@
 <dependency>
     <groupId>com.tencent.tars</groupId>
     <artifactId>tars-spring-cloud-starter</artifactId>
-    <version>1.6.2</version>
+    <version>1.6.3</version>
 </dependency>
 ```
 
@@ -110,7 +110,7 @@ tars:
   <dependency>
       <groupId>com.tencent.tars</groupId>
       <artifactId>tars-spring-cloud-starter</artifactId>
-      <version>1.6.2</version>
+      <version>1.6.3</version>
   </dependency>
   ```
 

diff --git a/docs/tars_java_user_guide.md b/docs/tars_java_user_guide.md
@@ -21,7 +21,7 @@
 <dependency>
     <groupId>com.tencent.tars</groupId>
     <artifactId>tars-server</artifactId>
-    <version>1.6.2</version>
+    <version>1.6.3</version>
     <type>jar</type>
 </dependency>
 ```
@@ -30,7 +30,7 @@
 <plugin>
     <groupId>com.tencent.tars</groupId>
     <artifactId>tars-maven-plugin</artifactId>
-    <version>1.6.2</version>
+    <version>1.6.3</version>
     <configuration>
 	<tars2JavaConfig>
 	    <tarsFiles>
@@ -65,7 +65,7 @@ module TestApp
 <plugin>
 	<groupId>com.tencent.tars</groupId>
 	<artifactId>tars-maven-plugin</artifactId>
-	<version>1.6.2</version>
+	<version>1.6.3</version>
 	<configuration>
 		<tars2JavaConfig>
 			<!-- tars文件位置 -->

diff --git a/docs/tars_tracing.md b/docs/tars_tracing.md
@@ -92,7 +92,7 @@ tars框架内部采用opentracing api来封装调用链数据采集功能，并
 
 ## tars-java 使用方法
 
-目前tars -java从1.6.2版本开始支持调用链，cpp 版本即将放出，下面以集成zipkin为例介绍。
+目前tars -java从1.6.3版本开始支持调用链，cpp 版本即将放出，下面以集成zipkin为例介绍。
 
 ### 开启调用链 
 
@@ -136,7 +136,7 @@ tars框架内部采用opentracing api来封装调用链数据采集功能，并
 >   <dependency>
 >         <groupId>com.tencent.tars</groupId>
 >         <artifactId>tars-core</artifactId>
->         <version>1.6.2</version>
+>         <version>1.6.3</version>
 >         <exclusions>  
 >         	<exclusion>  
 >         		<groupId>org.apache.kafka</groupId>  

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.tencent.tars</groupId>
 		<artifactId>tars-parent</artifactId>
-		<version>1.6.2</version>
+		<version>1.6.3</version>
 	</parent>
 	<artifactId>tars-examples</artifactId>
 	<name>${project.artifactId}</name>

diff --git a/examples/quickstart-client/pom.xml b/examples/quickstart-client/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.tencent.tars</groupId>
 		<artifactId>tars-parent</artifactId>
-		<version>1.6.2</version>
+		<version>1.6.3</version>
 	</parent>
 	<artifactId>tars-quickstart-client</artifactId>
 	<name>${project.artifactId}</name>

diff --git a/examples/quickstart-server/pom.xml b/examples/quickstart-server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.tencent.tars</groupId>
 		<artifactId>tars-parent</artifactId>
-		<version>1.6.2</version>
+		<version>1.6.3</version>
 	</parent>
 	<artifactId>tars-quickstart-server</artifactId>
 	<name>${project.artifactId}</name>

diff --git a/examples/stress-server/pom.xml b/examples/stress-server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.tencent.tars</groupId>
 		<artifactId>tars-parent</artifactId>
-		<version>1.6.2</version>
+		<version>1.6.3</version>
 	</parent>
 	<artifactId>tars-stress-server</artifactId>
 	<name>${project.artifactId}</name>

diff --git a/examples/tars-spring-boot-server/pom.xml b/examples/tars-spring-boot-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tars-examples</artifactId>
         <groupId>com.tencent.tars</groupId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>com.tencent.tars</groupId>
             <artifactId>tars-spring-boot-starter</artifactId>
-            <version>1.6.2</version>
+            <version>1.6.3</version>
         </dependency>
     </dependencies>
 

diff --git a/examples/tars-spring-cloud-client/pom.xml b/examples/tars-spring-cloud-client/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.tencent.tars</groupId>
   <artifactId>tars-spring-cloud-client</artifactId>
-  <version>1.6.2</version>
+  <version>1.6.3</version>
   <packaging>war</packaging>
 
   <name>tars-spring-cloud-client</name>
@@ -23,22 +23,22 @@
     <dependency>
       <groupId>com.tencent.tars</groupId>
       <artifactId>tars-core</artifactId>
-      <version>1.6.2</version>
+      <version>1.6.3</version>
     </dependency>
     <dependency>
       <groupId>com.tencent.tars</groupId>
       <artifactId>tars-spring</artifactId>
-      <version>1.6.2</version>
+      <version>1.6.3</version>
     </dependency>
     <dependency>
       <groupId>com.tencent.tars</groupId>
       <artifactId>tars-protobuf</artifactId>
-      <version>1.6.2</version>
+      <version>1.6.3</version>
     </dependency>
         <dependency>
       <groupId>com.tencent.tars</groupId>
       <artifactId>tars-spring-cloud-starter</artifactId>
-      <version>1.6.2</version>
+      <version>1.6.3</version>
     </dependency>
   </dependencies>
 </project>