update qcloud sdk to 5.9.30

Author: jordanqin

QCloudCosXml/cos-android-base/build.gradle

@@ -6,8 +6,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
 
-        versionCode 50927
-        versionName '5.9.27'
+        versionCode 50928
+        versionName '5.9.28'
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 

QCloudCosXml/cos-android-base/src/main/java/com/tencent/cos/xml/CosXmlServiceConfig.java

@@ -60,6 +60,7 @@ public class CosXmlServiceConfig implements Parcelable {
     public static final String PATH_STYLE_HOST_FORMAT = "cos.${region}.myqcloud.com";
 
     public static final String CI_HOST_FORMAT = "${bucket}.ci.${region}.myqcloud.com";
+    public static final String CI_APPID_HOST_FORMAT = "${appid}.ci.${region}.myqcloud.com";
     public static final String CI_REGION_HOST_FORMAT = "ci.${region}.myqcloud.com";
     public static final String PIC_HOST_FORMAT = "${bucket}.pic.${region}.myqcloud.com";
 
@@ -248,6 +249,22 @@ public String getRequestHost(String region, String bucket, String hostFormat) {
         return getFormatHost(hostFormat, region, bucket);
     }
 
+    /**
+     * 获取请求host
+     * @param region 区域
+     * @param appid appid
+     * @param hostFormat HOST 格式，支持通配符
+     * @return 请求host
+     */
+    public String getRequestHostByAppId(String region, String appid, String hostFormat) {
+        if (!TextUtils.isEmpty(host)) {
+            return host;
+        }
+        region = TextUtils.isEmpty(region) ? this.region : region; // 优先 request 中的 region
+
+        return getFormatHostByAppId(hostFormat, region, appid);
+    }
+
     /**
      * 获取请求host
      * @param region 区域
@@ -309,6 +326,17 @@ private String getFormatHost(String hostFormat, String region) {
         return hostFormat.replace("${region}", region);
     }
 
+    private String getFormatHostByAppId(String hostFormat, String region, String appid) {
+        if(region == null){
+            throw new IllegalArgumentException("please set request or config region !");
+        }
+        if(appid == null){
+            throw new IllegalArgumentException("please set request appid !");
+        }
+
+        return hostFormat.replace("${appid}", appid).replace("${region}", region);
+    }
+
     private String getHostFormat(boolean accelerate, boolean pathStyle) {
 
         if (!TextUtils.isEmpty(hostFormat)) {

QCloudCosXml/cos-android-base/src/main/java/com/tencent/cos/xml/model/tag/CosError.java

@@ -22,6 +22,9 @@
 
 package com.tencent.cos.xml.model.tag;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 /**
  * COS错误信息
  * 请参考：<a href="https://cloud.tencent.com/document/product/436/7730">COS错误信息</a>
@@ -47,4 +50,14 @@ public class CosError {
      * 每次请求出错时，服务端将会自动为这个错误生成一个ID，遇到问题时，该 ID 能更快地协助 COS 定位问题
      */
     public String traceId;
+
+    public static CosError fromJson(String json) throws JSONException {
+        JSONObject jsonObject = new JSONObject(json);
+        CosError cosError = new CosError();
+        cosError.code = jsonObject.optString("Code");
+        cosError.message = jsonObject.optString("Message");
+        cosError.requestId = jsonObject.optString("RequestId");
+        cosError.traceId = jsonObject.optString("TraceId");
+        return cosError;
+    }
 }

QCloudCosXml/cos-android-base/src/main/java/com/tencent/cos/xml/transfer/ResponseXmlS3BodySerializer.java

@@ -30,9 +30,11 @@
 import com.tencent.cos.xml.utils.BaseXmlSlimParser;
 import com.tencent.qcloud.core.common.QCloudClientException;
 import com.tencent.qcloud.core.common.QCloudServiceException;
+import com.tencent.qcloud.core.http.HttpConstants;
 import com.tencent.qcloud.core.http.HttpResponse;
 import com.tencent.qcloud.core.http.ResponseBodyConverter;
 
+import org.json.JSONException;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
@@ -64,21 +66,32 @@ private void parseCOSXMLError(HttpResponse response) throws CosXmlServiceExcepti
         CosXmlServiceException cosXmlServiceException = new CosXmlServiceException(message);
         cosXmlServiceException.setStatusCode(httpCode);
         cosXmlServiceException.setRequestId(response.header("x-cos-request-id"));
-        InputStream inputStream = response.byteStream();
-        if(inputStream != null){
-            CosError cosError = new CosError();
+        String contentType = response.header(HttpConstants.Header.CONTENT_TYPE);
+        CosError cosError = new CosError();
+        if(HttpConstants.ContentType.JSON.equalsIgnoreCase(contentType)){
             try {
-                BaseXmlSlimParser.parseError(inputStream, cosError);
-                if(cosError.code != null) cosXmlServiceException.setErrorCode(cosError.code);
-                if(cosError.message != null) cosXmlServiceException.setErrorMessage(cosError.message);
-                if(cosError.requestId != null) cosXmlServiceException.setRequestId(cosError.requestId);
-                if(cosError.resource != null) cosXmlServiceException.setServiceName(cosError.resource);
-            } catch (XmlPullParserException e) {
+                cosError = CosError.fromJson(response.string());
+            } catch (JSONException e) {
                 throw new CosXmlClientException(ClientErrorCode.SERVERERROR.getCode(), e);
             } catch (IOException e) {
                 throw new CosXmlClientException(ClientErrorCode.POOR_NETWORK.getCode(), e);
             }
+        } else {
+            InputStream inputStream = response.byteStream();
+            if(inputStream != null){
+                try {
+                    BaseXmlSlimParser.parseError(inputStream, cosError);
+                } catch (XmlPullParserException e) {
+                    throw new CosXmlClientException(ClientErrorCode.SERVERERROR.getCode(), e);
+                } catch (IOException e) {
+                    throw new CosXmlClientException(ClientErrorCode.POOR_NETWORK.getCode(), e);
+                }
+            }
         }
+        if(cosError.code != null) cosXmlServiceException.setErrorCode(cosError.code);
+        if(cosError.message != null) cosXmlServiceException.setErrorMessage(cosError.message);
+        if(cosError.requestId != null) cosXmlServiceException.setRequestId(cosError.requestId);
+        if(cosError.resource != null) cosXmlServiceException.setServiceName(cosError.resource);
         throw cosXmlServiceException;
     }
 

QCloudCosXml/cos-android/build.gradle

@@ -172,6 +172,11 @@ dependencies {
         embed(name: 'qmsp-oaid2-1.0.4', ext: 'aar')
     }
 
+    // 非lite版本引入gson库，万象部分功能需要
+    if (!android.defaultPublishConfig.contains("slim")) {
+        implementation 'com.google.code.gson:gson:2.11.0'
+    }
+
     // kms 加密
     compileOnly 'com.tencentcloudapi:tencentcloud-sdk-java-kms:3.1.213'
     compileOnly 'xerces:xercesImpl:2.12.0'

QCloudCosXml/cos-android/src/androidTest/java/com/tencent/cos/xml/core/TestConst.java

@@ -37,6 +37,7 @@ public class TestConst {
     public static final String PERSIST_BUCKET_REPLICATION_REGION = BuildConfig.PERSIST_BUCKET_REPLICATION_REGION;
 
     public static final String CI_BUCKET_REGION = "ap-beijing";
+    public static final String CI_BUCKET_APPID = "1253960454";
     public static final String CI_BUCKET = "cos-sdk-citest-1253960454";
 
     //审核

QCloudCosXml/cos-android/src/androidTest/java/com/tencent/cos/xml/core/TestUtils.java

@@ -14,6 +14,7 @@
 import com.tencent.cos.xml.transfer.COSTransferTask;
 import com.tencent.cos.xml.transfer.COSXMLTask;
 import com.tencent.cos.xml.transfer.TransferState;
+import com.tencent.cos.xml.utils.QCloudJsonUtils;
 import com.tencent.cos.xml.utils.QCloudXmlUtils;
 import com.tencent.qcloud.core.common.QCloudClientException;
 import com.tencent.qcloud.core.common.QCloudServiceException;
@@ -83,6 +84,10 @@ private static boolean isXmlBean(Object object){
         }
     }
 
+    public static void printJson(Object object) {
+        TestUtils.print(QCloudJsonUtils.toJson(object));
+    }
+
     public static <T> void printXML(T object) {
         if(isXmlBean(object)) {
             try {