Skip to content

Commit 2ee40b4

Browse files
author
jordanqin
committed
update qcloud sdk to 5.9.9
1 parent 697be2a commit 2ee40b4

File tree

149 files changed

+2340
-1907
lines changed

Some content is hidden

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

149 files changed

+2340
-1907
lines changed

‎QCloudCosXml/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ buildscript {
3838
jcenter()
3939
}
4040
dependencies {
41-
classpath 'com.android.tools.build:gradle:3.4.1'
41+
classpath 'com.android.tools.build:gradle:3.4.3'
4242
classpath "com.github.dcendents:android-maven-gradle-plugin:2.0"
4343
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
4444
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ android {
5555
}
5656

5757
compileOptions {
58-
sourceCompatibility = JavaVersion.VERSION_1_7
59-
targetCompatibility = JavaVersion.VERSION_1_7
58+
sourceCompatibility = JavaVersion.VERSION_1_8
59+
targetCompatibility = JavaVersion.VERSION_1_8
6060
}
6161
buildToolsVersion = '28.0.2'
6262
}

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

Lines changed: 76 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,11 @@
2929

3030
import com.tencent.beacon.core.info.BeaconPubParams;
3131
import com.tencent.beacon.event.open.BeaconReport;
32-
import com.tencent.cos.xml.common.ClientErrorCode;
3332
import com.tencent.cos.xml.base.BuildConfig;
33+
import com.tencent.cos.xml.common.ClientErrorCode;
3434
import com.tencent.cos.xml.exception.CosXmlClientException;
3535
import com.tencent.cos.xml.exception.CosXmlServiceException;
3636
import com.tencent.cos.xml.model.CosXmlRequest;
37-
import com.tencent.cos.xml.model.object.BasePutObjectRequest;
38-
import com.tencent.cos.xml.model.object.GetObjectRequest;
3937
import com.tencent.cos.xml.model.object.ObjectRequest;
4038
import com.tencent.cos.xml.transfer.TransferTaskMetrics;
4139
import com.tencent.qcloud.core.common.QCloudAuthenticationException;
@@ -53,7 +51,6 @@
5351
import java.net.ConnectException;
5452
import java.net.HttpRetryException;
5553
import java.net.InetAddress;
56-
import java.net.InetSocketAddress;
5754
import java.net.NoRouteToHostException;
5855
import java.net.SocketTimeoutException;
5956
import java.net.UnknownHostException;
@@ -164,45 +161,45 @@ public void reportDownloadTaskServiceException(CosXmlRequest request, QCloudServ
164161
createTransferExtra("DownloadTask", request));
165162
}
166163

167-
private String cosUploadName(boolean cse) {
168-
return cse? "COSUploadTask-CSE" : "COSUploadTask";
169-
}
170-
171-
private String cosDownloadName(boolean cse) {
172-
return cse? "COSDownloadTask-CSE" : "COSDownloadTask";
173-
}
164+
// private String cosUploadName(boolean cse) {
165+
// return cse? "COSUploadTask-CSE" : "COSUploadTask";
166+
// }
167+
//
168+
// private String cosDownloadName(boolean cse) {
169+
// return cse? "COSDownloadTask-CSE" : "COSDownloadTask";
170+
// }
174171

175-
public void reportCOSUploadTaskSuccess(CosXmlRequest request, boolean cse) {
176-
// 只需要一个 PutObjectRequest 壳，带上 HttpTaskMetrics 信息
177-
reportRequestSuccess(EVENT_CODE_UPLOAD, request,
178-
Collections.singletonMap("name", cosUploadName(cse)));
179-
}
180-
181-
public void reportCOSUploadTaskClientException(CosXmlRequest request, QCloudClientException clientException, boolean cse) {
182-
reportClientException(EVENT_CODE_UPLOAD, request, clientException,
183-
createTransferExtra(cosUploadName(cse), request));
184-
}
185-
186-
public void reportCOSUploadTaskServiceException(CosXmlRequest request, QCloudServiceException serviceException, boolean cse) {
187-
reportServiceException(EVENT_CODE_UPLOAD, request, serviceException,
188-
createTransferExtra(cosUploadName(cse), request));
189-
}
190-
191-
public void reportCOSDownloadTaskSuccess(CosXmlRequest request, boolean cse) {
192-
// 只需要一个 GetObjectRequest 壳，带上 HttpTaskMetrics 信息
193-
reportRequestSuccess(EVENT_CODE_DOWNLOAD, request,
194-
Collections.singletonMap("name", cosDownloadName(cse)));
195-
}
196-
197-
public void reportCOSDownloadTaskClientException(CosXmlRequest request, QCloudClientException clientException, boolean cse) {
198-
reportClientException(EVENT_CODE_DOWNLOAD, request, clientException,
199-
createTransferExtra(cosDownloadName(cse), request));
200-
}
201-
202-
public void reportCOSDownloadTaskServiceException(CosXmlRequest request, QCloudServiceException serviceException, boolean cse) {
203-
reportServiceException(EVENT_CODE_DOWNLOAD, request, serviceException,
204-
createTransferExtra(cosDownloadName(cse), request));
205-
}
172+
// public void reportCOSUploadTaskSuccess(CosXmlRequest request, boolean cse) {
173+
// // 只需要一个 PutObjectRequest 壳，带上 HttpTaskMetrics 信息
174+
// reportRequestSuccess(EVENT_CODE_UPLOAD, request,
175+
// Collections.singletonMap("name", cosUploadName(cse)));
176+
// }
177+
//
178+
// public void reportCOSUploadTaskClientException(CosXmlRequest request, QCloudClientException clientException, boolean cse) {
179+
// reportClientException(EVENT_CODE_UPLOAD, request, clientException,
180+
// createTransferExtra(cosUploadName(cse), request));
181+
// }
182+
//
183+
// public void reportCOSUploadTaskServiceException(CosXmlRequest request, QCloudServiceException serviceException, boolean cse) {
184+
// reportServiceException(EVENT_CODE_UPLOAD, request, serviceException,
185+
// createTransferExtra(cosUploadName(cse), request));
186+
// }
187+
//
188+
// public void reportCOSDownloadTaskSuccess(CosXmlRequest request, boolean cse) {
189+
// // 只需要一个 GetObjectRequest 壳，带上 HttpTaskMetrics 信息
190+
// reportRequestSuccess(EVENT_CODE_DOWNLOAD, request,
191+
// Collections.singletonMap("name", cosDownloadName(cse)));
192+
// }
193+
//
194+
// public void reportCOSDownloadTaskClientException(CosXmlRequest request, QCloudClientException clientException, boolean cse) {
195+
// reportClientException(EVENT_CODE_DOWNLOAD, request, clientException,
196+
// createTransferExtra(cosDownloadName(cse), request));
197+
// }
198+
//
199+
// public void reportCOSDownloadTaskServiceException(CosXmlRequest request, QCloudServiceException serviceException, boolean cse) {
200+
// reportServiceException(EVENT_CODE_DOWNLOAD, request, serviceException,
201+
// createTransferExtra(cosDownloadName(cse), request));
202+
// }
206203

207204
public void reportCopyTaskSuccess(CosXmlRequest request) {
208205
// 只需要一个 CopyObjectRequest 壳，带上 HttpTaskMetrics 信息
@@ -554,23 +551,23 @@ private Map<String, String> parseUrlParams(CosXmlRequest request) {
554551
return params;
555552
}
556553

557-
private BasePutObjectRequest emptyPutObjectRequestWithMetrics(HttpTaskMetrics taskMetrics) {
558-
BasePutObjectRequest putObjectRequest = new BasePutObjectRequest("", "", "");
559-
putObjectRequest.attachMetrics(taskMetrics);
560-
return putObjectRequest;
561-
}
554+
// private BasePutObjectRequest emptyPutObjectRequestWithMetrics(HttpTaskMetrics taskMetrics) {
555+
// BasePutObjectRequest putObjectRequest = new BasePutObjectRequest("", "", "");
556+
// putObjectRequest.attachMetrics(taskMetrics);
557+
// return putObjectRequest;
558+
// }
562559

563560
// private CopyObjectRequest emptyCopyObjectRequestWithMetrics(HttpTaskMetrics taskMetrics) {
564561
// CopyObjectRequest copyObjectRequest = new CopyObjectRequest("", "", null);
565562
// copyObjectRequest.attachMetrics(taskMetrics);
566563
// return copyObjectRequest;
567564
// }
568565

569-
private GetObjectRequest emptyGetObjectRequestWithMetrics(HttpTaskMetrics taskMetrics) {
570-
GetObjectRequest getObjectRequest = new GetObjectRequest("", "", "");
571-
getObjectRequest.attachMetrics(taskMetrics);
572-
return getObjectRequest;
573-
}
566+
// private GetObjectRequest emptyGetObjectRequestWithMetrics(HttpTaskMetrics taskMetrics) {
567+
// GetObjectRequest getObjectRequest = new GetObjectRequest("", "", "");
568+
// getObjectRequest.attachMetrics(taskMetrics);
569+
// return getObjectRequest;
570+
// }
574571

575572
private String parseEventCode(CosXmlRequest request) {
576573

@@ -661,26 +658,26 @@ private String flatInetAddressList(@Nullable List<InetAddress> ips) {
661658
return ipString.toString();
662659
}
663660

664-
private String getConnectIp(@Nullable InetSocketAddress socketAddress) {
665-
if (socketAddress == null || socketAddress.getAddress() == null) {
666-
return "";
667-
}
668-
return socketAddress.getAddress().getHostAddress();
669-
}
670-
671-
private Map<String, String> getDownloadParams(String region, boolean isSuccess) {
672-
Map<String, String> params = getCommonParams();
673-
params.put("result", isSuccess ? EVENT_PARAMS_SUCCESS : EVENT_PARAMS_FAILURE);
674-
params.put("region", region);
675-
return params;
676-
}
677-
678-
private Map<String, String> getUploadParams(String region, boolean isSuccess) {
679-
Map<String, String> params = getCommonParams();
680-
params.put("result", isSuccess ? EVENT_PARAMS_SUCCESS : EVENT_PARAMS_FAILURE);
681-
params.put("region", region);
682-
return params;
683-
}
661+
// private String getConnectIp(@Nullable InetSocketAddress socketAddress) {
662+
// if (socketAddress == null || socketAddress.getAddress() == null) {
663+
// return "";
664+
// }
665+
// return socketAddress.getAddress().getHostAddress();
666+
// }
667+
//
668+
// private Map<String, String> getDownloadParams(String region, boolean isSuccess) {
669+
// Map<String, String> params = getCommonParams();
670+
// params.put("result", isSuccess ? EVENT_PARAMS_SUCCESS : EVENT_PARAMS_FAILURE);
671+
// params.put("region", region);
672+
// return params;
673+
// }
674+
//
675+
// private Map<String, String> getUploadParams(String region, boolean isSuccess) {
676+
// Map<String, String> params = getCommonParams();
677+
// params.put("result", isSuccess ? EVENT_PARAMS_SUCCESS : EVENT_PARAMS_FAILURE);
678+
// params.put("region", region);
679+
// return params;
680+
// }
684681

685682
/**
686683
* 获取公共参数
@@ -857,13 +854,13 @@ private boolean isUploadTaskRequest(CosXmlRequest cosXmlRequest) {
857854
}
858855

859856

860-
// 这里有点问题，复制任务还包括了一部分分片上传的请求
861-
private boolean isCopyTaskRequest(CosXmlRequest cosXmlRequest) {
862-
863-
String requestName = cosXmlRequest.getClass().getSimpleName();
864-
return "UploadPartCopyRequest".equals(requestName) ||
865-
"CopyObjectRequest".equals(requestName);
866-
}
857+
// // 这里有点问题，复制任务还包括了一部分分片上传的请求
858+
// private boolean isCopyTaskRequest(CosXmlRequest cosXmlRequest) {
859+
//
860+
// String requestName = cosXmlRequest.getClass().getSimpleName();
861+
// return "UploadPartCopyRequest".equals(requestName) ||
862+
// "CopyObjectRequest".equals(requestName);
863+
// }
867864

868865
/**
869866
* 是否上报（过滤掉不需要上报的异常）

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ public CosXmlBaseService(Context context, CosXmlServiceConfig configuration,
137137
public CosXmlBaseService(Context context, CosXmlServiceConfig configuration) {
138138
if(configuration.isDebuggable() && !BuildConfig.DEBUG){
139139
FileLogAdapter fileLogAdapter = FileLogAdapter.getInstance(context, "QLog");
140-
LogServerProxy.init(context, fileLogAdapter);
141140
QCloudLogger.addAdapter(fileLogAdapter);
142141
}
143142
if(configuration.isDebuggable()){
@@ -183,6 +182,14 @@ public CosXmlBaseService(Context context, CosXmlServiceConfig configuration,
183182
this(context, configuration);
184183
this.selfSigner = selfSigner;
185184
}
185+
186+
/**
187+
* 兼容某些request的signerType（比如SensitiveContentRecognitionRequest应该是cos 而不是ci）
188+
* @return 新的正确的signerType
189+
*/
190+
protected String signerTypeCompat(String signerType, CosXmlRequest cosXmlRequest){
191+
return signerType;
192+
}
186193

187194
private void init(QCloudHttpClient.Builder builder, CosXmlServiceConfig configuration){
188195
builder.setConnectionTimeout(configuration.getConnectionTimeout())
@@ -353,7 +360,7 @@ protected String getRequestHost(CosXmlRequest request) throws CosXmlClientExcept
353360
if (credentialProvider == null) {
354361
httpRequestBuilder.signer(null, null);
355362
} else {
356-
httpRequestBuilder.signer(signerType, cosXmlRequest.getSignSourceProvider());
363+
httpRequestBuilder.signer(signerTypeCompat(signerType, cosXmlRequest), cosXmlRequest.getSignSourceProvider());
357364
}
358365

359366
if (selfSigner != null) {
@@ -558,7 +565,7 @@ public String getPresignedURL(CosXmlRequest cosXmlRequest) throws CosXmlClientEx
558565
try {
559566
//step1: obtain sign, contain token if it exist.
560567
QCloudLifecycleCredentials qCloudLifecycleCredentials = (QCloudLifecycleCredentials) credentialProvider.getCredentials();
561-
QCloudSigner signer = SignerFactory.getSigner(signerType);
568+
QCloudSigner signer = SignerFactory.getSigner(signerTypeCompat(signerType, cosXmlRequest));
562569

563570
QCloudHttpRequest request = buildHttpRequest(cosXmlRequest, null);
564571
signer.sign(request, qCloudLifecycleCredentials);
@@ -733,12 +740,9 @@ public CosXmlServiceConfig getConfig() {
733740
* 获取 SDK 日志信息
734741
*/
735742
public File[] getLogFiles(int limit) {
736-
LogServerProxy logServerProxy = LogServerProxy.getInstance();
737-
if (logServerProxy != null) {
738-
FileLogAdapter fileLogAdapter = logServerProxy.getFileLogAdapter();
739-
if (fileLogAdapter != null) {
740-
return fileLogAdapter.getLogFilesDesc(limit);
741-
}
743+
FileLogAdapter fileLogAdapter = QCloudLogger.getAdapter(FileLogAdapter.class);
744+
if (fileLogAdapter != null) {
745+
return fileLogAdapter.getLogFilesDesc(limit);
742746
}
743747
return null;
744748
}

0 commit comments

Comments
 (0)