Option中third_party_channel的值类型可以设置为任意类型

Author: yutaipu

src/main/java/cn/jpush/api/push/model/Options.java

@@ -6,8 +6,10 @@
 import cn.jiguang.common.ServiceHelper;
 import cn.jiguang.common.utils.Preconditions;
 
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Set;
 
 public class Options implements PushModel {
 
@@ -32,37 +34,42 @@ public class Options implements PushModel {
 
 
     /**
-     * example
-     * "third_party_channel": {
-     *    "xiaomi": {
-     *        "distribution": "ospush"
-     *     },
-     *    "huawei": {
-     *        "distribution": "jpush"
-     *     },
-     *    "meizu": {
-     *     "distribution": "jpush"
-     *     },
-     *    "fcm": {
-     *     "distribution": "ospush"
-     *     },
-     *    "oppo": {
-     *     "distribution": "ospush"
-     *     },
-     *    "vivo": {
-     *     "distribution": "ospush"
+     * {
+     *     "third_party_channel":{
+     *         "xiaomi":{
+     *             "distribution":"ospush",
+     *             "channel_id":"*******"
+     *         },
+     *         "huawei":{
+     *             "distribution":"jpush"
+     *         },
+     *         "meizu":{
+     *             "distribution":"jpush"
+     *         },
+     *         "fcm":{
+     *             "distribution":"ospush"
+     *         },
+     *         "oppo":{
+     *             "distribution":"ospush",
+     *             "channel_id":"*******"
+     *         },
+     *         "vivo":{
+     *             "distribution":"ospush",
+     *             "classification":0 // 2020/06 新增，和vivo官方字段含义一致 0 代表运营消息，1 代表系统消息，不填vivo官方默认为0
+     *                                // 使用此字段时，需使用setThirdPartyChannelV2方法，因为此值只能为整数形式
+     *         }
      *     }
      * }
      */
-    private Map<String, Map<String, String>> thirdPartyChannel;
+    private Map<String, JsonObject> thirdPartyChannel;
 
     private Options(int sendno,
                     long overrideMsgId,
                     long timeToLive,
                     boolean apnsProduction,
                     int bigPushDuration,
                     String apnsCollapseId,
-                    Map<String, Map<String, String>> thirdPartyChannel,
+                    Map<String, JsonObject> thirdPartyChannel,
                     Map<String, JsonPrimitive> customData) {
         this.sendno = sendno;
         this.overrideMsgId = overrideMsgId;
@@ -127,11 +134,8 @@ public JsonElement toJSON() {
 
         if (null != thirdPartyChannel && thirdPartyChannel.size() > 0) {
             JsonObject partyChannel = new JsonObject();
-            for (Map.Entry<String, Map<String, String>> entry : thirdPartyChannel.entrySet()) {
-                JsonObject channel = new JsonObject();
-                for (Map.Entry<String, String> stringEntry : entry.getValue().entrySet()) {
-                    channel.addProperty(stringEntry.getKey(), stringEntry.getValue());
-                }
+            for (Map.Entry<String, JsonObject> entry : thirdPartyChannel.entrySet()) {
+                JsonObject channel = entry.getValue();
                 partyChannel.add(entry.getKey(), channel);
             }
             json.add(THIRD_PARTH_CHANNEl, partyChannel);
@@ -154,7 +158,7 @@ public static class Builder {
         private boolean apnsProduction = false;
         private int bigPushDuration = 0;
         private String apnsCollapseId;
-        private Map<String, Map<String, String>> thirdPartyChannel;
+        private Map<String, JsonObject> thirdPartyChannel;
         private Map<String, JsonPrimitive> customData;
 
         public Builder setSendno(int sendno) {
@@ -187,11 +191,48 @@ public Builder setBigPushDuration(int bigPushDuration) {
             return this;
         }
 
+        @Deprecated
         public Map<String, Map<String, String>> getThirdPartyChannel() {
-            return thirdPartyChannel;
+            if (null != thirdPartyChannel) {
+                Map<String, Map<String, String>> thirdPartyChannelRsp = new HashMap<>();
+                Set<Map.Entry<String, JsonObject>> entrySet = thirdPartyChannel.entrySet();
+                for (Map.Entry<String, JsonObject> entry : entrySet) {
+                    JsonObject entryValue = entry.getValue();
+                    Set<Map.Entry<String, JsonElement>> valueEntrySet = entryValue.entrySet();
+                    Map<String, String> valueMap = new HashMap<>();
+                    for (Map.Entry<String, JsonElement> valueEntry : valueEntrySet) {
+                        valueMap.put(valueEntry.getKey(), null == valueEntry.getValue() ? null : valueEntry.getValue().getAsString());
+                    }
+                    thirdPartyChannelRsp.put(entry.getKey(), valueMap);
+                }
+                return thirdPartyChannelRsp;
+            }
+            return null;
         }
 
+        @Deprecated
         public Builder setThirdPartyChannel(Map<String, Map<String, String>> thirdPartyChannel) {
+            this.thirdPartyChannel = new HashMap<>();
+            if (null != thirdPartyChannel) {
+                Set<Map.Entry<String, Map<String, String>>> entrySet = thirdPartyChannel.entrySet();
+                for (Map.Entry<String, Map<String, String>> entry : entrySet) {
+                    String key = entry.getKey();
+                    Map<String, String> valueMap = entry.getValue();
+                    JsonObject valueObj = new JsonObject();
+                    if (null != valueMap) {
+                        Set<Map.Entry<String, String>> valueEntrySet = valueMap.entrySet();
+                        for (Map.Entry<String, String> valueEntry : valueEntrySet) {
+                            valueObj.addProperty(valueEntry.getKey(), valueEntry.getValue());
+                        }
+                        this.thirdPartyChannel.put(key, valueObj);
+                    }
+                }
+
+            }
+            return this;
+        }
+
+        public Builder setThirdPartyChannelV2(Map<String, JsonObject> thirdPartyChannel) {
             this.thirdPartyChannel = thirdPartyChannel;
             return this;
         }

src/main/java/cn/jpush/api/push/model/PushPayload.java

@@ -169,6 +169,10 @@ public int getSendno() {
     public Audience getAudience() {
         return audience;
     }
+
+    public Options getOptions() {
+        return options;
+    }
 
     @Override
     public JsonElement toJSON() {

src/test/java/cn/jpush/api/push/model/OptionsTest.java

@@ -13,6 +13,9 @@
 import cn.jiguang.common.ServiceHelper;
 import cn.jpush.api.FastTests;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Category(FastTests.class)
 public class OptionsTest {
 
@@ -128,5 +131,61 @@ public void testBigPushDuration() {
 
         assertThat(options.toJSON(), is((JsonElement) json));
     }
+
+    @Test
+    public void testThirdPartyChannel() {
+        int sendno = ServiceHelper.generateSendno();
+
+        Map<String, Map<String, String>> thirdMap = new HashMap<>();
+        Map<String, String> huaweiMap = new HashMap<>();
+        huaweiMap.put("distribution", "jpush");
+        thirdMap.put("huawei", huaweiMap);
+
+        Options options = Options.newBuilder()
+                .setSendno(sendno)
+                .setThirdPartyChannel(thirdMap)
+                .build();
+        System.out.println("json string: " + options.toJSON());
+
+        JsonObject json = new JsonObject();
+        JsonObject thirdPartyChannel = new JsonObject();
+        JsonObject huawei = new JsonObject();
+        huawei.addProperty("distribution", "jpush");
+        thirdPartyChannel.add("huawei", huawei);
+        json.add("sendno", new JsonPrimitive(sendno));
+        json.add("apns_production", new JsonPrimitive(false));
+        json.add("third_party_channel", thirdPartyChannel);
+
+        assertThat(options.toJSON(), is((JsonElement) json));
+    }
+
+    @Test
+    public void testThirdPartyChannelV2() {
+        int sendno = ServiceHelper.generateSendno();
+
+        Map<String, JsonObject> thirdMap = new HashMap<>();
+        JsonObject vivoJsonObj = new JsonObject();
+        vivoJsonObj.addProperty("distribution", "ospush");
+        vivoJsonObj.addProperty("classification", 1);
+        thirdMap.put("vivo", vivoJsonObj);
+
+        Options options = Options.newBuilder()
+                .setSendno(sendno)
+                .setThirdPartyChannelV2(thirdMap)
+                .build();
+        System.out.println("json string: " + options.toJSON());
+
+        JsonObject json = new JsonObject();
+        JsonObject thirdPartyChannel = new JsonObject();
+        JsonObject vivo = new JsonObject();
+        vivo.addProperty("distribution", "ospush");
+        vivo.addProperty("classification", 1);
+        thirdPartyChannel.add("vivo", vivo);
+        json.add("sendno", new JsonPrimitive(sendno));
+        json.add("apns_production", new JsonPrimitive(false));
+        json.add("third_party_channel", thirdPartyChannel);
+
+        assertThat(options.toJSON(), is((JsonElement) json));
+    }
 }