diff --git a/README.md b/README.md index 1b3326a..0cd66ea 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ cn.ucloud.ufile ufile-client-java - 2.4.2 + 2.4.4 ``` @@ -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.4' } ``` diff --git a/ufile-sample-java/pom.xml b/ufile-sample-java/pom.xml index cce9cee..443f5a0 100644 --- a/ufile-sample-java/pom.xml +++ b/ufile-sample-java/pom.xml @@ -26,7 +26,7 @@ cn.ucloud.ufile ufile-client-java - 2.4.2 + 2.4.4 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 index 8438ad7..14eeb10 100644 --- 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 @@ -7,16 +7,13 @@ import cn.ucloud.ufile.bean.ObjectListWithDirFormatBean; import cn.ucloud.ufile.exception.UfileClientException; import cn.ucloud.ufile.exception.UfileServerException; -import cn.ucloud.ufile.http.HttpClient; import cn.ucloud.ufile.http.UfileCallback; -import cn.ucloud.ufile.http.interceptor.LogInterceptor; import cn.ucloud.ufile.sample.Constants; import cn.ucloud.ufile.util.JLog; import okhttp3.Request; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.TimeUnit; /** * @author: joshua diff --git a/ufile/pom.xml b/ufile/pom.xml index f5f9399..ffe8a5e 100644 --- a/ufile/pom.xml +++ b/ufile/pom.xml @@ -7,7 +7,7 @@ cn.ucloud.ufile ufile pom - 2.4.2 + 2.4.4 ufile-core diff --git a/ufile/ufile-client-java/apidocs.zip b/ufile/ufile-client-java/apidocs.zip index 493882c..a9d6f94 100644 Binary files a/ufile/ufile-client-java/apidocs.zip and b/ufile/ufile-client-java/apidocs.zip differ diff --git a/ufile/ufile-client-java/pom.xml b/ufile/ufile-client-java/pom.xml index 5157961..c8b5919 100644 --- a/ufile/ufile-client-java/pom.xml +++ b/ufile/ufile-client-java/pom.xml @@ -6,11 +6,11 @@ ufile cn.ucloud.ufile - 2.4.2 + 2.4.4 ufile-client-java - 2.4.2 + 2.4.4 @@ -26,7 +26,7 @@ cn.ucloud.ufile ufile-core - 2.4.2 + 2.4.4 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 index c4f1b51..6359112 100644 --- 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 keys = json.keySet(); - if (keys != null) { - Map 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 keys = jsonObj.keySet(); + if (keys != null) { + Map 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/MultiUploadResponse.java b/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/bean/MultiUploadResponse.java index 6186293..2002a39 100644 --- a/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/bean/MultiUploadResponse.java +++ b/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/bean/MultiUploadResponse.java @@ -15,7 +15,7 @@ public class MultiUploadResponse extends BaseResponseBean { @SerializedName("Key") private String keyName; @SerializedName("FileSize") - private int fileSize; + private long fileSize; @SerializedName("ETag") protected String eTag; @@ -41,11 +41,11 @@ public void setKeyName(String keyName) { this.keyName = keyName; } - public int getFileSize() { + public long getFileSize() { return fileSize; } - public void setFileSize(int fileSize) { + public void setFileSize(long fileSize) { this.fileSize = fileSize; } 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 index af7d05b..a79dcab 100644 --- 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 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 index 7b4a974..1848961 100644 Binary files a/ufile/ufile-core/apidocs.zip and b/ufile/ufile-core/apidocs.zip differ diff --git a/ufile/ufile-core/pom.xml b/ufile/ufile-core/pom.xml index f249f65..17abe3c 100644 --- a/ufile/ufile-core/pom.xml +++ b/ufile/ufile-core/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - ufile cn.ucloud.ufile - 2.4.2 + ufile + 2.4.4 ufile-core - 2.4.2 + 2.4.4 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 index d242883..6b4a059 100644 --- 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.4"; /** * 默认分片大小（4MB） */