Merge pull request #21 from lexiLiu/1.0.0.6

[fix]

Author: jianbin2001

CHANGES.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## 1.0.0.6
+### Fix
+修复并发请求消息体异常问题
+
 ## 1.0.0.5
 ### Fix
 修复长连接单位错误问题 由分钟改为秒

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.getui.push</groupId>
     <artifactId>restful-sdk</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0.5</version>
+    <version>1.0.0.6</version>
     <url>https://github.com/GetuiLaboratory/getui-pushapi-java-client-v2</url>
     <name>Getui Push API Java Client</name>
     <description>Getui's officially supported Java client library for accessing Getui APIs.</description>

src/main/java/com/getui/push/v2/sdk/common/http/HttpManager.java

@@ -21,8 +21,8 @@ public class HttpManager {
      * @param maxHttpTryTime    失败最大尝试次数
      * @param trustSSL
      */
-    public HttpManager(int connectionTimeOut, int readTimeout, int maxHttpTryTime, long keepAliveMinutes, GtHttpProxyConfig proxyConfig, boolean trustSSL) {
-        this.client = new GtHttpClient(connectionTimeOut, readTimeout, maxHttpTryTime, keepAliveMinutes, proxyConfig, trustSSL);
+    public HttpManager(int connectionTimeOut, int readTimeout, int maxHttpTryTime, long keepAliveSeconds, GtHttpProxyConfig proxyConfig, boolean trustSSL) {
+        this.client = new GtHttpClient(connectionTimeOut, readTimeout, maxHttpTryTime, keepAliveSeconds, proxyConfig, trustSSL);
     }
 
     public String syncHttps(String url, String method, Map<String, Object> headers, String body, String contentType) {

src/main/java/com/getui/push/v2/sdk/core/factory/GtApiProxyFactory.java

@@ -79,7 +79,8 @@ public Object invoke(Object proxy, Method method, Object[] args) {
         if ("toString".equalsIgnoreCase(method.getName()) && Utils.isEmpty(args)) {
             return this.toString();
         }
-        ApiParam apiParam = gtApiRegistry.get(method);
+        final BaseParam baseParam = gtApiRegistry.get(method);
+        ApiParam apiParam = new ApiParam(baseParam);
         // 解析参数 -> HTTP参数
         handleApiParam(method, args, apiParam);
         return defaultApiClient.execute(apiParam);
@@ -115,24 +116,12 @@ public void close() {
         cache.remove(this.defaultApiClient);
     }
 
-    /**
-     * HTTP请求的参数
-     */
     public static class ApiParam {
-        /**
-         * 接口调用相对路径
-         * eg. /auth
-         */
-        private String uri;
-        /**
-         * 接口请求方式 GET/POST/PUT/DELETE
-         */
-        private String method;
+        private final BaseParam baseParam;
         /**
          * 路径参数
          */
         private String pathParams;
-
         /**
          * query参数
          */
@@ -141,14 +130,10 @@ public static class ApiParam {
          * body参数
          */
         private Object body;
-        /**
-         * 是否需要token
-         */
-        private Boolean needToken;
-        /**
-         * 返回值类型
-         */
-        private Type returnType;
+
+        public ApiParam(BaseParam baseParam) {
+            this.baseParam = baseParam;
+        }
 
         /**
          * 处理路径参数
@@ -160,19 +145,19 @@ public void handlePathParam(Object arg) {
             setPathParams(handleArg(arg));
         }
 
-        public void handleQueryParam(Object arg, String name) {
-            Assert.notNull(arg, "query参数");
-            final String param = handleArg(arg);
-            addQueryParams(name, param);
-        }
-
         private void addQueryParams(String name, String param) {
             if (queryParams == null) {
                 queryParams = new ArrayList<String>();
             }
             queryParams.add(name + "=" + param);
         }
 
+        public void handleQueryParam(Object arg, String name) {
+            Assert.notNull(arg, "query参数");
+            final String param = handleArg(arg);
+            addQueryParams(name, param);
+        }
+
         private String handleArg(Object arg) {
             if (arg instanceof Iterable) {
                 final Iterator iterator = ((Iterable) arg).iterator();
@@ -195,19 +180,23 @@ private String handleArg(Object arg) {
         }
 
         public String getUri() {
-            return uri;
+            return baseParam.getUri();
         }
 
-        public void setUri(String uri) {
-            this.uri = uri;
+        public String getMethod() {
+            return baseParam.getMethod();
         }
 
-        public String getMethod() {
-            return method;
+        public Boolean getNeedToken() {
+            return baseParam.getNeedToken();
         }
 
-        public void setMethod(String method) {
-            this.method = method;
+        public Type getReturnType() {
+            return baseParam.getReturnType();
+        }
+
+        public BaseParam getBaseParam() {
+            return baseParam;
         }
 
         public String getPathParams() {
@@ -234,6 +223,58 @@ public void setBody(Object body) {
             this.body = body;
         }
 
+
+        @Override
+        public String toString() {
+            final StringBuilder sb = new StringBuilder("ApiParam{");
+            sb.append("baseParam=").append(baseParam);
+            sb.append(", pathParams='").append(pathParams).append('\'');
+            sb.append(", queryParams=").append(queryParams);
+            sb.append(", body=").append(body);
+            sb.append('}');
+            return sb.toString();
+        }
+    }
+
+    /**
+     * HTTP请求的参数
+     */
+    public static class BaseParam {
+        /**
+         * 接口调用相对路径
+         * eg. /auth
+         */
+        private String uri;
+        /**
+         * 接口请求方式 GET/POST/PUT/DELETE
+         */
+        private String method;
+
+        /**
+         * 是否需要token
+         */
+        private Boolean needToken;
+        /**
+         * 返回值类型
+         */
+        private Type returnType;
+
+        public String getUri() {
+            return uri;
+        }
+
+        public void setUri(String uri) {
+            this.uri = uri;
+        }
+
+        public String getMethod() {
+            return method;
+        }
+
+        public void setMethod(String method) {
+            this.method = method;
+        }
+
         public Boolean getNeedToken() {
             return needToken;
         }
@@ -252,11 +293,9 @@ public void setReturnType(Type returnType) {
 
         @Override
         public String toString() {
-            return "ApiParam{" +
+            return "BaseParam{" +
                     "uri='" + uri + '\'' +
                     ", method='" + method + '\'' +
-                    ", pathParams='" + pathParams + '\'' +
-                    ", body=" + body +
                     ", needToken=" + needToken +
                     ", returnType=" + returnType +
                     '}';

src/main/java/com/getui/push/v2/sdk/core/registry/DefaultGtApiRegistry.java

@@ -24,39 +24,39 @@
  */
 public class DefaultGtApiRegistry implements GtApiRegistry {
 
-    private Map<String, GtApiProxyFactory.ApiParam> cache = new ConcurrentHashMap<String, GtApiProxyFactory.ApiParam>();
+    private Map<String, GtApiProxyFactory.BaseParam> cache = new ConcurrentHashMap<String, GtApiProxyFactory.BaseParam>();
 
     @Override
     public void register(Method method) {
         get(method);
     }
 
     @Override
-    public GtApiProxyFactory.ApiParam get(Method method) {
-        GtApiProxyFactory.ApiParam apiParam = cache.get(method.toString());
-        if (apiParam != null) {
-            return apiParam;
+    public GtApiProxyFactory.BaseParam get(Method method) {
+        GtApiProxyFactory.BaseParam param = cache.get(method.toString());
+        if (param != null) {
+            return param;
         }
         synchronized (cache) {
-            apiParam = cache.get(method.toString());
-            if (apiParam != null) {
-                return apiParam;
+            param = cache.get(method.toString());
+            if (param != null) {
+                return param;
             }
-            apiParam = doAnalise(method);
-            cache.put(method.toString(), apiParam);
-            return apiParam;
+            param = doAnalise(method);
+            cache.put(method.toString(), param);
+            return param;
         }
     }
 
-    private GtApiProxyFactory.ApiParam doAnalise(Method method) {
-        GtApiProxyFactory.ApiParam apiParam = new GtApiProxyFactory.ApiParam();
+    private GtApiProxyFactory.BaseParam doAnalise(Method method) {
+        GtApiProxyFactory.BaseParam param = new GtApiProxyFactory.BaseParam();
         // 解析方法注解 -> HTTP请求方式和uri
-        handleAnnotation(method.getAnnotations(), apiParam);
+        handleAnnotation(method.getAnnotations(), param);
         // 获取泛型类型，用于反序列化使用
         Type[] types = ((ParameterizedType) method.getGenericReturnType()).getActualTypeArguments();
         // 设置返回值类型，用于反序列化
-        apiParam.setReturnType(new GtTypeHelper(method.getReturnType(), types).getType());
-        return apiParam;
+        param.setReturnType(new GtTypeHelper(method.getReturnType(), types).getType());
+        return param;
     }
 
     /**
@@ -84,7 +84,7 @@ public Type getType() {
      * @param annotations
      * @param apiParam    notnull
      */
-    private GtApiProxyFactory.ApiParam handleAnnotation(Annotation[] annotations, GtApiProxyFactory.ApiParam apiParam) {
+    private GtApiProxyFactory.BaseParam handleAnnotation(Annotation[] annotations, GtApiProxyFactory.BaseParam apiParam) {
         if (apiParam == null) {
             throw new ApiException("apiParam cannot be null.");
         }

src/main/java/com/getui/push/v2/sdk/core/registry/GtApiRegistry.java

@@ -24,6 +24,6 @@ public interface GtApiRegistry {
      * @param method 方法
      * @return
      */
-    GtApiProxyFactory.ApiParam get(Method method);
+    GtApiProxyFactory.BaseParam get(Method method);
 
 }