Merge pull request #25 from lexiLiu/1.0.0.7

[fix]

Author: jianbin2001

CHANGES.md

@@ -1,5 +1,13 @@
 # Release Notes
 
+## 1.0.0.7
+### Fix
+* 修复超时重试http连接未释放问题
+
+### update
+* 移除guava依赖
+* 支持设置获取连接池中http连接超时时间
+
 ## 1.0.0.6
 ### Fix
 修复并发请求消息体异常问题

README.md

@@ -22,7 +22,7 @@
     <dependency>
         <groupId>com.getui.push</groupId>
         <artifactId>restful-sdk</artifactId>
-        <version>1.0.0.6</version>
+        <version>1.0.0.7</version>
     </dependency>
 ```
 

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.getui.push</groupId>
     <artifactId>restful-sdk</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0.6</version>
+    <version>1.0.0.7</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>
@@ -76,17 +76,11 @@
             <artifactId>gson</artifactId>
             <version>2.8.6</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>19.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.8.2</version>
-            <scope>test</scope>
+            <scope>provided</scope>
         </dependency>
 
     </dependencies>

src/main/java/com/getui/push/v2/sdk/ApiHelper.java

@@ -67,7 +67,9 @@ public static void close(GtApiConfiguration configuration) {
         configuration.check();
         String key = configuration.keyOfCache();
         ApiHelper apiHelper = apiHelperCache.remove(key);
-        apiHelper.gtApiProxyFactory.close();
+        if (apiHelper != null) {
+            apiHelper.gtApiProxyFactory.close();
+        }
     }
 
     private ApiHelper(GtApiProxyFactory gtApiProxyFactory) {

src/main/java/com/getui/push/v2/sdk/GtApiConfiguration.java

@@ -61,15 +61,19 @@ public class GtApiConfiguration {
      * @see RequestConfig#getConnectTimeout()
      */
     private int connectTimeout = 60000;
+    /**
+     * 从连接池中获取http连接的超时时间，单位ms
+     */
+    private int connectionRequestTimeout = 0;
     /**
      * http请求失败，最大尝试次数
      */
     private int maxHttpTryTime = 1;
     /**
-     * 保持长连接的时长，默认10s，最大{@link #MAX_KEEP_ALIVE_SECONDS}
+     * 保持长连接的时长，最大{@link #MAX_KEEP_ALIVE_SECONDS}
      */
-    private long keepAliveSeconds = 10;
-    final long MAX_KEEP_ALIVE_SECONDS = 30;
+    private long keepAliveSeconds = 30;
+    final long MAX_KEEP_ALIVE_SECONDS = 20 * 60;
 
     /**
      * http请求时是否需要信任https
@@ -180,6 +184,14 @@ public void setConnectTimeout(int connectTimeout) {
         this.connectTimeout = connectTimeout;
     }
 
+    public int getConnectionRequestTimeout() {
+        return connectionRequestTimeout;
+    }
+
+    public void setConnectionRequestTimeout(int connectionRequestTimeout) {
+        this.connectionRequestTimeout = connectionRequestTimeout;
+    }
+
     public int getMaxHttpTryTime() {
         return maxHttpTryTime;
     }

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

@@ -36,7 +36,13 @@ public class GtHttpClient {
     private int maxHttpTryTime;
     CloseableHttpClient httpclient;
 
-    public GtHttpClient(int connectTimeout, int soTimeout, int maxHttpTryTime, long keepAliveSeconds, GtHttpProxyConfig proxyConfig, boolean trustSSL) {
+    public GtHttpClient(int connectTimeout,
+                        int soTimeout,
+                        int connectionRequestTimeout,
+                        int maxHttpTryTime,
+                        long keepAliveSeconds,
+                        GtHttpProxyConfig proxyConfig,
+                        boolean trustSSL) {
         if (connectTimeout <= 0) {
             throw new IllegalArgumentException("connectTimeout must be > 0.");
         }
@@ -62,6 +68,7 @@ public GtHttpClient(int connectTimeout, int soTimeout, int maxHttpTryTime, long
         RequestConfig config = RequestConfig.custom()
                 .setConnectTimeout(connectTimeout)
                 .setSocketTimeout(soTimeout)
+                .setConnectionRequestTimeout(connectionRequestTimeout)
                 .setMaxRedirects(0)
                 .build();
         builder.setDefaultRequestConfig(config)
@@ -124,11 +131,13 @@ private String doRequest(HttpUriRequest request, int tryTimes) {
             response = httpclient.execute(request);
             final StatusLine statusLine = response.getStatusLine();
             code = statusLine.getStatusCode();
+            // toString内部回收connection
+            String responseBody = EntityUtils.toString(response.getEntity());
             if (code == HttpURLConnection.HTTP_OK ||
                     code == HttpURLConnection.HTTP_BAD_REQUEST ||
                     code == HttpURLConnection.HTTP_UNAUTHORIZED ||
                     code == HttpURLConnection.HTTP_FORBIDDEN) {
-                return EntityUtils.toString(response.getEntity());
+                return responseBody;
             } else if (code == HttpURLConnection.HTTP_NOT_FOUND) {
                 throw new ApiException("not found.", code);
             }

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

@@ -16,13 +16,14 @@ public class HttpManager {
     private GtHttpClient client;
 
     /**
-     * @param connectionTimeOut 连接超时时间
-     * @param readTimeout       读超时时间
-     * @param maxHttpTryTime    失败最大尝试次数
+     * @param connectionTimeOut        连接超时时间
+     * @param readTimeout              读超时时间
+     * @param connectionRequestTimeout 从连接池中获取连接的超时时间
+     * @param maxHttpTryTime           失败最大尝试次数
      * @param 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 HttpManager(int connectionTimeOut, int readTimeout, int connectionRequestTimeout, int maxHttpTryTime, long keepAliveSeconds, GtHttpProxyConfig proxyConfig, boolean trustSSL) {
+        this.client = new GtHttpClient(connectionTimeOut, readTimeout, connectionRequestTimeout, 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/Configs.java

@@ -13,7 +13,7 @@ public interface Configs {
 
     String HEADER_DOMAIN_HASH_KEY = "domainHash";
     String HEADER_OPEN_STABLE_DOMAIN = "openStableDomain";
-    String SDK_VERSION = "1.0.0.6";
+    String SDK_VERSION = "1.0.0.7";
     /**
      * 预置域名列表
      */

src/main/java/com/getui/push/v2/sdk/core/client/DefaultApiClient.java

@@ -130,9 +130,9 @@ private DefaultApiClient(GtApiConfiguration apiConfiguration, IJson json) {
         this.apiConfiguration = apiConfiguration;
 
         this.httpManager = new HttpManager(apiConfiguration.getConnectTimeout(),
-                apiConfiguration.getSoTimeout(), apiConfiguration.getMaxHttpTryTime(),
-                apiConfiguration.getKeepAliveSeconds(), apiConfiguration.getProxyConfig(),
-                apiConfiguration.isTrustSSL());
+                apiConfiguration.getSoTimeout(), apiConfiguration.getConnectionRequestTimeout(),
+                apiConfiguration.getMaxHttpTryTime(), apiConfiguration.getKeepAliveSeconds(),
+                apiConfiguration.getProxyConfig(), apiConfiguration.isTrustSSL());
 
         this.hostManager = new HostManager(apiConfiguration, this.httpManager);
         // 分析最稳定域名

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

@@ -5,7 +5,6 @@
 import com.getui.push.v2.sdk.anno.param.GtQueryParam;
 import com.getui.push.v2.sdk.common.ApiException;
 import com.getui.push.v2.sdk.common.Assert;
-import com.getui.push.v2.sdk.common.util.Utils;
 import com.getui.push.v2.sdk.core.client.DefaultApiClient;
 import com.getui.push.v2.sdk.core.registry.DefaultGtApiRegistry;
 import com.getui.push.v2.sdk.core.registry.GtApiRegistry;
@@ -26,7 +25,7 @@
  *
  * @author getui
  */
-public class GtApiProxyFactory implements InvocationHandler {
+public class GtApiProxyFactory {
 
     /**
      * 保证一个{@link DefaultApiClient}对象对应一个{@link GtApiProxyFactory}对象
@@ -71,19 +70,25 @@ private GtApiProxyFactory(DefaultApiClient defaultApiClient) {
      * @return
      */
     public <T> T createProxy(Class<T> apiService) {
-        return (T) Proxy.newProxyInstance(apiService.getClassLoader(), new Class[]{apiService}, this);
+        return (T) Proxy.newProxyInstance(apiService.getClassLoader(), new Class[]{apiService}, new ApiProxyHandler());
     }
 
-    @Override
-    public Object invoke(Object proxy, Method method, Object[] args) {
-        if ("toString".equalsIgnoreCase(method.getName()) && Utils.isEmpty(args)) {
-            return this.toString();
+    class ApiProxyHandler implements InvocationHandler {
+        @Override
+        public Object invoke(Object proxy, Method method, Object[] args) {
+            try {
+                if (Object.class.equals(method.getDeclaringClass())) {
+                    return method.invoke(this, args);
+                }
+            } catch (Throwable t) {
+                throw new RuntimeException(t);
+            }
+            final BaseParam baseParam = gtApiRegistry.get(method);
+            ApiParam apiParam = new ApiParam(baseParam);
+            // 解析参数 -> HTTP参数
+            handleApiParam(method, args, apiParam);
+            return defaultApiClient.execute(apiParam);
         }
-        final BaseParam baseParam = gtApiRegistry.get(method);
-        ApiParam apiParam = new ApiParam(baseParam);
-        // 解析参数 -> HTTP参数
-        handleApiParam(method, args, apiParam);
-        return defaultApiClient.execute(apiParam);
     }
 
     /**