Merge pull request #227 from 563750789/master

563750789 · web-flow · commit 1710df415c1c · 2024-11-18T16:32:35.000+08:00
update version
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qcloud</groupId>
     <artifactId>cos_api</artifactId>
-    <version>5.6.234</version>
+    <version>5.6.237</version>
     <packaging>jar</packaging>
     <name>cos-java-sdk</name>
     <description>java sdk for qcloud cos</description>
diff --git a/src/main/java/com/qcloud/cos/COSClient.java b/src/main/java/com/qcloud/cos/COSClient.java
@@ -4085,8 +4085,8 @@ public MediaInfoResponse generateMediainfo(MediaInfoRequest request) {
         rejectNull(request.getInput().getObject(),
                 "The input.object parameter must be specified setting the object tags");
         CosHttpRequest<MediaInfoRequest> httpRequest = this.createRequest(request.getBucketName(), "/mediainfo", request, HttpMethodName.POST);
-        this.setContent(httpRequest, RequestXmlFactory.convertToXmlByteArray(request), "application/xml", false);
-        return this.invoke(httpRequest, new Unmarshallers.MediaInfoUnmarshaller());
+        this.setContent(httpRequest, CIAuditingXmlFactoryV2.convertToXmlByteArray(request), "application/xml", false);
+        return this.invoke(httpRequest, new Unmarshallers.CICommonUnmarshaller<MediaInfoResponse>(MediaInfoResponse.class));
     }
 
     @Override
diff --git a/src/main/java/com/qcloud/cos/demo/ci/MediaInfoDemo.java b/src/main/java/com/qcloud/cos/demo/ci/MediaInfoDemo.java
@@ -3,6 +3,7 @@
 import com.qcloud.cos.COSClient;
 import com.qcloud.cos.model.ciModel.mediaInfo.MediaInfoRequest;
 import com.qcloud.cos.model.ciModel.mediaInfo.MediaInfoResponse;
+import com.qcloud.cos.utils.CIJackson;
 
 /**
  * GenerateMediainfo 接口用于获取媒体文件的信息。
diff --git a/src/main/java/com/qcloud/cos/internal/ParserMediaInfoUtils.java b/src/main/java/com/qcloud/cos/internal/ParserMediaInfoUtils.java
@@ -146,6 +146,8 @@ public static void ParsingMediaVideo(MediaInfoVideo video, String name, String v
                 video.setLanguage(value);
             case "NumFrames":
                 video.setNumFrames(value);
+            case "CreationTime":
+                video.setCreationTime(value);
             default:
                 break;
         }
@@ -558,6 +560,9 @@ public static void ParsingStreamAudio(MediaInfoAudio audio, String name, String
             case "CodecName":
                 audio.setCodecName(value);
                 break;
+            case "CreationTime":
+                audio.setCreationTime(value);
+                break;
             default:
                 break;
         }
diff --git a/src/main/java/com/qcloud/cos/internal/crypto/COSCryptoModuleBase.java b/src/main/java/com/qcloud/cos/internal/crypto/COSCryptoModuleBase.java
@@ -235,13 +235,8 @@ public InitiateMultipartUploadResult initiateMultipartUploadSecurely(
             long dataSize = req.getDataSize();
             long partSize = req.getPartSize();
 
-            if (dataSize < 0 || partSize < 0) {
-                throw new CosClientException("initiate multipart upload with encryption client must set dataSize and partSize");
-            }
-
-            if (partSize % 16 != 0) {
-                throw new CosClientException("initiat multipart uplaod with encryption client must set part size a mutiple of 16"
-                    + "but got " + partSize);
+            if (partSize < 0) {
+                throw new CosClientException("initiate multipart upload with encryption client must set partSize");
             }
 
             metadata.addUserMetadata(Headers.ENCRYPTION_DATA_SIZE, Long.toString(dataSize));
diff --git a/src/main/java/com/qcloud/cos/model/ciModel/mediaInfo/MediaInfoAudio.java b/src/main/java/com/qcloud/cos/model/ciModel/mediaInfo/MediaInfoAudio.java
@@ -95,6 +95,9 @@ public class MediaInfoAudio {
     @XStreamAlias("Language")
     private String language;
 
+    @XStreamAlias("CreationTime")
+    private String creationTime;
+
     public String getBitrate() {
         return bitrate;
     }
@@ -215,24 +218,35 @@ public void setLanguage(String language) {
         this.language = language;
     }
 
+    public String getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(String creationTime) {
+        this.creationTime = creationTime;
+    }
+
+
     @Override
     public String toString() {
-        return "MediaInfoAudio{" +
-                "bitrate='" + bitrate + '\'' +
-                ", channel='" + channel + '\'' +
-                ", channelLayout='" + channelLayout + '\'' +
-                ", codecLongName='" + codecLongName + '\'' +
-                ", codecName='" + codecName + '\'' +
-                ", codecTag='" + codecTag + '\'' +
-                ", codecTagString='" + codecTagString + '\'' +
-                ", codecTimeBase='" + codecTimeBase + '\'' +
-                ", duration='" + duration + '\'' +
-                ", index='" + index + '\'' +
-                ", sampleFmt='" + sampleFmt + '\'' +
-                ", sampleRate='" + sampleRate + '\'' +
-                ", startTime='" + startTime + '\'' +
-                ", timebase='" + timebase + '\'' +
-                ", language='" + language + '\'' +
-                '}';
+        final StringBuilder sb = new StringBuilder("MediaInfoAudio{");
+        sb.append("bitrate='").append(bitrate).append('\'');
+        sb.append(", channel='").append(channel).append('\'');
+        sb.append(", channelLayout='").append(channelLayout).append('\'');
+        sb.append(", codecLongName='").append(codecLongName).append('\'');
+        sb.append(", codecName='").append(codecName).append('\'');
+        sb.append(", codecTag='").append(codecTag).append('\'');
+        sb.append(", codecTagString='").append(codecTagString).append('\'');
+        sb.append(", codecTimeBase='").append(codecTimeBase).append('\'');
+        sb.append(", duration='").append(duration).append('\'');
+        sb.append(", index='").append(index).append('\'');
+        sb.append(", sampleFmt='").append(sampleFmt).append('\'');
+        sb.append(", sampleRate='").append(sampleRate).append('\'');
+        sb.append(", startTime='").append(startTime).append('\'');
+        sb.append(", timebase='").append(timebase).append('\'');
+        sb.append(", language='").append(language).append('\'');
+        sb.append(", creationTime='").append(creationTime).append('\'');
+        sb.append('}');
+        return sb.toString();
     }
 }
diff --git a/src/main/java/com/qcloud/cos/model/ciModel/mediaInfo/MediaInfoRequest.java b/src/main/java/com/qcloud/cos/model/ciModel/mediaInfo/MediaInfoRequest.java
@@ -1,16 +1,30 @@
 package com.qcloud.cos.model.ciModel.mediaInfo;
 
 import com.qcloud.cos.internal.CIServiceRequest;
+import com.qcloud.cos.internal.CosServiceRequest;
 import com.qcloud.cos.model.ciModel.common.MediaInputObject;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
 
 import java.io.Serializable;
 
 /**
  * 媒体信息接口 请求实体
  */
+@XStreamAlias("Request")
 public class MediaInfoRequest extends CIServiceRequest implements Serializable {
+    @XStreamAlias("BucketName")
+    private String bucketName;
+    @XStreamAlias("Input")
     private MediaInputObject input;
 
+    public String getBucketName() {
+        return bucketName;
+    }
+
+    public void setBucketName(String bucketName) {
+        this.bucketName = bucketName;
+    }
+
     public MediaInputObject getInput() {
         if (input==null)
             input = new MediaInputObject();
diff --git a/src/main/java/com/qcloud/cos/model/ciModel/mediaInfo/MediaInfoResponse.java b/src/main/java/com/qcloud/cos/model/ciModel/mediaInfo/MediaInfoResponse.java
@@ -2,14 +2,17 @@
 
 
 import com.qcloud.cos.model.CiServiceResult;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
 
 /**
  * MediaInfo 媒体信息返回包装类 详情见：https://cloud.tencent.com/document/product/460/38935
  */
+@XStreamAlias("Response")
 public class MediaInfoResponse extends CiServiceResult {
     /**
      * 媒体信息实体对象
      */
+    @XStreamAlias("MediaInfo")
     private MediaInfoStreamObject mediaInfo;
 
     public MediaInfoStreamObject getMediaInfo() {
diff --git a/src/main/java/com/qcloud/cos/model/ciModel/mediaInfo/MediaInfoStream.java b/src/main/java/com/qcloud/cos/model/ciModel/mediaInfo/MediaInfoStream.java
@@ -1,5 +1,8 @@
 package com.qcloud.cos.model.ciModel.mediaInfo;
 
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -10,14 +13,17 @@ public class MediaInfoStream {
     /**
      * 视频信息
      */
+    @XStreamImplicit(itemFieldName = "Video")
     private List<MediaInfoVideo> mediaInfoVideoList;
     /**
      * 音频信息
      */
+    @XStreamImplicit(itemFieldName = "Audio")
     private List<MediaInfoAudio> mediaInfoAudioList;
     /**
      * 字幕信息
      */
+    @XStreamAlias("Subtitle")
     private MediaInfoSubtitle subtitle;
 
     public List<MediaInfoVideo> getMediaInfoVideoList() {
diff --git a/src/main/java/com/qcloud/cos/model/ciModel/mediaInfo/MediaInfoStreamObject.java b/src/main/java/com/qcloud/cos/model/ciModel/mediaInfo/MediaInfoStreamObject.java
@@ -1,12 +1,16 @@
 package com.qcloud.cos.model.ciModel.mediaInfo;
 
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
 import java.io.Serializable;
 
 /**
  * MediaInfo 格式详情实体类 详情见：https://cloud.tencent.com/document/product/460/38935
  */
 public class MediaInfoStreamObject implements Serializable {
+    @XStreamAlias("Format")
     private MediaFormat format;
+    @XStreamAlias("Stream")
     private MediaInfoStream stream;
 
     public MediaFormat getFormat() {
diff --git a/src/main/java/com/qcloud/cos/model/ciModel/mediaInfo/MediaInfoVideo.java b/src/main/java/com/qcloud/cos/model/ciModel/mediaInfo/MediaInfoVideo.java
@@ -43,6 +43,24 @@ public class MediaInfoVideo {
     @XStreamAlias("CodecTag")
     private String codecTag;
 
+    /**
+     * 色原
+     */
+    @XStreamAlias("ColorPrimaries")
+    private String colorPrimaries;
+
+    /**
+     * 色彩范围
+     */
+    @XStreamAlias("ColorRange")
+    private String colorRange;
+
+    /**
+     * 色彩通道
+     */
+    @XStreamAlias("ColorTransfer")
+    private String colorTransfer;
+
     /**
      * 视频编码档位
      */
@@ -151,8 +169,44 @@ public class MediaInfoVideo {
     @XStreamAlias("Language")
     private String language;
 
+    @XStreamAlias("Rotation")
     private String rotation;
 
+    @XStreamAlias("CreationTime")
+    private String creationTime;
+
+    public String getColorPrimaries() {
+        return colorPrimaries;
+    }
+
+    public void setColorPrimaries(String colorPrimaries) {
+        this.colorPrimaries = colorPrimaries;
+    }
+
+    public String getColorRange() {
+        return colorRange;
+    }
+
+    public void setColorRange(String colorRange) {
+        this.colorRange = colorRange;
+    }
+
+    public String getColorTransfer() {
+        return colorTransfer;
+    }
+
+    public void setColorTransfer(String colorTransfer) {
+        this.colorTransfer = colorTransfer;
+    }
+
+    public String getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(String creationTime) {
+        this.creationTime = creationTime;
+    }
+
     public String getIndex() {
         return index;
     }
@@ -355,31 +409,37 @@ public void setRotation(String rotation) {
 
     @Override
     public String toString() {
-        return "MediaInfoVideo{" +
-                "index='" + index + '\'' +
-                ", codecName='" + codecName + '\'' +
-                ", codecLongName='" + codecLongName + '\'' +
-                ", codecTimeBase='" + codecTimeBase + '\'' +
-                ", codecTagString='" + codecTagString + '\'' +
-                ", codecTag='" + codecTag + '\'' +
-                ", profile='" + profile + '\'' +
-                ", height='" + height + '\'' +
-                ", width='" + width + '\'' +
-                ", hasBFrame='" + hasBFrame + '\'' +
-                ", refFrames='" + refFrames + '\'' +
-                ", sar='" + sar + '\'' +
-                ", dar='" + dar + '\'' +
-                ", pixFormat='" + pixFormat + '\'' +
-                ", fieldOrder='" + fieldOrder + '\'' +
-                ", level='" + level + '\'' +
-                ", fps='" + fps + '\'' +
-                ", avgFps='" + avgFps + '\'' +
-                ", timebase='" + timebase + '\'' +
-                ", startTime='" + startTime + '\'' +
-                ", duration='" + duration + '\'' +
-                ", bitrate='" + bitrate + '\'' +
-                ", numFrames='" + numFrames + '\'' +
-                ", language='" + language + '\'' +
-                '}';
+        final StringBuilder sb = new StringBuilder("MediaInfoVideo{");
+        sb.append("index='").append(index).append('\'');
+        sb.append(", codecName='").append(codecName).append('\'');
+        sb.append(", codecLongName='").append(codecLongName).append('\'');
+        sb.append(", codecTimeBase='").append(codecTimeBase).append('\'');
+        sb.append(", codecTagString='").append(codecTagString).append('\'');
+        sb.append(", codecTag='").append(codecTag).append('\'');
+        sb.append(", colorPrimaries='").append(colorPrimaries).append('\'');
+        sb.append(", colorRange='").append(colorRange).append('\'');
+        sb.append(", colorTransfer='").append(colorTransfer).append('\'');
+        sb.append(", profile='").append(profile).append('\'');
+        sb.append(", height='").append(height).append('\'');
+        sb.append(", width='").append(width).append('\'');
+        sb.append(", hasBFrame='").append(hasBFrame).append('\'');
+        sb.append(", refFrames='").append(refFrames).append('\'');
+        sb.append(", sar='").append(sar).append('\'');
+        sb.append(", dar='").append(dar).append('\'');
+        sb.append(", pixFormat='").append(pixFormat).append('\'');
+        sb.append(", fieldOrder='").append(fieldOrder).append('\'');
+        sb.append(", level='").append(level).append('\'');
+        sb.append(", fps='").append(fps).append('\'');
+        sb.append(", avgFps='").append(avgFps).append('\'');
+        sb.append(", timebase='").append(timebase).append('\'');
+        sb.append(", startTime='").append(startTime).append('\'');
+        sb.append(", duration='").append(duration).append('\'');
+        sb.append(", bitrate='").append(bitrate).append('\'');
+        sb.append(", numFrames='").append(numFrames).append('\'');
+        sb.append(", language='").append(language).append('\'');
+        sb.append(", rotation='").append(rotation).append('\'');
+        sb.append(", creationTime='").append(creationTime).append('\'');
+        sb.append('}');
+        return sb.toString();
     }
 }
diff --git a/src/main/java/com/qcloud/cos/model/ciModel/template/MediaTemplateTransTplObject.java b/src/main/java/com/qcloud/cos/model/ciModel/template/MediaTemplateTransTplObject.java
@@ -61,6 +61,9 @@ public void setVideo(MediaVideoObject video) {
     }
 
     public MediaTimeIntervalObject getTimeInterval() {
+        if (timeInterval == null) {
+            timeInterval = new MediaTimeIntervalObject();
+        }
         return timeInterval;
     }
 
@@ -69,6 +72,9 @@ public void setTimeInterval(MediaTimeIntervalObject timeInterval) {
     }
 
     public MediaSnapshotObject getSnapshot() {
+        if (snapshot == null) {
+            snapshot = new MediaSnapshotObject();
+        }
         return snapshot;
     }
 
