支持文件推送

Author: yutaipu

.classpath

@@ -14,5 +14,4 @@ test-output/
 *.iml
 
 *.releaseBackup
-release.properties
-
+release.properties

.gitignore

@@ -204,6 +204,18 @@ public PushResult sendPush(PushPayload pushPayload) throws APIConnectionExceptio
     public PushResult sendPush(String payloadString) throws APIConnectionException, APIRequestException {
         return _pushClient.sendPush(payloadString);
     }
+
+    /**
+     * Send a file push with PushPayload object.
+     *
+     * @param pushPayload payload object of a push.
+     * @return PushResult The result object of a Push. Can be printed to a JSON.
+     * @throws APIConnectionException if a remote or network exception occurs.
+     * @throws APIRequestException if a request exception occurs.
+     */
+    public PushResult sendFilePush(PushPayload pushPayload) throws APIConnectionException, APIRequestException {
+        return _pushClient.sendFilePush(pushPayload);
+    }
 
     /**
      * Validate a push action, but do NOT send it actually.
@@ -1233,5 +1245,7 @@ private ScheduleResult createPeriodicalSchedule(String name, String start, Strin
     public void close() {
         _pushClient.close();
     }
+
+
 }
 

.project

@@ -14,12 +14,8 @@
 import cn.jpush.api.push.model.*;
 import cn.jpush.api.push.model.audience.Audience;
 import com.google.gson.*;
-import com.google.gson.reflect.TypeToken;
 
-import java.lang.reflect.Type;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Entrance for sending Push.
@@ -39,6 +35,7 @@ public class PushClient {
     private String _pushValidatePath;
     private String batchRegidPushPath;
     private String batchAliasPushPath;
+    private String _filePushPath;
 
     private JsonParser _jsonParser = new JsonParser();
 
@@ -92,6 +89,7 @@ public PushClient(String masterSecret, String appKey, int maxRetryTimes, HttpPro
         this._baseUrl = (String) conf.get(ClientConfig.PUSH_HOST_NAME);
         this._pushPath = (String) conf.get(ClientConfig.PUSH_PATH);
         this._pushValidatePath = (String) conf.get(ClientConfig.PUSH_VALIDATE_PATH);
+        this._filePushPath = (String) conf.get(ClientConfig.FILE_PUSH_PATH);
 
         this._apnsProduction = (Integer) conf.get(ClientConfig.APNS_PRODUCTION);
         this._timeToLive = (Long) conf.get(ClientConfig.TIME_TO_LIVE);
@@ -106,6 +104,7 @@ public PushClient(String masterSecret, String appKey, HttpProxy proxy, ClientCon
         this._baseUrl = (String) conf.get(ClientConfig.PUSH_HOST_NAME);
         this._pushPath = (String) conf.get(ClientConfig.PUSH_PATH);
         this._pushValidatePath = (String) conf.get(ClientConfig.PUSH_VALIDATE_PATH);
+        this._filePushPath = (String) conf.get(ClientConfig.FILE_PUSH_PATH);
 
         this.batchAliasPushPath = (String) conf.get(ClientConfig.BATCH_ALIAS_PUSH_PATH);
         this.batchRegidPushPath = (String) conf.get(ClientConfig.BATCH_REGID_PUSH_PATH);
@@ -162,35 +161,16 @@ public void setBaseUrl(String baseUrl) {
     }
 
     public PushResult sendPush(PushPayload pushPayload) throws APIConnectionException, APIRequestException {
-        Preconditions.checkArgument(!(null == pushPayload), "pushPayload should not be null");
-
-        if (_apnsProduction > 0) {
-            pushPayload.resetOptionsApnsProduction(true);
-        } else if (_apnsProduction == 0) {
-            pushPayload.resetOptionsApnsProduction(false);
-        }
-
-        if (_timeToLive >= 0) {
-            pushPayload.resetOptionsTimeToLive(_timeToLive);
-        }
+        checkPushPayload(pushPayload);
 
         ResponseWrapper response = _httpClient.sendPost(_baseUrl + _pushPath, getEncryptData(pushPayload));
 
         return BaseResult.fromResponse(response, PushResult.class);
     }
 
-    public PushResult sendPushValidate(PushPayload pushPayload) throws APIConnectionException, APIRequestException {
-        Preconditions.checkArgument(!(null == pushPayload), "pushPayload should not be null");
-
-        if (_apnsProduction > 0) {
-            pushPayload.resetOptionsApnsProduction(true);
-        } else if (_apnsProduction == 0) {
-            pushPayload.resetOptionsApnsProduction(false);
-        }
 
-        if (_timeToLive >= 0) {
-            pushPayload.resetOptionsTimeToLive(_timeToLive);
-        }
+    public PushResult sendPushValidate(PushPayload pushPayload) throws APIConnectionException, APIRequestException {
+        checkPushPayload(pushPayload);
 
         ResponseWrapper response = _httpClient.sendPost(_baseUrl + _pushValidatePath, getEncryptData(pushPayload));
 
@@ -211,6 +191,14 @@ public PushResult sendPush(String payloadString) throws APIConnectionException,
         return BaseResult.fromResponse(response, PushResult.class);
     }
 
+    public PushResult sendFilePush(PushPayload pushPayload) throws APIConnectionException, APIRequestException {
+        checkPushPayload(pushPayload);
+
+        ResponseWrapper response = _httpClient.sendPost(_baseUrl + _filePushPath, getEncryptData(pushPayload));
+
+        return BaseResult.fromResponse(response, PushResult.class);
+    }
+
     public PushResult sendPushValidate(String payloadString) throws APIConnectionException, APIRequestException {
         Preconditions.checkArgument(StringUtils.isNotEmpty(payloadString), "pushPayload should not be empty");
 
@@ -358,6 +346,20 @@ private String getEncryptData(String pushPayload, Audience audience) {
         return pushPayload;
     }
 
+    private void checkPushPayload(PushPayload pushPayload) {
+        Preconditions.checkArgument(!(null == pushPayload), "pushPayload should not be null");
+
+        if (_apnsProduction > 0) {
+            pushPayload.resetOptionsApnsProduction(true);
+        } else if (_apnsProduction == 0) {
+            pushPayload.resetOptionsApnsProduction(false);
+        }
+
+        if (_timeToLive >= 0) {
+            pushPayload.resetOptionsTimeToLive(_timeToLive);
+        }
+    }
+
 }
 
 

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

@@ -15,13 +15,15 @@ public class Audience implements PushModel {
     private static final String ALL = "all";
 
     private final boolean all;
+    private final boolean file;
     private final Set<AudienceTarget> targets;
 
-    private Audience(boolean all, Set<AudienceTarget> targets) {
+    private Audience(boolean all, boolean file, Set<AudienceTarget> targets) {
         this.all = all;
+        this.file = file;
         this.targets = targets;
     }
-    
+
     public static Builder newBuilder() {
         return new Builder();
     }
@@ -99,7 +101,12 @@ public static Audience abTest(Collection<String> abTestIds) {
         AudienceTarget target = AudienceTarget.abTest(abTestIds);
         return newBuilder().addAudienceTarget(target).build();
     }
-    
+
+    public static Audience file(String fileId) {
+        AudienceTarget target = AudienceTarget.file(fileId);
+        return newBuilder().setFile(Boolean.TRUE).addAudienceTarget(target).build();
+    }
+
 
     public boolean isAll() {
         return this.all;
@@ -109,9 +116,17 @@ public JsonElement toJSON() {
         if (all) {
             return new JsonPrimitive(ALL);
         }
-        
+
         // if not all, there will be target be set.
         JsonObject json = new JsonObject();
+        if (file) {
+            for (AudienceTarget target : targets) {
+                if (AudienceType.FILE == target.getAudienceType()) {
+                    json.add(target.getAudienceTypeValue(), target.toFileJSON());
+                }
+            }
+            return json;
+        }
         if (null != targets) {
 	        for (AudienceTarget target : targets) {
 	            json.add(target.getAudienceTypeValue(), target.toJSON());
@@ -126,44 +141,54 @@ public static Audience fromJsonElement(JsonElement jsonElement) {
         }
         boolean all = !jsonElement.isJsonObject();
         if (all) {
-            return new Audience(all, null);
+            return new Audience(true, false,null);
         }
+        boolean file = false;
         JsonObject jsonObject = jsonElement.getAsJsonObject();
         Set<AudienceTarget> audienceTargetSet = new HashSet<>();
         for (AudienceType type : AudienceType.values()) {
             JsonArray jsonArray = jsonObject.getAsJsonArray(type.value());
             if (jsonArray == null) {
                 continue;
             }
+            if (AudienceType.FILE == type) {
+                file = true;
+            }
             audienceTargetSet.add(AudienceTarget.fromJsonElement(jsonArray, type));
         }
-        return new Audience(all, audienceTargetSet);
+        return new Audience(false, file, audienceTargetSet);
     }
 
     public static class Builder {
         private boolean all = false;
+        private boolean file = false;
         private Set<AudienceTarget> audienceBuilder = null;
-        
+
         public Builder setAll(boolean all) {
             this.all = all;
             return this;
         }
-        
+
+        public Builder setFile(boolean file) {
+            this.file = file;
+            return this;
+        }
+
         public Builder addAudienceTarget(AudienceTarget target) {
             if (null == audienceBuilder) {
                 audienceBuilder = new HashSet<AudienceTarget>();
             }
             audienceBuilder.add(target);
             return this;
         }
-        
+
         public Audience build() {
             Preconditions.checkArgument(! (all && null != audienceBuilder), "If audience is all, no any other audience may be set.");
             Preconditions.checkArgument(! (all == false && null == audienceBuilder), "No any audience target is set.");
-            return new Audience(all, audienceBuilder);
+            return new Audience(all, file, audienceBuilder);
         }
     }
-    
+
 }