Merge pull request #201 from 563750789/master

update to 5.6.517

Author: 563750789

README.md

@@ -8,7 +8,7 @@
 <dependency>
     <groupId>com.qcloud</groupId>
     <artifactId>cos_api</artifactId>
-    <version>5.6.155</version>
+    <version>5.6.213</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qcloud</groupId>
     <artifactId>cos_api</artifactId>
-    <version>5.6.212</version>
+    <version>5.6.217</version>
     <packaging>jar</packaging>
     <name>cos-java-sdk</name>
     <description>java sdk for qcloud cos</description>
@@ -150,6 +150,12 @@
             <artifactId>xstream</artifactId>
             <version>1.4.20</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>4.4.0</version>
+        </dependency>
     </dependencies>
 
     <distributionManagement>
@@ -339,4 +345,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>

src/main/java/com/qcloud/cos/COS.java

@@ -31,14 +31,7 @@
 import com.qcloud.cos.model.bucketcertificate.BucketGetDomainCertificate;
 import com.qcloud.cos.model.bucketcertificate.BucketPutDomainCertificate;
 import com.qcloud.cos.model.bucketcertificate.SetBucketDomainCertificateRequest;
-import com.qcloud.cos.model.ciModel.ai.AddPersonFaceRequest;
-import com.qcloud.cos.model.ciModel.ai.AddPersonFaceResponse;
-import com.qcloud.cos.model.ciModel.ai.CreatePersonRequest;
-import com.qcloud.cos.model.ciModel.ai.CreatePersonResponse;
-import com.qcloud.cos.model.ciModel.ai.DeletePersonFaceRequest;
-import com.qcloud.cos.model.ciModel.ai.FaceSearchBucketRequest;
-import com.qcloud.cos.model.ciModel.ai.SearchPersonFaceRequest;
-import com.qcloud.cos.model.ciModel.ai.SearchPersonFaceResponse;
+import com.qcloud.cos.model.ciModel.ai.*;
 import com.qcloud.cos.model.ciModel.common.CImageProcessRequest;
 import com.qcloud.cos.model.ciModel.hls.*;
 import com.qcloud.cos.model.ciModel.image.*;
@@ -55,14 +48,11 @@
 import com.qcloud.cos.model.ciModel.bucket.MediaBucketResponse;
 import com.qcloud.cos.model.ciModel.common.ImageProcessRequest;
 import com.qcloud.cos.model.ciModel.job.*;
-import com.qcloud.cos.model.ciModel.job.v2.DNADbConfigsRequest;
-import com.qcloud.cos.model.ciModel.job.v2.DNADbConfigsResponse;
-import com.qcloud.cos.model.ciModel.job.v2.DNADbFilesRequest;
-import com.qcloud.cos.model.ciModel.job.v2.DNADbFilesResponse;
-import com.qcloud.cos.model.ciModel.job.v2.MediaJobResponseV2;
-import com.qcloud.cos.model.ciModel.job.v2.MediaJobsRequestV2;
+import com.qcloud.cos.model.ciModel.job.v2.*;
 import com.qcloud.cos.model.ciModel.mediaInfo.MediaInfoRequest;
 import com.qcloud.cos.model.ciModel.mediaInfo.MediaInfoResponse;
+import com.qcloud.cos.model.ciModel.metaInsight.CreateDatasetRequest;
+import com.qcloud.cos.model.ciModel.metaInsight.CreateDatasetResponse;
 import com.qcloud.cos.model.ciModel.persistence.AIGameRecResponse;
 import com.qcloud.cos.model.ciModel.persistence.CIUploadResult;
 import com.qcloud.cos.model.ciModel.persistence.AIRecRequest;
@@ -3264,6 +3254,12 @@ SelectObjectContentResult selectObjectContent(SelectObjectContentRequest selectR
     UpdataHLSPlayKeyResponse updataHLSPlayKey(UpdataHLSPlayKeyRequest customRequest);
 
     MediaListTemplateResponse describeMediaTemplatesV2(MediaTemplateRequest request);
+
+    InputStream getPlayList(GetPlayListRequest request);
+
+    RecognizeLogoResponse recognizeLogo(RecognizeLogoRequest customRequest);
+
+    CreateDatasetResponse createDataset(CreateDatasetRequest customRequest);
 }
 
 

src/main/java/com/qcloud/cos/COSClient.java

@@ -98,14 +98,12 @@
 import com.qcloud.cos.model.ciModel.image.ImageStyleResponse;
 import com.qcloud.cos.model.ciModel.image.OpenImageSearchRequest;
 import com.qcloud.cos.model.ciModel.job.*;
-import com.qcloud.cos.model.ciModel.job.v2.DNADbConfigsRequest;
-import com.qcloud.cos.model.ciModel.job.v2.DNADbConfigsResponse;
-import com.qcloud.cos.model.ciModel.job.v2.DNADbFilesRequest;
-import com.qcloud.cos.model.ciModel.job.v2.DNADbFilesResponse;
-import com.qcloud.cos.model.ciModel.job.v2.MediaJobResponseV2;
-import com.qcloud.cos.model.ciModel.job.v2.MediaJobsRequestV2;
+import com.qcloud.cos.model.ciModel.job.MediaJobObject;
+import com.qcloud.cos.model.ciModel.job.v2.*;
 import com.qcloud.cos.model.ciModel.mediaInfo.MediaInfoRequest;
 import com.qcloud.cos.model.ciModel.mediaInfo.MediaInfoResponse;
+import com.qcloud.cos.model.ciModel.metaInsight.CreateDatasetRequest;
+import com.qcloud.cos.model.ciModel.metaInsight.CreateDatasetResponse;
 import com.qcloud.cos.model.ciModel.persistence.AIGameRecResponse;
 import com.qcloud.cos.model.ciModel.persistence.CIUploadResult;
 import com.qcloud.cos.model.ciModel.persistence.AIRecRequest;
@@ -155,7 +153,6 @@
 
 import org.apache.commons.codec.DecoderException;
 import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.entity.ContentType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -2144,7 +2141,7 @@ public CopyObjectResult copyObject(CopyObjectRequest copyObjectRequest)
                                 + " httpRequest: %s, retryIdx:%d, maxErrorRetry:%d", cse.getMessage(), request,
                         retryIndex, clientConfig.getMaxErrorRetryForCopyRequest());
                 log.debug(errorMsg);
-                if (retryIndex < clientConfig.getMaxErrorRetryForCopyRequest() && RetryUtils.ShouldRetryCopyRequest(cse)) {
+                if (retryIndex < clientConfig.getMaxErrorRetryForCopyRequest() && RetryUtils.shouldRetryCopyRequest(cse)) {
                     retryIndex++;
                     continue;
                 }
@@ -2261,7 +2258,7 @@ public CopyPartResult copyPart(CopyPartRequest copyPartRequest)
                                 + " httpRequest: %s, retryIdx:%d, maxErrorRetry:%d", cse.getMessage(), request,
                         retryIndex, clientConfig.getMaxErrorRetryForCopyRequest());
                 log.debug(errorMsg);
-                if (retryIndex < clientConfig.getMaxErrorRetryForCopyRequest() && RetryUtils.ShouldRetryCopyRequest(cse)) {
+                if (retryIndex < clientConfig.getMaxErrorRetryForCopyRequest() && RetryUtils.shouldRetryCopyRequest(cse)) {
                     retryIndex++;
                     continue;
                 }
@@ -4333,46 +4330,32 @@ public String reportBadCase(ReportBadCaseRequest reportBadCaseRequest) {
         return invoke(request, new Unmarshallers.ReportBadCaseUnmarshaller());
     }
 
-
     private String buildDocPreview(CosHttpRequest<DocHtmlRequest> request) throws URISyntaxException {
-        String urlStr = request.getProtocol().toString() + "://" + request.getEndpoint() + request.getResourcePath();
-        URIBuilder uriBuilder = new URIBuilder(urlStr);
-        COSSigner cosSigner = clientConfig.getCosSigner();
         Date expiredTime = new Date(System.currentTimeMillis() + clientConfig.getSignExpired() * 1000);
-        String authoriationStr = cosSigner.buildAuthorizationStr(request.getHttpMethod(), request.getResourcePath(),
-                request.getHeaders(), request.getParameters(), fetchCredential(), expiredTime, true);
+        HashMap<String, String> params = new HashMap<>();
+        params.put("ci-process", "doc-preview");
         DocHtmlRequest originalRequest = request.getOriginalRequest();
-        uriBuilder.addParameter("ci-process", "doc-preview");
-        uriBuilder.addParameter("dstType", originalRequest.getDstType().toString());
-        uriBuilder.addParameter("srcType", originalRequest.getSrcType());
-        uriBuilder.addParameter("page", originalRequest.getPage());
-        uriBuilder.addParameter("ImageParams", originalRequest.getImageParams());
-        uriBuilder.addParameter("sheet", originalRequest.getSheet());
-        uriBuilder.addParameter("password", originalRequest.getPassword());
-        uriBuilder.addParameter("comment", originalRequest.getComment());
-        uriBuilder.addParameter("excelPaperDirection", originalRequest.getExcelPaperDirection());
-        uriBuilder.addParameter("excelPaperSize", originalRequest.getExcelPaperSize());
-        uriBuilder.addParameter("quality", originalRequest.getQuality());
-        uriBuilder.addParameter("scale", originalRequest.getScale());
-        uriBuilder.addParameter("imageDpi", originalRequest.getImageDpi());
-        return uriBuilder.build().toString() + "&" + authoriationStr;
-    }
-
-//    private void checkAuditingRequest(ImageAuditingRequest request) {
-//        rejectNull(request.getDetectType(), "The detectType parameter must be specified setting the object tags");
-//        rejectNull(request.getObjectKey(), "The objectKey parameter must be specified setting the object tags");
-//    }
-//
-//    private void checkWorkflowParameter(MediaWorkflowRequest request) {
-//        rejectNull(request.getName(),
-//                "The name parameter must be specified setting the object tags");
-//        rejectNull(request.getTopology(),
-//                "The topology parameter must be specified setting the object tags");
-//        rejectEmpty(request.getTopology().getMediaWorkflowNodes(),
-//                "The Nodes parameter must be specified setting the object tags");
-//        rejectEmpty(request.getTopology().getMediaWorkflowDependency(),
-//                "The Dependency parameter must be specified setting the object tags");
-//    }
+        putIfNotNull(params, "dstType", originalRequest.getDstType().toString());
+        putIfNotNull(params, "srcType", originalRequest.getSrcType());
+        putIfNotNull(params, "page", originalRequest.getPage());
+        putIfNotNull(params, "ImageParams", originalRequest.getImageParams());
+        putIfNotNull(params, "sheet", originalRequest.getSheet());
+        putIfNotNull(params, "password", originalRequest.getPassword());
+        putIfNotNull(params, "comment", originalRequest.getComment());
+        putIfNotNull(params, "excelPaperDirection", originalRequest.getExcelPaperDirection());
+        putIfNotNull(params, "excelPaperSize", originalRequest.getExcelPaperSize());
+        putIfNotNull(params, "quality", originalRequest.getQuality());
+        putIfNotNull(params, "scale", originalRequest.getScale());
+        putIfNotNull(params, "imageDpi", originalRequest.getImageDpi());
+        URL url = generatePresignedUrl(request.getBucketName(), request.getResourcePath(), expiredTime, HttpMethodName.GET, new HashMap<String, String>(), params, false, false);
+        return url.toString();
+    }
+
+    private void putIfNotNull(HashMap<String, String> map, String key, String value) {
+        if (value != null) {
+            map.put(key, value);
+        }
+    }
 
     private void checkCIRequestCommon(CIServiceRequest request) {
         rejectNull(request,
@@ -4381,16 +4364,6 @@ private void checkCIRequestCommon(CIServiceRequest request) {
                 "The bucketName parameter must be specified setting the object tags");
     }
 
-//    private void checkRequestOutput(MediaOutputObject output) {
-//        rejectNull(output.getBucket(),
-//                "The output.bucket parameter must be specified setting the object tags");
-//        rejectNull(output.getRegion(),
-//                "The output.region parameter must be specified setting the object tags");
-//        rejectNull(output.getObject(),
-//                "The output.object parameter must be specified setting the object tags");
-//    }
-
-
     private void checkMediaListJobResponse(MediaListJobResponse response) {
         List<MediaJobObject> jobsDetailList = response.getJobsDetailList();
         if (jobsDetailList.size() == 1) {
@@ -5133,6 +5106,50 @@ public MediaListTemplateResponse describeMediaTemplatesV2(MediaTemplateRequest r
         return this.invoke(httpRequest, new Unmarshallers.CICommonUnmarshaller<MediaListTemplateResponse>(MediaListTemplateResponse.class));
     }
 
+    @Override
+    public InputStream getPlayList(GetPlayListRequest getPlayListRequest) {
+        CosHttpRequest<GetPlayListRequest> request = createRequest(getPlayListRequest.getBucketName(), "/getplaylist", getPlayListRequest, HttpMethodName.GET);
+        addParameterIfNotNull(request, "object", getPlayListRequest.getObject());
+        addParameterIfNotNull(request, "expires", getPlayListRequest.getExpires());
+
+        return invoke(request, new CIGetSnapshotResponseHandler());
+    }
 
+    @Override
+    public RecognizeLogoResponse recognizeLogo(RecognizeLogoRequest customRequest) {
+
+        CosHttpRequest<RecognizeLogoRequest> request = createRequest(customRequest.getBucketName(), "/", customRequest , HttpMethodName.GET);
+        addParameterIfNotNull(request, "ci-process", customRequest.getCiProcess());
+        addParameterIfNotNull(request, "detect-url", customRequest.getDetectUrl());
+
+        return invoke(request, new Unmarshallers.CICommonUnmarshaller<RecognizeLogoResponse>(RecognizeLogoResponse.class));
+    }
+
+    @Override
+    public CreateDatasetResponse createDataset(CreateDatasetRequest customRequest) {
+        return null;
+    }
+
+
+    public String generateCosDomainPrivateM3U8Url(PrivateM3U8Request privateM3U8Request) {
+        CosHttpRequest<PrivateM3U8Request> request = createRequest(privateM3U8Request.getBucketName(), privateM3U8Request.getObject(), privateM3U8Request, HttpMethodName.GET);
+        request.addParameter("ci-process","pm3u8");
+        addParameterIfNotNull(request,"expires",privateM3U8Request.getExpires());
+        addParameterIfNotNull(request,"tokenType",privateM3U8Request.getTokenType());
+        addParameterIfNotNull(request,"token",privateM3U8Request.getToken());
+        return buildPrivateM3U8Url(request);
+    }
+
+    private String buildPrivateM3U8Url(CosHttpRequest<PrivateM3U8Request> request)  {
+        Date expiredTime = new Date(System.currentTimeMillis() + clientConfig.getSignExpired() * 1000);
+        HashMap<String, String> params = new HashMap<>();
+        params.put("ci-process", "pm3u8");
+        PrivateM3U8Request originalRequest = request.getOriginalRequest();
+        putIfNotNull(params, "expires", originalRequest.getExpires());
+        putIfNotNull(params, "tokenType", originalRequest.getTokenType());
+        putIfNotNull(params, "token", originalRequest.getToken());
+        URL url = generatePresignedUrl(request.getBucketName(), request.getResourcePath(), expiredTime, HttpMethodName.GET, new HashMap<String, String>(), params, false, false);
+        return url.toString();
+    }
 }
 

src/main/java/com/qcloud/cos/auth/COSSigner.java

@@ -101,8 +101,7 @@ public String buildAuthorizationStr(HttpMethodName methodName, String resouce_pa
                                         COSCredentials cred,
                                         Date expiredTime) {
         Date startTime = new Date();
-        return buildAuthorizationStr(methodName, resouce_path, new HashMap<>(), new HashMap<>(),
-                cred, startTime, expiredTime, true);
+        return buildAuthorizationStr(methodName, resouce_path, new HashMap<>(), new HashMap<>(), cred, startTime, expiredTime, true);
     }
 
     public String buildAuthorizationStr(HttpMethodName methodName, String resouce_path,

src/main/java/com/qcloud/cos/demo/ci/AIGetRequestDemo.java

@@ -2,11 +2,7 @@
 
 import com.qcloud.cos.COSClient;
 import com.qcloud.cos.model.ciModel.image.AIImageColoringRequest;
-import com.qcloud.cos.utils.IOUtils;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

src/main/java/com/qcloud/cos/demo/ci/CreateDatasetDemo.java

@@ -0,0 +1,41 @@
+package com.qcloud.cos.demo.ci;
+
+import com.qcloud.cos.COSClient;
+import com.qcloud.cos.model.ciModel.metaInsight.CreateDatasetRequest;
+import com.qcloud.cos.model.ciModel.metaInsight.CreateDatasetResponse;
+import com.qcloud.cos.utils.CIJackson;
+
+/**
+ * 创建数据集 详情见https://cloud.tencent.com/document/product/460/106020
+ */
+public class CreateDatasetDemo {
+
+    public static void main(String[] args) {
+        // 1 初始化用户身份信息（secretId, secretKey）。
+        COSClient client = ClientUtils.getTestClient();
+        // 2 调用要使用的方法。
+        createDataset(client);
+    }
+
+    /**
+     * createDataset 本接口用于创建一个数据集（Dataset），数据集是由文件元数据构成的集合，用于存储和管理元数据。
+     * 该接口属于 POST 请求。
+     */
+    public static void createDataset(COSClient client) {
+        CreateDatasetRequest request = new CreateDatasetRequest();
+        request.setAppId("1251704708");
+        // 设置数据集名称，同一个账户下唯一。命名规则如下： 长度为1~32字符。 只能包含小写英文字母，数字，短划线（-）。 必须以英文字母和数字开头。;是否必传：是
+        request.setDatasetName("mark");
+        // 设置数据集描述信息。长度为1~256个英文或中文字符，默认值为空。;是否必传：否
+        request.setDescription("test");
+        // 设置指模板，在建立元数据索引时，后端将根据模板来决定收集哪些元数据。
+        // 每个模板都包含一个或多个算子，不同的算子表示不同的元数据。
+        // 目前支持的模板： Official:DefaultEmptyId：默认为空的模板，表示不进行元数据的采集。
+        //               Official:COSBasicMeta：基础信息模板，包含 COS 文件基础元信息算子，表示采集 COS 文件的名称、类型、ACL等基础元信息数据。
+        //               Official:FaceSearch：人脸检索模板，包含人脸检索、COS 文件基础元信息算子。
+        //               Official:ImageSearch：图像检索模板，包含图像检索、COS 文件基础元信息算子。
+        request.setTemplateId("Official:COSBasicMeta");
+        System.out.println(CIJackson.toJsonString(request));
+        CreateDatasetResponse response = client.createDataset(request);
+    }
+}