sdk: rolling update for 1.2.87-release

VERSION

@@ -1 +1 @@
-1.2.86-release
+1.2.87-release

examples/generic/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>ucloud-sdk-java</artifactId>
         <groupId>cn.ucloud</groupId>
-        <version>1.2.86-release</version>
+        <version>1.2.87-release</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>cn.ucloud</groupId>
             <artifactId>ucloud-sdk-java-common</artifactId>
-            <version>1.2.86-release</version>
+            <version>1.2.87-release</version>
         </dependency>
     </dependencies>
 </project>

examples/uhost/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>ucloud-sdk-java</artifactId>
         <groupId>cn.ucloud</groupId>
-        <version>1.2.86-release</version>
+        <version>1.2.87-release</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>cn.ucloud</groupId>
             <artifactId>ucloud-sdk-java-uhost</artifactId>
-            <version>1.2.86-release</version>
+            <version>1.2.87-release</version>
         </dependency>
     </dependencies>
 </project>

pom.xml

@@ -7,7 +7,7 @@
     <groupId>cn.ucloud</groupId>
     <artifactId>ucloud-sdk-java</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.86-release</version>
+    <version>1.2.87-release</version>
     <modules>
         <module>ucloud-sdk-java-common</module>
         <module>ucloud-sdk-java-cloudwatch</module>

ucloud-sdk-java-cloudwatch/pom.xml

@@ -5,19 +5,19 @@
     <parent>
         <artifactId>ucloud-sdk-java</artifactId>
         <groupId>cn.ucloud</groupId>
-        <version>1.2.86-release</version>
+        <version>1.2.87-release</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ucloud-sdk-java-cloudwatch</artifactId>
     <name>ucloud-sdk-java</name>
-    <version>1.2.86-release</version>
+    <version>1.2.87-release</version>
 
     <dependencies>
         <dependency>
             <groupId>cn.ucloud</groupId>
             <artifactId>ucloud-sdk-java-common</artifactId>
-            <version>1.2.86-release</version>
+            <version>1.2.87-release</version>
         </dependency>
 
         <dependency>

ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/ListAlertRecordResponse.java

@@ -133,7 +133,7 @@ public static class AlertRecord extends Response {
 
         /** 产品相关的额外属性列表 */
         @SerializedName("ContentAttrList")
-        private List<String> contentAttrList;
+        private List<ContentAttrItem> contentAttrList;
 
         public String getRegion() {
             return region;
@@ -303,12 +303,39 @@ public void setEndAt(Integer endAt) {
             this.endAt = endAt;
         }
 
-        public List<String> getContentAttrList() {
+        public List<ContentAttrItem> getContentAttrList() {
             return contentAttrList;
         }
 
-        public void setContentAttrList(List<String> contentAttrList) {
+        public void setContentAttrList(List<ContentAttrItem> contentAttrList) {
             this.contentAttrList = contentAttrList;
         }
     }
+
+    public static class ContentAttrItem extends Response {
+
+        /** 键 */
+        @SerializedName("Key")
+        private String key;
+
+        /** 值 */
+        @SerializedName("Value")
+        private String value;
+
+        public String getKey() {
+            return key;
+        }
+
+        public void setKey(String key) {
+            this.key = key;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public void setValue(String value) {
+            this.value = value;
+        }
+    }
 }

ucloud-sdk-java-cloudwatch/src/main/java/cn/ucloud/cloudwatch/models/QueryMetricDataSetResponse.java

@@ -57,7 +57,7 @@ public static class MetricResult extends Response {
 
         /** 资源标签列表。每项为 TagListItem：Tag（标签名）和 TagValue（标签值）。 */
         @SerializedName("TagList")
-        private List<Integer> tagList;
+        private List<TagListItem> tagList;
 
         /** 指标数据点列表，元素为 MetricPoint */
         @SerializedName("Values")
@@ -79,11 +79,11 @@ public void setResourceName(String resourceName) {
             this.resourceName = resourceName;
         }
 
-        public List<Integer> getTagList() {
+        public List<TagListItem> getTagList() {
             return tagList;
         }
 
-        public void setTagList(List<Integer> tagList) {
+        public void setTagList(List<TagListItem> tagList) {
             this.tagList = tagList;
         }
 
@@ -123,105 +123,6 @@ public void setValue(Double value) {
         }
     }
 
-    public static class ObjectType extends Response {
-
-        /** ID */
-        @SerializedName("Id")
-        private Integer id;
-
-        /** 资源类型ID */
-        @SerializedName("ObjectType")
-        private String objectType;
-
-        /** 资源类型 */
-        @SerializedName("ObjectTypeKey")
-        private String objectTypeKey;
-
-        /** 产品名称 */
-        @SerializedName("ProductName")
-        private String productName;
-
-        /** 产品子名称 */
-        @SerializedName("ProductName1")
-        private String productName1;
-
-        /** 产品中文名称 */
-        @SerializedName("ProductCNName")
-        private String productCNName;
-
-        /** 产品英文名称 */
-        @SerializedName("ProductENName")
-        private String productENName;
-
-        /** {type: spec|basic, key:string, name: string}[] -> JSON字符串 */
-        @SerializedName("Metas")
-        private String metas;
-
-        public Integer getId() {
-            return id;
-        }
-
-        public void setId(Integer id) {
-            this.id = id;
-        }
-
-        public String getObjectType() {
-            return objectType;
-        }
-
-        public void setObjectType(String objectType) {
-            this.objectType = objectType;
-        }
-
-        public String getObjectTypeKey() {
-            return objectTypeKey;
-        }
-
-        public void setObjectTypeKey(String objectTypeKey) {
-            this.objectTypeKey = objectTypeKey;
-        }
-
-        public String getProductName() {
-            return productName;
-        }
-
-        public void setProductName(String productName) {
-            this.productName = productName;
-        }
-
-        public String getProductName1() {
-            return productName1;
-        }
-
-        public void setProductName1(String productName1) {
-            this.productName1 = productName1;
-        }
-
-        public String getProductCNName() {
-            return productCNName;
-        }
-
-        public void setProductCNName(String productCNName) {
-            this.productCNName = productCNName;
-        }
-
-        public String getProductENName() {
-            return productENName;
-        }
-
-        public void setProductENName(String productENName) {
-            this.productENName = productENName;
-        }
-
-        public String getMetas() {
-            return metas;
-        }
-
-        public void setMetas(String metas) {
-            this.metas = metas;
-        }
-    }
-
     public static class QueryMetricDataResp extends Response {
 
         /** 无效或无权限资源的 ID 列表 */
@@ -265,7 +166,7 @@ public static class QueryMetricDataRespItem extends Response {
 
         /** 标签列表。每项为 TagEntry：TagName（标签名）和 KeyList（该标签的全部候选值）。 */
         @SerializedName("TagEntries")
-        private List<ObjectType> tagEntries;
+        private List<TagEntry> tagEntries;
 
         /** 查询到的时间序列列表 */
         @SerializedName("Results")
@@ -295,11 +196,11 @@ public void setErrMsg(String errMsg) {
             this.errMsg = errMsg;
         }
 
-        public List<ObjectType> getTagEntries() {
+        public List<TagEntry> getTagEntries() {
             return tagEntries;
         }
 
-        public void setTagEntries(List<ObjectType> tagEntries) {
+        public void setTagEntries(List<TagEntry> tagEntries) {
             this.tagEntries = tagEntries;
         }
 
@@ -311,4 +212,58 @@ public void setResults(List<MetricResult> results) {
             this.results = results;
         }
     }
+
+    public static class TagEntry extends Response {
+
+        /** 标签名称 */
+        @SerializedName("TagName")
+        private String tagName;
+
+        /** 标签候选值列表 */
+        @SerializedName("KeyList")
+        private List<String> keyList;
+
+        public String getTagName() {
+            return tagName;
+        }
+
+        public void setTagName(String tagName) {
+            this.tagName = tagName;
+        }
+
+        public List<String> getKeyList() {
+            return keyList;
+        }
+
+        public void setKeyList(List<String> keyList) {
+            this.keyList = keyList;
+        }
+    }
+
+    public static class TagListItem extends Response {
+
+        /** 标签名 */
+        @SerializedName("Tag")
+        private String tag;
+
+        /** 标签值 */
+        @SerializedName("TagValue")
+        private String tagValue;
+
+        public String getTag() {
+            return tag;
+        }
+
+        public void setTag(String tag) {
+            this.tag = tag;
+        }
+
+        public String getTagValue() {
+            return tagValue;
+        }
+
+        public void setTagValue(String tagValue) {
+            this.tagValue = tagValue;
+        }
+    }
 }