Merge branch 'clb-Java-2020-04-01-online-973-2025_02_17_20_17_40' into 'integration_2025-02-20_759260291074'

feat: [development task] clb-973-Java (1027514)

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

Author: BitsAdmin

volcengine-java-sdk-clb/src/main/java/com/volcengine/clb/model/CreateListenerRequest.java

@@ -46,6 +46,12 @@ public class CreateListenerRequest {
   @SerializedName("Bandwidth")
   private Integer bandwidth = null;
 
+  @SerializedName("CACertificateId")
+  private String caCertificateId = null;
+
+  @SerializedName("CAEnabled")
+  private String caEnabled = null;
+
   @SerializedName("CertCenterCertificateId")
   private String certCenterCertificateId = null;
 
@@ -219,6 +225,42 @@ public void setBandwidth(Integer bandwidth) {
     this.bandwidth = bandwidth;
   }
 
+  public CreateListenerRequest caCertificateId(String caCertificateId) {
+    this.caCertificateId = caCertificateId;
+    return this;
+  }
+
+   /**
+   * Get caCertificateId
+   * @return caCertificateId
+  **/
+  @Schema(description = "")
+  public String getCaCertificateId() {
+    return caCertificateId;
+  }
+
+  public void setCaCertificateId(String caCertificateId) {
+    this.caCertificateId = caCertificateId;
+  }
+
+  public CreateListenerRequest caEnabled(String caEnabled) {
+    this.caEnabled = caEnabled;
+    return this;
+  }
+
+   /**
+   * Get caEnabled
+   * @return caEnabled
+  **/
+  @Schema(description = "")
+  public String getCaEnabled() {
+    return caEnabled;
+  }
+
+  public void setCaEnabled(String caEnabled) {
+    this.caEnabled = caEnabled;
+  }
+
   public CreateListenerRequest certCenterCertificateId(String certCenterCertificateId) {
     this.certCenterCertificateId = certCenterCertificateId;
     return this;
@@ -805,6 +847,8 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.aclStatus, createListenerRequest.aclStatus) &&
         Objects.equals(this.aclType, createListenerRequest.aclType) &&
         Objects.equals(this.bandwidth, createListenerRequest.bandwidth) &&
+        Objects.equals(this.caCertificateId, createListenerRequest.caCertificateId) &&
+        Objects.equals(this.caEnabled, createListenerRequest.caEnabled) &&
         Objects.equals(this.certCenterCertificateId, createListenerRequest.certCenterCertificateId) &&
         Objects.equals(this.certificateId, createListenerRequest.certificateId) &&
         Objects.equals(this.certificateSource, createListenerRequest.certificateSource) &&
@@ -840,7 +884,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(aclIds, aclStatus, aclType, bandwidth, certCenterCertificateId, certificateId, certificateSource, clientBodyTimeout, clientHeaderTimeout, connectionDrainEnabled, connectionDrainTimeout, cookie, description, enabled, endPort, establishedTimeout, healthCheck, http2Enabled, keepaliveTimeout, listenerName, loadBalancerId, persistenceTimeout, persistenceType, port, protocol, proxyConnectTimeout, proxyProtocolType, proxyReadTimeout, proxySendTimeout, scheduler, securityPolicyId, sendTimeout, serverGroupId, startPort, tags);
+    return Objects.hash(aclIds, aclStatus, aclType, bandwidth, caCertificateId, caEnabled, certCenterCertificateId, certificateId, certificateSource, clientBodyTimeout, clientHeaderTimeout, connectionDrainEnabled, connectionDrainTimeout, cookie, description, enabled, endPort, establishedTimeout, healthCheck, http2Enabled, keepaliveTimeout, listenerName, loadBalancerId, persistenceTimeout, persistenceType, port, protocol, proxyConnectTimeout, proxyProtocolType, proxyReadTimeout, proxySendTimeout, scheduler, securityPolicyId, sendTimeout, serverGroupId, startPort, tags);
   }
 
 
@@ -853,6 +897,8 @@ public String toString() {
     sb.append("    aclStatus: ").append(toIndentedString(aclStatus)).append("\n");
     sb.append("    aclType: ").append(toIndentedString(aclType)).append("\n");
     sb.append("    bandwidth: ").append(toIndentedString(bandwidth)).append("\n");
+    sb.append("    caCertificateId: ").append(toIndentedString(caCertificateId)).append("\n");
+    sb.append("    caEnabled: ").append(toIndentedString(caEnabled)).append("\n");
     sb.append("    certCenterCertificateId: ").append(toIndentedString(certCenterCertificateId)).append("\n");
     sb.append("    certificateId: ").append(toIndentedString(certificateId)).append("\n");
     sb.append("    certificateSource: ").append(toIndentedString(certificateSource)).append("\n");

volcengine-java-sdk-clb/src/main/java/com/volcengine/clb/model/DeleteLoadBalancerRequest.java

@@ -30,9 +30,30 @@
 
 
 public class DeleteLoadBalancerRequest {
+  @SerializedName("ForceDelete")
+  private Boolean forceDelete = null;
+
   @SerializedName("LoadBalancerId")
   private String loadBalancerId = null;
 
+  public DeleteLoadBalancerRequest forceDelete(Boolean forceDelete) {
+    this.forceDelete = forceDelete;
+    return this;
+  }
+
+   /**
+   * Get forceDelete
+   * @return forceDelete
+  **/
+  @Schema(description = "")
+  public Boolean isForceDelete() {
+    return forceDelete;
+  }
+
+  public void setForceDelete(Boolean forceDelete) {
+    this.forceDelete = forceDelete;
+  }
+
   public DeleteLoadBalancerRequest loadBalancerId(String loadBalancerId) {
     this.loadBalancerId = loadBalancerId;
     return this;
@@ -62,12 +83,13 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     DeleteLoadBalancerRequest deleteLoadBalancerRequest = (DeleteLoadBalancerRequest) o;
-    return Objects.equals(this.loadBalancerId, deleteLoadBalancerRequest.loadBalancerId);
+    return Objects.equals(this.forceDelete, deleteLoadBalancerRequest.forceDelete) &&
+        Objects.equals(this.loadBalancerId, deleteLoadBalancerRequest.loadBalancerId);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(loadBalancerId);
+    return Objects.hash(forceDelete, loadBalancerId);
   }
 
 
@@ -76,6 +98,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class DeleteLoadBalancerRequest {\n");
 
+    sb.append("    forceDelete: ").append(toIndentedString(forceDelete)).append("\n");
     sb.append("    loadBalancerId: ").append(toIndentedString(loadBalancerId)).append("\n");
     sb.append("}");
     return sb.toString();

volcengine-java-sdk-clb/src/main/java/com/volcengine/clb/model/DescribeListenerAttributesResponse.java

@@ -46,6 +46,12 @@ public class DescribeListenerAttributesResponse extends com.volcengine.model.Abs
   @SerializedName("Bandwidth")
   private Integer bandwidth = null;
 
+  @SerializedName("CACertificateId")
+  private String caCertificateId = null;
+
+  @SerializedName("CAEnabled")
+  private String caEnabled = null;
+
   @SerializedName("CertCenterCertificateId")
   private String certCenterCertificateId = null;
 
@@ -157,6 +163,9 @@ public class DescribeListenerAttributesResponse extends com.volcengine.model.Abs
   @SerializedName("UpdateTime")
   private String updateTime = null;
 
+  @SerializedName("WafProtectionEnabled")
+  private String wafProtectionEnabled = null;
+
   public DescribeListenerAttributesResponse aclIds(List<String> aclIds) {
     this.aclIds = aclIds;
     return this;
@@ -237,6 +246,42 @@ public void setBandwidth(Integer bandwidth) {
     this.bandwidth = bandwidth;
   }
 
+  public DescribeListenerAttributesResponse caCertificateId(String caCertificateId) {
+    this.caCertificateId = caCertificateId;
+    return this;
+  }
+
+   /**
+   * Get caCertificateId
+   * @return caCertificateId
+  **/
+  @Schema(description = "")
+  public String getCaCertificateId() {
+    return caCertificateId;
+  }
+
+  public void setCaCertificateId(String caCertificateId) {
+    this.caCertificateId = caCertificateId;
+  }
+
+  public DescribeListenerAttributesResponse caEnabled(String caEnabled) {
+    this.caEnabled = caEnabled;
+    return this;
+  }
+
+   /**
+   * Get caEnabled
+   * @return caEnabled
+  **/
+  @Schema(description = "")
+  public String getCaEnabled() {
+    return caEnabled;
+  }
+
+  public void setCaEnabled(String caEnabled) {
+    this.caEnabled = caEnabled;
+  }
+
   public DescribeListenerAttributesResponse certCenterCertificateId(String certCenterCertificateId) {
     this.certCenterCertificateId = certCenterCertificateId;
     return this;
@@ -913,6 +958,24 @@ public void setUpdateTime(String updateTime) {
     this.updateTime = updateTime;
   }
 
+  public DescribeListenerAttributesResponse wafProtectionEnabled(String wafProtectionEnabled) {
+    this.wafProtectionEnabled = wafProtectionEnabled;
+    return this;
+  }
+
+   /**
+   * Get wafProtectionEnabled
+   * @return wafProtectionEnabled
+  **/
+  @Schema(description = "")
+  public String getWafProtectionEnabled() {
+    return wafProtectionEnabled;
+  }
+
+  public void setWafProtectionEnabled(String wafProtectionEnabled) {
+    this.wafProtectionEnabled = wafProtectionEnabled;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -927,6 +990,8 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.aclStatus, describeListenerAttributesResponse.aclStatus) &&
         Objects.equals(this.aclType, describeListenerAttributesResponse.aclType) &&
         Objects.equals(this.bandwidth, describeListenerAttributesResponse.bandwidth) &&
+        Objects.equals(this.caCertificateId, describeListenerAttributesResponse.caCertificateId) &&
+        Objects.equals(this.caEnabled, describeListenerAttributesResponse.caEnabled) &&
         Objects.equals(this.certCenterCertificateId, describeListenerAttributesResponse.certCenterCertificateId) &&
         Objects.equals(this.certificateId, describeListenerAttributesResponse.certificateId) &&
         Objects.equals(this.certificateSource, describeListenerAttributesResponse.certificateSource) &&
@@ -963,12 +1028,13 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.startPort, describeListenerAttributesResponse.startPort) &&
         Objects.equals(this.status, describeListenerAttributesResponse.status) &&
         Objects.equals(this.tags, describeListenerAttributesResponse.tags) &&
-        Objects.equals(this.updateTime, describeListenerAttributesResponse.updateTime);
+        Objects.equals(this.updateTime, describeListenerAttributesResponse.updateTime) &&
+        Objects.equals(this.wafProtectionEnabled, describeListenerAttributesResponse.wafProtectionEnabled);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(aclIds, aclStatus, aclType, bandwidth, certCenterCertificateId, certificateId, certificateSource, clientBodyTimeout, clientHeaderTimeout, connectionDrainEnabled, connectionDrainTimeout, cookie, createTime, description, enabled, endPort, establishedTimeout, healthCheck, http2Enabled, keepaliveTimeout, listenerId, listenerName, loadBalancerId, persistenceTimeout, persistenceType, port, protocol, proxyConnectTimeout, proxyProtocolType, proxyReadTimeout, proxySendTimeout, requestId, responseCheckEnabled, scheduler, securityPolicyId, sendTimeout, serverGroupId, startPort, status, tags, updateTime);
+    return Objects.hash(aclIds, aclStatus, aclType, bandwidth, caCertificateId, caEnabled, certCenterCertificateId, certificateId, certificateSource, clientBodyTimeout, clientHeaderTimeout, connectionDrainEnabled, connectionDrainTimeout, cookie, createTime, description, enabled, endPort, establishedTimeout, healthCheck, http2Enabled, keepaliveTimeout, listenerId, listenerName, loadBalancerId, persistenceTimeout, persistenceType, port, protocol, proxyConnectTimeout, proxyProtocolType, proxyReadTimeout, proxySendTimeout, requestId, responseCheckEnabled, scheduler, securityPolicyId, sendTimeout, serverGroupId, startPort, status, tags, updateTime, wafProtectionEnabled);
   }
 
 
@@ -981,6 +1047,8 @@ public String toString() {
     sb.append("    aclStatus: ").append(toIndentedString(aclStatus)).append("\n");
     sb.append("    aclType: ").append(toIndentedString(aclType)).append("\n");
     sb.append("    bandwidth: ").append(toIndentedString(bandwidth)).append("\n");
+    sb.append("    caCertificateId: ").append(toIndentedString(caCertificateId)).append("\n");
+    sb.append("    caEnabled: ").append(toIndentedString(caEnabled)).append("\n");
     sb.append("    certCenterCertificateId: ").append(toIndentedString(certCenterCertificateId)).append("\n");
     sb.append("    certificateId: ").append(toIndentedString(certificateId)).append("\n");
     sb.append("    certificateSource: ").append(toIndentedString(certificateSource)).append("\n");
@@ -1018,6 +1086,7 @@ public String toString() {
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    updateTime: ").append(toIndentedString(updateTime)).append("\n");
+    sb.append("    wafProtectionEnabled: ").append(toIndentedString(wafProtectionEnabled)).append("\n");
     sb.append("}");
     return sb.toString();
   }

volcengine-java-sdk-clb/src/main/java/com/volcengine/clb/model/DescribeRulesRequest.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.clb.model.TagFilterForDescribeRulesInput;
 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;
 /**
@@ -33,6 +36,9 @@ public class DescribeRulesRequest {
   @SerializedName("ListenerId")
   private String listenerId = null;
 
+  @SerializedName("TagFilters")
+  private List<TagFilterForDescribeRulesInput> tagFilters = null;
+
   public DescribeRulesRequest listenerId(String listenerId) {
     this.listenerId = listenerId;
     return this;
@@ -52,6 +58,33 @@ public void setListenerId(String listenerId) {
     this.listenerId = listenerId;
   }
 
+  public DescribeRulesRequest tagFilters(List<TagFilterForDescribeRulesInput> tagFilters) {
+    this.tagFilters = tagFilters;
+    return this;
+  }
+
+  public DescribeRulesRequest addTagFiltersItem(TagFilterForDescribeRulesInput tagFiltersItem) {
+    if (this.tagFilters == null) {
+      this.tagFilters = new ArrayList<TagFilterForDescribeRulesInput>();
+    }
+    this.tagFilters.add(tagFiltersItem);
+    return this;
+  }
+
+   /**
+   * Get tagFilters
+   * @return tagFilters
+  **/
+  @Valid
+  @Schema(description = "")
+  public List<TagFilterForDescribeRulesInput> getTagFilters() {
+    return tagFilters;
+  }
+
+  public void setTagFilters(List<TagFilterForDescribeRulesInput> tagFilters) {
+    this.tagFilters = tagFilters;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -62,12 +95,13 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     DescribeRulesRequest describeRulesRequest = (DescribeRulesRequest) o;
-    return Objects.equals(this.listenerId, describeRulesRequest.listenerId);
+    return Objects.equals(this.listenerId, describeRulesRequest.listenerId) &&
+        Objects.equals(this.tagFilters, describeRulesRequest.tagFilters);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(listenerId);
+    return Objects.hash(listenerId, tagFilters);
   }
 
 
@@ -77,6 +111,7 @@ public String toString() {
     sb.append("class DescribeRulesRequest {\n");
 
     sb.append("    listenerId: ").append(toIndentedString(listenerId)).append("\n");
+    sb.append("    tagFilters: ").append(toIndentedString(tagFilters)).append("\n");
     sb.append("}");
     return sb.toString();
   }

volcengine-java-sdk-clb/src/main/java/com/volcengine/clb/model/ListTagsForResourcesRequest.java

@@ -56,7 +56,11 @@ public enum ResourceTypeEnum {
     @SerializedName("listener")
     LISTENER("listener"),
     @SerializedName("servergroup")
-    SERVERGROUP("servergroup");
+    SERVERGROUP("servergroup"),
+    @SerializedName("rule")
+    RULE("rule"),
+    @SerializedName("ec")
+    EC("ec");
 
     private String value;