Skip to content

Commit b667143

Browse files
volc-sdk-teamvolc-sdk-team
committed
Merge branch 'mainrelease' into 'master'
Mainrelease See merge request iaasng/volcengine-java-sdk!143
2 parents 93f2ce4 + 6ed7e14 commit b667143

File tree

133 files changed

+11323
-325
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+11323
-325
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>com.volcengine</groupId>
5656
<artifactId>volcengine-java-sdk-bom</artifactId>
57-
<version>0.1.104</version>
57+
<version>0.1.105</version>
5858
<type>pom</type>
5959
<scope>import</scope>
6060
</dependency>
@@ -70,12 +70,12 @@
7070
<dependency>
7171
<groupId>com.volcengine</groupId>
7272
<artifactId>volcengine-java-sdk-vpc</artifactId>
73-
<version>0.1.104</version>
73+
<version>0.1.105</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>com.volcengine</groupId>
7777
<artifactId>volcengine-java-sdk-ecs</artifactId>
78-
<version>0.1.104</version>
78+
<version>0.1.105</version>
7979
</dependency>
8080
</dependencies>
8181
```

‎meta.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"lasted": "0.1.104",
3-
"meta_commit": "8ff49b704a7c10574720fbd5b8e4724682a152b6"
2+
"lasted": "0.1.105",
3+
"meta_commit": "8f86397ab7fcd8bc8b8558b00adb516aac0cc89f"
44
}

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.volcengine</groupId>
55
<artifactId>volcengine-java-sdk</artifactId>
66
<packaging>pom</packaging>
7-
<version>0.1.104</version>
7+
<version>0.1.105</version>
88
<name>volcengine-java-sdk</name>
99
<url>https://open.volcengineapi.com</url>
1010
<description>The Java SDK For Volcengine</description>

‎volcengine-java-sdk-alb/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.1.104</version>
6+
<version>0.1.105</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

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

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,15 @@ public class CreateListenerRequest {
4444
@SerializedName("CACertificateId")
4545
private String caCertificateId = null;
4646

47+
@SerializedName("CertCenterCertificateId")
48+
private String certCenterCertificateId = null;
49+
4750
@SerializedName("CertificateId")
4851
private String certificateId = null;
4952

53+
@SerializedName("CertificateSource")
54+
private String certificateSource = null;
55+
5056
@SerializedName("Description")
5157
private String description = null;
5258

@@ -74,6 +80,9 @@ public class CreateListenerRequest {
7480
@SerializedName("Protocol")
7581
private String protocol = null;
7682

83+
@SerializedName("ProxyProtocolDisabled")
84+
private String proxyProtocolDisabled = null;
85+
7786
@SerializedName("ServerGroupId")
7887
private String serverGroupId = null;
7988

@@ -157,6 +166,24 @@ public void setCaCertificateId(String caCertificateId) {
157166
this.caCertificateId = caCertificateId;
158167
}
159168

169+
public CreateListenerRequest certCenterCertificateId(String certCenterCertificateId) {
170+
this.certCenterCertificateId = certCenterCertificateId;
171+
return this;
172+
}
173+
174+
/**
175+
* Get certCenterCertificateId
176+
* @return certCenterCertificateId
177+
**/
178+
@Schema(description = "")
179+
public String getCertCenterCertificateId() {
180+
return certCenterCertificateId;
181+
}
182+
183+
public void setCertCenterCertificateId(String certCenterCertificateId) {
184+
this.certCenterCertificateId = certCenterCertificateId;
185+
}
186+
160187
public CreateListenerRequest certificateId(String certificateId) {
161188
this.certificateId = certificateId;
162189
return this;
@@ -175,6 +202,24 @@ public void setCertificateId(String certificateId) {
175202
this.certificateId = certificateId;
176203
}
177204

205+
public CreateListenerRequest certificateSource(String certificateSource) {
206+
this.certificateSource = certificateSource;
207+
return this;
208+
}
209+
210+
/**
211+
* Get certificateSource
212+
* @return certificateSource
213+
**/
214+
@Schema(description = "")
215+
public String getCertificateSource() {
216+
return certificateSource;
217+
}
218+
219+
public void setCertificateSource(String certificateSource) {
220+
this.certificateSource = certificateSource;
221+
}
222+
178223
public CreateListenerRequest description(String description) {
179224
this.description = description;
180225
return this;
@@ -349,6 +394,24 @@ public void setProtocol(String protocol) {
349394
this.protocol = protocol;
350395
}
351396

397+
public CreateListenerRequest proxyProtocolDisabled(String proxyProtocolDisabled) {
398+
this.proxyProtocolDisabled = proxyProtocolDisabled;
399+
return this;
400+
}
401+
402+
/**
403+
* Get proxyProtocolDisabled
404+
* @return proxyProtocolDisabled
405+
**/
406+
@Schema(description = "")
407+
public String getProxyProtocolDisabled() {
408+
return proxyProtocolDisabled;
409+
}
410+
411+
public void setProxyProtocolDisabled(String proxyProtocolDisabled) {
412+
this.proxyProtocolDisabled = proxyProtocolDisabled;
413+
}
414+
352415
public CreateListenerRequest serverGroupId(String serverGroupId) {
353416
this.serverGroupId = serverGroupId;
354417
return this;
@@ -382,7 +445,9 @@ public boolean equals(java.lang.Object o) {
382445
Objects.equals(this.aclStatus, createListenerRequest.aclStatus) &&
383446
Objects.equals(this.aclType, createListenerRequest.aclType) &&
384447
Objects.equals(this.caCertificateId, createListenerRequest.caCertificateId) &&
448+
Objects.equals(this.certCenterCertificateId, createListenerRequest.certCenterCertificateId) &&
385449
Objects.equals(this.certificateId, createListenerRequest.certificateId) &&
450+
Objects.equals(this.certificateSource, createListenerRequest.certificateSource) &&
386451
Objects.equals(this.description, createListenerRequest.description) &&
387452
Objects.equals(this.domainExtensions, createListenerRequest.domainExtensions) &&
388453
Objects.equals(this.enableHttp2, createListenerRequest.enableHttp2) &&
@@ -392,12 +457,13 @@ public boolean equals(java.lang.Object o) {
392457
Objects.equals(this.loadBalancerId, createListenerRequest.loadBalancerId) &&
393458
Objects.equals(this.port, createListenerRequest.port) &&
394459
Objects.equals(this.protocol, createListenerRequest.protocol) &&
460+
Objects.equals(this.proxyProtocolDisabled, createListenerRequest.proxyProtocolDisabled) &&
395461
Objects.equals(this.serverGroupId, createListenerRequest.serverGroupId);
396462
}
397463

398464
@Override
399465
public int hashCode() {
400-
return Objects.hash(aclIds, aclStatus, aclType, caCertificateId, certificateId, description, domainExtensions, enableHttp2, enableQuic, enabled, listenerName, loadBalancerId, port, protocol, serverGroupId);
466+
return Objects.hash(aclIds, aclStatus, aclType, caCertificateId, certCenterCertificateId, certificateId, certificateSource, description, domainExtensions, enableHttp2, enableQuic, enabled, listenerName, loadBalancerId, port, protocol, proxyProtocolDisabled, serverGroupId);
401467
}
402468

403469

@@ -410,7 +476,9 @@ public String toString() {
410476
sb.append(" aclStatus: ").append(toIndentedString(aclStatus)).append("\n");
411477
sb.append(" aclType: ").append(toIndentedString(aclType)).append("\n");
412478
sb.append(" caCertificateId: ").append(toIndentedString(caCertificateId)).append("\n");
479+
sb.append(" certCenterCertificateId: ").append(toIndentedString(certCenterCertificateId)).append("\n");
413480
sb.append(" certificateId: ").append(toIndentedString(certificateId)).append("\n");
481+
sb.append(" certificateSource: ").append(toIndentedString(certificateSource)).append("\n");
414482
sb.append(" description: ").append(toIndentedString(description)).append("\n");
415483
sb.append(" domainExtensions: ").append(toIndentedString(domainExtensions)).append("\n");
416484
sb.append(" enableHttp2: ").append(toIndentedString(enableHttp2)).append("\n");
@@ -420,6 +488,7 @@ public String toString() {
420488
sb.append(" loadBalancerId: ").append(toIndentedString(loadBalancerId)).append("\n");
421489
sb.append(" port: ").append(toIndentedString(port)).append("\n");
422490
sb.append(" protocol: ").append(toIndentedString(protocol)).append("\n");
491+
sb.append(" proxyProtocolDisabled: ").append(toIndentedString(proxyProtocolDisabled)).append("\n");
423492
sb.append(" serverGroupId: ").append(toIndentedString(serverGroupId)).append("\n");
424493
sb.append("}");
425494
return sb.toString();

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

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,15 @@ public class DescribeListenerAttributesResponse extends com.volcengine.model.Abs
4545
@SerializedName("CACertificateId")
4646
private String caCertificateId = null;
4747

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

54+
@SerializedName("CertificateSource")
55+
private String certificateSource = null;
56+
5157
@SerializedName("CreateTime")
5258
private String createTime = null;
5359

@@ -87,6 +93,9 @@ public class DescribeListenerAttributesResponse extends com.volcengine.model.Abs
8793
@SerializedName("Protocol")
8894
private String protocol = null;
8995

96+
@SerializedName("ProxyProtocolDisabled")
97+
private String proxyProtocolDisabled = null;
98+
9099
@SerializedName("RequestId")
91100
private String requestId = null;
92101

@@ -182,6 +191,24 @@ public void setCaCertificateId(String caCertificateId) {
182191
this.caCertificateId = caCertificateId;
183192
}
184193

194+
public DescribeListenerAttributesResponse certCenterCertificateId(String certCenterCertificateId) {
195+
this.certCenterCertificateId = certCenterCertificateId;
196+
return this;
197+
}
198+
199+
/**
200+
* Get certCenterCertificateId
201+
* @return certCenterCertificateId
202+
**/
203+
@Schema(description = "")
204+
public String getCertCenterCertificateId() {
205+
return certCenterCertificateId;
206+
}
207+
208+
public void setCertCenterCertificateId(String certCenterCertificateId) {
209+
this.certCenterCertificateId = certCenterCertificateId;
210+
}
211+
185212
public DescribeListenerAttributesResponse certificateId(String certificateId) {
186213
this.certificateId = certificateId;
187214
return this;
@@ -200,6 +227,24 @@ public void setCertificateId(String certificateId) {
200227
this.certificateId = certificateId;
201228
}
202229

230+
public DescribeListenerAttributesResponse certificateSource(String certificateSource) {
231+
this.certificateSource = certificateSource;
232+
return this;
233+
}
234+
235+
/**
236+
* Get certificateSource
237+
* @return certificateSource
238+
**/
239+
@Schema(description = "")
240+
public String getCertificateSource() {
241+
return certificateSource;
242+
}
243+
244+
public void setCertificateSource(String certificateSource) {
245+
this.certificateSource = certificateSource;
246+
}
247+
203248
public DescribeListenerAttributesResponse createTime(String createTime) {
204249
this.createTime = createTime;
205250
return this;
@@ -443,6 +488,24 @@ public void setProtocol(String protocol) {
443488
this.protocol = protocol;
444489
}
445490

491+
public DescribeListenerAttributesResponse proxyProtocolDisabled(String proxyProtocolDisabled) {
492+
this.proxyProtocolDisabled = proxyProtocolDisabled;
493+
return this;
494+
}
495+
496+
/**
497+
* Get proxyProtocolDisabled
498+
* @return proxyProtocolDisabled
499+
**/
500+
@Schema(description = "")
501+
public String getProxyProtocolDisabled() {
502+
return proxyProtocolDisabled;
503+
}
504+
505+
public void setProxyProtocolDisabled(String proxyProtocolDisabled) {
506+
this.proxyProtocolDisabled = proxyProtocolDisabled;
507+
}
508+
446509
public DescribeListenerAttributesResponse requestId(String requestId) {
447510
this.requestId = requestId;
448511
return this;
@@ -556,7 +619,9 @@ public boolean equals(java.lang.Object o) {
556619
Objects.equals(this.aclStatus, describeListenerAttributesResponse.aclStatus) &&
557620
Objects.equals(this.aclType, describeListenerAttributesResponse.aclType) &&
558621
Objects.equals(this.caCertificateId, describeListenerAttributesResponse.caCertificateId) &&
622+
Objects.equals(this.certCenterCertificateId, describeListenerAttributesResponse.certCenterCertificateId) &&
559623
Objects.equals(this.certificateId, describeListenerAttributesResponse.certificateId) &&
624+
Objects.equals(this.certificateSource, describeListenerAttributesResponse.certificateSource) &&
560625
Objects.equals(this.createTime, describeListenerAttributesResponse.createTime) &&
561626
Objects.equals(this.customizedCfgId, describeListenerAttributesResponse.customizedCfgId) &&
562627
Objects.equals(this.description, describeListenerAttributesResponse.description) &&
@@ -570,6 +635,7 @@ public boolean equals(java.lang.Object o) {
570635
Objects.equals(this.port, describeListenerAttributesResponse.port) &&
571636
Objects.equals(this.projectName, describeListenerAttributesResponse.projectName) &&
572637
Objects.equals(this.protocol, describeListenerAttributesResponse.protocol) &&
638+
Objects.equals(this.proxyProtocolDisabled, describeListenerAttributesResponse.proxyProtocolDisabled) &&
573639
Objects.equals(this.requestId, describeListenerAttributesResponse.requestId) &&
574640
Objects.equals(this.serverGroupId, describeListenerAttributesResponse.serverGroupId) &&
575641
Objects.equals(this.serverGroups, describeListenerAttributesResponse.serverGroups) &&
@@ -579,7 +645,7 @@ public boolean equals(java.lang.Object o) {
579645

580646
@Override
581647
public int hashCode() {
582-
return Objects.hash(aclIds, aclStatus, aclType, caCertificateId, certificateId, createTime, customizedCfgId, description, domainExtensions, enableHttp2, enableQuic, enabled, listenerId, listenerName, loadBalancerId, port, projectName, protocol, requestId, serverGroupId, serverGroups, status, updateTime);
648+
return Objects.hash(aclIds, aclStatus, aclType, caCertificateId, certCenterCertificateId, certificateId, certificateSource, createTime, customizedCfgId, description, domainExtensions, enableHttp2, enableQuic, enabled, listenerId, listenerName, loadBalancerId, port, projectName, protocol, proxyProtocolDisabled, requestId, serverGroupId, serverGroups, status, updateTime);
583649
}
584650

585651

@@ -592,7 +658,9 @@ public String toString() {
592658
sb.append(" aclStatus: ").append(toIndentedString(aclStatus)).append("\n");
593659
sb.append(" aclType: ").append(toIndentedString(aclType)).append("\n");
594660
sb.append(" caCertificateId: ").append(toIndentedString(caCertificateId)).append("\n");
661+
sb.append(" certCenterCertificateId: ").append(toIndentedString(certCenterCertificateId)).append("\n");
595662
sb.append(" certificateId: ").append(toIndentedString(certificateId)).append("\n");
663+
sb.append(" certificateSource: ").append(toIndentedString(certificateSource)).append("\n");
596664
sb.append(" createTime: ").append(toIndentedString(createTime)).append("\n");
597665
sb.append(" customizedCfgId: ").append(toIndentedString(customizedCfgId)).append("\n");
598666
sb.append(" description: ").append(toIndentedString(description)).append("\n");
@@ -606,6 +674,7 @@ public String toString() {
606674
sb.append(" port: ").append(toIndentedString(port)).append("\n");
607675
sb.append(" projectName: ").append(toIndentedString(projectName)).append("\n");
608676
sb.append(" protocol: ").append(toIndentedString(protocol)).append("\n");
677+
sb.append(" proxyProtocolDisabled: ").append(toIndentedString(proxyProtocolDisabled)).append("\n");
609678
sb.append(" requestId: ").append(toIndentedString(requestId)).append("\n");
610679
sb.append(" serverGroupId: ").append(toIndentedString(serverGroupId)).append("\n");
611680
sb.append(" serverGroups: ").append(toIndentedString(serverGroups)).append("\n");

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

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ public class DescribeListenersRequest {
4949
@SerializedName("ProjectName")
5050
private String projectName = null;
5151

52+
@SerializedName("Protocol")
53+
private String protocol = null;
54+
5255
public DescribeListenersRequest listenerIds(List<String> listenerIds) {
5356
this.listenerIds = listenerIds;
5457
return this;
@@ -165,6 +168,24 @@ public void setProjectName(String projectName) {
165168
this.projectName = projectName;
166169
}
167170

171+
public DescribeListenersRequest protocol(String protocol) {
172+
this.protocol = protocol;
173+
return this;
174+
}
175+
176+
/**
177+
* Get protocol
178+
* @return protocol
179+
**/
180+
@Schema(description = "")
181+
public String getProtocol() {
182+
return protocol;
183+
}
184+
185+
public void setProtocol(String protocol) {
186+
this.protocol = protocol;
187+
}
188+
168189

169190
@Override
170191
public boolean equals(java.lang.Object o) {
@@ -180,12 +201,13 @@ public boolean equals(java.lang.Object o) {
180201
Objects.equals(this.loadBalancerId, describeListenersRequest.loadBalancerId) &&
181202
Objects.equals(this.pageNumber, describeListenersRequest.pageNumber) &&
182203
Objects.equals(this.pageSize, describeListenersRequest.pageSize) &&
183-
Objects.equals(this.projectName, describeListenersRequest.projectName);
204+
Objects.equals(this.projectName, describeListenersRequest.projectName) &&
205+
Objects.equals(this.protocol, describeListenersRequest.protocol);
184206
}
185207

186208
@Override
187209
public int hashCode() {
188-
return Objects.hash(listenerIds, listenerName, loadBalancerId, pageNumber, pageSize, projectName);
210+
return Objects.hash(listenerIds, listenerName, loadBalancerId, pageNumber, pageSize, projectName, protocol);
189211
}
190212

191213

@@ -200,6 +222,7 @@ public String toString() {
200222
sb.append(" pageNumber: ").append(toIndentedString(pageNumber)).append("\n");
201223
sb.append(" pageSize: ").append(toIndentedString(pageSize)).append("\n");
202224
sb.append(" projectName: ").append(toIndentedString(projectName)).append("\n");
225+
sb.append(" protocol: ").append(toIndentedString(protocol)).append("\n");
203226
sb.append("}");
204227
return sb.toString();
205228
}

0 commit comments

Comments
 (0)