update qcloud sdk to 5.9.26

jordanqin · jordanqin · commit 1915b7c3b7a5 · 2024-04-15T17:33:03.000+08:00
diff --git a/QCloudCosXml/cos-android-base/build.gradle b/QCloudCosXml/cos-android-base/build.gradle
@@ -6,8 +6,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
 
-        versionCode 50923
-        versionName '5.9.23'
+        versionCode 50924
+        versionName '5.9.24'
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
diff --git a/QCloudCosXml/cos-android/build.gradle b/QCloudCosXml/cos-android/build.gradle
@@ -89,8 +89,8 @@ android {
     }
 
     // 切换发 normal 或者 slim 包，需要同步修改 pom.artifactId 信息
-    defaultPublishConfig "normalRelease"
-//      defaultPublishConfig  "slimRelease"
+//    defaultPublishConfig "normalRelease"
+      defaultPublishConfig  "slimRelease"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
diff --git a/QCloudCosXml/cos-android/src/androidTest/java/com/tencent/cos/xml/common/CosXmlConfigTest.java b/QCloudCosXml/cos-android/src/androidTest/java/com/tencent/cos/xml/common/CosXmlConfigTest.java
@@ -27,6 +27,12 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.tencent.cos.xml.CosXmlServiceConfig;
+import com.tencent.cos.xml.CosXmlSimpleService;
+import com.tencent.cos.xml.core.ServiceFactory;
+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.model.object.HeadObjectRequest;
 import com.tencent.qcloud.core.http.QCloudHttpRetryHandler;
 import com.tencent.qcloud.core.task.RetryStrategy;
 
@@ -87,6 +93,59 @@ public boolean shouldRetry(Request request, Response response, Exception excepti
         Assert.assertEquals("", headerHost);
     }
 
+    @Test
+    public void multipleConfigTest() {
+        HeadObjectRequest headObjectRequest1 = new HeadObjectRequest(TestConst.PERSIST_BUCKET, TestConst.PERSIST_BUCKET_SMALL_OBJECT_PATH);
+        CosXmlServiceConfig cosXmlServiceConfig1 = new CosXmlServiceConfig.Builder()
+                .isHttps(true)
+                .setDebuggable(true)
+                .addHeader("testkey1", "testvalue1")
+                .setConnectionTimeout(4000)
+                .setSocketTimeout(4000)
+                .setRegion(TestConst.PERSIST_BUCKET_REGION)
+                .builder();
+        CosXmlSimpleService service1 = ServiceFactory.INSTANCE.newService(cosXmlServiceConfig1);
+        try {
+            service1.addCustomerDNS("mobile-ut-1253960454.cos.ap-guangzhou.myqcloud.com", new String[]{"183.47.104.187"});
+        } catch (CosXmlClientException e) {
+            throw new RuntimeException(e);
+        }
+        try {
+            service1.headObject(headObjectRequest1);
+        } catch (CosXmlClientException e) {
+        } catch (CosXmlServiceException e) {
+        }
+
+        HeadObjectRequest headObjectRequest2 = new HeadObjectRequest(TestConst.ASR_BUCKET, TestConst.ASR_OBJECT_LONG);
+        CosXmlServiceConfig cosXmlServiceConfig2 = new CosXmlServiceConfig.Builder()
+                .isHttps(true)
+                .setDebuggable(true)
+                .addHeader("testkey2", "testvalue2")
+                .setConnectionTimeout(4000)
+                .setSocketTimeout(4000)
+                .setRegion(TestConst.PERSIST_BUCKET_REGION)
+                .builder();
+        CosXmlSimpleService service2 = ServiceFactory.INSTANCE.newService(cosXmlServiceConfig2);
+        try {
+            service2.addCustomerDNS("ci-auditing-sample-1253960454.cos.ap-guangzhou.myqcloud.com", new String[]{"127.0.0.1"});
+            service2.addCustomerDNS("ci-auditing-sample-1253960454.cos.ap-guangzhou.tencentcos.cn", new String[]{"127.0.0.1"});
+            service1.addCustomerDNS("mobile-ut-1253960454.cos.ap-guangzhou.myqcloud.com", new String[]{"127.0.0.1"});
+        } catch (CosXmlClientException e) {
+            throw new RuntimeException(e);
+        }
+        try {
+            service2.headObject(headObjectRequest2);
+        } catch (CosXmlClientException e) {
+        } catch (CosXmlServiceException e) {
+        }
+
+        try {
+            service1.headObject(headObjectRequest1);
+        } catch (CosXmlClientException e) {
+        } catch (CosXmlServiceException e) {
+        }
+    }
+
     @Test
     public void testIpPortHost() {
 
diff --git a/QCloudCosXml/cos-android/src/androidTest/java/com/tencent/cos/xml/core/ServiceFactory.java b/QCloudCosXml/cos-android/src/androidTest/java/com/tencent/cos/xml/core/ServiceFactory.java
@@ -430,7 +430,7 @@ private CosXmlSimpleService newServiceBySessionCredentials(CosXmlServiceConfig c
                 new ShortTimeCredentialProvider(TestConst.SECRET_ID, TestConst.SECRET_KEY,60000) );
     }
 
-    private CosXmlSimpleService newService(CosXmlServiceConfig cosXmlServiceConfig) {
+    public CosXmlSimpleService newService(CosXmlServiceConfig cosXmlServiceConfig) {
         return new CosXmlSimpleService(getContext(), cosXmlServiceConfig,
                 new ShortTimeCredentialProvider(TestConst.SECRET_ID, TestConst.SECRET_KEY,60000) );
 
diff --git a/QCloudCosXml/cos-android/src/main/java/com/tencent/cos/xml/model/object/ListPartsRequest.java b/QCloudCosXml/cos-android/src/main/java/com/tencent/cos/xml/model/object/ListPartsRequest.java
@@ -68,7 +68,7 @@ public Map<String, String> getQueryString() {
             queryParameters.put("max-parts",maxParts);
         }
         if(partNumberMarker != null){
-            queryParameters.put("part-number-marker",maxParts);
+            queryParameters.put("part-number-marker",partNumberMarker);
         }
         if(encodingType != null){
             queryParameters.put("Encoding-type",encodingType);
@@ -133,6 +133,14 @@ public void setPartNumberMarker(int partNumberMarker) {
         this.partNumberMarker = String.valueOf(partNumberMarker);
     }
 
+    /**
+     * 设置列出分片的起点。
+     * @param partNumberMarker 列出分片的起点，可从ListPartsResult中读取。
+     */
+    public void setPartNumberMarker(String partNumberMarker) {
+        this.partNumberMarker = partNumberMarker;
+    }
+
     /**
      * 获取设置的NumberMarker
      * @return 用户设置的NumberMarker
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
@@ -70,6 +70,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -83,6 +84,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * 上传传输任务
@@ -466,6 +468,53 @@ public void onFail(CosXmlRequest request, CosXmlClientException exception, CosXm
         });
     }
 
+    public void listAllPartsAsync(CosXmlSimpleService cosXmlService, CosXmlResultListener cosXmlResultListener) {
+        // 初始化分页标记
+        AtomicReference<String> nextPartNumberMarker = new AtomicReference<>(null);
+        ArrayList<ListParts.Part> allParts = new ArrayList<>();
+        // 创建一个处理结果的方法
+        Runnable handleResult = new Runnable() {
+            @Override
+            public void run() {
+                // 设置分页标记
+                if (nextPartNumberMarker.get() != null && !nextPartNumberMarker.get().isEmpty()) {
+                    listPartsRequest.setPartNumberMarker(nextPartNumberMarker.get());
+                }
+
+                // 发送请求
+                cosXmlService.listPartsAsync(listPartsRequest, new CosXmlResultListener() {
+                    @Override
+                    public void onSuccess(CosXmlRequest request, CosXmlResult result) {
+                        ListPartsResult listPartsResult = (ListPartsResult) result;
+                        if(listPartsResult.listParts.parts != null && listPartsResult.listParts.parts.size() > 0){
+                            allParts.addAll(listPartsResult.listParts.parts);
+                        }
+
+                        // 更新分页标记
+                        nextPartNumberMarker.set(listPartsResult.listParts.nextPartNumberMarker);
+                        // 如果还有更多的分块，再次调用 handleResult
+                        if (nextPartNumberMarker.get() != null && !nextPartNumberMarker.get().isEmpty()) {
+                            run();
+                        } else {
+                            // 所有的操作都完成了
+                            listPartsResult.listParts.parts = allParts;
+                            cosXmlResultListener.onSuccess(request, listPartsResult);
+                        }
+                    }
+
+                    @Override
+                    public void onFail(CosXmlRequest request, CosXmlClientException clientException, CosXmlServiceException serviceException) {
+                        // 处理错误
+                        cosXmlResultListener.onFail(request, clientException, serviceException);
+                    }
+                });
+            }
+        };
+
+        // 开始处理
+        handleResult.run();
+    }
+
     private void listMultiUpload(CosXmlSimpleService cosXmlService){
         listPartsRequest = new ListPartsRequest(bucket, cosPath, uploadId);
         listPartsRequest.setRegion(region);
@@ -486,7 +535,7 @@ public void onStateChanged(String taskId, int state) {
             }
         });
 
-        cosXmlService.listPartsAsync(listPartsRequest, new CosXmlResultListener() {
+        listAllPartsAsync(cosXmlService, new CosXmlResultListener() {
             @Override
             public void onSuccess(CosXmlRequest request, final CosXmlResult result) {
                 if(request != listPartsRequest){
diff --git a/QCloudCosXml/version.gradle b/QCloudCosXml/version.gradle
@@ -22,6 +22,6 @@
  */
 
 ext {
-    cosSdkVersionCode = 50925
-    cosSdkVersionName = '5.9.25'
+    cosSdkVersionCode = 50926
+    cosSdkVersionName = '5.9.26'
 }

Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,8 @@ android {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`// 切换发 normal 或者 slim 包，需要同步修改 pom.artifactId 信息`
`92`		`- defaultPublishConfig "normalRelease"`
`93`		`-// defaultPublishConfig "slimRelease"`
	`92`	`+// defaultPublishConfig "normalRelease"`
	`93`	`+ defaultPublishConfig "slimRelease"`
`94`	`94`
`95`	`95`	`compileOptions {`
`96`	`96`	`sourceCompatibility = JavaVersion.VERSION_1_8`
Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ private CosXmlSimpleService newServiceBySessionCredentials(CosXmlServiceConfig c`
`430`	`430`	`new ShortTimeCredentialProvider(TestConst.SECRET_ID, TestConst.SECRET_KEY,60000) );`
`431`	`431`	`}`
`432`	`432`
`433`		`- private CosXmlSimpleService newService(CosXmlServiceConfig cosXmlServiceConfig) {`
	`433`	`+ public CosXmlSimpleService newService(CosXmlServiceConfig cosXmlServiceConfig) {`
`434`	`434`	`return new CosXmlSimpleService(getContext(), cosXmlServiceConfig,`
`435`	`435`	`new ShortTimeCredentialProvider(TestConst.SECRET_ID, TestConst.SECRET_KEY,60000) );`
`436`	`436`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@`
`22`	`22`	`*/`
`23`	`23`
`24`	`24`	`ext {`
`25`		`- cosSdkVersionCode = 50925`
`26`		`- cosSdkVersionName = '5.9.25'`
	`25`	`+ cosSdkVersionCode = 50926`
	`26`	`+ cosSdkVersionName = '5.9.26'`
`27`	`27`	`}`