Skip to content

Commit a771cfe

Browse files
author
BitsAdmin
committed
Merge branch 'clb-Java-2020-04-01-online-844-2024_12_16_14_30_41' into 'integration_2024-12-23_649936414466'
feat: [development task] clb-844-Java (929706) See merge request iaasng/volcengine-java-sdk!328
2 parents 61c52ff + 60f2156 commit a771cfe

File tree

7 files changed

+306
-7
lines changed

7 files changed

+306
-7
lines changed

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

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,15 @@ public class CreateListenerRequest {
4646
@SerializedName("Bandwidth")
4747
private Integer bandwidth = null;
4848

49+
@SerializedName("CertCenterCertificateId")
50+
private String certCenterCertificateId = null;
51+
4952
@SerializedName("CertificateId")
5053
private String certificateId = null;
5154

55+
@SerializedName("CertificateSource")
56+
private String certificateSource = null;
57+
5258
@SerializedName("ClientBodyTimeout")
5359
private Integer clientBodyTimeout = null;
5460

@@ -213,6 +219,24 @@ public void setBandwidth(Integer bandwidth) {
213219
this.bandwidth = bandwidth;
214220
}
215221

222+
public CreateListenerRequest certCenterCertificateId(String certCenterCertificateId) {
223+
this.certCenterCertificateId = certCenterCertificateId;
224+
return this;
225+
}
226+
227+
/**
228+
* Get certCenterCertificateId
229+
* @return certCenterCertificateId
230+
**/
231+
@Schema(description = "")
232+
public String getCertCenterCertificateId() {
233+
return certCenterCertificateId;
234+
}
235+
236+
public void setCertCenterCertificateId(String certCenterCertificateId) {
237+
this.certCenterCertificateId = certCenterCertificateId;
238+
}
239+
216240
public CreateListenerRequest certificateId(String certificateId) {
217241
this.certificateId = certificateId;
218242
return this;
@@ -231,6 +255,24 @@ public void setCertificateId(String certificateId) {
231255
this.certificateId = certificateId;
232256
}
233257

258+
public CreateListenerRequest certificateSource(String certificateSource) {
259+
this.certificateSource = certificateSource;
260+
return this;
261+
}
262+
263+
/**
264+
* Get certificateSource
265+
* @return certificateSource
266+
**/
267+
@Schema(description = "")
268+
public String getCertificateSource() {
269+
return certificateSource;
270+
}
271+
272+
public void setCertificateSource(String certificateSource) {
273+
this.certificateSource = certificateSource;
274+
}
275+
234276
public CreateListenerRequest clientBodyTimeout(Integer clientBodyTimeout) {
235277
this.clientBodyTimeout = clientBodyTimeout;
236278
return this;
@@ -763,7 +805,9 @@ public boolean equals(java.lang.Object o) {
763805
Objects.equals(this.aclStatus, createListenerRequest.aclStatus) &&
764806
Objects.equals(this.aclType, createListenerRequest.aclType) &&
765807
Objects.equals(this.bandwidth, createListenerRequest.bandwidth) &&
808+
Objects.equals(this.certCenterCertificateId, createListenerRequest.certCenterCertificateId) &&
766809
Objects.equals(this.certificateId, createListenerRequest.certificateId) &&
810+
Objects.equals(this.certificateSource, createListenerRequest.certificateSource) &&
767811
Objects.equals(this.clientBodyTimeout, createListenerRequest.clientBodyTimeout) &&
768812
Objects.equals(this.clientHeaderTimeout, createListenerRequest.clientHeaderTimeout) &&
769813
Objects.equals(this.connectionDrainEnabled, createListenerRequest.connectionDrainEnabled) &&
@@ -796,7 +840,7 @@ public boolean equals(java.lang.Object o) {
796840

797841
@Override
798842
public int hashCode() {
799-
return Objects.hash(aclIds, aclStatus, aclType, bandwidth, certificateId, 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);
843+
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);
800844
}
801845

802846

@@ -809,7 +853,9 @@ public String toString() {
809853
sb.append(" aclStatus: ").append(toIndentedString(aclStatus)).append("\n");
810854
sb.append(" aclType: ").append(toIndentedString(aclType)).append("\n");
811855
sb.append(" bandwidth: ").append(toIndentedString(bandwidth)).append("\n");
856+
sb.append(" certCenterCertificateId: ").append(toIndentedString(certCenterCertificateId)).append("\n");
812857
sb.append(" certificateId: ").append(toIndentedString(certificateId)).append("\n");
858+
sb.append(" certificateSource: ").append(toIndentedString(certificateSource)).append("\n");
813859
sb.append(" clientBodyTimeout: ").append(toIndentedString(clientBodyTimeout)).append("\n");
814860
sb.append(" clientHeaderTimeout: ").append(toIndentedString(clientHeaderTimeout)).append("\n");
815861
sb.append(" connectionDrainEnabled: ").append(toIndentedString(connectionDrainEnabled)).append("\n");

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

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,15 @@ public class DescribeListenerAttributesResponse extends com.volcengine.model.Abs
4646
@SerializedName("Bandwidth")
4747
private Integer bandwidth = null;
4848

49+
@SerializedName("CertCenterCertificateId")
50+
private String certCenterCertificateId = null;
51+
4952
@SerializedName("CertificateId")
5053
private String certificateId = null;
5154

55+
@SerializedName("CertificateSource")
56+
private String certificateSource = null;
57+
5258
@SerializedName("ClientBodyTimeout")
5359
private Integer clientBodyTimeout = null;
5460

@@ -124,6 +130,9 @@ public class DescribeListenerAttributesResponse extends com.volcengine.model.Abs
124130
@SerializedName("RequestId")
125131
private String requestId = null;
126132

133+
@SerializedName("ResponseCheckEnabled")
134+
private String responseCheckEnabled = null;
135+
127136
@SerializedName("Scheduler")
128137
private String scheduler = null;
129138

@@ -228,6 +237,24 @@ public void setBandwidth(Integer bandwidth) {
228237
this.bandwidth = bandwidth;
229238
}
230239

240+
public DescribeListenerAttributesResponse certCenterCertificateId(String certCenterCertificateId) {
241+
this.certCenterCertificateId = certCenterCertificateId;
242+
return this;
243+
}
244+
245+
/**
246+
* Get certCenterCertificateId
247+
* @return certCenterCertificateId
248+
**/
249+
@Schema(description = "")
250+
public String getCertCenterCertificateId() {
251+
return certCenterCertificateId;
252+
}
253+
254+
public void setCertCenterCertificateId(String certCenterCertificateId) {
255+
this.certCenterCertificateId = certCenterCertificateId;
256+
}
257+
231258
public DescribeListenerAttributesResponse certificateId(String certificateId) {
232259
this.certificateId = certificateId;
233260
return this;
@@ -246,6 +273,24 @@ public void setCertificateId(String certificateId) {
246273
this.certificateId = certificateId;
247274
}
248275

276+
public DescribeListenerAttributesResponse certificateSource(String certificateSource) {
277+
this.certificateSource = certificateSource;
278+
return this;
279+
}
280+
281+
/**
282+
* Get certificateSource
283+
* @return certificateSource
284+
**/
285+
@Schema(description = "")
286+
public String getCertificateSource() {
287+
return certificateSource;
288+
}
289+
290+
public void setCertificateSource(String certificateSource) {
291+
this.certificateSource = certificateSource;
292+
}
293+
249294
public DescribeListenerAttributesResponse clientBodyTimeout(Integer clientBodyTimeout) {
250295
this.clientBodyTimeout = clientBodyTimeout;
251296
return this;
@@ -697,6 +742,24 @@ public void setRequestId(String requestId) {
697742
this.requestId = requestId;
698743
}
699744

745+
public DescribeListenerAttributesResponse responseCheckEnabled(String responseCheckEnabled) {
746+
this.responseCheckEnabled = responseCheckEnabled;
747+
return this;
748+
}
749+
750+
/**
751+
* Get responseCheckEnabled
752+
* @return responseCheckEnabled
753+
**/
754+
@Schema(description = "")
755+
public String getResponseCheckEnabled() {
756+
return responseCheckEnabled;
757+
}
758+
759+
public void setResponseCheckEnabled(String responseCheckEnabled) {
760+
this.responseCheckEnabled = responseCheckEnabled;
761+
}
762+
700763
public DescribeListenerAttributesResponse scheduler(String scheduler) {
701764
this.scheduler = scheduler;
702765
return this;
@@ -864,7 +927,9 @@ public boolean equals(java.lang.Object o) {
864927
Objects.equals(this.aclStatus, describeListenerAttributesResponse.aclStatus) &&
865928
Objects.equals(this.aclType, describeListenerAttributesResponse.aclType) &&
866929
Objects.equals(this.bandwidth, describeListenerAttributesResponse.bandwidth) &&
930+
Objects.equals(this.certCenterCertificateId, describeListenerAttributesResponse.certCenterCertificateId) &&
867931
Objects.equals(this.certificateId, describeListenerAttributesResponse.certificateId) &&
932+
Objects.equals(this.certificateSource, describeListenerAttributesResponse.certificateSource) &&
868933
Objects.equals(this.clientBodyTimeout, describeListenerAttributesResponse.clientBodyTimeout) &&
869934
Objects.equals(this.clientHeaderTimeout, describeListenerAttributesResponse.clientHeaderTimeout) &&
870935
Objects.equals(this.connectionDrainEnabled, describeListenerAttributesResponse.connectionDrainEnabled) &&
@@ -890,6 +955,7 @@ public boolean equals(java.lang.Object o) {
890955
Objects.equals(this.proxyReadTimeout, describeListenerAttributesResponse.proxyReadTimeout) &&
891956
Objects.equals(this.proxySendTimeout, describeListenerAttributesResponse.proxySendTimeout) &&
892957
Objects.equals(this.requestId, describeListenerAttributesResponse.requestId) &&
958+
Objects.equals(this.responseCheckEnabled, describeListenerAttributesResponse.responseCheckEnabled) &&
893959
Objects.equals(this.scheduler, describeListenerAttributesResponse.scheduler) &&
894960
Objects.equals(this.securityPolicyId, describeListenerAttributesResponse.securityPolicyId) &&
895961
Objects.equals(this.sendTimeout, describeListenerAttributesResponse.sendTimeout) &&
@@ -902,7 +968,7 @@ public boolean equals(java.lang.Object o) {
902968

903969
@Override
904970
public int hashCode() {
905-
return Objects.hash(aclIds, aclStatus, aclType, bandwidth, certificateId, 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, scheduler, securityPolicyId, sendTimeout, serverGroupId, startPort, status, tags, updateTime);
971+
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);
906972
}
907973

908974

@@ -915,7 +981,9 @@ public String toString() {
915981
sb.append(" aclStatus: ").append(toIndentedString(aclStatus)).append("\n");
916982
sb.append(" aclType: ").append(toIndentedString(aclType)).append("\n");
917983
sb.append(" bandwidth: ").append(toIndentedString(bandwidth)).append("\n");
984+
sb.append(" certCenterCertificateId: ").append(toIndentedString(certCenterCertificateId)).append("\n");
918985
sb.append(" certificateId: ").append(toIndentedString(certificateId)).append("\n");
986+
sb.append(" certificateSource: ").append(toIndentedString(certificateSource)).append("\n");
919987
sb.append(" clientBodyTimeout: ").append(toIndentedString(clientBodyTimeout)).append("\n");
920988
sb.append(" clientHeaderTimeout: ").append(toIndentedString(clientHeaderTimeout)).append("\n");
921989
sb.append(" connectionDrainEnabled: ").append(toIndentedString(connectionDrainEnabled)).append("\n");
@@ -941,6 +1009,7 @@ public String toString() {
9411009
sb.append(" proxyReadTimeout: ").append(toIndentedString(proxyReadTimeout)).append("\n");
9421010
sb.append(" proxySendTimeout: ").append(toIndentedString(proxySendTimeout)).append("\n");
9431011
sb.append(" requestId: ").append(toIndentedString(requestId)).append("\n");
1012+
sb.append(" responseCheckEnabled: ").append(toIndentedString(responseCheckEnabled)).append("\n");
9441013
sb.append(" scheduler: ").append(toIndentedString(scheduler)).append("\n");
9451014
sb.append(" securityPolicyId: ").append(toIndentedString(securityPolicyId)).append("\n");
9461015
sb.append(" sendTimeout: ").append(toIndentedString(sendTimeout)).append("\n");

‎volcengine-java-sdk-clb/src/main/java/com/volcengine/clb/model/DescribeListenersRequest.java‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ public class DescribeListenersRequest {
4848
@SerializedName("PageSize")
4949
private Integer pageSize = null;
5050

51+
@SerializedName("Protocol")
52+
private String protocol = null;
53+
5154
@SerializedName("TagFilters")
5255
private List<TagFilterForDescribeListenersInput> tagFilters = null;
5356

@@ -149,6 +152,24 @@ public void setPageSize(Integer pageSize) {
149152
this.pageSize = pageSize;
150153
}
151154

155+
public DescribeListenersRequest protocol(String protocol) {
156+
this.protocol = protocol;
157+
return this;
158+
}
159+
160+
/**
161+
* Get protocol
162+
* @return protocol
163+
**/
164+
@Schema(description = "")
165+
public String getProtocol() {
166+
return protocol;
167+
}
168+
169+
public void setProtocol(String protocol) {
170+
this.protocol = protocol;
171+
}
172+
152173
public DescribeListenersRequest tagFilters(List<TagFilterForDescribeListenersInput> tagFilters) {
153174
this.tagFilters = tagFilters;
154175
return this;
@@ -191,12 +212,13 @@ public boolean equals(java.lang.Object o) {
191212
Objects.equals(this.loadBalancerId, describeListenersRequest.loadBalancerId) &&
192213
Objects.equals(this.pageNumber, describeListenersRequest.pageNumber) &&
193214
Objects.equals(this.pageSize, describeListenersRequest.pageSize) &&
215+
Objects.equals(this.protocol, describeListenersRequest.protocol) &&
194216
Objects.equals(this.tagFilters, describeListenersRequest.tagFilters);
195217
}
196218

197219
@Override
198220
public int hashCode() {
199-
return Objects.hash(listenerIds, listenerName, loadBalancerId, pageNumber, pageSize, tagFilters);
221+
return Objects.hash(listenerIds, listenerName, loadBalancerId, pageNumber, pageSize, protocol, tagFilters);
200222
}
201223

202224

@@ -210,6 +232,7 @@ public String toString() {
210232
sb.append(" loadBalancerId: ").append(toIndentedString(loadBalancerId)).append("\n");
211233
sb.append(" pageNumber: ").append(toIndentedString(pageNumber)).append("\n");
212234
sb.append(" pageSize: ").append(toIndentedString(pageSize)).append("\n");
235+
sb.append(" protocol: ").append(toIndentedString(protocol)).append("\n");
213236
sb.append(" tagFilters: ").append(toIndentedString(tagFilters)).append("\n");
214237
sb.append("}");
215238
return sb.toString();

‎volcengine-java-sdk-clb/src/main/java/com/volcengine/clb/model/DescribeLoadBalancerAttributesResponse.java‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@ public class DescribeLoadBalancerAttributesResponse extends com.volcengine.model
165165
@SerializedName("Tags")
166166
private List<TagForDescribeLoadBalancerAttributesOutput> tags = null;
167167

168+
@SerializedName("TimestampRemoveEnabled")
169+
private String timestampRemoveEnabled = null;
170+
168171
@SerializedName("Type")
169172
private String type = null;
170173

@@ -977,6 +980,24 @@ public void setTags(List<TagForDescribeLoadBalancerAttributesOutput> tags) {
977980
this.tags = tags;
978981
}
979982

983+
public DescribeLoadBalancerAttributesResponse timestampRemoveEnabled(String timestampRemoveEnabled) {
984+
this.timestampRemoveEnabled = timestampRemoveEnabled;
985+
return this;
986+
}
987+
988+
/**
989+
* Get timestampRemoveEnabled
990+
* @return timestampRemoveEnabled
991+
**/
992+
@Schema(description = "")
993+
public String getTimestampRemoveEnabled() {
994+
return timestampRemoveEnabled;
995+
}
996+
997+
public void setTimestampRemoveEnabled(String timestampRemoveEnabled) {
998+
this.timestampRemoveEnabled = timestampRemoveEnabled;
999+
}
1000+
9801001
public DescribeLoadBalancerAttributesResponse type(String type) {
9811002
this.type = type;
9821003
return this;
@@ -1083,14 +1104,15 @@ public boolean equals(java.lang.Object o) {
10831104
Objects.equals(this.status, describeLoadBalancerAttributesResponse.status) &&
10841105
Objects.equals(this.subnetId, describeLoadBalancerAttributesResponse.subnetId) &&
10851106
Objects.equals(this.tags, describeLoadBalancerAttributesResponse.tags) &&
1107+
Objects.equals(this.timestampRemoveEnabled, describeLoadBalancerAttributesResponse.timestampRemoveEnabled) &&
10861108
Objects.equals(this.type, describeLoadBalancerAttributesResponse.type) &&
10871109
Objects.equals(this.updateTime, describeLoadBalancerAttributesResponse.updateTime) &&
10881110
Objects.equals(this.vpcId, describeLoadBalancerAttributesResponse.vpcId);
10891111
}
10901112

10911113
@Override
10921114
public int hashCode() {
1093-
return Objects.hash(accessLog, accountId, addressIpVersion, allowedPorts, businessStatus, bypassSecurityGroupEnabled, createTime, deletedTime, description, eip, eipAddress, eipID, enabled, eniAddress, eniAddressNum, eniAddresses, eniID, eniIpv6Address, exclusiveClusterId, expiredTime, ipv6AddressBandwidth, ipv6EipId, listeners, loadBalancerBillingType, loadBalancerId, loadBalancerName, loadBalancerSpec, lockReason, logTopicId, masterZoneId, modificationProtectionReason, modificationProtectionStatus, newArch, overdueTime, projectName, requestId, serverGroups, serviceManaged, slaveZoneId, status, subnetId, tags, type, updateTime, vpcId);
1115+
return Objects.hash(accessLog, accountId, addressIpVersion, allowedPorts, businessStatus, bypassSecurityGroupEnabled, createTime, deletedTime, description, eip, eipAddress, eipID, enabled, eniAddress, eniAddressNum, eniAddresses, eniID, eniIpv6Address, exclusiveClusterId, expiredTime, ipv6AddressBandwidth, ipv6EipId, listeners, loadBalancerBillingType, loadBalancerId, loadBalancerName, loadBalancerSpec, lockReason, logTopicId, masterZoneId, modificationProtectionReason, modificationProtectionStatus, newArch, overdueTime, projectName, requestId, serverGroups, serviceManaged, slaveZoneId, status, subnetId, tags, timestampRemoveEnabled, type, updateTime, vpcId);
10941116
}
10951117

10961118

@@ -1141,6 +1163,7 @@ public String toString() {
11411163
sb.append(" status: ").append(toIndentedString(status)).append("\n");
11421164
sb.append(" subnetId: ").append(toIndentedString(subnetId)).append("\n");
11431165
sb.append(" tags: ").append(toIndentedString(tags)).append("\n");
1166+
sb.append(" timestampRemoveEnabled: ").append(toIndentedString(timestampRemoveEnabled)).append("\n");
11441167
sb.append(" type: ").append(toIndentedString(type)).append("\n");
11451168
sb.append(" updateTime: ").append(toIndentedString(updateTime)).append("\n");
11461169
sb.append(" vpcId: ").append(toIndentedString(vpcId)).append("\n");

0 commit comments

Comments
 (0)