Merge branch 'redis-Java-2020-12-07-online-837-2024_12_10_20_36_08' into 'integration_2024-12-16_638911295234'

feat: [development task] Redis-837-Java (916202)

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

Author: BitsAdmin

volcengine-java-sdk-redis/src/main/java/com/volcengine/redis/RedisApi.java

@@ -19,8 +19,11 @@
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import com.volcengine.redis.model.SecurityGroupBindInfoForDescribeAllowListsOutput;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 /**
@@ -30,6 +33,52 @@
 
 
 public class AllowListForDescribeAllowListsOutput {
+  /**
+   * Gets or Sets allowListCategory
+   */
+  @JsonAdapter(AllowListCategoryEnum.Adapter.class)
+  public enum AllowListCategoryEnum {
+    @SerializedName("Ordinary")
+    ORDINARY("Ordinary"),
+    @SerializedName("Default")
+    DEFAULT("Default");
+
+    private String value;
+
+    AllowListCategoryEnum(String value) {
+      this.value = value;
+    }
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+    public static AllowListCategoryEnum fromValue(String input) {
+      for (AllowListCategoryEnum b : AllowListCategoryEnum.values()) {
+        if (b.value.equals(input)) {
+          return b;
+        }
+      }
+      return null;
+    }
+    public static class Adapter extends TypeAdapter<AllowListCategoryEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final AllowListCategoryEnum enumeration) throws IOException {
+        jsonWriter.value(String.valueOf(enumeration.getValue()));
+      }
+
+      @Override
+      public AllowListCategoryEnum read(final JsonReader jsonReader) throws IOException {
+        Object value = jsonReader.nextString();
+        return AllowListCategoryEnum.fromValue((String)(value));
+      }
+    }
+  }  @SerializedName("AllowListCategory")
+  private AllowListCategoryEnum allowListCategory = null;
+
   @SerializedName("AllowListDesc")
   private String allowListDesc = null;
 
@@ -48,6 +97,27 @@ public class AllowListForDescribeAllowListsOutput {
   @SerializedName("AssociatedInstanceNum")
   private Integer associatedInstanceNum = null;
 
+  @SerializedName("SecurityGroupBindInfos")
+  private List<SecurityGroupBindInfoForDescribeAllowListsOutput> securityGroupBindInfos = null;
+
+  public AllowListForDescribeAllowListsOutput allowListCategory(AllowListCategoryEnum allowListCategory) {
+    this.allowListCategory = allowListCategory;
+    return this;
+  }
+
+   /**
+   * Get allowListCategory
+   * @return allowListCategory
+  **/
+  @Schema(description = "")
+  public AllowListCategoryEnum getAllowListCategory() {
+    return allowListCategory;
+  }
+
+  public void setAllowListCategory(AllowListCategoryEnum allowListCategory) {
+    this.allowListCategory = allowListCategory;
+  }
+
   public AllowListForDescribeAllowListsOutput allowListDesc(String allowListDesc) {
     this.allowListDesc = allowListDesc;
     return this;
@@ -156,6 +226,33 @@ public void setAssociatedInstanceNum(Integer associatedInstanceNum) {
     this.associatedInstanceNum = associatedInstanceNum;
   }
 
+  public AllowListForDescribeAllowListsOutput securityGroupBindInfos(List<SecurityGroupBindInfoForDescribeAllowListsOutput> securityGroupBindInfos) {
+    this.securityGroupBindInfos = securityGroupBindInfos;
+    return this;
+  }
+
+  public AllowListForDescribeAllowListsOutput addSecurityGroupBindInfosItem(SecurityGroupBindInfoForDescribeAllowListsOutput securityGroupBindInfosItem) {
+    if (this.securityGroupBindInfos == null) {
+      this.securityGroupBindInfos = new ArrayList<SecurityGroupBindInfoForDescribeAllowListsOutput>();
+    }
+    this.securityGroupBindInfos.add(securityGroupBindInfosItem);
+    return this;
+  }
+
+   /**
+   * Get securityGroupBindInfos
+   * @return securityGroupBindInfos
+  **/
+  @Valid
+  @Schema(description = "")
+  public List<SecurityGroupBindInfoForDescribeAllowListsOutput> getSecurityGroupBindInfos() {
+    return securityGroupBindInfos;
+  }
+
+  public void setSecurityGroupBindInfos(List<SecurityGroupBindInfoForDescribeAllowListsOutput> securityGroupBindInfos) {
+    this.securityGroupBindInfos = securityGroupBindInfos;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -166,17 +263,19 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     AllowListForDescribeAllowListsOutput allowListForDescribeAllowListsOutput = (AllowListForDescribeAllowListsOutput) o;
-    return Objects.equals(this.allowListDesc, allowListForDescribeAllowListsOutput.allowListDesc) &&
+    return Objects.equals(this.allowListCategory, allowListForDescribeAllowListsOutput.allowListCategory) &&
+        Objects.equals(this.allowListDesc, allowListForDescribeAllowListsOutput.allowListDesc) &&
         Objects.equals(this.allowListIPNum, allowListForDescribeAllowListsOutput.allowListIPNum) &&
         Objects.equals(this.allowListId, allowListForDescribeAllowListsOutput.allowListId) &&
         Objects.equals(this.allowListName, allowListForDescribeAllowListsOutput.allowListName) &&
         Objects.equals(this.allowListType, allowListForDescribeAllowListsOutput.allowListType) &&
-        Objects.equals(this.associatedInstanceNum, allowListForDescribeAllowListsOutput.associatedInstanceNum);
+        Objects.equals(this.associatedInstanceNum, allowListForDescribeAllowListsOutput.associatedInstanceNum) &&
+        Objects.equals(this.securityGroupBindInfos, allowListForDescribeAllowListsOutput.securityGroupBindInfos);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(allowListDesc, allowListIPNum, allowListId, allowListName, allowListType, associatedInstanceNum);
+    return Objects.hash(allowListCategory, allowListDesc, allowListIPNum, allowListId, allowListName, allowListType, associatedInstanceNum, securityGroupBindInfos);
   }
 
 
@@ -185,12 +284,14 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class AllowListForDescribeAllowListsOutput {\n");
 
+    sb.append("    allowListCategory: ").append(toIndentedString(allowListCategory)).append("\n");
     sb.append("    allowListDesc: ").append(toIndentedString(allowListDesc)).append("\n");
     sb.append("    allowListIPNum: ").append(toIndentedString(allowListIPNum)).append("\n");
     sb.append("    allowListId: ").append(toIndentedString(allowListId)).append("\n");
     sb.append("    allowListName: ").append(toIndentedString(allowListName)).append("\n");
     sb.append("    allowListType: ").append(toIndentedString(allowListType)).append("\n");
     sb.append("    associatedInstanceNum: ").append(toIndentedString(associatedInstanceNum)).append("\n");
+    sb.append("    securityGroupBindInfos: ").append(toIndentedString(securityGroupBindInfos)).append("\n");
     sb.append("}");
     return sb.toString();
   }

volcengine-java-sdk-redis/src/main/java/com/volcengine/redis/model/AllowListForDescribeAllowListsOutput.java

@@ -0,0 +1,94 @@
+/*
+ * redis
+ * 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.redis.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;
+/**
+ * ConfigureNodeForDescribeDBInstanceDetailOutput
+ */
+
+
+
+public class ConfigureNodeForDescribeDBInstanceDetailOutput {
+  @SerializedName("AZ")
+  private String AZ = null;
+
+  public ConfigureNodeForDescribeDBInstanceDetailOutput AZ(String AZ) {
+    this.AZ = AZ;
+    return this;
+  }
+
+   /**
+   * Get AZ
+   * @return AZ
+  **/
+  @Schema(description = "")
+  public String getAZ() {
+    return AZ;
+  }
+
+  public void setAZ(String AZ) {
+    this.AZ = AZ;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ConfigureNodeForDescribeDBInstanceDetailOutput configureNodeForDescribeDBInstanceDetailOutput = (ConfigureNodeForDescribeDBInstanceDetailOutput) o;
+    return Objects.equals(this.AZ, configureNodeForDescribeDBInstanceDetailOutput.AZ);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(AZ);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ConfigureNodeForDescribeDBInstanceDetailOutput {\n");
+    
+    sb.append("    AZ: ").append(toIndentedString(AZ)).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    ");
+  }
+
+}

volcengine-java-sdk-redis/src/main/java/com/volcengine/redis/model/ConfigureNodeForDescribeDBInstanceDetailOutput.java

@@ -19,8 +19,11 @@
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import com.volcengine.redis.model.SecurityGroupBindInfoForCreateAllowListInput;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 /**
@@ -91,6 +94,9 @@ public AllowListCategoryEnum read(final JsonReader jsonReader) throws IOExceptio
   @SerializedName("ClientToken")
   private String clientToken = null;
 
+  @SerializedName("SecurityGroupBindInfos")
+  private List<SecurityGroupBindInfoForCreateAllowListInput> securityGroupBindInfos = null;
+
   public CreateAllowListRequest allowList(String allowList) {
     this.allowList = allowList;
     return this;
@@ -100,8 +106,7 @@ public CreateAllowListRequest allowList(String allowList) {
    * Get allowList
    * @return allowList
   **/
-  @NotNull
-  @Schema(required = true, description = "")
+  @Schema(description = "")
   public String getAllowList() {
     return allowList;
   }
@@ -201,6 +206,33 @@ public void setClientToken(String clientToken) {
     this.clientToken = clientToken;
   }
 
+  public CreateAllowListRequest securityGroupBindInfos(List<SecurityGroupBindInfoForCreateAllowListInput> securityGroupBindInfos) {
+    this.securityGroupBindInfos = securityGroupBindInfos;
+    return this;
+  }
+
+  public CreateAllowListRequest addSecurityGroupBindInfosItem(SecurityGroupBindInfoForCreateAllowListInput securityGroupBindInfosItem) {
+    if (this.securityGroupBindInfos == null) {
+      this.securityGroupBindInfos = new ArrayList<SecurityGroupBindInfoForCreateAllowListInput>();
+    }
+    this.securityGroupBindInfos.add(securityGroupBindInfosItem);
+    return this;
+  }
+
+   /**
+   * Get securityGroupBindInfos
+   * @return securityGroupBindInfos
+  **/
+  @Valid
+  @Schema(description = "")
+  public List<SecurityGroupBindInfoForCreateAllowListInput> getSecurityGroupBindInfos() {
+    return securityGroupBindInfos;
+  }
+
+  public void setSecurityGroupBindInfos(List<SecurityGroupBindInfoForCreateAllowListInput> securityGroupBindInfos) {
+    this.securityGroupBindInfos = securityGroupBindInfos;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -216,12 +248,13 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.allowListDesc, createAllowListRequest.allowListDesc) &&
         Objects.equals(this.allowListName, createAllowListRequest.allowListName) &&
         Objects.equals(this.allowListType, createAllowListRequest.allowListType) &&
-        Objects.equals(this.clientToken, createAllowListRequest.clientToken);
+        Objects.equals(this.clientToken, createAllowListRequest.clientToken) &&
+        Objects.equals(this.securityGroupBindInfos, createAllowListRequest.securityGroupBindInfos);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(allowList, allowListCategory, allowListDesc, allowListName, allowListType, clientToken);
+    return Objects.hash(allowList, allowListCategory, allowListDesc, allowListName, allowListType, clientToken, securityGroupBindInfos);
   }
 
 
@@ -236,6 +269,7 @@ public String toString() {
     sb.append("    allowListName: ").append(toIndentedString(allowListName)).append("\n");
     sb.append("    allowListType: ").append(toIndentedString(allowListType)).append("\n");
     sb.append("    clientToken: ").append(toIndentedString(clientToken)).append("\n");
+    sb.append("    securityGroupBindInfos: ").append(toIndentedString(securityGroupBindInfos)).append("\n");
     sb.append("}");
     return sb.toString();
   }