update qcloud sdk to 5.9.43

Author: jordanqin

QCloudCosXml/cos-android-base/build.gradle

@@ -6,8 +6,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
 
-        versionCode 50942
-        versionName '5.9.40'
+        versionCode 50943
+        versionName '5.9.41'
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 

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

@@ -26,6 +26,7 @@
 import com.tencent.cos.xml.exception.CosXmlServiceException;
 import com.tencent.cos.xml.listener.CosXmlResultListener;
 import com.tencent.cos.xml.model.CosXmlRequest;
+import com.tencent.cos.xml.model.CosXmlResult;
 import com.tencent.cos.xml.model.object.BasePutObjectRequest;
 import com.tencent.cos.xml.model.object.BasePutObjectResult;
 import com.tencent.cos.xml.model.object.GetObjectBytesRequest;
@@ -57,6 +58,16 @@
  */
 
 public interface BaseCosXml {
+    /**
+     * 通用接口同步方法
+     */
+    <T1 extends CosXmlRequest, T2 extends CosXmlResult> T2 commonInterface(T1 request, Class<T2> resultClass) throws CosXmlClientException, CosXmlServiceException;
+
+    /**
+     * 通用接口异步方法
+     */
+    <T1 extends CosXmlRequest, T2 extends CosXmlResult> void commonInterfaceAsync(T1 request, Class<T2> resultClass, final CosXmlResultListener cosXmlResultListener);
+
     /**
      * <p>
      * 下载 COS 对象的同步方法.&nbsp;

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

@@ -49,7 +49,6 @@
 import com.tencent.cos.xml.transfer.ResponseFileBodySerializer;
 import com.tencent.cos.xml.transfer.ResponseXmlS3BodySerializer;
 import com.tencent.cos.xml.utils.StringUtils;
-import com.tencent.cos.xml.utils.URLEncodeUtils;
 import com.tencent.qcloud.core.auth.QCloudCredentialProvider;
 import com.tencent.qcloud.core.auth.QCloudCredentials;
 import com.tencent.qcloud.core.auth.QCloudSelfSigner;
@@ -88,6 +87,8 @@
 import java.util.UUID;
 import java.util.concurrent.Executor;
 
+import okhttp3.HttpUrl;
+
 
 /**
  * 提供用于访问Tencent Cloud COS服务的基础服务类。
@@ -656,6 +657,8 @@ public String getAccessUrl(CosXmlRequest cosXmlRequest) {
             int index = requestURL.indexOf("?");
             return index > 0 ? requestURL.substring(0, index) : requestURL;
         }
+        HttpUrl.Builder httpUrlBuilder = new HttpUrl.Builder();
+        httpUrlBuilder.scheme(config.getProtocol());
         String host = null;
         try {
             // host = cosXmlRequest.getHost(config, false);
@@ -664,14 +667,16 @@ public String getAccessUrl(CosXmlRequest cosXmlRequest) {
             CosTrackService.getInstance().reportError(TAG, e);
             e.printStackTrace();
         }
-        String path = "/";
-        try {
-            path = URLEncodeUtils.cosPathEncode(cosXmlRequest.getPath(config));
-        } catch (CosXmlClientException e) {
-            CosTrackService.getInstance().reportError(TAG, e);
-            e.printStackTrace();
+        httpUrlBuilder.host(host);
+
+        String path = cosXmlRequest.getPath(config);
+        if (path.startsWith("/")) {
+            path = path.substring(1);
         }
-        return config.getProtocol() + "://" + host + path;
+        if (path.length() > 0) {
+            httpUrlBuilder.addPathSegments(path);
+        }
+        return httpUrlBuilder.build().toString();
     }
 
     /**
@@ -825,6 +830,40 @@ public String getObjectUrl(String bucket, String region, String key) {
         return getAccessUrl(putObjectRequest);
     }
 
+    /**
+     * 通用接口同步方法
+     */
+    @Override
+    public <T1 extends CosXmlRequest, T2 extends CosXmlResult> T2 commonInterface(T1 request, Class<T2> resultClass) throws CosXmlClientException, CosXmlServiceException {
+        try {
+            return execute(request, resultClass.newInstance());
+        } catch (IllegalAccessException e) {
+            throw new CosXmlClientException(ClientErrorCode.INVALID_ARGUMENT.getCode(),
+                    "Failed to create result instance", e);
+        } catch (InstantiationException e) {
+            throw new CosXmlClientException(ClientErrorCode.INVALID_ARGUMENT.getCode(),
+                    "Failed to create result instance", e);
+        }
+    }
+
+    /**
+     * 通用接口异步方法
+     */
+    @Override
+    public <T1 extends CosXmlRequest, T2 extends CosXmlResult> void commonInterfaceAsync(T1 request, Class<T2> resultClass, CosXmlResultListener cosXmlResultListener) {
+        try {
+            schedule(request, resultClass.newInstance(), cosXmlResultListener);
+        } catch (IllegalAccessException e) {
+            cosXmlResultListener.onFail(request,
+                    new CosXmlClientException(ClientErrorCode.INVALID_ARGUMENT.getCode(),
+                            "Failed to create result instance", e), null);
+        } catch (InstantiationException e) {
+            cosXmlResultListener.onFail(request,
+                    new CosXmlClientException(ClientErrorCode.INVALID_ARGUMENT.getCode(),
+                            "Failed to create result instance", e), null);
+        }
+    }
+
     /**
      * 取消请求任务.&nbsp;
      * 详细介绍，请查看:{@link  BaseCosXml#cancel(CosXmlRequest)}

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

@@ -35,10 +35,12 @@ public class CosXmlServiceException extends QCloudServiceException {
     private static final long serialVersionUID = 1L;
 
     private String httpMsg;
+    private String host;
 
-    public CosXmlServiceException(String httpMsg) {
+    public CosXmlServiceException(String httpMsg, String host) {
         super(null);
         this.httpMsg = httpMsg;
+        this.host = host;
     }
 
     public CosXmlServiceException(String errorMessage, Exception cause) {
@@ -49,6 +51,10 @@ public String getHttpMessage(){
         return httpMsg;
     }
 
+    public String getHost(){
+        return host;
+    }
+
     public CosXmlServiceException(QCloudServiceException qcloudServiceException){
         super(null);
         this.setErrorCode(qcloudServiceException.getErrorCode());

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

@@ -439,6 +439,18 @@ public void setSign(String sign){
         addHeader(HttpConstants.Header.AUTHORIZATION, sign);
     }
 
+    /**
+     * 设置签名Authorization和token
+     * @param sign Authorization
+     * @param token token
+     */
+    public void setSign(String sign, String token){
+        addHeader(HttpConstants.Header.AUTHORIZATION, sign);
+        if(TextUtils.isEmpty(token)){
+            addHeader("x-cos-security-token", token);
+        }
+    }
+
     /**
      * 获取签名原料提供器
      * @return 签名原料提供器

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

@@ -43,6 +43,10 @@
  */
 
 public abstract class CosXmlResult {
+    /**
+     * 最终响应结果的host
+     */
+    public String host;
     /**
      * http状态码
      */
@@ -70,6 +74,7 @@ public void parseResponseBody(HttpResponse response) throws CosXmlClientExceptio
         httpCode = response.code();
         httpMessage = response.message();
         headers = response.headers();
+        host = response.host();
 
         try {
             xmlParser(response);

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

@@ -61,7 +61,7 @@ private void parseCOSXMLError(HttpResponse response) throws CosXmlServiceExcepti
         int httpCode = response.code();
         if(httpCode >= 200 && httpCode < 300)return;
         String message = response.message();
-        CosXmlServiceException cosXmlServiceException = new CosXmlServiceException(message);
+        CosXmlServiceException cosXmlServiceException = new CosXmlServiceException(message, response.host());
         cosXmlServiceException.setStatusCode(httpCode);
         cosXmlServiceException.setRequestId(response.header("x-cos-request-id"));
         InputStream inputStream = response.byteStream();

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

@@ -71,7 +71,7 @@ private void parseCOSXMLError(HttpResponse response) throws CosXmlServiceExcepti
         int httpCode = response.code();
         if(httpCode >= 200 && httpCode < 300)return;
         String message = response.message();
-        CosXmlServiceException cosXmlServiceException = new CosXmlServiceException(message);
+        CosXmlServiceException cosXmlServiceException = new CosXmlServiceException(message, response.host());
         cosXmlServiceException.setStatusCode(httpCode);
         cosXmlServiceException.setRequestId(response.header("x-cos-request-id"));
         InputStream inputStream = response.byteStream();

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

@@ -63,7 +63,7 @@ private void parseCOSXMLError(HttpResponse response) throws CosXmlServiceExcepti
         int httpCode = response.code();
         if(httpCode >= 200 && httpCode < 300)return;
         String message = response.message();
-        CosXmlServiceException cosXmlServiceException = new CosXmlServiceException(message);
+        CosXmlServiceException cosXmlServiceException = new CosXmlServiceException(message, response.host());
         cosXmlServiceException.setStatusCode(httpCode);
         cosXmlServiceException.setRequestId(response.header("x-cos-request-id"));
         String contentType = response.header(HttpConstants.Header.CONTENT_TYPE);

QCloudCosXml/cos-android/build.gradle

@@ -142,6 +142,9 @@ dependencies {
 
     androidTestCompileOnly project(path: ':cos-android')
     androidTestCompileOnly project(path: ':cos-android-base')
+    androidTestCompileOnly project(path: ':xmlAnnoation')
+    androidTestAnnotationProcessor project(':xmlCompiler')
+
     // kms 加密
     androidTestImplementation 'com.tencentcloudapi:tencentcloud-sdk-java-kms:3.1.213'
     androidTestImplementation 'xerces:xercesImpl:2.12.0'