Merge pull request #78 from jpush/dev

PushClient can switch to NettyHttpClient or NativeHttpClient

Author: KenChoi1992

example/main/java/cn/jpush/api/examples/PushExample.java

@@ -6,6 +6,7 @@
 import java.util.Map;
 
 import cn.jiguang.common.ServiceHelper;
+import cn.jiguang.common.connection.NativeHttpClient;
 import cn.jiguang.common.connection.NettyHttpClient;
 import cn.jiguang.common.resp.ResponseWrapper;
 import cn.jpush.api.push.model.notification.*;
@@ -46,7 +47,8 @@ public class PushExample {
 	public static void main(String[] args) {
 //        testSendPushWithCustomConfig();
 //        testSendIosAlert();
-		testSendPush();
+//		testSendPush();
+        testSendPushes();
 //        testSendPush_fromJSON();
 //        testSendPushWithCallback();
 //        testSendPushesWithMultiCallback();
@@ -134,15 +136,22 @@ public static void testSendPush() {
 	    // Can use this https proxy: https://github.com/Exa-Networks/exaproxy
 		ClientConfig clientConfig = ClientConfig.getInstance();
         JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY, null, clientConfig);
-        
+        String authCode = ServiceHelper.getBasicAuthorization(APP_KEY, MASTER_SECRET);
+        // Here you can use NativeHttpClient or NettyHttpClient.
+        NativeHttpClient httpClient = new NativeHttpClient(authCode, null, clientConfig);
+        // Call setHttpClient to set httpClient,
+        // If you don't invoke this method, default httpClient will use NativeHttpClient.
+        jpushClient.getPushClient().setHttpClient(httpClient);
+
+
         // For push, all you need do is to build PushPayload object.
         PushPayload payload = buildPushObject_all_alias_alert();
         try {
             PushResult result = jpushClient.sendPush(payload);
             LOG.info("Got result - " + result);
-            Thread.sleep(5000);
-            //如果使用 NettyHttpClient，需要手动调用 close 方法退出进程
-//            jpushClient.close();
+            // 如果使用 NettyHttpClient，需要手动调用 close 方法退出进程
+            // If uses NettyHttpClient, call close when finished sending request, otherwise process will not exit.
+            // jpushClient.close();
         } catch (APIConnectionException e) {
             LOG.error("Connection error. Should retry later. ", e);
             LOG.error("Sendno: " + payload.getSendno());
@@ -154,8 +163,6 @@ public static void testSendPush() {
             LOG.info("Error Message: " + e.getErrorMessage());
             LOG.info("Msg ID: " + e.getMsgId());
             LOG.error("Sendno: " + payload.getSendno());
-        } catch (InterruptedException e) {
-            e.printStackTrace();
         }
     }
 
@@ -185,6 +192,10 @@ public static void testSendPush_fromJSON() {
             LOG.info("Msg ID: " + e.getMsgId());
             LOG.error("Sendno: " + payload.getSendno());
         }
+    }
+
+    public static void testSendPushes() {
+
     }
 
 	public static PushPayload buildPushObject_all_all_alert() {

pom.xml

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>cn.jpush.api</groupId>
             <artifactId>jiguang-common</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.3</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>

src/main/java/cn/jpush/api/JPushClient.java

@@ -175,6 +175,11 @@ public JPushClient(String masterSecret, String appKey, boolean apnsProduction, l
         _deviceClient = new DeviceClient(masterSecret, appKey);
         _scheduleClient = new ScheduleClient(masterSecret, appKey);
     }
+
+    public PushClient getPushClient() {
+        return _pushClient;
+    }
+
     // ----------------------------- Push API
 
     /**
@@ -1179,8 +1184,8 @@ private ScheduleResult createPeriodicalSchedule(String name, String start, Strin
         return _scheduleClient.createSchedule(payload);
     }
 
-//    public void close() {
-//        _pushClient.close();
-//    }
+    public void close() {
+        _pushClient.close();
+    }
 }
 

src/main/java/cn/jpush/api/push/PushClient.java

@@ -1,5 +1,7 @@
 package cn.jpush.api.push;
 
+import cn.jiguang.common.connection.IHttpClient;
+import cn.jiguang.common.connection.NativeHttpClient;
 import cn.jiguang.common.connection.NettyHttpClient;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
@@ -9,7 +11,6 @@
 import cn.jiguang.common.utils.Preconditions;
 import cn.jiguang.common.utils.StringUtils;
 import cn.jiguang.common.connection.HttpProxy;
-import cn.jiguang.common.connection.NativeHttpClient;
 import cn.jiguang.common.resp.APIConnectionException;
 import cn.jiguang.common.resp.APIRequestException;
 import cn.jiguang.common.resp.BaseResult;
@@ -28,7 +29,7 @@
  */
 public class PushClient {
 
-    private final NativeHttpClient _httpClient;
+    private IHttpClient _httpClient;
     private String _baseUrl;
     private String _pushPath;
     private String _pushValidatePath;
@@ -210,12 +211,16 @@ public PushResult sendPushValidate(String payloadString) throws APIConnectionExc
         return BaseResult.fromResponse(response, PushResult.class);
     }
 
+    public void setHttpClient(IHttpClient client) {
+        this._httpClient = client;
+    }
+
     // 如果使用 NettyHttpClient，在发送请求后需要手动调用 close 方法
-//    public void close() {
-//        if (_httpClient instanceof NettyHttpClient) {
-//            _httpClient.close();
-//        }
-//    }
+    public void close() {
+        if (_httpClient != null && _httpClient instanceof NettyHttpClient) {
+            ((NettyHttpClient) _httpClient).close();
+        }
+    }
 }