ongoing: im client

Author: Javen

src/main/java/cn/jpush/api/common/connection/NativeHttpClient.java

@@ -26,6 +26,15 @@
 import cn.jpush.api.common.resp.APIRequestException;
 import cn.jpush.api.common.resp.ResponseWrapper;
 
+/**
+ * The implementation has no connection pool mechanism, used origin java connection.
+ * 
+ * 本实现没有连接池机制，基于 Java 原始的 HTTP 连接实现。
+ * 
+ * 遇到连接超时，会自动重连指定的次数（默认为 3）；如果是读取超时，则不会自动重连。
+ * 
+ * 可选支持 HTTP 代理，同时支持 2 种方式：1) HTTP 头上加上 Proxy-Authorization 信息；2）全局配置 Authenticator.setDefault；
+ */
 public class NativeHttpClient implements IHttpClient {
     private static final Logger LOG = LoggerFactory.getLogger(NativeHttpClient.class);
     private static final String KEYWORDS_CONNECT_TIMED_OUT = "connect timed out";
@@ -35,6 +44,9 @@ public class NativeHttpClient implements IHttpClient {
     private String _authCode;
     private HttpProxy _proxy;
 
+    /**
+     * 默认的重连次数是 3
+     */
     public NativeHttpClient(String authCode) {
         this(authCode, DEFAULT_MAX_RETRY_TIMES, null);
     }
@@ -46,6 +58,11 @@ public NativeHttpClient(String authCode, int maxRetryTimes, HttpProxy proxy) {
         this._authCode = authCode;
         this._proxy = proxy;
 
+        if (_proxy.isAuthenticationNeeded()) {
+        	Authenticator.setDefault(new SimpleProxyAuthenticator(
+                _proxy.getUsername(), _proxy.getPassword()));
+        }
+        
         initSSL();
     }
 
@@ -108,8 +125,6 @@ private ResponseWrapper _doRequest(String url, String content,
 			    conn = (HttpURLConnection) aUrl.openConnection(_proxy.getNetProxy());
 			    if (_proxy.isAuthenticationNeeded()) {
 			        conn.setRequestProperty("Proxy-Authorization", _proxy.getProxyAuthorization());
-			        Authenticator.setDefault(new SimpleProxyAuthenticator(
-			                _proxy.getUsername(), _proxy.getPassword()));
 			    }
 			} else {
 			    conn = (HttpURLConnection) aUrl.openConnection();

src/main/java/cn/jpush/api/im/IMClient.java

@@ -16,22 +16,17 @@
 import com.google.gson.JsonParser;
 
 /**
- * Entrance for sending Push.
+ * Entrance for JPush IM API.
  * 
- * For the following parameters, you can set them by instance creation. 
- * This action will override setting in PushPayload Optional.
- * * apnsProduction If not present, the default is true.
- * * timeToLive If not present, the default is 86400(s) (one day).
  * 
- * Can be used directly.
  */
 public class IMClient {
-    public static final String HOST_NAME_SSL = "https://api.jpush.cn";
+    public static final String HOST_NAME_SSL = "";	//"https://im.api.jpush.cn";
     public static final String PUSH_PATH = "/v3/push";
     public static final String PUSH_VALIDATE_PATH = "/v3/push/validate";
 
     private final NativeHttpClient _httpClient;
-    private JsonParser _jsonParser = new JsonParser();
+    private static JsonParser _jsonParser = new JsonParser();
 
     // If not present, true by default.
     private boolean _apnsProduction = true;
@@ -43,8 +38,9 @@ public class IMClient {
 
     private String _baseUrl;
 
+    
     /**
-     * Create a Push Client.
+     * Create a IM Client.
      * 
      * @param masterSecret API access secret of the appKey.
      * @param appKey The KEY of one application on JPush.
@@ -58,7 +54,7 @@ public IMClient(String masterSecret, String appKey, int maxRetryTimes) {
 	}
 
 	/**
-	 * Create a Push Client with max retry times.
+	 * Create a IM Client with max retry times.
 	 * 
 	 * @param masterSecret  API access secret of the appKey.
 	 * @param appKey The KEY of one application on JPush.
@@ -73,7 +69,7 @@ public IMClient(String masterSecret, String appKey, int maxRetryTimes, HttpProxy
 	}
 
 	/**
-     * Create a Push Client with global settings.
+     * Create a IM Client with global settings.
      * 
      * If you want different settings from default globally, this constructor is what you needed.
      *