Skip to content

Commit a8d0829

Browse files
liuweiwei-xyzliuweiwei-xyz
committed
Merge 'integration_2024-09-12_433541957890' into 'master'
merge branch integration_2024-09-12_433541957890 into master See merge request: !256
2 parents 98dded0 + 17ae490 commit a8d0829

File tree

412 files changed

+10139
-508
lines changed

Some content is hidden

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

412 files changed

+10139
-508
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.128</version>
57+
<version>0.1.129</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.128</version>
73+
<version>0.1.129</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>com.volcengine</groupId>
7777
<artifactId>volcengine-java-sdk-ecs</artifactId>
78-
<version>0.1.128</version>
78+
<version>0.1.129</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.128",
3-
"meta_commit": "e0b990936f701fc4600d8bad0764fc0c2b63699f"
2+
"lasted": "0.1.129",
3+
"meta_commit": "f58ed5afe402d491b994b51f7f4858121fe66887"
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.128</version>
7+
<version>0.1.129</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.128</version>
6+
<version>0.1.129</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/AccessLogForDescribeLoadBalancerAttributesOutput.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class AccessLogForDescribeLoadBalancerAttributesOutput {
3233
@SerializedName("BucketName")
3334
private String bucketName = null;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class AclEntryForAddAclEntriesInput {
3233
@SerializedName("Description")
3334
private String description = null;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class AclEntryForDescribeAclAttributesOutput {
3233
@SerializedName("Description")
3334
private String description = null;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
*/
3131

3232

33+
3334
public class AclForDescribeAclsOutput {
3435
@SerializedName("AclEntryCount")
3536
private Integer aclEntryCount = null;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232

3333

34+
3435
public class AddAclEntriesRequest {
3536
@SerializedName("AclEntries")
3637
private List<AclEntryForAddAclEntriesInput> aclEntries = null;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class AddAclEntriesResponse extends com.volcengine.model.AbstractResponse {
3233
@SerializedName("RequestId")
3334
private String requestId = null;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232

3333

34+
3435
public class AddServerGroupBackendServersRequest {
3536
@SerializedName("ServerGroupId")
3637
private String serverGroupId = null;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
*/
3131

3232

33+
3334
public class AddServerGroupBackendServersResponse extends com.volcengine.model.AbstractResponse {
3435
@SerializedName("RequestId")
3536
private String requestId = null;

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

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
*/
3131

3232

33+
3334
public class CACertificateForDescribeCACertificatesOutput {
3435
@SerializedName("CACertificateId")
3536
private String caCertificateId = null;
@@ -58,6 +59,9 @@ public class CACertificateForDescribeCACertificatesOutput {
5859
@SerializedName("ProjectName")
5960
private String projectName = null;
6061

62+
@SerializedName("San")
63+
private String san = null;
64+
6165
@SerializedName("Status")
6266
private String status = null;
6367

@@ -231,6 +235,24 @@ public void setProjectName(String projectName) {
231235
this.projectName = projectName;
232236
}
233237

238+
public CACertificateForDescribeCACertificatesOutput san(String san) {
239+
this.san = san;
240+
return this;
241+
}
242+
243+
/**
244+
* Get san
245+
* @return san
246+
**/
247+
@Schema(description = "")
248+
public String getSan() {
249+
return san;
250+
}
251+
252+
public void setSan(String san) {
253+
this.san = san;
254+
}
255+
234256
public CACertificateForDescribeCACertificatesOutput status(String status) {
235257
this.status = status;
236258
return this;
@@ -268,12 +290,13 @@ public boolean equals(java.lang.Object o) {
268290
Objects.equals(this.expiredAt, caCertificateForDescribeCACertificatesOutput.expiredAt) &&
269291
Objects.equals(this.listeners, caCertificateForDescribeCACertificatesOutput.listeners) &&
270292
Objects.equals(this.projectName, caCertificateForDescribeCACertificatesOutput.projectName) &&
293+
Objects.equals(this.san, caCertificateForDescribeCACertificatesOutput.san) &&
271294
Objects.equals(this.status, caCertificateForDescribeCACertificatesOutput.status);
272295
}
273296

274297
@Override
275298
public int hashCode() {
276-
return Objects.hash(caCertificateId, caCertificateName, certificateType, createTime, description, domainName, expiredAt, listeners, projectName, status);
299+
return Objects.hash(caCertificateId, caCertificateName, certificateType, createTime, description, domainName, expiredAt, listeners, projectName, san, status);
277300
}
278301

279302

@@ -291,6 +314,7 @@ public String toString() {
291314
sb.append(" expiredAt: ").append(toIndentedString(expiredAt)).append("\n");
292315
sb.append(" listeners: ").append(toIndentedString(listeners)).append("\n");
293316
sb.append(" projectName: ").append(toIndentedString(projectName)).append("\n");
317+
sb.append(" san: ").append(toIndentedString(san)).append("\n");
294318
sb.append(" status: ").append(toIndentedString(status)).append("\n");
295319
sb.append("}");
296320
return sb.toString();

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

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
*/
3131

3232

33+
3334
public class CertificateForDescribeAllCertificatesOutput {
3435
@SerializedName("CertificateId")
3536
private String certificateId = null;
@@ -58,6 +59,9 @@ public class CertificateForDescribeAllCertificatesOutput {
5859
@SerializedName("ProjectName")
5960
private String projectName = null;
6061

62+
@SerializedName("San")
63+
private String san = null;
64+
6165
@SerializedName("Status")
6266
private String status = null;
6367

@@ -231,6 +235,24 @@ public void setProjectName(String projectName) {
231235
this.projectName = projectName;
232236
}
233237

238+
public CertificateForDescribeAllCertificatesOutput san(String san) {
239+
this.san = san;
240+
return this;
241+
}
242+
243+
/**
244+
* Get san
245+
* @return san
246+
**/
247+
@Schema(description = "")
248+
public String getSan() {
249+
return san;
250+
}
251+
252+
public void setSan(String san) {
253+
this.san = san;
254+
}
255+
234256
public CertificateForDescribeAllCertificatesOutput status(String status) {
235257
this.status = status;
236258
return this;
@@ -268,12 +290,13 @@ public boolean equals(java.lang.Object o) {
268290
Objects.equals(this.expiredAt, certificateForDescribeAllCertificatesOutput.expiredAt) &&
269291
Objects.equals(this.listeners, certificateForDescribeAllCertificatesOutput.listeners) &&
270292
Objects.equals(this.projectName, certificateForDescribeAllCertificatesOutput.projectName) &&
293+
Objects.equals(this.san, certificateForDescribeAllCertificatesOutput.san) &&
271294
Objects.equals(this.status, certificateForDescribeAllCertificatesOutput.status);
272295
}
273296

274297
@Override
275298
public int hashCode() {
276-
return Objects.hash(certificateId, certificateName, certificateType, createTime, description, domainName, expiredAt, listeners, projectName, status);
299+
return Objects.hash(certificateId, certificateName, certificateType, createTime, description, domainName, expiredAt, listeners, projectName, san, status);
277300
}
278301

279302

@@ -291,6 +314,7 @@ public String toString() {
291314
sb.append(" expiredAt: ").append(toIndentedString(expiredAt)).append("\n");
292315
sb.append(" listeners: ").append(toIndentedString(listeners)).append("\n");
293316
sb.append(" projectName: ").append(toIndentedString(projectName)).append("\n");
317+
sb.append(" san: ").append(toIndentedString(san)).append("\n");
294318
sb.append(" status: ").append(toIndentedString(status)).append("\n");
295319
sb.append("}");
296320
return sb.toString();

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

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
*/
3131

3232

33+
3334
public class CertificateForDescribeCertificatesOutput {
3435
@SerializedName("CertificateId")
3536
private String certificateId = null;
@@ -58,6 +59,9 @@ public class CertificateForDescribeCertificatesOutput {
5859
@SerializedName("ProjectName")
5960
private String projectName = null;
6061

62+
@SerializedName("San")
63+
private String san = null;
64+
6165
@SerializedName("Status")
6266
private String status = null;
6367

@@ -231,6 +235,24 @@ public void setProjectName(String projectName) {
231235
this.projectName = projectName;
232236
}
233237

238+
public CertificateForDescribeCertificatesOutput san(String san) {
239+
this.san = san;
240+
return this;
241+
}
242+
243+
/**
244+
* Get san
245+
* @return san
246+
**/
247+
@Schema(description = "")
248+
public String getSan() {
249+
return san;
250+
}
251+
252+
public void setSan(String san) {
253+
this.san = san;
254+
}
255+
234256
public CertificateForDescribeCertificatesOutput status(String status) {
235257
this.status = status;
236258
return this;
@@ -268,12 +290,13 @@ public boolean equals(java.lang.Object o) {
268290
Objects.equals(this.expiredAt, certificateForDescribeCertificatesOutput.expiredAt) &&
269291
Objects.equals(this.listeners, certificateForDescribeCertificatesOutput.listeners) &&
270292
Objects.equals(this.projectName, certificateForDescribeCertificatesOutput.projectName) &&
293+
Objects.equals(this.san, certificateForDescribeCertificatesOutput.san) &&
271294
Objects.equals(this.status, certificateForDescribeCertificatesOutput.status);
272295
}
273296

274297
@Override
275298
public int hashCode() {
276-
return Objects.hash(certificateId, certificateName, certificateType, createTime, description, domainName, expiredAt, listeners, projectName, status);
299+
return Objects.hash(certificateId, certificateName, certificateType, createTime, description, domainName, expiredAt, listeners, projectName, san, status);
277300
}
278301

279302

@@ -291,6 +314,7 @@ public String toString() {
291314
sb.append(" expiredAt: ").append(toIndentedString(expiredAt)).append("\n");
292315
sb.append(" listeners: ").append(toIndentedString(listeners)).append("\n");
293316
sb.append(" projectName: ").append(toIndentedString(projectName)).append("\n");
317+
sb.append(" san: ").append(toIndentedString(san)).append("\n");
294318
sb.append(" status: ").append(toIndentedString(status)).append("\n");
295319
sb.append("}");
296320
return sb.toString();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class CreateAclRequest {
3233
@SerializedName("AclName")
3334
private String aclName = null;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class CreateAclResponse extends com.volcengine.model.AbstractResponse {
3233
@SerializedName("AclId")
3334
private String aclId = null;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class CreateCustomizedCfgRequest {
3233
@SerializedName("CustomizedCfgContent")
3334
private String customizedCfgContent = null;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class CreateCustomizedCfgResponse extends com.volcengine.model.AbstractResponse {
3233
@SerializedName("CustomizedCfgId")
3334
private String customizedCfgId = null;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232

3333

34+
3435
public class CreateHealthCheckTemplatesRequest {
3536
@SerializedName("HealthCheckTemplates")
3637
private List<HealthCheckTemplateForCreateHealthCheckTemplatesInput> healthCheckTemplates = null;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
*/
3131

3232

33+
3334
public class CreateHealthCheckTemplatesResponse extends com.volcengine.model.AbstractResponse {
3435
@SerializedName("HealthCheckTemplateIDs")
3536
private List<String> healthCheckTemplateIDs = null;

0 commit comments

Comments
 (0)