optimize XStream parsing logic

Author: markjrzhang

pom.xml

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

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/VideoTag.java

@@ -1,11 +1,24 @@
 package com.qcloud.cos.model.ciModel.job;
 
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
 public class VideoTag {
     /**
      * 场景类型，可选择视频标签的运用场景，不同的运用场景使用的算法、输入输出等都会有所差异
      * 当前版本只适配 Stream 场景
      */
+    @XStreamAlias("Scenario")
     private String scenario;
+    @XStreamAlias("Text")
+    private String text;
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
 
     public String getScenario() {
         return scenario;

src/main/java/com/qcloud/cos/model/ciModel/xml/CIMediaXmlFactory.java

@@ -256,6 +256,7 @@ private static void addVideoTag(XmlWriter xml, VideoTag videoTag) {
         if (objIsNotValid(videoTag)) {
             xml.start("VideoTag");
             addIfNotNull(xml, "Scenario", videoTag.getScenario());
+            addIfNotNull(xml, "Text", videoTag.getText());
             xml.end();
         }
     }