merge origin master

Author: jeffreykzli

README.md

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

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qcloud</groupId>
     <artifactId>cos_api</artifactId>
-    <version>5.6.224</version>
+    <version>5.6.228</version>
     <packaging>jar</packaging>
     <name>cos-java-sdk</name>
     <description>java sdk for qcloud cos</description>

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

@@ -3291,6 +3291,8 @@ SelectObjectContentResult selectObjectContent(SelectObjectContentRequest selectR
     UpdateDatasetResponse updateDataset(UpdateDatasetRequest customRequest);
 
     UpdateFileMetaIndexResponse updateFileMetaIndex(UpdateFileMetaIndexRequest customRequest);
+
+    MediaTemplateResponseV2 createMediaTemplateV2(MediaTemplateRequestV2 request);
 }
 
 

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

@@ -5316,6 +5316,15 @@ public UpdateFileMetaIndexResponse updateFileMetaIndex(UpdateFileMetaIndexReques
         return invoke(request, new Unmarshallers.CICommonJsonUnmarshaller<UpdateFileMetaIndexResponse>(UpdateFileMetaIndexResponse.class));
     }
 
+    @Override
+    public MediaTemplateResponseV2 createMediaTemplateV2(MediaTemplateRequestV2 templateRequest) {
+        rejectNull(templateRequest,
+                "The request parameter must be specified setting the object tags");
+        CosHttpRequest<MediaTemplateRequestV2> request = this.createRequest(templateRequest.getBucketName(), "/template", templateRequest, HttpMethodName.POST);
+        this.setContent(request, CIAuditingXmlFactoryV2.convertToXmlByteArray(templateRequest), "application/xml", false);
+        return invoke(request, new Unmarshallers.CICommonUnmarshaller<MediaTemplateResponseV2>(MediaTemplateResponseV2.class));
+    }
+
     public String generateCosDomainPrivateM3U8Url(PrivateM3U8Request privateM3U8Request) {
         CosHttpRequest<PrivateM3U8Request> request = createRequest(privateM3U8Request.getBucketName(), privateM3U8Request.getObject(), privateM3U8Request, HttpMethodName.GET);
         request.addParameter("ci-process","pm3u8");

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

@@ -1,14 +1,18 @@
 package com.qcloud.cos.demo.ci;
 
 import com.qcloud.cos.COSClient;
-import com.qcloud.cos.model.ciModel.job.MediaJobOperation;
-import com.qcloud.cos.model.ciModel.job.MediaJobResponse;
-import com.qcloud.cos.model.ciModel.job.MediaJobsRequest;
+import com.qcloud.cos.model.ciModel.job.MediaContainerObject;
+import com.qcloud.cos.model.ciModel.job.MediaVideoObject;
+import com.qcloud.cos.model.ciModel.job.TransTpl;
 import com.qcloud.cos.model.ciModel.job.VideoTargetRec;
+import com.qcloud.cos.model.ciModel.job.v2.*;
+import com.qcloud.cos.model.ciModel.template.MediaListTemplateResponse;
+import com.qcloud.cos.model.ciModel.template.MediaTemplateObject;
 import com.qcloud.cos.model.ciModel.template.MediaTemplateRequest;
-import com.qcloud.cos.model.ciModel.template.MediaTemplateResponse;
+import com.qcloud.cos.utils.CIJackson;
 
 import java.io.UnsupportedEncodingException;
+import java.util.List;
 
 /**
  * 媒体处理 目标检测任务 job接口相关demo
@@ -19,7 +23,7 @@ public static void main(String[] args) throws Exception {
         // 1 初始化用户身份信息（secretId, secretKey）。
         COSClient client = ClientUtils.getTestClient();
         // 2 调用要使用的方法。
-        describeMediaJob(client);
+        describeMediaTemplates(client);
     }
 
     /**
@@ -30,65 +34,38 @@ public static void main(String[] args) throws Exception {
      */
     public static void createMediaJobs(COSClient client) {
         //1.创建任务请求对象
-        MediaJobsRequest request = new MediaJobsRequest();
+        MediaJobsRequestV2 request = new MediaJobsRequestV2();
         //2.添加请求参数 参数详情请见api接口文档
-        request.setBucketName("shanghaitest-1251704708");
+        request.setBucketName("demo-1234567890");
         request.setTag("VideoTargetRec");
-        request.getInput().setObject("test/2023Y05M19D06H25M20S00.30.ts");
+        request.getInput().setObject("1.mp4");
         //2.1添加媒体任务操作参数
         MediaJobOperation operation = request.getOperation();
-        operation.setDecryptKey("4kkb6KFBFQmmg60dzuzOgA==");
-        operation.setDecryptIv("YWFhYWFhYWFhYWFhYWFhYQ==");
-        operation.setDecryptMode("AES128CBCNOPADDING");
 
         VideoTargetRec videoTargetRec = operation.getVideoTargetRec();
         videoTargetRec.setBody("true");
         videoTargetRec.setPet("true");
         videoTargetRec.setCar("true");
+        videoTargetRec.setFace("true");
 
         //3.调用接口,获取任务响应对象
-        MediaJobResponse response = client.createMediaJobs(request);
+        MediaJobResponseV2 response = client.createMediaJobsV2(request);
         System.out.println(response.getJobsDetail().getJobId());
     }
 
-    /**
-     * createMediaJobs 接口用于创建媒体任务
-     * 使用目标检测参数创建任务
-     */
-    public static void createMediaJobs2(COSClient client) {
-        //1.创建任务请求对象
-        MediaJobsRequest request = new MediaJobsRequest();
-        //2.添加请求参数 参数详情请见api接口文档
-        request.setBucketName("demo-1234567890");
-        request.setTag("VideoTargetRec");
-        request.getInput().setObject("1.mp4");
-        //2.1添加媒体任务操作参数
-        MediaJobOperation operation = request.getOperation();
-        operation.setJobLevel("0");
-
-        VideoTargetRec videoTargetRec = operation.getVideoTargetRec();
-        videoTargetRec.setBody("false");
-        videoTargetRec.setPet("true");
-        videoTargetRec.setCar("false");
-
-        //3.调用接口,获取任务响应对象
-        MediaJobResponse response = client.createMediaJobs(request);
-        System.out.println(response);
-    }
-
     /**
      * describeMediaJob 根据jobId查询任务信息
      *
      */
     public static void describeMediaJob(COSClient client) {
         //1.创建任务请求对象
-        MediaJobsRequest request = new MediaJobsRequest();
+        MediaJobsRequestV2 request = new MediaJobsRequestV2();
         //2.添加请求参数 参数详情请见api接口文档
-        request.setBucketName("shanghaitest-1251704708");
-        request.setJobId("a350aba00ff8011edbf2061ef03bc37b5");
+        request.setBucketName("demo-1234567890");
+        request.setJobId("a794b193e4fad11ef8a36bfd795e*****");
         //3.调用接口,获取任务响应对象
-        MediaJobResponse response = client.describeMediaJob(request);
-        System.out.println(response);
+        MediaJobResponseV2 response = client.describeMediaJobV2(request);
+        System.out.println(CIJackson.toJsonString(response));
     }
 
     /**
@@ -98,18 +75,45 @@ public static void describeMediaJob(COSClient client) {
      */
     public static void createMediaTemplate(COSClient client) throws UnsupportedEncodingException {
         //1.创建模板请求对象
-        MediaTemplateRequest request = new MediaTemplateRequest();
+        MediaTemplateRequestV2 request = new MediaTemplateRequestV2();
         //2.添加请求参数 参数详情请见api接口文档
         request.setBucketName("demo-1234567890");
         request.setTag("VideoTargetRec");
-        request.setName("mark-VideoTargetRec");
-        VideoTargetRec videoTargetRec = request.getVideoTargetRec();
-        videoTargetRec.setCar("true");
-        videoTargetRec.setBody("true");
+        request.setName("mark-VideoTargetRec-175");
+        VideoTargetRec videoTargetRec = new VideoTargetRec();
+        videoTargetRec.setCar("false");
+        videoTargetRec.setBody("false");
         videoTargetRec.setPet("false");
+        videoTargetRec.setFace("true");
+        videoTargetRec.setProcessType("Mosaic");
 
-        MediaTemplateResponse response = client.createMediaTemplate(request);
-        System.out.println(response);
+        TransTpl transTpl = new TransTpl();
+        MediaContainerObject container = new MediaContainerObject();
+        container.setFormat("mp4");
+        transTpl.setContainer(container);
+
+        MediaVideoObject video = new MediaVideoObject();
+        video.setCodec("H.264");
+        video.setCrf("23");
+        transTpl.setVideo(video);
+        videoTargetRec.setTransTpl(transTpl);
+        request.setVideoTargetRec(videoTargetRec);
+        MediaTemplateResponseV2 response = client.createMediaTemplateV2(request);
+
+        System.out.println(CIJackson.toJsonString(response));
     }
 
+    public static void describeMediaTemplates(COSClient client) {
+        //1.创建模板请求对象
+        MediaTemplateRequest request = new MediaTemplateRequest();
+        //2.添加请求参数 参数详情请见api接口文档
+        request.setBucketName("demo-1234567890");
+        request.setTag("VideoTargetRec");
+        //3.调用接口,获取模板响应对象
+        MediaListTemplateResponse response = client.describeMediaTemplatesV2(request);
+        List<MediaTemplateObject> templateList = response.getTemplateList();
+        for (MediaTemplateObject mediaTemplateObject : templateList) {
+            System.out.println(CIJackson.toJsonString(mediaTemplateObject));
+        }
+    }
 }

src/main/java/com/qcloud/cos/internal/cihandler/XStreamXmlResponsesSaxParser.java

@@ -3,24 +3,14 @@
 import com.qcloud.cos.exception.CosServiceException;
 import com.qcloud.cos.internal.CosServiceRequest;
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.converters.Converter;
-import com.thoughtworks.xstream.converters.MarshallingContext;
-import com.thoughtworks.xstream.converters.SingleValueConverter;
-import com.thoughtworks.xstream.converters.UnmarshallingContext;
-import com.thoughtworks.xstream.io.HierarchicalStreamReader;
-import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
-import com.thoughtworks.xstream.io.xml.StaxDriver;
-import com.thoughtworks.xstream.mapper.Mapper;
 import com.thoughtworks.xstream.security.AnyTypePermission;
 
 import java.io.InputStream;
-import java.io.StringWriter;
 import java.lang.reflect.Field;
+import java.util.concurrent.ConcurrentHashMap;
 
 public abstract class XStreamXmlResponsesSaxParser<T> {
-
-    private XStream xstream;
+    private static final ConcurrentHashMap<String, XStream> xStreamMap = new ConcurrentHashMap<String, XStream>();
 
     abstract T getResponse(InputStream in);
 
@@ -29,17 +19,21 @@ static XStream initXStream(Object obj) {
     }
 
     static <T> XStream initXStream(Class<T> cls) {
-        XStream xstream = new XStream();
-        //忽略不需要的节点
-        xstream.ignoreUnknownElements();
-        //对指定的类使用Annotations 进行序列化
-        xstream.processAnnotations(cls);
-        xstream.addPermission(AnyTypePermission.ANY);
-        Field[] fields = CosServiceRequest.class.getDeclaredFields();
-        for (Field field : fields) {
-            xstream.omitField(CosServiceRequest.class, field.getName());
+        if (!xStreamMap.containsKey(cls.getName())) {
+            XStream xstream = new XStream();
+            //忽略不需要的节点
+            xstream.ignoreUnknownElements();
+            //对指定的类使用Annotations 进行序列化
+            xstream.processAnnotations(cls);
+            xstream.addPermission(AnyTypePermission.ANY);
+            Field[] fields = CosServiceRequest.class.getDeclaredFields();
+            for (Field field : fields) {
+                xstream.omitField(CosServiceRequest.class, field.getName());
+            }
+            xStreamMap.put(cls.getName(), xstream);
+            return xstream;
         }
-        return xstream;
+        return xStreamMap.get(cls.getName());
     }
 
     public static String toXML(Object obj) {
@@ -48,9 +42,9 @@ public static String toXML(Object obj) {
     }
 
     public static <T> T toBean(InputStream inputStream, Class<T> cls) {
-        try {
+        try (InputStream in = inputStream) {
             XStream xstream = initXStream(cls);
-            return (T) xstream.fromXML(inputStream);
+            return (T) xstream.fromXML(in);
         } catch (Exception e) {
             e.printStackTrace();
             throw new CosServiceException("Response parse error");

src/main/java/com/qcloud/cos/model/ciModel/job/MediaJobOperation.java

@@ -49,6 +49,8 @@ public class MediaJobOperation {
 
     @XStreamAlias("EncryptMode")
     private String encryptMode;
+    @XStreamAlias("SnapshotPrefix")
+    private String snapshotPrefix;
 
     @XStreamAlias("Output")
     private MediaOutputObject output;
@@ -519,6 +521,14 @@ public void setVersion(String version) {
         this.version = version;
     }
 
+    public String getSnapshotPrefix() {
+        return snapshotPrefix;
+    }
+
+    public void setSnapshotPrefix(String snapshotPrefix) {
+        this.snapshotPrefix = snapshotPrefix;
+    }
+
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder("MediaJobOperation{");

src/main/java/com/qcloud/cos/model/ciModel/job/TransTpl.java

@@ -0,0 +1,86 @@
+package com.qcloud.cos.model.ciModel.job;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+public class TransTpl {
+    @XStreamAlias("Container")
+    private MediaContainerObject container;
+    @XStreamAlias("Video")
+    private MediaVideoObject video;
+    @XStreamAlias("Codec")
+    private String codec;
+    @XStreamAlias("Bitrate")
+    private String bitrate;
+    @XStreamAlias("Crf")
+    private String crf;
+    @XStreamAlias("Width")
+    private String width;
+    @XStreamAlias("Height")
+    private String height;
+    @XStreamAlias("Fps")
+    private String fps;
+
+    public MediaContainerObject getContainer() {
+        return container;
+    }
+
+    public void setContainer(MediaContainerObject container) {
+        this.container = container;
+    }
+
+    public String getCodec() {
+        return codec;
+    }
+
+    public void setCodec(String codec) {
+        this.codec = codec;
+    }
+
+    public String getBitrate() {
+        return bitrate;
+    }
+
+    public void setBitrate(String bitrate) {
+        this.bitrate = bitrate;
+    }
+
+    public String getCrf() {
+        return crf;
+    }
+
+    public void setCrf(String crf) {
+        this.crf = crf;
+    }
+
+    public String getWidth() {
+        return width;
+    }
+
+    public void setWidth(String width) {
+        this.width = width;
+    }
+
+    public String getHeight() {
+        return height;
+    }
+
+    public void setHeight(String height) {
+        this.height = height;
+    }
+
+    public String getFps() {
+        return fps;
+    }
+
+    public void setFps(String fps) {
+        this.fps = fps;
+    }
+
+    public MediaVideoObject getVideo() {
+        return video;
+    }
+
+    public void setVideo(MediaVideoObject video) {
+        this.video = video;
+    }
+}