Merge branch 'rocketmq-Java-2023-01-01-online-984-2025_02_20_15_21_26' into 'integration_2025-02-20_759260291074'

feat: [development task] RocketMQ-984-Java (1027511)

See merge request iaasng/volcengine-java-sdk!381

Author: BitsAdmin

volcengine-java-sdk-rocketmq/src/main/java/com/volcengine/rocketmq/RocketmqApi.java

@@ -20,11 +20,11 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import com.volcengine.rocketmq.model.ChargeDetailForDescribeInstanceDetailOutput;
+import com.volcengine.rocketmq.model.InstanceTagForDescribeInstanceDetailOutput;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.IOException;
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 /**
@@ -73,6 +73,9 @@ public class BasicInfoForDescribeInstanceDetailOutput {
   @SerializedName("InstanceStatus")
   private String instanceStatus = null;
 
+  @SerializedName("InstanceTags")
+  private List<InstanceTagForDescribeInstanceDetailOutput> instanceTags = null;
+
   @SerializedName("ProjectName")
   private String projectName = null;
 
@@ -88,9 +91,6 @@ public class BasicInfoForDescribeInstanceDetailOutput {
   @SerializedName("SubnetId")
   private String subnetId = null;
 
-  @SerializedName("Tags")
-  private Map<String, String> tags = null;
-
   @SerializedName("UsedGroupNumber")
   private Integer usedGroupNumber = null;
 
@@ -347,6 +347,33 @@ public void setInstanceStatus(String instanceStatus) {
     this.instanceStatus = instanceStatus;
   }
 
+  public BasicInfoForDescribeInstanceDetailOutput instanceTags(List<InstanceTagForDescribeInstanceDetailOutput> instanceTags) {
+    this.instanceTags = instanceTags;
+    return this;
+  }
+
+  public BasicInfoForDescribeInstanceDetailOutput addInstanceTagsItem(InstanceTagForDescribeInstanceDetailOutput instanceTagsItem) {
+    if (this.instanceTags == null) {
+      this.instanceTags = new ArrayList<InstanceTagForDescribeInstanceDetailOutput>();
+    }
+    this.instanceTags.add(instanceTagsItem);
+    return this;
+  }
+
+   /**
+   * Get instanceTags
+   * @return instanceTags
+  **/
+  @Valid
+  @Schema(description = "")
+  public List<InstanceTagForDescribeInstanceDetailOutput> getInstanceTags() {
+    return instanceTags;
+  }
+
+  public void setInstanceTags(List<InstanceTagForDescribeInstanceDetailOutput> instanceTags) {
+    this.instanceTags = instanceTags;
+  }
+
   public BasicInfoForDescribeInstanceDetailOutput projectName(String projectName) {
     this.projectName = projectName;
     return this;
@@ -437,32 +464,6 @@ public void setSubnetId(String subnetId) {
     this.subnetId = subnetId;
   }
 
-  public BasicInfoForDescribeInstanceDetailOutput tags(Map<String, String> tags) {
-    this.tags = tags;
-    return this;
-  }
-
-  public BasicInfoForDescribeInstanceDetailOutput putTagsItem(String key, String tagsItem) {
-    if (this.tags == null) {
-      this.tags = new HashMap<String, String>();
-    }
-    this.tags.put(key, tagsItem);
-    return this;
-  }
-
-   /**
-   * Get tags
-   * @return tags
-  **/
-  @Schema(description = "")
-  public Map<String, String> getTags() {
-    return tags;
-  }
-
-  public void setTags(Map<String, String> tags) {
-    this.tags = tags;
-  }
-
   public BasicInfoForDescribeInstanceDetailOutput usedGroupNumber(Integer usedGroupNumber) {
     this.usedGroupNumber = usedGroupNumber;
     return this;
@@ -612,12 +613,12 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.instanceId, basicInfoForDescribeInstanceDetailOutput.instanceId) &&
         Objects.equals(this.instanceName, basicInfoForDescribeInstanceDetailOutput.instanceName) &&
         Objects.equals(this.instanceStatus, basicInfoForDescribeInstanceDetailOutput.instanceStatus) &&
+        Objects.equals(this.instanceTags, basicInfoForDescribeInstanceDetailOutput.instanceTags) &&
         Objects.equals(this.projectName, basicInfoForDescribeInstanceDetailOutput.projectName) &&
         Objects.equals(this.regionId, basicInfoForDescribeInstanceDetailOutput.regionId) &&
         Objects.equals(this.ssLMode, basicInfoForDescribeInstanceDetailOutput.ssLMode) &&
         Objects.equals(this.storageSpace, basicInfoForDescribeInstanceDetailOutput.storageSpace) &&
         Objects.equals(this.subnetId, basicInfoForDescribeInstanceDetailOutput.subnetId) &&
-        Objects.equals(this.tags, basicInfoForDescribeInstanceDetailOutput.tags) &&
         Objects.equals(this.usedGroupNumber, basicInfoForDescribeInstanceDetailOutput.usedGroupNumber) &&
         Objects.equals(this.usedQueueNumber, basicInfoForDescribeInstanceDetailOutput.usedQueueNumber) &&
         Objects.equals(this.usedStorageSpace, basicInfoForDescribeInstanceDetailOutput.usedStorageSpace) &&
@@ -629,7 +630,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(accountId, applyPrivateDNSToPublic, availableQueueNumber, chargeDetail, computeSpec, createTime, eipId, enableSSL, fileReservedTime, instanceDescription, instanceId, instanceName, instanceStatus, projectName, regionId, ssLMode, storageSpace, subnetId, tags, usedGroupNumber, usedQueueNumber, usedStorageSpace, usedTopicNumber, version, vpcId, zoneId);
+    return Objects.hash(accountId, applyPrivateDNSToPublic, availableQueueNumber, chargeDetail, computeSpec, createTime, eipId, enableSSL, fileReservedTime, instanceDescription, instanceId, instanceName, instanceStatus, instanceTags, projectName, regionId, ssLMode, storageSpace, subnetId, usedGroupNumber, usedQueueNumber, usedStorageSpace, usedTopicNumber, version, vpcId, zoneId);
   }
 
 
@@ -651,12 +652,12 @@ public String toString() {
     sb.append("    instanceId: ").append(toIndentedString(instanceId)).append("\n");
     sb.append("    instanceName: ").append(toIndentedString(instanceName)).append("\n");
     sb.append("    instanceStatus: ").append(toIndentedString(instanceStatus)).append("\n");
+    sb.append("    instanceTags: ").append(toIndentedString(instanceTags)).append("\n");
     sb.append("    projectName: ").append(toIndentedString(projectName)).append("\n");
     sb.append("    regionId: ").append(toIndentedString(regionId)).append("\n");
     sb.append("    ssLMode: ").append(toIndentedString(ssLMode)).append("\n");
     sb.append("    storageSpace: ").append(toIndentedString(storageSpace)).append("\n");
     sb.append("    subnetId: ").append(toIndentedString(subnetId)).append("\n");
-    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    usedGroupNumber: ").append(toIndentedString(usedGroupNumber)).append("\n");
     sb.append("    usedQueueNumber: ").append(toIndentedString(usedQueueNumber)).append("\n");
     sb.append("    usedStorageSpace: ").append(toIndentedString(usedStorageSpace)).append("\n");

volcengine-java-sdk-rocketmq/src/main/java/com/volcengine/rocketmq/model/BasicInfoForDescribeInstanceDetailOutput.java

@@ -0,0 +1,117 @@
+/*
+ * rocketmq
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: common-version
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+package com.volcengine.rocketmq.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.IOException;
+import javax.validation.constraints.*;
+import javax.validation.Valid;
+/**
+ * BindTagForCreateInstanceInput
+ */
+
+
+
+public class BindTagForCreateInstanceInput {
+  @SerializedName("Key")
+  private String key = null;
+
+  @SerializedName("Value")
+  private String value = null;
+
+  public BindTagForCreateInstanceInput key(String key) {
+    this.key = key;
+    return this;
+  }
+
+   /**
+   * Get key
+   * @return key
+  **/
+  @Schema(description = "")
+  public String getKey() {
+    return key;
+  }
+
+  public void setKey(String key) {
+    this.key = key;
+  }
+
+  public BindTagForCreateInstanceInput value(String value) {
+    this.value = value;
+    return this;
+  }
+
+   /**
+   * Get value
+   * @return value
+  **/
+  @Schema(description = "")
+  public String getValue() {
+    return value;
+  }
+
+  public void setValue(String value) {
+    this.value = value;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    BindTagForCreateInstanceInput bindTagForCreateInstanceInput = (BindTagForCreateInstanceInput) o;
+    return Objects.equals(this.key, bindTagForCreateInstanceInput.key) &&
+        Objects.equals(this.value, bindTagForCreateInstanceInput.value);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(key, value);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class BindTagForCreateInstanceInput {\n");
+    
+    sb.append("    key: ").append(toIndentedString(key)).append("\n");
+    sb.append("    value: ").append(toIndentedString(value)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}