Merge pull request #48 from JoshuaYin/master

joshua.yin · web-flow · commit 5b08fc5e57cf · 2021-01-07T20:37:14.000+08:00
修复错误返回若不是json格式时的崩溃 bug
diff --git a/ufile-sample-java/pom.xml b/ufile-sample-java/pom.xml
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>cn.ucloud.ufile</groupId>
             <artifactId>ufile-client-java</artifactId>
-            <version>2.6.2</version>
+            <version>2.6.4</version>
         </dependency>
     </dependencies>
 
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.6.3</version>
+    <version>2.6.4</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.6.3</version>
+        <version>2.6.4</version>
     </parent>
 
     <artifactId>ufile-client-java</artifactId>
-    <version>2.6.3</version>
+    <version>2.6.4</version>
 
     <dependencies>
         <dependency>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>cn.ucloud.ufile</groupId>
             <artifactId>ufile-core</artifactId>
-            <version>2.6.3</version>
+            <version>2.6.4</version>
         </dependency>
     </dependencies>
 
diff --git a/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/PutFileApi.java b/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/PutFileApi.java
@@ -398,6 +398,7 @@ public UfileErrorBean parseErrorResponse(Response response) throws UfileClientEx
                     errorBean = new Gson().fromJson((content == null || content.length() == 0) ? "{}" : content, UfileErrorBean.class);
                 } catch (Exception e) {
                     errorBean = new UfileErrorBean();
+                    errorBean.setErrMsg(content);
                 }
                 errorBean.setResponseCode(response.code());
                 errorBean.setxSessionId(response.header("X-SessionId"));
diff --git a/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/PutStreamApi.java b/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/PutStreamApi.java
@@ -404,6 +404,7 @@ public UfileErrorBean parseErrorResponse(Response response) throws UfileClientEx
                     errorBean = new Gson().fromJson((content == null || content.length() == 0) ? "{}" : content, UfileErrorBean.class);
                 } catch (Exception e) {
                     errorBean = new UfileErrorBean();
+                    errorBean.setErrMsg(content);
                 }
                 errorBean.setResponseCode(response.code());
                 errorBean.setxSessionId(response.header("X-SessionId"));
diff --git a/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/multi/FinishMultiUploadApi.java b/ufile/ufile-client-java/src/main/java/cn/ucloud/ufile/api/object/multi/FinishMultiUploadApi.java
@@ -269,6 +269,7 @@ public UfileErrorBean parseErrorResponse(Response response) throws UfileClientEx
                     errorBean = new Gson().fromJson((content == null || content.length() == 0) ? "{}" : content, UfileErrorBean.class);
                 } catch (Exception e) {
                     errorBean = new UfileErrorBean();
+                    errorBean.setErrMsg(content);
                 }
                 errorBean.setResponseCode(response.code());
                 errorBean.setxSessionId(response.header("X-SessionId"));
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>
         <groupId>cn.ucloud.ufile</groupId>
         <artifactId>ufile</artifactId>
-        <version>2.6.3</version>
+        <version>2.6.4</version>
     </parent>
 
     <artifactId>ufile-core</artifactId>
-    <version>2.6.3</version>
+    <version>2.6.4</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.6.3";
+    public static final String SDK_VERSION = "2.6.4";
     /**
      * 默认分片大小（4MB）
      */
diff --git a/ufile/ufile-core/src/main/java/cn/ucloud/ufile/api/UfileApi.java b/ufile/ufile-core/src/main/java/cn/ucloud/ufile/api/UfileApi.java
@@ -11,6 +11,7 @@
 import cn.ucloud.ufile.http.HttpClient;
 import cn.ucloud.ufile.http.response.ResponseParser;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.OkHttpClient;
@@ -288,8 +289,14 @@ public T parseHttpResponse(Response response) throws UfileClientException, Ufile
     public UfileErrorBean parseErrorResponse(Response response) throws UfileClientException {
         try {
             String content = response.body().string();
-            content = (content == null || content.length() == 0) ? "{}" : content;
-            UfileErrorBean errorBean = new Gson().fromJson(content, UfileErrorBean.class);
+            content = (content == null || content.length() == 0) ? "" : content;
+            UfileErrorBean errorBean = null;
+            try {
+                errorBean = new Gson().fromJson(content, UfileErrorBean.class);
+            } catch (JsonParseException e) {
+                errorBean = new UfileErrorBean();
+                errorBean.setErrMsg(content);
+            }
             errorBean.setResponseCode(response.code());
             errorBean.setxSessionId(response.header("X-SessionId"));
             return errorBean;
diff --git a/ufile/ufile-core/src/main/java/cn/ucloud/ufile/http/interceptor/LogInterceptor.java b/ufile/ufile-core/src/main/java/cn/ucloud/ufile/http/interceptor/LogInterceptor.java
@@ -45,17 +45,19 @@ public Response intercept(Chain chain) throws IOException {
         JLog.T(TAG, "[response-code]:" + response.code());
         JLog.T(TAG, "[response-headers]:" + response.headers().toString());
 
-        /* 获得返回的body，注意此处不要使用responseBody.string()获取返回数据，原因在于这个方法会消耗返回结果的数据(buffer) */
-//        ResponseBody responseBody = response.body();
+        if (JLog.SHOW_TEST) {
+            /* 获得返回的body，注意此处不要使用responseBody.string()获取返回数据，原因在于这个方法会消耗返回结果的数据(buffer) */
+            ResponseBody responseBody = response.body();
 
-        /* 为了不消耗buffer，我们这里使用source先获得buffer对象，然后clone()后使用 */
-//        BufferedSource source = responseBody.source();
-//        source.request(Long.MAX_VALUE); // Buffer the entire body.
-//        /* 获得返回的数据 */
-//        Buffer buffer = source.buffer();
-//        if (buffer.size() < 1024)
-//            /* 使用前clone() 下，避免直接消耗 */
-//            JLog.T(TAG, "[response-body]:" + buffer.clone().readString(Charset.forName("UTF-8")));
+            /* 为了不消耗buffer，我们这里使用source先获得buffer对象，然后clone()后使用 */
+            BufferedSource source = responseBody.source();
+            source.request(Long.MAX_VALUE); // Buffer the entire body.
+            /* 获得返回的数据 */
+            Buffer buffer = source.buffer();
+            if (buffer.size() < 2 << 10)
+                /* 使用前clone() 下，避免直接消耗 */
+                JLog.T(TAG, "[response-body]:" + buffer.clone().readString(Charset.forName("UTF-8")));
+        }
 
         return response;
     }

Original file line number	Diff line number	Diff line change
`@@ -398,6 +398,7 @@ public UfileErrorBean parseErrorResponse(Response response) throws UfileClientEx`
`398`	`398`	`errorBean = new Gson().fromJson((content == null \|\| content.length() == 0) ? "{}" : content, UfileErrorBean.class);`
`399`	`399`	`} catch (Exception e) {`
`400`	`400`	`errorBean = new UfileErrorBean();`
	`401`	`+ errorBean.setErrMsg(content);`
`401`	`402`	`}`
`402`	`403`	`errorBean.setResponseCode(response.code());`
`403`	`404`	`errorBean.setxSessionId(response.header("X-SessionId"));`
Original file line number	Diff line number	Diff line change
`@@ -404,6 +404,7 @@ public UfileErrorBean parseErrorResponse(Response response) throws UfileClientEx`
`404`	`404`	`errorBean = new Gson().fromJson((content == null \|\| content.length() == 0) ? "{}" : content, UfileErrorBean.class);`
`405`	`405`	`} catch (Exception e) {`
`406`	`406`	`errorBean = new UfileErrorBean();`
	`407`	`+ errorBean.setErrMsg(content);`
`407`	`408`	`}`
`408`	`409`	`errorBean.setResponseCode(response.code());`
`409`	`410`	`errorBean.setxSessionId(response.header("X-SessionId"));`
Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,7 @@ public UfileErrorBean parseErrorResponse(Response response) throws UfileClientEx`
`269`	`269`	`errorBean = new Gson().fromJson((content == null \|\| content.length() == 0) ? "{}" : content, UfileErrorBean.class);`
`270`	`270`	`} catch (Exception e) {`
`271`	`271`	`errorBean = new UfileErrorBean();`
	`272`	`+ errorBean.setErrMsg(content);`
`272`	`273`	`}`
`273`	`274`	`errorBean.setResponseCode(response.code());`
`274`	`275`	`errorBean.setxSessionId(response.header("X-SessionId"));`