* 兼容性修复ObjectListWithDirFormatApi中，若后台返回UserMeta=null导致异常的bug

Joshua Yin · Joshua Yin · commit e620a04ffec8 · 2020-03-30T23:48:21.000+08:00
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@
     <dependency>
         <groupId>cn.ucloud.ufile</groupId>
         <artifactId>ufile-client-java</artifactId>
-        <version>2.4.2</version>
+        <version>2.4.3</version>
     </dependency>
     ```
 
@@ -36,7 +36,7 @@
         /*
          * your other dependencies
          */
-        implementation 'cn.ucloud.ufile:ufile-client-java:2.4.2'
+        implementation 'cn.ucloud.ufile:ufile-client-java:2.4.3'
     }
     ```
 
diff --git a/ufile-sample-java/src/main/java/cn/ucloud/ufile/sample/Constants.java b/ufile-sample-java/src/main/java/cn/ucloud/ufile/sample/Constants.java
@@ -43,8 +43,8 @@ public class Constants {
      * 请修改下面的公私钥
      */
     public static final ObjectAuthorization OBJECT_AUTHORIZER = new UfileObjectLocalAuthorization(
-            "UcloudPublicKey",
-            "UcloudPrivateKey");
+            System.getenv("UcloudPublicKey"),
+            System.getenv("UcloudPrivateKey"));
 
     /**
      * 远程Object相关API的签名器
diff --git a/ufile-sample-java/src/main/java/cn/ucloud/ufile/sample/object/GetObjectSample.java b/ufile-sample-java/src/main/java/cn/ucloud/ufile/sample/object/GetObjectSample.java
@@ -33,13 +33,13 @@ public class GetObjectSample {
     private static ObjectConfig config = new ObjectConfig("cn-sh2", "ufileos.com");
 
     public static void main(String[] args) {
-        String keyName = "";
-        String bucketName = "";
+        String keyName = "jdk-8u192-macosx-x64.dmg";
+        String bucketName = "new-bucket";
         //  5 * 60秒 --> 5分钟后过期
         int expiresDuration = 5 * 60;
 
-        String localDir = "";
-        String saveName = "";
+        String localDir = "/Users/joshua/MyResource/FileDetachTest/ftp";
+        String saveName = keyName;
         try {
             String url = UfileClient.object(Constants.OBJECT_AUTHORIZER, config)
                     .getDownloadUrlFromPrivateBucket(keyName, bucketName, expiresDuration)
diff --git a/ufile-sample-java/src/main/java/cn/ucloud/ufile/sample/object/ObjectListWithDirFormatSample.java b/ufile-sample-java/src/main/java/cn/ucloud/ufile/sample/object/ObjectListWithDirFormatSample.java
@@ -28,7 +28,7 @@ public class ObjectListWithDirFormatSample {
     private static ObjectConfig config = new ObjectConfig("cn-sh2", "ufileos.com");
 
     public static void main(String[] args) {
-        String bucketName = "";
+        String bucketName = "new-bucket";
 
         execute_list_all(bucketName);
     }
@@ -94,6 +94,8 @@ public static void execute_list_all(String bucketName) {
                 if (response == null || response.getObjectContents() == null)
                     break;
 
+                JLog.D(TAG, "[response-demo]:" + response.toString());
+
                 for (ObjectContentBean content : response.getObjectContents()) {
                     if (content == null)
                         continue;
diff --git a/ufile-sample-java/src/main/java/cn/ucloud/ufile/sample/object/PutObjectSample.java b/ufile-sample-java/src/main/java/cn/ucloud/ufile/sample/object/PutObjectSample.java
@@ -27,16 +27,16 @@
  */
 public class PutObjectSample {
     private static final String TAG = "PutObjectSample";
-    private static ObjectConfig config = new ObjectConfig("cn-sh2", "ufileos.com");
+    private static ObjectConfig config = new ObjectConfig("cn-bj", "ufileos.com");
 
     public static void main(String[] args) {
         InputStream is = new ByteArrayInputStream(new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07});
         // 如果上传File，则文件的MimeType可以使用MimeTypeUtil.getMimeType(File)来获取，MimeTypeUtil可能支持的type类型不全，用户可以按需自行填写
-        File file = new File("");
-        String keyName = "";
+        File file = new File("/Users/joshua/Downloads/test.jpg");
+        String keyName = file.getName();
         String mimeType = MimeTypeUtil.getMimeType(keyName);
-        String bucketName = "";
-        putStream(is, mimeType, keyName, bucketName);
+        String bucketName = "test-bkt";
+        putFile(file, mimeType, keyName, bucketName);
     }
 
     public static void putFile(File file, String mimeType, String nameAs, String toBucket) {
diff --git a/ufile/pom.xml b/ufile/pom.xml
@@ -7,7 +7,7 @@
     <groupId>cn.ucloud.ufile</groupId>
     <artifactId>ufile</artifactId>
     <packaging>pom</packaging>
-    <version>2.4.2</version>
+    <version>2.4.3</version>
 
     <modules>
         <module>ufile-core</module>
diff --git a/ufile/ufile-client-java/apidocs.zip b/ufile/ufile-client-java/apidocs.zip
diff --git a/ufile/ufile-client-java/pom.xml b/ufile/ufile-client-java/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <artifactId>ufile</artifactId>
         <groupId>cn.ucloud.ufile</groupId>
-        <version>2.4.2</version>
+        <version>2.4.3</version>
     </parent>
 
     <artifactId>ufile-client-java</artifactId>
-    <version>2.4.2</version>
+    <version>2.4.3</version>
 
     <dependencies>
         <dependency>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>cn.ucloud.ufile</groupId>
             <artifactId>ufile-core</artifactId>
-            <version>2.4.2</version>
+            <version>2.4.3</version>
         </dependency>
     </dependencies>
 
diff --git a/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/ObjectListWithDirFormatApi.java b/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/ObjectListWithDirFormatApi.java
@@ -196,17 +196,20 @@ public ObjectListWithDirFormatBean parseHttpResponse(Response response) throws U
                     if (content == null || content.getJsonUserMeta() == null)
                         continue;
 
-                    JsonObject json = content.getJsonUserMeta();
-                    Set<String> keys = json.keySet();
-                    if (keys != null) {
-                        Map<String, String> metadata = new HashMap<>();
-                        for (String name : keys) {
-                            if (name == null || name.isEmpty())
-                                continue;
-
-                            metadata.put(name.toLowerCase(), json.get(name).getAsString());
+                    JsonElement json = content.getJsonUserMeta();
+                    if (json != null && json instanceof JsonObject) {
+                       JsonObject jsonObj= (JsonObject) json;
+                        Set<String> keys = jsonObj.keySet();
+                        if (keys != null) {
+                            Map<String, String> metadata = new HashMap<>();
+                            for (String name : keys) {
+                                if (name == null || name.isEmpty())
+                                    continue;
+
+                                metadata.put(name.toLowerCase(), jsonObj.get(name).getAsString());
+                            }
+                            content.setUserMeta(metadata);
                         }
-                        content.setUserMeta(metadata);
                     }
                 }
             }
diff --git a/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/bean/ObjectContentBean.java b/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/bean/ObjectContentBean.java
@@ -1,7 +1,7 @@
 package cn.ucloud.ufile.bean;
 
 import com.google.gson.Gson;
-import com.google.gson.JsonObject;
+import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
@@ -30,7 +30,7 @@ public class ObjectContentBean implements Serializable {
     @SerializedName("CreateTime")
     private Long createTime;
     @SerializedName("UserMeta")
-    private JsonObject jsonUserMeta;
+    private JsonElement jsonUserMeta;
     private transient Map<String, String> userMeta;
 
     public String getBucketName() {
@@ -97,7 +97,7 @@ public void setCreateTime(long createTime) {
         this.createTime = createTime;
     }
 
-    public JsonObject getJsonUserMeta() {
+    public JsonElement getJsonUserMeta() {
         return jsonUserMeta;
     }
 
diff --git a/ufile/ufile-core/apidocs.zip b/ufile/ufile-core/apidocs.zip
diff --git a/ufile/ufile-core/pom.xml b/ufile/ufile-core/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <artifactId>ufile</artifactId>
         <groupId>cn.ucloud.ufile</groupId>
-        <version>2.4.2</version>
+        <version>2.4.3</version>
     </parent>
 
     <artifactId>ufile-core</artifactId>
-    <version>2.4.2</version>
+    <version>2.4.3</version>
 
     <dependencies>
         <dependency>
diff --git a/ufile/ufile-core/src/main/java/cn/ucloud/ufile/UfileConstants.java b/ufile/ufile-core/src/main/java/cn/ucloud/ufile/UfileConstants.java
@@ -6,7 +6,7 @@
  * @date: 2018/11/22 15:00
  */
 public class UfileConstants {
-    public static final String SDK_VERSION = "2.4.2";
+    public static final String SDK_VERSION = "2.4.3";
     /**
      * 默认分片大小（4MB）
      */
