update qcloud sdk to 5.9.3

jordanqin · jordanqin · commit ba42db15f489 · 2022-08-05T15:55:52.000+08:00
diff --git a/QCloudCosXml/cos-android/src/androidTestNormal/java/com/tencent/cos/xml/model/bucket/PutBucketTestAdapter.java b/QCloudCosXml/cos-android/src/androidTestNormal/java/com/tencent/cos/xml/model/bucket/PutBucketTestAdapter.java
@@ -4,13 +4,11 @@
 import androidx.annotation.Nullable;
 
 import com.tencent.cos.xml.CosXmlService;
-import com.tencent.cos.xml.common.COSACL;
 import com.tencent.cos.xml.core.TestConst;
 import com.tencent.cos.xml.exception.CosXmlClientException;
 import com.tencent.cos.xml.exception.CosXmlServiceException;
 import com.tencent.cos.xml.listener.CosXmlResultListener;
 import com.tencent.cos.xml.model.NormalRequestTestAdapter;
-import com.tencent.cos.xml.model.tag.ACLAccount;
 
 import org.junit.Assert;
 
@@ -20,13 +18,13 @@ public class PutBucketTestAdapter extends NormalRequestTestAdapter<PutBucketRequ
     protected PutBucketRequest newRequestInstance() {
         PutBucketRequest request = new PutBucketRequest(TestConst.TEMP_BUCKET);
         request.enableMAZ(true);
-        request.setXCOSACL(COSACL.DEFAULT);
-        ACLAccount aclAccount = new ACLAccount();
-        aclAccount.addAccount(TestConst.OWNER_UIN);
-        aclAccount.addAccount(TestConst.OWNER_UIN, TestConst.OWNER_UIN);
-        request.setXCOSGrantRead(aclAccount);
-        request.setXCOSGrantWrite(aclAccount);
-        request.setXCOSReadWrite(aclAccount);
+//        request.setXCOSACL(COSACL.DEFAULT);
+//        ACLAccount aclAccount = new ACLAccount();
+//        aclAccount.addAccount(TestConst.OWNER_UIN);
+//        aclAccount.addAccount(TestConst.OWNER_UIN, TestConst.OWNER_UIN);
+//        request.setXCOSGrantRead(aclAccount);
+//        request.setXCOSGrantWrite(aclAccount);
+//        request.setXCOSReadWrite(aclAccount);
         return request;
     }
 
diff --git a/QCloudCosXml/cos-android/src/main/java/com/tencent/cos/xml/model/object/CompleteMultiUploadResult.java b/QCloudCosXml/cos-android/src/main/java/com/tencent/cos/xml/model/object/CompleteMultiUploadResult.java
@@ -32,9 +32,7 @@
 
 import org.xmlpull.v1.XmlPullParserException;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 
 /**
  * 完成整个分块上传的返回的结果.
@@ -52,12 +50,13 @@ final public class CompleteMultiUploadResult extends CosXmlResult {
     public void parseResponseBody(HttpResponse response) throws CosXmlServiceException, CosXmlClientException {
         super.parseResponseBody(response);
 
+        completeMultipartUpload = new CompleteMultipartUploadResult();
         try {
             completeMultipartUpload = QCloudXml.fromXml(response.byteStream(), CompleteMultipartUploadResult.class);
         } catch (IOException e) {
-            e.printStackTrace();
+            throw new CosXmlClientException(ClientErrorCode.POOR_NETWORK.getCode(), e);
         } catch (XmlPullParserException e) {
-            e.printStackTrace();
+            throw new CosXmlClientException(ClientErrorCode.SERVERERROR.getCode(), e);
         }
     }
 
diff --git a/QCloudCosXml/cos-android/src/main/java/com/tencent/cos/xml/model/object/PutObjectResult.java b/QCloudCosXml/cos-android/src/main/java/com/tencent/cos/xml/model/object/PutObjectResult.java
@@ -24,6 +24,7 @@
 
 import androidx.annotation.Nullable;
 
+import com.tencent.cos.xml.common.ClientErrorCode;
 import com.tencent.cos.xml.exception.CosXmlClientException;
 import com.tencent.cos.xml.exception.CosXmlServiceException;
 import com.tencent.cos.xml.model.tag.pic.PicUploadResult;
@@ -47,10 +48,10 @@ public void parseResponseBody(HttpResponse response) throws CosXmlServiceExcepti
         super.parseResponseBody(response);
         try {
             picUploadResult = QCloudXml.fromXml(response.byteStream(), PicUploadResult.class);
-        } catch (IOException e) {
-            e.printStackTrace();
         } catch (XmlPullParserException e) {
-            e.printStackTrace();
+            throw new CosXmlClientException(ClientErrorCode.SERVERERROR.getCode(), e);
+        } catch (IOException e) {
+            throw new CosXmlClientException(ClientErrorCode.POOR_NETWORK.getCode(), e);
         }
     }
 
diff --git a/QCloudCosXml/cos-android/src/main/java/com/tencent/cos/xml/model/tag/CreateBucketConfiguration.java b/QCloudCosXml/cos-android/src/main/java/com/tencent/cos/xml/model/tag/CreateBucketConfiguration.java
@@ -29,6 +29,6 @@ public class CreateBucketConfiguration {
     /**
      * 存储桶 AZ 配置，指定为 MAZ 以创建多 AZ 存储桶
      */
-    public String bucketAzConfig = "OAZ"; // MAZ|OAZ
+    public String bucketAzConfig = "MAZ";
 
 }
diff --git a/QCloudCosXml/cos-android/src/main/java/com/tencent/cos/xml/transfer/COSXMLUploadTask.java b/QCloudCosXml/cos-android/src/main/java/com/tencent/cos/xml/transfer/COSXMLUploadTask.java
@@ -960,12 +960,14 @@ protected CosXmlResult buildCOSXMLTaskResult(CosXmlResult sourceResult) {
             cosxmlUploadTaskResult.httpCode = completeMultiUploadResult.httpCode;
             cosxmlUploadTaskResult.httpMessage = completeMultiUploadResult.httpMessage;
             cosxmlUploadTaskResult.headers = completeMultiUploadResult.headers;
-            cosxmlUploadTaskResult.eTag = completeMultiUploadResult.completeMultipartUpload.eTag;
             cosxmlUploadTaskResult.accessUrl = completeMultiUploadResult.accessUrl;
-            PicUploadResult picUploadResult = new PicUploadResult();
-            picUploadResult.originalInfo = completeMultiUploadResult.completeMultipartUpload.getOriginInfo();
-            picUploadResult.processResults = completeMultiUploadResult.completeMultipartUpload.processResults;
-            cosxmlUploadTaskResult.picUploadResult = picUploadResult;
+            if(completeMultiUploadResult.completeMultipartUpload != null){
+                cosxmlUploadTaskResult.eTag = completeMultiUploadResult.completeMultipartUpload.eTag;
+                PicUploadResult picUploadResult = new PicUploadResult();
+                picUploadResult.originalInfo = completeMultiUploadResult.completeMultipartUpload.getOriginInfo();
+                picUploadResult.processResults = completeMultiUploadResult.completeMultipartUpload.processResults;
+                cosxmlUploadTaskResult.picUploadResult = picUploadResult;
+            }
         }
         return cosxmlUploadTaskResult;
     }
diff --git a/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/bucket/GetBucketIntelligentTieringResult.java b/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/bucket/GetBucketIntelligentTieringResult.java
@@ -8,6 +8,10 @@
 import com.tencent.qcloud.core.http.HttpResponse;
 import com.tencent.qcloud.qcloudxml.core.QCloudXml;
 
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+
 /**
  * <p>
  * Created by rickenwang on 2020/11/10.
@@ -27,8 +31,10 @@ public void parseResponseBody(HttpResponse response) throws CosXmlClientExceptio
 
         try {
             configuration = QCloudXml.fromXml(response.byteStream(), IntelligentTieringConfiguration.class);
-        } catch (Exception e) {
-            throw new CosXmlClientException(ClientErrorCode.INTERNAL_ERROR.getCode(), "", e.getCause());
+        } catch (XmlPullParserException e) {
+            throw new CosXmlClientException(ClientErrorCode.SERVERERROR.getCode(), e);
+        } catch (IOException e) {
+            throw new CosXmlClientException(ClientErrorCode.POOR_NETWORK.getCode(), e);
         }
     }
 }
diff --git a/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/bucket/GetBucketObjectVersionsResult.java b/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/bucket/GetBucketObjectVersionsResult.java
@@ -23,6 +23,7 @@
 package com.tencent.cos.xml.model.bucket;
 
 import com.tencent.cos.xml.BeaconService;
+import com.tencent.cos.xml.common.ClientErrorCode;
 import com.tencent.cos.xml.exception.CosXmlClientException;
 import com.tencent.cos.xml.exception.CosXmlServiceException;
 import com.tencent.cos.xml.model.CosXmlResult;
@@ -55,10 +56,10 @@ public void parseResponseBody(HttpResponse response) throws CosXmlClientExceptio
             XmlParser.parseGetBucketObjectVersionsResult(response.byteStream(), listVersionResult);
         } catch (XmlPullParserException e) {
             BeaconService.getInstance().reportError(TAG, e);
-            e.printStackTrace();
+            throw new CosXmlClientException(ClientErrorCode.SERVERERROR.getCode(), e);
         } catch (IOException e) {
             BeaconService.getInstance().reportError(TAG, e);
-            e.printStackTrace();
+            throw new CosXmlClientException(ClientErrorCode.POOR_NETWORK.getCode(), e);
         }
     }
 }
diff --git a/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/bucket/PutBucketRequest.java b/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/bucket/PutBucketRequest.java
@@ -37,14 +37,16 @@
 
 import java.io.IOException;
 
+import okhttp3.RequestBody;
+
 /**
  * 创建存储桶（Bucket）的请求.
  * @see com.tencent.cos.xml.CosXml#putBucket(PutBucketRequest)
  * @see com.tencent.cos.xml.CosXml#putBucketAsync(PutBucketRequest, CosXmlResultListener)
  */
 final public class PutBucketRequest extends BucketRequest {
 
-    private CreateBucketConfiguration createBucketConfiguration = new CreateBucketConfiguration();
+    private CreateBucketConfiguration createBucketConfiguration = null;
 
     public PutBucketRequest(String bucket){
         super(bucket);
@@ -55,7 +57,11 @@ public PutBucketRequest(String bucket){
      * @param enable 是否为 多AZ 配置
      */
     public void enableMAZ(boolean enable) {
-        createBucketConfiguration.bucketAzConfig = enable ? "MAZ" : "OAZ";
+        if (enable){
+            createBucketConfiguration = new CreateBucketConfiguration();
+        } else {
+            createBucketConfiguration = null;
+        }
     }
 
     /**
@@ -123,12 +129,16 @@ public String getMethod() {
 
     @Override
     public RequestBodySerializer getRequestBody() throws CosXmlClientException {
-        try {
-            return RequestBodySerializer.string(COSRequestHeaderKey.APPLICATION_XML, XmlBuilder.buildCreateBucketConfiguration(createBucketConfiguration));
-        } catch (XmlPullParserException e) {
-            throw new CosXmlClientException(ClientErrorCode.INVALID_ARGUMENT.getCode(), e);
-        } catch (IOException e) {
-            throw new CosXmlClientException(ClientErrorCode.INVALID_ARGUMENT.getCode(), e);
+        if(createBucketConfiguration != null){
+            try {
+                return RequestBodySerializer.string(COSRequestHeaderKey.APPLICATION_XML, XmlBuilder.buildCreateBucketConfiguration(createBucketConfiguration));
+            } catch (XmlPullParserException e) {
+                throw new CosXmlClientException(ClientErrorCode.INVALID_ARGUMENT.getCode(), e);
+            } catch (IOException e) {
+                throw new CosXmlClientException(ClientErrorCode.INVALID_ARGUMENT.getCode(), e);
+            }
+        } else {
+            return RequestBodySerializer.wrap(RequestBody.create(null, new byte[]{}));
         }
     }
 }
diff --git a/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/ci/GetBucketDPStateResult.java b/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/ci/GetBucketDPStateResult.java
@@ -1,5 +1,6 @@
 package com.tencent.cos.xml.model.ci;
 
+import com.tencent.cos.xml.common.ClientErrorCode;
 import com.tencent.cos.xml.exception.CosXmlClientException;
 import com.tencent.cos.xml.exception.CosXmlServiceException;
 import com.tencent.cos.xml.model.CosXmlResult;
@@ -30,8 +31,10 @@ public void parseResponseBody(HttpResponse response) throws CosXmlClientExceptio
         try {
             GetBucketDPState getBucketDPS = QCloudXml.fromXml(response.byteStream(), GetBucketDPState.class);
             bucketDocumentPreviewState = getBucketDPS.DocBucketList;
-        } catch (XmlPullParserException | IOException e) {
-            throw new CosXmlServiceException("Parse xml error", e);
+        } catch (IOException e) {
+            throw new CosXmlClientException(ClientErrorCode.SERVERERROR.getCode(), e);
+        } catch (XmlPullParserException e) {
+            throw new CosXmlClientException(ClientErrorCode.POOR_NETWORK.getCode(), e);
         }
     }
 
diff --git a/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/ci/PreviewDocumentInHtmlLinkResult.java b/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/ci/PreviewDocumentInHtmlLinkResult.java
@@ -24,13 +24,15 @@
 
 import android.text.TextUtils;
 
+import com.tencent.cos.xml.common.ClientErrorCode;
 import com.tencent.cos.xml.exception.CosXmlClientException;
 import com.tencent.cos.xml.exception.CosXmlServiceException;
 import com.tencent.cos.xml.model.CosXmlResult;
 import com.tencent.qcloud.core.http.HttpResponse;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 
@@ -57,8 +59,10 @@ public void parseResponseBody(HttpResponse response) throws CosXmlClientExceptio
             if(jsonObject.has("PreviewUrl")) {
                 previewUrl = jsonObject.getString("PreviewUrl");
             }
-        } catch (JSONException | IOException e) {
-            e.printStackTrace();
+        } catch (JSONException e) {
+            throw new CosXmlClientException(ClientErrorCode.SERVERERROR.getCode(), e);
+        } catch (IOException e) {
+            throw new CosXmlClientException(ClientErrorCode.POOR_NETWORK.getCode(), e);
         }
     }
 
diff --git a/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/ci/PutBucketDPStateResult.java b/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/ci/PutBucketDPStateResult.java
@@ -1,10 +1,10 @@
 package com.tencent.cos.xml.model.ci;
 
+import com.tencent.cos.xml.common.ClientErrorCode;
 import com.tencent.cos.xml.exception.CosXmlClientException;
 import com.tencent.cos.xml.exception.CosXmlServiceException;
 import com.tencent.cos.xml.model.CosXmlResult;
 import com.tencent.cos.xml.model.tag.BucketDocumentPreviewState;
-import com.tencent.cos.xml.model.tag.GetBucketDPState;
 import com.tencent.cos.xml.model.tag.PutBucketDPState;
 import com.tencent.qcloud.core.http.HttpResponse;
 import com.tencent.qcloud.qcloudxml.core.QCloudXml;
@@ -31,8 +31,10 @@ public void parseResponseBody(HttpResponse response) throws CosXmlClientExceptio
         try {
             PutBucketDPState putBucketDPState = QCloudXml.fromXml(response.byteStream(), PutBucketDPState.class);
             bucketDocumentPreviewState = putBucketDPState.DocBucket;
-        } catch (XmlPullParserException | IOException e) {
-            throw new CosXmlServiceException("Parse xml error", e);
+        } catch (IOException e) {
+            throw new CosXmlClientException(ClientErrorCode.SERVERERROR.getCode(), e);
+        } catch (XmlPullParserException e) {
+            throw new CosXmlClientException(ClientErrorCode.POOR_NETWORK.getCode(), e);
         }
     }
 
diff --git a/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/ci/QRCodeUploadResult.java b/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/ci/QRCodeUploadResult.java
@@ -1,5 +1,6 @@
 package com.tencent.cos.xml.model.ci;
 
+import com.tencent.cos.xml.common.ClientErrorCode;
 import com.tencent.cos.xml.exception.CosXmlClientException;
 import com.tencent.cos.xml.exception.CosXmlServiceException;
 import com.tencent.cos.xml.model.tag.pic.PicObject;
@@ -31,9 +32,9 @@ public void parseResponseBody(HttpResponse response) throws CosXmlClientExceptio
         try {
             picUploadResult = QCloudXml.fromXml(response.byteStream(), PicUploadResult.class);
         } catch (IOException e) {
-            e.printStackTrace();
+            throw new CosXmlClientException(ClientErrorCode.SERVERERROR.getCode(), e);
         } catch (XmlPullParserException e) {
-            e.printStackTrace();
+            throw new CosXmlClientException(ClientErrorCode.POOR_NETWORK.getCode(), e);
         }
     }
 
diff --git a/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/ci/SensitiveContentRecognitionResult.java b/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/ci/SensitiveContentRecognitionResult.java
@@ -1,6 +1,7 @@
 package com.tencent.cos.xml.model.ci;
 
 
+import com.tencent.cos.xml.common.ClientErrorCode;
 import com.tencent.cos.xml.exception.CosXmlClientException;
 import com.tencent.cos.xml.exception.CosXmlServiceException;
 import com.tencent.cos.xml.model.CosXmlResult;
@@ -29,10 +30,10 @@ public void parseResponseBody(HttpResponse response) throws CosXmlClientExceptio
         super.parseResponseBody(response);
         try {
             recognitionResult = QCloudXml.fromXml(response.byteStream(), RecognitionResult.class);
-        } catch (IOException e) {
-            e.printStackTrace();
         } catch (XmlPullParserException e) {
-            e.printStackTrace();
+            throw new CosXmlClientException(ClientErrorCode.SERVERERROR.getCode(), e);
+        } catch (IOException e) {
+            throw new CosXmlClientException(ClientErrorCode.POOR_NETWORK.getCode(), e);
         }
     }
     
diff --git a/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/ci/asr/DescribeSpeechQueuesResult.java b/QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/ci/asr/DescribeSpeechQueuesResult.java
@@ -37,7 +37,7 @@
 
 /**
  * 用于查询语音识别队列的返回结果.
- * @see com.tencent.cos.xml.CIService#getDescribeSpeechQueues(DescribeSpeechQueuesRequest)
+ * @see com.tencent.cos.xml.CIService#describeSpeechQueues(DescribeSpeechQueuesRequest)
  * @see DescribeSpeechQueuesRequest
  */
 final public class DescribeSpeechQueuesResult extends CosXmlResult {
diff --git a/QCloudCosXml/version.gradle b/QCloudCosXml/version.gradle
@@ -22,6 +22,6 @@
  */
 
 ext {
-    cosSdkVersionCode = 50902
-    cosSdkVersionName = '5.9.2'
+    cosSdkVersionCode = 50903
+    cosSdkVersionName = '5.9.3'
 }

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@ public class CreateBucketConfiguration {`
`29`	`29`	`/**`
`30`	`30`	`* 存储桶 AZ 配置，指定为 MAZ 以创建多 AZ 存储桶`
`31`	`31`	`*/`
`32`		`- public String bucketAzConfig = "OAZ"; // MAZ\|OAZ`
	`32`	`+ public String bucketAzConfig = "MAZ";`
`33`	`33`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`package com.tencent.cos.xml.model.bucket;`
`24`	`24`
`25`	`25`	`import com.tencent.cos.xml.BeaconService;`
	`26`	`+import com.tencent.cos.xml.common.ClientErrorCode;`
`26`	`27`	`import com.tencent.cos.xml.exception.CosXmlClientException;`
`27`	`28`	`import com.tencent.cos.xml.exception.CosXmlServiceException;`
`28`	`29`	`import com.tencent.cos.xml.model.CosXmlResult;`
`@@ -55,10 +56,10 @@ public void parseResponseBody(HttpResponse response) throws CosXmlClientExceptio`
`55`	`56`	`XmlParser.parseGetBucketObjectVersionsResult(response.byteStream(), listVersionResult);`
`56`	`57`	`} catch (XmlPullParserException e) {`
`57`	`58`	`BeaconService.getInstance().reportError(TAG, e);`
`58`		`- e.printStackTrace();`
	`59`	`+ throw new CosXmlClientException(ClientErrorCode.SERVERERROR.getCode(), e);`
`59`	`60`	`} catch (IOException e) {`
`60`	`61`	`BeaconService.getInstance().reportError(TAG, e);`
`61`		`- e.printStackTrace();`
	`62`	`+ throw new CosXmlClientException(ClientErrorCode.POOR_NETWORK.getCode(), e);`
`62`	`63`	`}`
`63`	`64`	`}`
`64`	`65`	`}`