update VideoTag v2

update DatasetBinding

Author: markjrzhang

pom.xml

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

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

@@ -4970,6 +4970,14 @@ public MediaJobResponseV2 describeMediaJobV2(MediaJobsRequestV2 req) {
         rejectNull(req.getJobId(),
                 "The jobId parameter must be specified setting the object tags");
         CosHttpRequest<MediaJobsRequestV2> request = createRequest(req.getBucketName(), "/jobs/" + req.getJobId(), req, HttpMethodName.GET);
+        addParameterIfNotNull(request, "queueId", req.getQueueId());
+        addParameterIfNotNull(request, "tag", req.getTag());
+        addParameterIfNotNull(request, "orderByTime", req.getOrderByTime());
+        addParameterIfNotNull(request, "nextToken", req.getNextToken());
+        addParameterIfNotNull(request, "size", req.getSize().toString());
+        addParameterIfNotNull(request, "states", req.getStates());
+        addParameterIfNotNull(request, "startCreationTime", req.getStartCreationTime());
+        addParameterIfNotNull(request, "endCreationTime", req.getEndCreationTime());
         return invoke(request,new Unmarshallers.CICommonUnmarshaller<MediaJobResponseV2>(MediaJobResponseV2.class));
     }
 

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

@@ -1,9 +1,10 @@
 package com.qcloud.cos.demo.ci;
 
 import com.qcloud.cos.COSClient;
-import com.qcloud.cos.model.ciModel.job.MediaJobResponse;
-import com.qcloud.cos.model.ciModel.job.MediaJobsRequest;
 import com.qcloud.cos.model.ciModel.job.VideoTag;
+import com.qcloud.cos.model.ciModel.job.v2.MediaJobResponseV2;
+import com.qcloud.cos.model.ciModel.job.v2.MediaJobsRequestV2;
+import com.qcloud.cos.utils.Jackson;
 
 /**
  * 媒体处理视频标签任务接口相关demo 详情见https://cloud.tencent.com/document/product/460/84779
@@ -25,7 +26,7 @@ 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("markjrzhang-1251704708");
         request.setTag("VideoTag");
@@ -35,7 +36,7 @@ public static void createMediaJobs(COSClient client) {
         videoTag.setScenario("Stream");
         //2.1添加媒体任务操作参数
         //3.调用接口,获取任务响应对象
-        MediaJobResponse response = client.createMediaJobs(request);
+        MediaJobResponseV2 response = client.createMediaJobsV2(request);
         System.out.println(response.getJobsDetail().getJobId());
     }
 
@@ -46,13 +47,13 @@ public static void createMediaJobs(COSClient client) {
      */
     public static void describeMediaJob(COSClient client) {
         //1.创建任务请求对象
-        MediaJobsRequest request = new MediaJobsRequest();
+        MediaJobsRequestV2 request = new MediaJobsRequestV2();
         //2.添加请求参数 参数详情请见api接口文档
-        request.setBucketName("markjrzhang-1251704708");
-        request.setJobId("j412a06a4e45211eda690e1551b253531");
+        request.setBucketName("demo-1234567890");
+        request.setJobId("jd121a0be669c11ef934ca5674d7*****");
         //3.调用接口,获取任务响应对象
-        MediaJobResponse response = client.describeMediaJob(request);
-        System.out.println(response);
+        MediaJobResponseV2 response = client.describeMediaJobV2(request);
+        System.out.println(Jackson.toJsonString(response));
     }
 
 }

src/main/java/com/qcloud/cos/model/ciModel/common/MediaInputObject.java

@@ -14,6 +14,10 @@ public class MediaInputObject {
     private String url;
     @XStreamAlias("Vod")
     private MediaVod vod;
+    @XStreamAlias("BucketId")
+    private String bucketId;
+    @XStreamAlias("Region")
+    private String region;
 
     public String getObject() {
         return object;
@@ -42,6 +46,22 @@ public void setVod(MediaVod vod) {
         this.vod = vod;
     }
 
+    public String getBucketId() {
+        return bucketId;
+    }
+
+    public void setBucketId(String bucketId) {
+        this.bucketId = bucketId;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder("MediaInputObject{");

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

@@ -1,4 +1,39 @@
 package com.qcloud.cos.model.ciModel.job;
 
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+
+import java.util.List;
+
 public class ActionTag {
+    @XStreamAlias("StartTime")
+    private String startTime;
+    @XStreamAlias("EndTime")
+    private String endTime;
+    @XStreamImplicit(itemFieldName = "Tags")
+    private List<MediaTags> tags;
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public List<MediaTags> getTags() {
+        return tags;
+    }
+
+    public void setTags(List<MediaTags> tags) {
+        this.tags = tags;
+    }
 }

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

@@ -0,0 +1,46 @@
+package com.qcloud.cos.model.ciModel.job;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+public class BBox {
+    @XStreamAlias("X1")
+    private String x1;
+    @XStreamAlias("Y1")
+    private String y1;
+    @XStreamAlias("X2")
+    private String x2;
+    @XStreamAlias("Y2")
+    private String y2;
+
+    public String getX1() {
+        return x1;
+    }
+
+    public void setX1(String x1) {
+        this.x1 = x1;
+    }
+
+    public String getY1() {
+        return y1;
+    }
+
+    public void setY1(String y1) {
+        this.y1 = y1;
+    }
+
+    public String getX2() {
+        return x2;
+    }
+
+    public void setX2(String x2) {
+        this.x2 = x2;
+    }
+
+    public String getY2() {
+        return y2;
+    }
+
+    public void setY2(String y2) {
+        this.y2 = y2;
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.qcloud.cos.model.ciModel.job;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+
+import java.util.List;
+
+public class CommonTag {
+    @XStreamAlias("Name")
+    private String name;
+    @XStreamAlias("Confidence")
+    private String confidence;
+    @XStreamAlias("Count")
+    private String count;
+    @XStreamImplicit(itemFieldName = "DetailPerSecond")
+    List<DetailPerSecond> DetailPerSecondList;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getConfidence() {
+        return confidence;
+    }
+
+    public void setConfidence(String confidence) {
+        this.confidence = confidence;
+    }
+
+    public String getCount() {
+        return count;
+    }
+
+    public void setCount(String count) {
+        this.count = count;
+    }
+
+    public List<DetailPerSecond> getDetailPerSecondList() {
+        return DetailPerSecondList;
+    }
+
+    public void setDetailPerSecondList(List<DetailPerSecond> detailPerSecondList) {
+        DetailPerSecondList = detailPerSecondList;
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.qcloud.cos.model.ciModel.job;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+
+import java.util.List;
+
+public class DetailPerSecond {
+    @XStreamAlias("TimeStamp")
+    private String timeStamp;
+    @XStreamAlias("Name")
+    private String name;
+    @XStreamAlias("Confidence")
+    private String confidence;
+    @XStreamImplicit(itemFieldName = "BBox")
+    private List<BBox> bboxList;
+
+    public String getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(String timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public String getConfidence() {
+        return confidence;
+    }
+
+    public void setConfidence(String confidence) {
+        this.confidence = confidence;
+    }
+
+    public List<BBox> getBboxList() {
+        return bboxList;
+    }
+
+    public void setBboxList(List<BBox> bboxList) {
+        this.bboxList = bboxList;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

@@ -0,0 +1,36 @@
+package com.qcloud.cos.model.ciModel.job;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+public class MediaTags {
+    @XStreamAlias("Tag")
+    private String tag;
+    @XStreamAlias("TagCls")
+    private String tagCls;
+    @XStreamAlias("Confidence")
+    private String confidence;
+
+    public String getTag() {
+        return tag;
+    }
+
+    public void setTag(String tag) {
+        this.tag = tag;
+    }
+
+    public String getTagCls() {
+        return tagCls;
+    }
+
+    public void setTagCls(String tagCls) {
+        this.tagCls = tagCls;
+    }
+
+    public String getConfidence() {
+        return confidence;
+    }
+
+    public void setConfidence(String confidence) {
+        this.confidence = confidence;
+    }
+}

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

@@ -1,4 +1,30 @@
 package com.qcloud.cos.model.ciModel.job;
 
-public class ObjectTag {
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+
+import java.util.List;
+
+public class ObjectTag  {
+    @XStreamImplicit(itemFieldName = "Objects")
+    private List<ObjectTagInfo> objects;
+
+    @XStreamAlias("TimeStamp")
+    private String timeStamp;
+
+    public List<ObjectTagInfo> getObjects() {
+        return objects;
+    }
+
+    public void setObjects(List<ObjectTagInfo> objects) {
+        this.objects = objects;
+    }
+
+    public String getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(String timeStamp) {
+        this.timeStamp = timeStamp;
+    }
 }