Skip to content

Commit 93f2ce4

Browse files
committed
Merge branch 'mainrelease' into 'master'
Mainrelease See merge request iaasng/volcengine-java-sdk!142
2 parents 41d5812 + fe80123 commit 93f2ce4

File tree

271 files changed

+31397
-1994
lines changed

Some content is hidden

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

271 files changed

+31397
-1994
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.103</version>
57+
<version>0.1.104</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.103</version>
73+
<version>0.1.104</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>com.volcengine</groupId>
7777
<artifactId>volcengine-java-sdk-ecs</artifactId>
78-
<version>0.1.103</version>
78+
<version>0.1.104</version>
7979
</dependency>
8080
</dependencies>
8181
```

meta.json

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

pom.xml

Lines changed: 2 additions & 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.103</version>
7+
<version>0.1.104</version>
88
<name>volcengine-java-sdk</name>
99
<url>https://open.volcengineapi.com</url>
1010
<description>The Java SDK For Volcengine</description>
@@ -235,5 +235,6 @@
235235
<module>volcengine-java-sdk-vepfs</module>
236236
<module>volcengine-java-sdk-rdsmssql</module>
237237
<module>volcengine-java-sdk-veiapi</module>
238+
<module>volcengine-java-sdk-privatelink</module>
238239
</modules>
239240
</project>

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.103</version>
6+
<version>0.1.104</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

volcengine-java-sdk-autoscaling/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.103</version>
6+
<version>0.1.104</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

volcengine-java-sdk-billing/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.103</version>
6+
<version>0.1.104</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

volcengine-java-sdk-billing/src/main/java/com/volcengine/billing/model/ListForListAmortizedCostBillDailyOutput.java

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,9 @@ public class ListForListAmortizedCostBillDailyOutput {
194194
@SerializedName("Project")
195195
private String project = null;
196196

197+
@SerializedName("ProjectDisplayName")
198+
private String projectDisplayName = null;
199+
197200
@SerializedName("Region")
198201
private String region = null;
199202

@@ -1223,6 +1226,24 @@ public void setProject(String project) {
12231226
this.project = project;
12241227
}
12251228

1229+
public ListForListAmortizedCostBillDailyOutput projectDisplayName(String projectDisplayName) {
1230+
this.projectDisplayName = projectDisplayName;
1231+
return this;
1232+
}
1233+
1234+
/**
1235+
* Get projectDisplayName
1236+
* @return projectDisplayName
1237+
**/
1238+
@Schema(description = "")
1239+
public String getProjectDisplayName() {
1240+
return projectDisplayName;
1241+
}
1242+
1243+
public void setProjectDisplayName(String projectDisplayName) {
1244+
this.projectDisplayName = projectDisplayName;
1245+
}
1246+
12261247
public ListForListAmortizedCostBillDailyOutput region(String region) {
12271248
this.region = region;
12281249
return this;
@@ -1522,6 +1543,7 @@ public boolean equals(java.lang.Object o) {
15221543
Objects.equals(this.product, listForListAmortizedCostBillDailyOutput.product) &&
15231544
Objects.equals(this.productZh, listForListAmortizedCostBillDailyOutput.productZh) &&
15241545
Objects.equals(this.project, listForListAmortizedCostBillDailyOutput.project) &&
1546+
Objects.equals(this.projectDisplayName, listForListAmortizedCostBillDailyOutput.projectDisplayName) &&
15251547
Objects.equals(this.region, listForListAmortizedCostBillDailyOutput.region) &&
15261548
Objects.equals(this.regionCode, listForListAmortizedCostBillDailyOutput.regionCode) &&
15271549
Objects.equals(this.roundAmount, listForListAmortizedCostBillDailyOutput.roundAmount) &&
@@ -1539,7 +1561,7 @@ public boolean equals(java.lang.Object o) {
15391561

15401562
@Override
15411563
public int hashCode() {
1542-
return Objects.hash(amortizedBeginTime, amortizedDay, amortizedEndTime, amortizedMonth, amortizedType, billCategory, billID, billPeriod, billingMethodCode, billingMode, busiPeriod, businessMode, configName, configurationCode, count, couponAmount, currency, dailyAmortizedCouponAmount, dailyAmortizedDiscountBillAmount, dailyAmortizedOriginalBillAmount, dailyAmortizedPaidAmount, dailyAmortizedPayableAmount, dailyAmortizedPreferentialBillAmount, dailyAmortizedRoundAmount, discountBillAmount, element, elementCode, expandField, expenseTime, factor, factorCode, instanceName, instanceNo, nowAmortizedCouponAmount, nowAmortizedDiscountBillAmount, nowAmortizedOriginalBillAmount, nowAmortizedPaidAmount, nowAmortizedPayableAmount, nowAmortizedPreferentialBillAmount, nowAmortizedRoundAmount, originalBillAmount, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, preferentialBillAmount, price, priceUnit, product, productZh, project, region, regionCode, roundAmount, sellerCustomerName, sellerID, sellerUserName, subjectName, tag, unit, useDuration, useDurationUnit, zone, zoneCode);
1564+
return Objects.hash(amortizedBeginTime, amortizedDay, amortizedEndTime, amortizedMonth, amortizedType, billCategory, billID, billPeriod, billingMethodCode, billingMode, busiPeriod, businessMode, configName, configurationCode, count, couponAmount, currency, dailyAmortizedCouponAmount, dailyAmortizedDiscountBillAmount, dailyAmortizedOriginalBillAmount, dailyAmortizedPaidAmount, dailyAmortizedPayableAmount, dailyAmortizedPreferentialBillAmount, dailyAmortizedRoundAmount, discountBillAmount, element, elementCode, expandField, expenseTime, factor, factorCode, instanceName, instanceNo, nowAmortizedCouponAmount, nowAmortizedDiscountBillAmount, nowAmortizedOriginalBillAmount, nowAmortizedPaidAmount, nowAmortizedPayableAmount, nowAmortizedPreferentialBillAmount, nowAmortizedRoundAmount, originalBillAmount, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, preferentialBillAmount, price, priceUnit, product, productZh, project, projectDisplayName, region, regionCode, roundAmount, sellerCustomerName, sellerID, sellerUserName, subjectName, tag, unit, useDuration, useDurationUnit, zone, zoneCode);
15431565
}
15441566

15451567

@@ -1603,6 +1625,7 @@ public String toString() {
16031625
sb.append(" product: ").append(toIndentedString(product)).append("\n");
16041626
sb.append(" productZh: ").append(toIndentedString(productZh)).append("\n");
16051627
sb.append(" project: ").append(toIndentedString(project)).append("\n");
1628+
sb.append(" projectDisplayName: ").append(toIndentedString(projectDisplayName)).append("\n");
16061629
sb.append(" region: ").append(toIndentedString(region)).append("\n");
16071630
sb.append(" regionCode: ").append(toIndentedString(regionCode)).append("\n");
16081631
sb.append(" roundAmount: ").append(toIndentedString(roundAmount)).append("\n");

volcengine-java-sdk-billing/src/main/java/com/volcengine/billing/model/ListForListAmortizedCostBillDetailOutput.java

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,9 @@ public class ListForListAmortizedCostBillDetailOutput {
197197
@SerializedName("Project")
198198
private String project = null;
199199

200+
@SerializedName("ProjectDisplayName")
201+
private String projectDisplayName = null;
202+
200203
@SerializedName("Region")
201204
private String region = null;
202205

@@ -1241,6 +1244,24 @@ public void setProject(String project) {
12411244
this.project = project;
12421245
}
12431246

1247+
public ListForListAmortizedCostBillDetailOutput projectDisplayName(String projectDisplayName) {
1248+
this.projectDisplayName = projectDisplayName;
1249+
return this;
1250+
}
1251+
1252+
/**
1253+
* Get projectDisplayName
1254+
* @return projectDisplayName
1255+
**/
1256+
@Schema(description = "")
1257+
public String getProjectDisplayName() {
1258+
return projectDisplayName;
1259+
}
1260+
1261+
public void setProjectDisplayName(String projectDisplayName) {
1262+
this.projectDisplayName = projectDisplayName;
1263+
}
1264+
12441265
public ListForListAmortizedCostBillDetailOutput region(String region) {
12451266
this.region = region;
12461267
return this;
@@ -1523,6 +1544,7 @@ public boolean equals(java.lang.Object o) {
15231544
Objects.equals(this.product, listForListAmortizedCostBillDetailOutput.product) &&
15241545
Objects.equals(this.productZh, listForListAmortizedCostBillDetailOutput.productZh) &&
15251546
Objects.equals(this.project, listForListAmortizedCostBillDetailOutput.project) &&
1547+
Objects.equals(this.projectDisplayName, listForListAmortizedCostBillDetailOutput.projectDisplayName) &&
15261548
Objects.equals(this.region, listForListAmortizedCostBillDetailOutput.region) &&
15271549
Objects.equals(this.roundAmount, listForListAmortizedCostBillDetailOutput.roundAmount) &&
15281550
Objects.equals(this.sellerCustomerName, listForListAmortizedCostBillDetailOutput.sellerCustomerName) &&
@@ -1539,7 +1561,7 @@ public boolean equals(java.lang.Object o) {
15391561

15401562
@Override
15411563
public int hashCode() {
1542-
return Objects.hash(amortizedBeginTime, amortizedDay, amortizedEndTime, amortizedMonth, amortizedType, billCategory, billID, billPeriod, billingFunction, billingMethodCode, billingMode, busiPeriod, businessMode, configName, costID, count, couponAmount, currency, dailyAmortizedCouponAmount, dailyAmortizedDiscountBillAmount, dailyAmortizedOriginalBillAmount, dailyAmortizedPaidAmount, dailyAmortizedPayableAmount, dailyAmortizedPreferentialBillAmount, dailyAmortizedRoundAmount, discountBillAmount, discountBizBillingFunction, discountBizMeasureInterval, discountBizUnitPrice, discountBizUnitPriceInterval, effectiveFactor, element, expandField, expenseBeginTime, expenseEndTime, factor, instanceName, instanceNo, marketPrice, measureInterval, originalBillAmount, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, preferentialBillAmount, price, priceInterval, priceUnit, product, productZh, project, region, roundAmount, sellerCustomerName, sellerID, sellerUserName, subjectName, tag, tradeTime, unit, useDuration, useDurationUnit, zone);
1564+
return Objects.hash(amortizedBeginTime, amortizedDay, amortizedEndTime, amortizedMonth, amortizedType, billCategory, billID, billPeriod, billingFunction, billingMethodCode, billingMode, busiPeriod, businessMode, configName, costID, count, couponAmount, currency, dailyAmortizedCouponAmount, dailyAmortizedDiscountBillAmount, dailyAmortizedOriginalBillAmount, dailyAmortizedPaidAmount, dailyAmortizedPayableAmount, dailyAmortizedPreferentialBillAmount, dailyAmortizedRoundAmount, discountBillAmount, discountBizBillingFunction, discountBizMeasureInterval, discountBizUnitPrice, discountBizUnitPriceInterval, effectiveFactor, element, expandField, expenseBeginTime, expenseEndTime, factor, instanceName, instanceNo, marketPrice, measureInterval, originalBillAmount, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, preferentialBillAmount, price, priceInterval, priceUnit, product, productZh, project, projectDisplayName, region, roundAmount, sellerCustomerName, sellerID, sellerUserName, subjectName, tag, tradeTime, unit, useDuration, useDurationUnit, zone);
15431565
}
15441566

15451567

@@ -1604,6 +1626,7 @@ public String toString() {
16041626
sb.append(" product: ").append(toIndentedString(product)).append("\n");
16051627
sb.append(" productZh: ").append(toIndentedString(productZh)).append("\n");
16061628
sb.append(" project: ").append(toIndentedString(project)).append("\n");
1629+
sb.append(" projectDisplayName: ").append(toIndentedString(projectDisplayName)).append("\n");
16071630
sb.append(" region: ").append(toIndentedString(region)).append("\n");
16081631
sb.append(" roundAmount: ").append(toIndentedString(roundAmount)).append("\n");
16091632
sb.append(" sellerCustomerName: ").append(toIndentedString(sellerCustomerName)).append("\n");

volcengine-java-sdk-billing/src/main/java/com/volcengine/billing/model/ListForListAmortizedCostBillMonthlyOutput.java

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,9 @@ public class ListForListAmortizedCostBillMonthlyOutput {
233233
@SerializedName("Project")
234234
private String project = null;
235235

236+
@SerializedName("ProjectDisplayName")
237+
private String projectDisplayName = null;
238+
236239
@SerializedName("Region")
237240
private String region = null;
238241

@@ -1511,6 +1514,24 @@ public void setProject(String project) {
15111514
this.project = project;
15121515
}
15131516

1517+
public ListForListAmortizedCostBillMonthlyOutput projectDisplayName(String projectDisplayName) {
1518+
this.projectDisplayName = projectDisplayName;
1519+
return this;
1520+
}
1521+
1522+
/**
1523+
* Get projectDisplayName
1524+
* @return projectDisplayName
1525+
**/
1526+
@Schema(description = "")
1527+
public String getProjectDisplayName() {
1528+
return projectDisplayName;
1529+
}
1530+
1531+
public void setProjectDisplayName(String projectDisplayName) {
1532+
this.projectDisplayName = projectDisplayName;
1533+
}
1534+
15141535
public ListForListAmortizedCostBillMonthlyOutput region(String region) {
15151536
this.region = region;
15161537
return this;
@@ -1913,6 +1934,7 @@ public boolean equals(java.lang.Object o) {
19131934
Objects.equals(this.product, listForListAmortizedCostBillMonthlyOutput.product) &&
19141935
Objects.equals(this.productZh, listForListAmortizedCostBillMonthlyOutput.productZh) &&
19151936
Objects.equals(this.project, listForListAmortizedCostBillMonthlyOutput.project) &&
1937+
Objects.equals(this.projectDisplayName, listForListAmortizedCostBillMonthlyOutput.projectDisplayName) &&
19161938
Objects.equals(this.region, listForListAmortizedCostBillMonthlyOutput.region) &&
19171939
Objects.equals(this.roundAmount, listForListAmortizedCostBillMonthlyOutput.roundAmount) &&
19181940
Objects.equals(this.sellerCustomerName, listForListAmortizedCostBillMonthlyOutput.sellerCustomerName) &&
@@ -1935,7 +1957,7 @@ public boolean equals(java.lang.Object o) {
19351957

19361958
@Override
19371959
public int hashCode() {
1938-
return Objects.hash(amortizedBeginTime, amortizedDayNum, amortizedEndTime, amortizedMonth, amortizedType, beforeAmortizedCouponAmount, beforeAmortizedDiscountBillAmount, beforeAmortizedOriginalBillAmount, beforeAmortizedPaidAmount, beforeAmortizedPayableAmount, beforeAmortizedPreferentialBillAmount, beforeAmortizedRoundAmount, billCategory, billID, billPeriod, billingFunction, billingMethodCode, billingMode, busiPeriod, businessMode, configName, count, couponAmount, currency, dailyAmortizedCouponAmount, dailyAmortizedDiscountBillAmount, dailyAmortizedOriginalBillAmount, dailyAmortizedPaidAmount, dailyAmortizedPayableAmount, dailyAmortizedPreferentialBillAmount, dailyAmortizedRoundAmount, discountBillAmount, discountBizBillingFunction, discountBizMeasureInterval, discountBizUnitPrice, discountBizUnitPriceInterval, effectiveFactor, element, expandField, expenseTime, factor, instanceName, instanceNo, marketPrice, measureInterval, nowAmortizedCouponAmount, nowAmortizedDiscountBillAmount, nowAmortizedOriginalBillAmount, nowAmortizedPaidAmount, nowAmortizedPayableAmount, nowAmortizedPreferentialBillAmount, nowAmortizedRoundAmount, originalBillAmount, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, preferentialBillAmount, price, priceInterval, priceUnit, product, productZh, project, region, roundAmount, sellerCustomerName, sellerID, sellerUserName, subjectName, tag, unamortizedCouponAmount, unamortizedDiscountBillAmount, unamortizedOriginalBillAmount, unamortizedPaidAmount, unamortizedPayableAmount, unamortizedPreferentialBillAmount, unamortizedRoundAmount, unit, useDuration, useDurationUnit, zone);
1960+
return Objects.hash(amortizedBeginTime, amortizedDayNum, amortizedEndTime, amortizedMonth, amortizedType, beforeAmortizedCouponAmount, beforeAmortizedDiscountBillAmount, beforeAmortizedOriginalBillAmount, beforeAmortizedPaidAmount, beforeAmortizedPayableAmount, beforeAmortizedPreferentialBillAmount, beforeAmortizedRoundAmount, billCategory, billID, billPeriod, billingFunction, billingMethodCode, billingMode, busiPeriod, businessMode, configName, count, couponAmount, currency, dailyAmortizedCouponAmount, dailyAmortizedDiscountBillAmount, dailyAmortizedOriginalBillAmount, dailyAmortizedPaidAmount, dailyAmortizedPayableAmount, dailyAmortizedPreferentialBillAmount, dailyAmortizedRoundAmount, discountBillAmount, discountBizBillingFunction, discountBizMeasureInterval, discountBizUnitPrice, discountBizUnitPriceInterval, effectiveFactor, element, expandField, expenseTime, factor, instanceName, instanceNo, marketPrice, measureInterval, nowAmortizedCouponAmount, nowAmortizedDiscountBillAmount, nowAmortizedOriginalBillAmount, nowAmortizedPaidAmount, nowAmortizedPayableAmount, nowAmortizedPreferentialBillAmount, nowAmortizedRoundAmount, originalBillAmount, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, preferentialBillAmount, price, priceInterval, priceUnit, product, productZh, project, projectDisplayName, region, roundAmount, sellerCustomerName, sellerID, sellerUserName, subjectName, tag, unamortizedCouponAmount, unamortizedDiscountBillAmount, unamortizedOriginalBillAmount, unamortizedPaidAmount, unamortizedPayableAmount, unamortizedPreferentialBillAmount, unamortizedRoundAmount, unit, useDuration, useDurationUnit, zone);
19391961
}
19401962

19411963

@@ -2012,6 +2034,7 @@ public String toString() {
20122034
sb.append(" product: ").append(toIndentedString(product)).append("\n");
20132035
sb.append(" productZh: ").append(toIndentedString(productZh)).append("\n");
20142036
sb.append(" project: ").append(toIndentedString(project)).append("\n");
2037+
sb.append(" projectDisplayName: ").append(toIndentedString(projectDisplayName)).append("\n");
20152038
sb.append(" region: ").append(toIndentedString(region)).append("\n");
20162039
sb.append(" roundAmount: ").append(toIndentedString(roundAmount)).append("\n");
20172040
sb.append(" sellerCustomerName: ").append(toIndentedString(sellerCustomerName)).append("\n");

0 commit comments

Comments
 (0)