2.6.5

* 上传回调策略新增callbackBodyType字段

Author: joshua.yin

ufile-sample-java/pom.xml

@@ -55,7 +55,7 @@
         <dependency>
             <groupId>cn.ucloud.ufile</groupId>
             <artifactId>ufile-client-java</artifactId>
-            <version>2.6.4</version>
+            <version>2.6.5</version>
         </dependency>
     </dependencies>
 

ufile/pom.xml

@@ -7,7 +7,7 @@
     <groupId>cn.ucloud.ufile</groupId>
     <artifactId>ufile</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.4</version>
+    <version>2.6.5</version>
 
     <modules>
         <module>ufile-core</module>

ufile/ufile-client-java/apidocs.zip

@@ -6,11 +6,11 @@
     <parent>
         <artifactId>ufile</artifactId>
         <groupId>cn.ucloud.ufile</groupId>
-        <version>2.6.4</version>
+        <version>2.6.5</version>
     </parent>
 
     <artifactId>ufile-client-java</artifactId>
-    <version>2.6.4</version>
+    <version>2.6.5</version>
 
     <dependencies>
         <dependency>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>cn.ucloud.ufile</groupId>
             <artifactId>ufile-core</artifactId>
-            <version>2.6.4</version>
+            <version>2.6.5</version>
         </dependency>
     </dependencies>
 

ufile/ufile-client-java/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>cn.ucloud.ufile</groupId>
         <artifactId>ufile</artifactId>
-        <version>2.6.4</version>
+        <version>2.6.5</version>
     </parent>
 
     <artifactId>ufile-core</artifactId>
-    <version>2.6.4</version>
+    <version>2.6.5</version>
 
     <dependencies>
         <dependency>

ufile/ufile-core/apidocs.zip

@@ -6,7 +6,7 @@
  * @date: 2018/11/22 15:00
  */
 public class UfileConstants {
-    public static final String SDK_VERSION = "2.6.4";
+    public static final String SDK_VERSION = "2.6.5";
     /**
      * 默认分片大小（4MB）
      */

ufile/ufile-core/pom.xml

@@ -20,8 +20,8 @@ public final class PutPolicyForCallback extends PutPolicy {
 
     private PutPolicyForCallback(String policyContent, String policy) throws UfileClientException {
         super(policy);
-        JLog.D(TAG, "[PutPolicyContent]:" + policyContent);
         this.policyContent = policyContent;
+        JLog.D(TAG, "[PutPolicyContent]:" + policyContent);
     }
 
     public String getPolicyContent() {
@@ -30,15 +30,21 @@ public String getPolicyContent() {
 
     public static class Builder extends PutPolicy.Builder<PutPolicyForCallback> {
         private String callbackUrl;
+        private String callbackBodyType;
         private List<PolicyParam> callbackBody;
 
         public Builder(String callbackUrl) {
             this(callbackUrl, new ArrayList<PolicyParam>());
         }
 
         public Builder(String callbackUrl, List<PolicyParam> callbackBody) {
+            this(callbackUrl, callbackBody, null);
+        }
+
+        public Builder(String callbackUrl, List<PolicyParam> callbackBody, String callbackBodyType) {
             this.callbackUrl = callbackUrl;
             this.callbackBody = callbackBody;
+            this.callbackBodyType = callbackBodyType;
         }
 
         public Builder setCallbackUrl(String callbackUrl) {
@@ -51,6 +57,11 @@ public Builder setCallbackBody(List<PolicyParam> callbackBody) {
             return this;
         }
 
+        public Builder setCallbackBodyType(String callbackBodyType) {
+            this.callbackBodyType = callbackBodyType;
+            return this;
+        }
+
         public Builder addCallbackBody(PolicyParam param) {
             if (param == null)
                 return this;
@@ -70,26 +81,46 @@ public List<PolicyParam> getCallbackBody() {
             return callbackBody;
         }
 
+        public String getCallbackBodyType() {
+            return callbackBodyType;
+        }
+
         public PutPolicyForCallback build() throws UfileClientException {
             if (callbackUrl == null || callbackUrl.isEmpty())
                 throw new UfileClientException("callbackUrl can not be null or empty in PutPolicyForCallback");
 
             JsonObject json = new JsonObject();
             json.addProperty("callbackUrl", callbackUrl);
+            if (callbackBodyType != null && !callbackBodyType.isEmpty())
+                json.addProperty("callbackBodyType", callbackBodyType);
+
             StringBuilder sb = new StringBuilder();
             if (callbackBody != null) {
-                for (int i = 0, len = callbackBody.size(); i < len; i++, sb.append(i < len ? "&" : "")) {
-                    PolicyParam param = callbackBody.get(i);
-                    if (param == null)
-                        continue;
-
-                    String str = param.format();
-                    if (str == null)
-                        continue;
-
-                    sb.append(str);
+                if (callbackBodyType != null && callbackBodyType.startsWith("application/json")) {
+                    JsonObject body = new JsonObject();
+                    for (int i = 0, len = callbackBody.size(); i < len; i++) {
+                        PolicyParam param = callbackBody.get(i);
+                        if (param == null || param.key == null)
+                            continue;
+
+                        body.addProperty(param.key, param.value);
+                    }
+                    sb.append(body.toString());
+                } else {
+                    for (int i = 0, len = callbackBody.size(); i < len; i++, sb.append(i < len ? "&" : "")) {
+                        PolicyParam param = callbackBody.get(i);
+                        if (param == null)
+                            continue;
+
+                        String str = param.format();
+                        if (str == null)
+                            continue;
+
+                        sb.append(str);
+                    }
                 }
             }
+
             json.addProperty("callbackBody", sb.toString());
             String policy = json.toString();