Skip to content

Commit 155de0e

Browse files
committed
Merge branch 'hot_fix' into 'master'
bugfix: Hot fix See merge request iaasng/volcstack-java-sdk!10
2 parents 506b449 + cddb9af commit 155de0e

File tree

861 files changed

+54983
-2570
lines changed

Some content is hidden

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

861 files changed

+54983
-2570
lines changed

README.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,19 @@
3030

3131
建议使用Maven构建自己的项目,添加需要的相应模块的依赖,示例如下:
3232

33+
##### Init maven setting.xml #####
34+
需要使用字节跳动的maven仓库来完成依赖,请先到maven安装目录的conf/setting.xml
35+
在<mirrors/>标签中增加
36+
37+
```xml
38+
<mirror>
39+
<id>bytedanceMaven</id>
40+
<mirrorOf>my-repo-id</mirrorOf>
41+
<name>字节跳动maven仓库</name>
42+
<url>https://artifact.bytedance.com/repository/releases/</url>
43+
</mirror>
44+
```
45+
3346
##### Importing the pom #####
3447

3548
```xml
@@ -38,7 +51,7 @@
3851
<dependency>
3952
<groupId>com.volcengine</groupId>
4053
<artifactId>volcstack-java-sdk-bom</artifactId>
41-
<version>0.1.0</version>
54+
<version>0.1.1</version>
4255
<type>pom</type>
4356
<scope>import</scope>
4457
</dependency>
@@ -54,12 +67,12 @@
5467
<dependency>
5568
<groupId>com.volcengine</groupId>
5669
<artifactId>volcstack-java-sdk-vpc</artifactId>
57-
<version>0.1.0</version>
70+
<version>0.1.1</version>
5871
</dependency>
5972
<dependency>
6073
<groupId>com.volcengine</groupId>
6174
<artifactId>volcstack-java-sdk-ecs</artifactId>
62-
<version>0.1.0</version>
75+
<version>0.1.1</version>
6376
</dependency>
6477
</dependencies>
6578
```

pom.xml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.volcengine</groupId>
55
<artifactId>volcstack-java-sdk</artifactId>
66
<packaging>pom</packaging>
7-
<version>0.1.0-SHAPSHOT</version>
7+
<version>0.1.1</version>
88
<properties>
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1010
<java.source.version>1.7</java.source.version>
@@ -72,14 +72,16 @@
7272
</dependencies>
7373
</dependencyManagement>
7474
<distributionManagement>
75-
<snapshotRepository>
76-
<id>ossrh</id>
77-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
78-
</snapshotRepository>
7975
<repository>
80-
<id>ossrh</id>
81-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
76+
<id>maven.byted.org</id>
77+
<name>maven.byted.org</name>
78+
<url>https://artifact-maven.byted.org/repository/releases/</url>
8279
</repository>
80+
<snapshotRepository>
81+
<id>maven.byted.org</id>
82+
<name>maven.byted.org</name>
83+
<url>https://artifact-maven.byted.org/repository/releases/</url>
84+
</snapshotRepository>
8385
</distributionManagement>
8486
<build>
8587
<plugins>

volcstack-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>volcstack-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.1.0-SHAPSHOT</version>
6+
<version>0.1.1</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

volcstack-java-sdk-autoscaling/src/main/java/com/volcengine/volcstack/autoscaling/AutoScalingApi.java

Lines changed: 283 additions & 31 deletions
Large diffs are not rendered by default.

volcstack-java-sdk-autoscaling/src/main/java/com/volcengine/volcstack/autoscaling/model/AlarmPolicyConditionForCreateScalingPolicyInput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* AlarmPolicyConditionForCreateScalingPolicyInput
2828
*/
2929

30-
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-13T17:16:15.237208+08:00[Asia/Shanghai]")
30+
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-24T15:52:12.731669+08:00[Asia/Shanghai]")
3131
public class AlarmPolicyConditionForCreateScalingPolicyInput {
3232
@SerializedName("ComparisonOperator")
3333
private String comparisonOperator = null;

volcstack-java-sdk-autoscaling/src/main/java/com/volcengine/volcstack/autoscaling/model/AlarmPolicyConditionForModifyScalingPolicyInput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* AlarmPolicyConditionForModifyScalingPolicyInput
2828
*/
2929

30-
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-13T17:16:15.237208+08:00[Asia/Shanghai]")
30+
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-24T15:52:12.731669+08:00[Asia/Shanghai]")
3131
public class AlarmPolicyConditionForModifyScalingPolicyInput {
3232
@SerializedName("ComparisonOperator")
3333
private String comparisonOperator = null;

volcstack-java-sdk-autoscaling/src/main/java/com/volcengine/volcstack/autoscaling/model/AlarmPolicyForCreateScalingPolicyInput.java

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,17 @@
2828
* AlarmPolicyForCreateScalingPolicyInput
2929
*/
3030

31-
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-13T17:16:15.237208+08:00[Asia/Shanghai]")
31+
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-24T15:52:12.731669+08:00[Asia/Shanghai]")
3232
public class AlarmPolicyForCreateScalingPolicyInput {
3333
@SerializedName("Condition")
3434
private AlarmPolicyConditionForCreateScalingPolicyInput condition = null;
3535

3636
@SerializedName("EvaluationCount")
3737
private Integer evaluationCount = null;
3838

39+
@SerializedName("RuleId")
40+
private String ruleId = null;
41+
3942
@SerializedName("RuleType")
4043
private String ruleType = null;
4144

@@ -76,6 +79,24 @@ public void setEvaluationCount(Integer evaluationCount) {
7679
this.evaluationCount = evaluationCount;
7780
}
7881

82+
public AlarmPolicyForCreateScalingPolicyInput ruleId(String ruleId) {
83+
this.ruleId = ruleId;
84+
return this;
85+
}
86+
87+
/**
88+
* Get ruleId
89+
* @return ruleId
90+
**/
91+
@Schema(description = "")
92+
public String getRuleId() {
93+
return ruleId;
94+
}
95+
96+
public void setRuleId(String ruleId) {
97+
this.ruleId = ruleId;
98+
}
99+
79100
public AlarmPolicyForCreateScalingPolicyInput ruleType(String ruleType) {
80101
this.ruleType = ruleType;
81102
return this;
@@ -106,12 +127,13 @@ public boolean equals(java.lang.Object o) {
106127
AlarmPolicyForCreateScalingPolicyInput alarmPolicyForCreateScalingPolicyInput = (AlarmPolicyForCreateScalingPolicyInput) o;
107128
return Objects.equals(this.condition, alarmPolicyForCreateScalingPolicyInput.condition) &&
108129
Objects.equals(this.evaluationCount, alarmPolicyForCreateScalingPolicyInput.evaluationCount) &&
130+
Objects.equals(this.ruleId, alarmPolicyForCreateScalingPolicyInput.ruleId) &&
109131
Objects.equals(this.ruleType, alarmPolicyForCreateScalingPolicyInput.ruleType);
110132
}
111133

112134
@Override
113135
public int hashCode() {
114-
return Objects.hash(condition, evaluationCount, ruleType);
136+
return Objects.hash(condition, evaluationCount, ruleId, ruleType);
115137
}
116138

117139

@@ -122,6 +144,7 @@ public String toString() {
122144

123145
sb.append(" condition: ").append(toIndentedString(condition)).append("\n");
124146
sb.append(" evaluationCount: ").append(toIndentedString(evaluationCount)).append("\n");
147+
sb.append(" ruleId: ").append(toIndentedString(ruleId)).append("\n");
125148
sb.append(" ruleType: ").append(toIndentedString(ruleType)).append("\n");
126149
sb.append("}");
127150
return sb.toString();

volcstack-java-sdk-autoscaling/src/main/java/com/volcengine/volcstack/autoscaling/model/AlarmPolicyForDescribeScalingPoliciesOutput.java

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,17 @@
2828
* AlarmPolicyForDescribeScalingPoliciesOutput
2929
*/
3030

31-
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-13T17:16:15.237208+08:00[Asia/Shanghai]")
31+
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-24T15:52:12.731669+08:00[Asia/Shanghai]")
3232
public class AlarmPolicyForDescribeScalingPoliciesOutput {
3333
@SerializedName("Condition")
3434
private ConditionForDescribeScalingPoliciesOutput condition = null;
3535

3636
@SerializedName("EvaluationCount")
3737
private Integer evaluationCount = null;
3838

39+
@SerializedName("RuleId")
40+
private String ruleId = null;
41+
3942
@SerializedName("RuleType")
4043
private String ruleType = null;
4144

@@ -76,6 +79,24 @@ public void setEvaluationCount(Integer evaluationCount) {
7679
this.evaluationCount = evaluationCount;
7780
}
7881

82+
public AlarmPolicyForDescribeScalingPoliciesOutput ruleId(String ruleId) {
83+
this.ruleId = ruleId;
84+
return this;
85+
}
86+
87+
/**
88+
* Get ruleId
89+
* @return ruleId
90+
**/
91+
@Schema(description = "")
92+
public String getRuleId() {
93+
return ruleId;
94+
}
95+
96+
public void setRuleId(String ruleId) {
97+
this.ruleId = ruleId;
98+
}
99+
79100
public AlarmPolicyForDescribeScalingPoliciesOutput ruleType(String ruleType) {
80101
this.ruleType = ruleType;
81102
return this;
@@ -106,12 +127,13 @@ public boolean equals(java.lang.Object o) {
106127
AlarmPolicyForDescribeScalingPoliciesOutput alarmPolicyForDescribeScalingPoliciesOutput = (AlarmPolicyForDescribeScalingPoliciesOutput) o;
107128
return Objects.equals(this.condition, alarmPolicyForDescribeScalingPoliciesOutput.condition) &&
108129
Objects.equals(this.evaluationCount, alarmPolicyForDescribeScalingPoliciesOutput.evaluationCount) &&
130+
Objects.equals(this.ruleId, alarmPolicyForDescribeScalingPoliciesOutput.ruleId) &&
109131
Objects.equals(this.ruleType, alarmPolicyForDescribeScalingPoliciesOutput.ruleType);
110132
}
111133

112134
@Override
113135
public int hashCode() {
114-
return Objects.hash(condition, evaluationCount, ruleType);
136+
return Objects.hash(condition, evaluationCount, ruleId, ruleType);
115137
}
116138

117139

@@ -122,6 +144,7 @@ public String toString() {
122144

123145
sb.append(" condition: ").append(toIndentedString(condition)).append("\n");
124146
sb.append(" evaluationCount: ").append(toIndentedString(evaluationCount)).append("\n");
147+
sb.append(" ruleId: ").append(toIndentedString(ruleId)).append("\n");
125148
sb.append(" ruleType: ").append(toIndentedString(ruleType)).append("\n");
126149
sb.append("}");
127150
return sb.toString();

volcstack-java-sdk-autoscaling/src/main/java/com/volcengine/volcstack/autoscaling/model/AlarmPolicyForModifyScalingPolicyInput.java

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,17 @@
2828
* AlarmPolicyForModifyScalingPolicyInput
2929
*/
3030

31-
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-13T17:16:15.237208+08:00[Asia/Shanghai]")
31+
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-24T15:52:12.731669+08:00[Asia/Shanghai]")
3232
public class AlarmPolicyForModifyScalingPolicyInput {
3333
@SerializedName("Condition")
3434
private AlarmPolicyConditionForModifyScalingPolicyInput condition = null;
3535

3636
@SerializedName("EvaluationCount")
3737
private Integer evaluationCount = null;
3838

39+
@SerializedName("RuleId")
40+
private String ruleId = null;
41+
3942
@SerializedName("RuleType")
4043
private String ruleType = null;
4144

@@ -76,6 +79,24 @@ public void setEvaluationCount(Integer evaluationCount) {
7679
this.evaluationCount = evaluationCount;
7780
}
7881

82+
public AlarmPolicyForModifyScalingPolicyInput ruleId(String ruleId) {
83+
this.ruleId = ruleId;
84+
return this;
85+
}
86+
87+
/**
88+
* Get ruleId
89+
* @return ruleId
90+
**/
91+
@Schema(description = "")
92+
public String getRuleId() {
93+
return ruleId;
94+
}
95+
96+
public void setRuleId(String ruleId) {
97+
this.ruleId = ruleId;
98+
}
99+
79100
public AlarmPolicyForModifyScalingPolicyInput ruleType(String ruleType) {
80101
this.ruleType = ruleType;
81102
return this;
@@ -106,12 +127,13 @@ public boolean equals(java.lang.Object o) {
106127
AlarmPolicyForModifyScalingPolicyInput alarmPolicyForModifyScalingPolicyInput = (AlarmPolicyForModifyScalingPolicyInput) o;
107128
return Objects.equals(this.condition, alarmPolicyForModifyScalingPolicyInput.condition) &&
108129
Objects.equals(this.evaluationCount, alarmPolicyForModifyScalingPolicyInput.evaluationCount) &&
130+
Objects.equals(this.ruleId, alarmPolicyForModifyScalingPolicyInput.ruleId) &&
109131
Objects.equals(this.ruleType, alarmPolicyForModifyScalingPolicyInput.ruleType);
110132
}
111133

112134
@Override
113135
public int hashCode() {
114-
return Objects.hash(condition, evaluationCount, ruleType);
136+
return Objects.hash(condition, evaluationCount, ruleId, ruleType);
115137
}
116138

117139

@@ -122,6 +144,7 @@ public String toString() {
122144

123145
sb.append(" condition: ").append(toIndentedString(condition)).append("\n");
124146
sb.append(" evaluationCount: ").append(toIndentedString(evaluationCount)).append("\n");
147+
sb.append(" ruleId: ").append(toIndentedString(ruleId)).append("\n");
125148
sb.append(" ruleType: ").append(toIndentedString(ruleType)).append("\n");
126149
sb.append("}");
127150
return sb.toString();

0 commit comments

Comments
 (0)