Merge branch 'master' into 'for_iaas_3.10.0'

feat: rebase Master

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

Author: xuyaming0800

volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/VkeApi.java

@@ -29,7 +29,7 @@
  * ApiServerEndpointsForListClustersOutput
  */
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-07-15T17:10:54.001539+08:00[Asia/Shanghai]")
+@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-09-19T12:20:19.967862+08:00[Asia/Shanghai]")
 public class ApiServerEndpointsForListClustersOutput {
   @SerializedName("PrivateIp")
   private PrivateIpForListClustersOutput privateIp = null;

volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/ApiServerEndpointsForListClustersOutput.java

@@ -28,7 +28,7 @@
  * ApiServerPublicAccessConfigForCreateClusterInput
  */
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-07-15T17:10:54.001539+08:00[Asia/Shanghai]")
+@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-09-19T12:20:19.967862+08:00[Asia/Shanghai]")
 public class ApiServerPublicAccessConfigForCreateClusterInput {
   @SerializedName("PublicAccessNetworkConfig")
   private PublicAccessNetworkConfigForCreateClusterInput publicAccessNetworkConfig = null;

volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/ApiServerPublicAccessConfigForCreateClusterInput.java

@@ -22,17 +22,48 @@
 import com.volcengine.vke.model.PublicAccessNetworkConfigForListClustersOutput;
 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;
 /**
  * ApiServerPublicAccessConfigForListClustersOutput
  */
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-07-15T17:10:54.001539+08:00[Asia/Shanghai]")
+@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-09-19T12:20:19.967862+08:00[Asia/Shanghai]")
 public class ApiServerPublicAccessConfigForListClustersOutput {
+  @SerializedName("AccessSourceIpsv4")
+  private List<String> accessSourceIpsv4 = null;
+
   @SerializedName("PublicAccessNetworkConfig")
   private PublicAccessNetworkConfigForListClustersOutput publicAccessNetworkConfig = null;
 
+  public ApiServerPublicAccessConfigForListClustersOutput accessSourceIpsv4(List<String> accessSourceIpsv4) {
+    this.accessSourceIpsv4 = accessSourceIpsv4;
+    return this;
+  }
+
+  public ApiServerPublicAccessConfigForListClustersOutput addAccessSourceIpsv4Item(String accessSourceIpsv4Item) {
+    if (this.accessSourceIpsv4 == null) {
+      this.accessSourceIpsv4 = new ArrayList<String>();
+    }
+    this.accessSourceIpsv4.add(accessSourceIpsv4Item);
+    return this;
+  }
+
+   /**
+   * Get accessSourceIpsv4
+   * @return accessSourceIpsv4
+  **/
+  @Schema(description = "")
+  public List<String> getAccessSourceIpsv4() {
+    return accessSourceIpsv4;
+  }
+
+  public void setAccessSourceIpsv4(List<String> accessSourceIpsv4) {
+    this.accessSourceIpsv4 = accessSourceIpsv4;
+  }
+
   public ApiServerPublicAccessConfigForListClustersOutput publicAccessNetworkConfig(PublicAccessNetworkConfigForListClustersOutput publicAccessNetworkConfig) {
     this.publicAccessNetworkConfig = publicAccessNetworkConfig;
     return this;
@@ -62,12 +93,13 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     ApiServerPublicAccessConfigForListClustersOutput apiServerPublicAccessConfigForListClustersOutput = (ApiServerPublicAccessConfigForListClustersOutput) o;
-    return Objects.equals(this.publicAccessNetworkConfig, apiServerPublicAccessConfigForListClustersOutput.publicAccessNetworkConfig);
+    return Objects.equals(this.accessSourceIpsv4, apiServerPublicAccessConfigForListClustersOutput.accessSourceIpsv4) &&
+        Objects.equals(this.publicAccessNetworkConfig, apiServerPublicAccessConfigForListClustersOutput.publicAccessNetworkConfig);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(publicAccessNetworkConfig);
+    return Objects.hash(accessSourceIpsv4, publicAccessNetworkConfig);
   }
 
 
@@ -76,6 +108,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ApiServerPublicAccessConfigForListClustersOutput {\n");
 
+    sb.append("    accessSourceIpsv4: ").append(toIndentedString(accessSourceIpsv4)).append("\n");
     sb.append("    publicAccessNetworkConfig: ").append(toIndentedString(publicAccessNetworkConfig)).append("\n");
     sb.append("}");
     return sb.toString();

volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/ApiServerPublicAccessConfigForListClustersOutput.java

@@ -28,7 +28,7 @@
  * ApiServerPublicAccessConfigForUpdateClusterConfigInput
  */
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-07-15T17:10:54.001539+08:00[Asia/Shanghai]")
+@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-09-19T12:20:19.967862+08:00[Asia/Shanghai]")
 public class ApiServerPublicAccessConfigForUpdateClusterConfigInput {
   @SerializedName("PublicAccessNetworkConfig")
   private PublicAccessNetworkConfigForUpdateClusterConfigInput publicAccessNetworkConfig = null;

volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/ApiServerPublicAccessConfigForUpdateClusterConfigInput.java

@@ -27,7 +27,7 @@
  * AutoScalingForCreateNodePoolInput
  */
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-07-15T17:10:54.001539+08:00[Asia/Shanghai]")
+@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-09-19T12:20:19.967862+08:00[Asia/Shanghai]")
 public class AutoScalingForCreateNodePoolInput {
   @SerializedName("DesiredReplicas")
   private Integer desiredReplicas = null;

volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/AutoScalingForCreateNodePoolInput.java

@@ -27,7 +27,7 @@
  * AutoScalingForListNodePoolsOutput
  */
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-07-15T17:10:54.001539+08:00[Asia/Shanghai]")
+@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-09-19T12:20:19.967862+08:00[Asia/Shanghai]")
 public class AutoScalingForListNodePoolsOutput {
   @SerializedName("DesiredReplicas")
   private Integer desiredReplicas = null;

volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/AutoScalingForListNodePoolsOutput.java

@@ -27,7 +27,7 @@
  * AutoScalingForUpdateNodePoolConfigInput
  */
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-07-15T17:10:54.001539+08:00[Asia/Shanghai]")
+@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-09-19T12:20:19.967862+08:00[Asia/Shanghai]")
 public class AutoScalingForUpdateNodePoolConfigInput {
   @SerializedName("DesiredReplicas")
   private Integer desiredReplicas = null;

volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/AutoScalingForUpdateNodePoolConfigInput.java

@@ -30,7 +30,7 @@
  * ClusterConfigForCreateClusterInput
  */
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-07-15T17:10:54.001539+08:00[Asia/Shanghai]")
+@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-09-19T12:20:19.967862+08:00[Asia/Shanghai]")
 public class ClusterConfigForCreateClusterInput {
   @SerializedName("ApiServerPublicAccessConfig")
   private ApiServerPublicAccessConfigForCreateClusterInput apiServerPublicAccessConfig = null;

volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/ClusterConfigForCreateClusterInput.java

@@ -31,7 +31,7 @@
  * ClusterConfigForListClustersOutput
  */
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-07-15T17:10:54.001539+08:00[Asia/Shanghai]")
+@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-09-19T12:20:19.967862+08:00[Asia/Shanghai]")
 public class ClusterConfigForListClustersOutput {
   @SerializedName("ApiServerEndpoints")
   private ApiServerEndpointsForListClustersOutput apiServerEndpoints = null;