prepare release v3.3.5

Author: KenChoi

README.md

@@ -44,7 +44,7 @@
     <dependency>
         <groupId>cn.jpush.api</groupId>
         <artifactId>jiguang-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </dependency>
     <dependency>
         <groupId>io.netty</groupId>

pom.xml

@@ -3,7 +3,7 @@
 
 	<groupId>cn.jpush.api</groupId>
 	<artifactId>jpush-client</artifactId>
-	<version>3.3.4-SNAPSHOT</version>
+	<version>3.3.5-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<url>https://github.com/jpush/jpush-api-java-client</url>
 	<name>JPush API Java Client</name>
@@ -35,14 +35,14 @@
 		<url>https://github.com/jpush/jpush-api-java-client</url>
 		<connection>scm:git:git@github.com:jpush/jpush-api-java-client.git</connection>
 		<developerConnection>scm:git:git@github.com:jpush/jpush-api-java-client.git</developerConnection>
-		<tag>v3.3.4</tag>
+		<tag>v3.3.5</tag>
 	</scm>
 
 	<dependencies>
         <dependency>
             <groupId>cn.jpush.api</groupId>
             <artifactId>jiguang-common</artifactId>
-            <version>1.0.9</version>
+            <version>1.1.1</version>
         </dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>

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

@@ -1,16 +1,13 @@
 package cn.jpush.api.push;
 
-import cn.jiguang.common.connection.IHttpClient;
-import cn.jiguang.common.connection.NativeHttpClient;
-import cn.jiguang.common.connection.NettyHttpClient;
+import cn.jiguang.common.connection.*;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
 
 import cn.jiguang.common.ClientConfig;
 import cn.jiguang.common.ServiceHelper;
 import cn.jiguang.common.utils.Preconditions;
 import cn.jiguang.common.utils.StringUtils;
-import cn.jiguang.common.connection.HttpProxy;
 import cn.jiguang.common.resp.APIConnectionException;
 import cn.jiguang.common.resp.APIRequestException;
 import cn.jiguang.common.resp.BaseResult;
@@ -239,6 +236,8 @@ public void setHttpClient(IHttpClient client) {
     public void close() {
         if (_httpClient != null && _httpClient instanceof NettyHttpClient) {
             ((NettyHttpClient) _httpClient).close();
+        } else if (_httpClient != null && _httpClient instanceof ApacheHttpClient) {
+            ((ApacheHttpClient) _httpClient).close();
         }
     }
 }

src/test/java/cn/jpush/api/push/PushClientTest.java

@@ -8,6 +8,7 @@
 import cn.jiguang.common.connection.NettyHttpClient;
 import cn.jiguang.common.resp.ResponseWrapper;
 import cn.jpush.api.JPushClient;
+import cn.jpush.api.push.model.Options;
 import cn.jpush.api.push.model.Platform;
 import cn.jpush.api.push.model.audience.Audience;
 import cn.jpush.api.push.model.notification.*;
@@ -38,7 +39,6 @@ public void testSendPush() {
             PushResult result = jpushClient.sendPush(payload);
             int status = result.getResponseCode();
             LOG.info("Got result - " + result);
-
         } catch (APIConnectionException e) {
             LOG.error("Connection error. Should retry later. ", e);
             LOG.error("Sendno: " + payload.getSendno());
@@ -77,8 +77,9 @@ public void onSucceed(ResponseWrapper responseWrapper) {
     public static PushPayload buildPushObject_all_alias_alert() {
         return PushPayload.newBuilder()
                 .setPlatform(Platform.all())
-                .setAudience(Audience.alias("alias"))
+                .setAudience(Audience.registrationId(REGISTRATION_ID3))
                 .setNotification(Notification.alert(ALERT))
+                .setOptions(Options.newBuilder().setApnsProduction(false).setTimeToLive(86000).build())
                 .build();
     }