Skip to content

Commit 25b046f

Browse files
author
jordanqin
committed
update qcloud sdk to 5.9.42
1 parent 074ae42 commit 25b046f

File tree

91 files changed

+560
-393
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+560
-393
lines changed

‎QCloudCosXml/cos-android-base/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
minSdkVersion 15
77
targetSdkVersion 28
88

9-
versionCode 50941
10-
versionName '5.9.39'
9+
versionCode 50942
10+
versionName '5.9.40'
1111

1212
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1313

‎QCloudCosXml/cos-android/src/androidTest/java/com/tencent/cos/xml/common/OtherTest.java‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
import java.net.URLEncoder;
6666
import java.security.MessageDigest;
6767
import java.security.NoSuchAlgorithmException;
68-
import java.util.ArrayList;
6968

7069
import okhttp3.MediaType;
7170
import okhttp3.OkHttpClient;
@@ -474,34 +473,34 @@ public void testIsMyqcloudUrl(){
474473
assertFalse(DomainSwitchUtils.isMyqcloudUrl(testUrls[6]));
475474
}
476475

477-
@Test
478-
public void testMultiThreadedCosXmlService() {
479-
try {
480-
// 线程数常量
481-
int THREAD_COUNT = 10000;
482-
Thread[] threads = new Thread[THREAD_COUNT];
483-
ArrayList<Throwable> exceptions = new ArrayList<>();
484-
for (int i = 0; i < THREAD_COUNT; i++) {
485-
threads[i] = new Thread(() -> {
486-
CosXmlSimpleService service = ServiceFactory.INSTANCE.newDefaultService();
487-
service.getConfig();
488-
});
489-
threads[i].setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
490-
@Override
491-
public void uncaughtException(Thread t, Throwable e) {
492-
e.printStackTrace();
493-
exceptions.add(e);
494-
}
495-
});
496-
threads[i].start();
497-
}
498-
for (int i = 0; i < THREAD_COUNT; i++) {
499-
threads[i].join();
500-
}
501-
assertTrue(exceptions.isEmpty());
502-
} catch (Exception e) {
503-
e.printStackTrace();
504-
Assert.fail(e.getMessage());
505-
}
506-
}
476+
// @Test
477+
// public void testMultiThreadedCosXmlService() {
478+
// try {
479+
// // 线程数常量
480+
// int THREAD_COUNT = 10000;
481+
// Thread[] threads = new Thread[THREAD_COUNT];
482+
// ArrayList<Throwable> exceptions = new ArrayList<>();
483+
// for (int i = 0; i < THREAD_COUNT; i++) {
484+
// threads[i] = new Thread(() -> {
485+
// CosXmlSimpleService service = ServiceFactory.INSTANCE.newDefaultService();
486+
// service.getConfig();
487+
// });
488+
// threads[i].setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
489+
// @Override
490+
// public void uncaughtException(Thread t, Throwable e) {
491+
// e.printStackTrace();
492+
// exceptions.add(e);
493+
// }
494+
// });
495+
// threads[i].start();
496+
// }
497+
// for (int i = 0; i < THREAD_COUNT; i++) {
498+
// threads[i].join();
499+
// }
500+
// assertTrue(exceptions.isEmpty());
501+
// } catch (Exception e) {
502+
// e.printStackTrace();
503+
// Assert.fail(e.getMessage());
504+
// }
505+
// }
507506
}

‎QCloudCosXml/cos-android/src/androidTest/java/com/tencent/cos/xml/transfer/DownloadTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ public void onFail(CosXmlRequest request, CosXmlClientException clientException,
365365
TestConst.PERSIST_BUCKET_BIG_OBJECT_PATH,
366366
TestUtils.localParentPath());
367367
getObjectRequest.setRange(0, 10);
368-
getObjectRequest.addNoSignHeader("Range");
368+
// getObjectRequest.addNoSignHeader("Range");
369369
COSXMLDownloadTask downloadTask = transferManager.download(TestUtils.getContext(),
370370
getObjectRequest);
371371

‎QCloudCosXml/cos-android/src/androidTest/java/com/tencent/cos/xml/transfer/UploadTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1441,7 +1441,7 @@ public void onFail(CosXmlRequest request, CosXmlClientException clientException,
14411441
} catch (CosXmlClientException e) {
14421442
throw new RuntimeException(e);
14431443
}
1444-
request.setSignInUrl(true);
1444+
// request.setSignInUrl(true);
14451445
request.isSupportAccelerate(true);
14461446
Assert.assertTrue(request.isSupportAccelerate());
14471447
request.setSignSourceProvider(new COSXmlSignSourceProvider());

‎QCloudCosXml/cos-android/src/androidTestNormal/java/com/tencent/cos/xml/ci/AuditTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ public void imagesAudit() {
236236

237237
TestUtils.sleep(20000);
238238

239-
GetImageAuditRequest getAuditRequest = new GetImageAuditRequest(TestConst.CI_BUCKET, result.postImagesAuditJobResponse.jobsDetail.get(0).jobId);
239+
GetImageAuditRequest getAuditRequest = new GetImageAuditRequest(TestConst.CI_BUCKET, result.postImagesAuditJobResponse.jobsDetail.get(2).jobId);
240240
try {
241241
GetImageAuditResult getResult = ciService.getImageAudit(getAuditRequest);
242242
Assert.assertNotNull(getResult.getImageAuditJobResponse);
@@ -287,7 +287,7 @@ public void onSuccess(CosXmlRequest request, CosXmlResult resultArg) {
287287

288288
TestUtils.sleep(20000);
289289

290-
GetImageAuditRequest getAuditRequest = new GetImageAuditRequest(TestConst.CI_BUCKET, result.postImagesAuditJobResponse.jobsDetail.get(0).jobId);
290+
GetImageAuditRequest getAuditRequest = new GetImageAuditRequest(TestConst.CI_BUCKET, result.postImagesAuditJobResponse.jobsDetail.get(2).jobId);
291291
ciService.getImageAuditAsync(getAuditRequest, new CosXmlResultListener() {
292292
@Override
293293
public void onSuccess(CosXmlRequest request, CosXmlResult result) {

‎QCloudCosXml/cos-android/src/main/java/com/tencent/cos/xml/transfer/COSDownloadTask.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import androidx.annotation.Nullable;
88

9-
import com.tencent.cos.xml.common.COSRequestHeaderKey;
109
import com.tencent.cos.xml.common.ClientErrorCode;
1110
import com.tencent.cos.xml.common.Range;
1211
import com.tencent.cos.xml.crypto.COSDirect;
@@ -201,8 +200,6 @@ public SimpleDownloadTask(COSDirect cosDirect, GetObjectRequest getObjectRequest
201200
CancellationTokenSource transferTaskCts) {
202201
this.cosDirect = cosDirect;
203202
this.getObjectRequest = getObjectRequest;
204-
//下载重试时会改变request的range，因此不能让range参与签名
205-
this.getObjectRequest.addNoSignHeader(COSRequestHeaderKey.RANGE);
206203
this.tcs = new TaskCompletionSource<>();
207204
this.mTransferTaskCts = transferTaskCts;
208205
}

‎QCloudCosXml/cos-android/src/main/java/com/tencent/cos/xml/transfer/COSXMLDownloadTask.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,6 @@ private void realDownload(final long rangeStart, final long rangeEnd, final long
179179
getObjectRequest.setCredentialProvider(credentialProvider);
180180
if(rangeEnd > 0 || rangeStart > 0){
181181
getObjectRequest.setRange(rangeStart, rangeEnd);
182-
//下载重试时会改变request的range，因此不能让range参与签名
183-
getObjectRequest.addNoSignHeader(COSRequestHeaderKey.RANGE);
184182
}
185183

186184
if(onSignatureListener != null){

‎QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/ci/PutBucketDPStateRequest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
package com.tencent.cos.xml.model.ci;
22

33
import com.tencent.cos.xml.CosXmlServiceConfig;
4+
import com.tencent.cos.xml.common.COSRequestHeaderKey;
45
import com.tencent.cos.xml.common.RequestMethod;
5-
import com.tencent.cos.xml.exception.CosXmlClientException;
66
import com.tencent.cos.xml.model.bucket.BucketRequest;
7-
import com.tencent.qcloud.core.http.HttpConstants;
87
import com.tencent.qcloud.core.http.RequestBodySerializer;
98

9+
import org.xmlpull.v1.XmlPullParserException;
10+
11+
import java.io.IOException;
12+
1013
/**
1114
* <p>
1215
* </p>
@@ -22,8 +25,6 @@ public PutBucketDPStateRequest(String bucket) {
2225
public PutBucketDPStateRequest(String bucket, String region) {
2326
super(bucket);
2427
this.region = region;
25-
addNoSignHeader("Content-Type");
26-
addNoSignHeader("Content-Length");
2728
}
2829

2930
@Override
@@ -42,7 +43,7 @@ public String getRequestHost(CosXmlServiceConfig config) {
4243
}
4344

4445
@Override
45-
public RequestBodySerializer getRequestBody() throws CosXmlClientException {
46-
return RequestBodySerializer.string(HttpConstants.ContentType.TEXT_PLAIN, "");
46+
protected RequestBodySerializer xmlBuilder() throws XmlPullParserException, IOException {
47+
return RequestBodySerializer.bytes(COSRequestHeaderKey.TEXT_PLAIN, "".getBytes("utf-8"));
4748
}
4849
}

‎QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/ci/ai/AddImageSearchRequest.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
package com.tencent.cos.xml.model.ci.ai;
2424

2525
import androidx.annotation.NonNull;
26+
2627
import com.tencent.cos.xml.CosXmlServiceConfig;
2728
import com.tencent.cos.xml.common.COSRequestHeaderKey;
2829
import com.tencent.cos.xml.exception.CosXmlClientException;
@@ -31,8 +32,11 @@
3132
import com.tencent.cos.xml.utils.QCloudXmlUtils;
3233
import com.tencent.qcloud.core.http.HttpConstants;
3334
import com.tencent.qcloud.core.http.RequestBodySerializer;
35+
36+
import org.xmlpull.v1.XmlPullParserException;
37+
38+
import java.io.IOException;
3439
import java.util.Map;
35-
import com.tencent.cos.xml.model.ci.ai.AddImageSearch;
3640

3741
/**
3842
* 添加图库图片
@@ -61,7 +65,6 @@ public class AddImageSearchRequest extends BucketRequest {
6165
public AddImageSearchRequest(@NonNull String bucket , @NonNull String objectKey) {
6266
super(bucket);
6367
this.objectKey = objectKey;
64-
addNoSignHeader("Content-Type");
6568
}
6669
/**
6770
* 设置 添加图库图片
@@ -81,11 +84,12 @@ public Map<String, String> getQueryString() {
8184
public String getPath(CosXmlServiceConfig cosXmlServiceConfig) {
8285
return "/" + objectKey;
8386
}
87+
8488
@Override
85-
public RequestBodySerializer getRequestBody() throws CosXmlClientException {
86-
return RequestBodySerializer.string(COSRequestHeaderKey.APPLICATION_XML,
87-
QCloudXmlUtils.toXml(this.addImageSearch));
89+
protected RequestBodySerializer xmlBuilder() throws XmlPullParserException, IOException, CosXmlClientException {
90+
return RequestBodySerializer.bytes(COSRequestHeaderKey.APPLICATION_XML, QCloudXmlUtils.toXml(this.addImageSearch).getBytes("utf-8"));
8891
}
92+
8993
@Override
9094
public String getMethod() {
9195
return HttpConstants.RequestMethod.POST;

‎QCloudCosXml/cos-android/src/normal/java/com/tencent/cos/xml/model/ci/ai/CreateWordsGeneralizeJobRequest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
import com.tencent.qcloud.core.http.HttpConstants;
3838
import com.tencent.qcloud.core.http.RequestBodySerializer;
3939

40+
import org.xmlpull.v1.XmlPullParserException;
41+
42+
import java.io.IOException;
43+
4044
/**
4145
* 提交一个AI分词识别任务的请求.
4246
* @see com.tencent.cos.xml.CIService#createWordsGeneralizeJob(CreateWordsGeneralizeJobRequest)
@@ -51,8 +55,6 @@ public class CreateWordsGeneralizeJobRequest extends BucketRequest {
5155
*/
5256
public CreateWordsGeneralizeJobRequest(@NonNull String bucket) {
5357
super(bucket);
54-
addNoSignHeader("Content-Type");
55-
addNoSignHeader("Content-Length");
5658
createWordsGeneralizeJob = new CreateWordsGeneralizeJob();
5759
}
5860

@@ -122,9 +124,8 @@ public String getPath(CosXmlServiceConfig cosXmlServiceConfig) {
122124
}
123125

124126
@Override
125-
public RequestBodySerializer getRequestBody() throws CosXmlClientException {
126-
return RequestBodySerializer.string(COSRequestHeaderKey.APPLICATION_XML,
127-
QCloudXmlUtils.toXml(createWordsGeneralizeJob));
127+
protected RequestBodySerializer xmlBuilder() throws XmlPullParserException, IOException, CosXmlClientException {
128+
return RequestBodySerializer.bytes(COSRequestHeaderKey.APPLICATION_XML, QCloudXmlUtils.toXml(this.createWordsGeneralizeJob).getBytes("utf-8"));
128129
}
129130

130131
@Override

0 commit comments

Comments
 (0)