Skip to content

Commit d494c74

Browse files
author
BitsAdmin
committed
Merge branch 'ecs-Java-2020-04-01-online-829-2024_12_10_11_05_32' into 'integration_2024-12-16_638911295234'
feat: [development task] ecs-829-Java (916204) See merge request iaasng/volcengine-java-sdk!322
2 parents 4d20715 + 42dbb5d commit d494c74

File tree

40 files changed

+3724
-47
lines changed

40 files changed

+3724
-47
lines changed

‎volcengine-java-sdk-ecs/src/main/java/com/volcengine/ecs/EcsApi.java‎

Lines changed: 378 additions & 0 deletions
Large diffs are not rendered by default.

‎volcengine-java-sdk-ecs/src/main/java/com/volcengine/ecs/model/CapacityForDescribeDedicatedHostsOutput.java‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
import com.google.gson.annotations.SerializedName;
2020
import com.google.gson.stream.JsonReader;
2121
import com.google.gson.stream.JsonWriter;
22+
import com.volcengine.ecs.model.LocalVolumeCapacityForDescribeDedicatedHostsOutput;
2223
import io.swagger.v3.oas.annotations.media.Schema;
2324
import java.io.IOException;
25+
import java.util.ArrayList;
26+
import java.util.List;
2427
import javax.validation.constraints.*;
2528
import javax.validation.Valid;
2629
/**
@@ -36,6 +39,9 @@ public class CapacityForDescribeDedicatedHostsOutput {
3639
@SerializedName("AvailableVcpus")
3740
private Integer availableVcpus = null;
3841

42+
@SerializedName("LocalVolumeCapacities")
43+
private List<LocalVolumeCapacityForDescribeDedicatedHostsOutput> localVolumeCapacities = null;
44+
3945
@SerializedName("TotalMemory")
4046
private Integer totalMemory = null;
4147

@@ -78,6 +84,33 @@ public void setAvailableVcpus(Integer availableVcpus) {
7884
this.availableVcpus = availableVcpus;
7985
}
8086

87+
public CapacityForDescribeDedicatedHostsOutput localVolumeCapacities(List<LocalVolumeCapacityForDescribeDedicatedHostsOutput> localVolumeCapacities) {
88+
this.localVolumeCapacities = localVolumeCapacities;
89+
return this;
90+
}
91+
92+
public CapacityForDescribeDedicatedHostsOutput addLocalVolumeCapacitiesItem(LocalVolumeCapacityForDescribeDedicatedHostsOutput localVolumeCapacitiesItem) {
93+
if (this.localVolumeCapacities == null) {
94+
this.localVolumeCapacities = new ArrayList<LocalVolumeCapacityForDescribeDedicatedHostsOutput>();
95+
}
96+
this.localVolumeCapacities.add(localVolumeCapacitiesItem);
97+
return this;
98+
}
99+
100+
/**
101+
* Get localVolumeCapacities
102+
* @return localVolumeCapacities
103+
**/
104+
@Valid
105+
@Schema(description = "")
106+
public List<LocalVolumeCapacityForDescribeDedicatedHostsOutput> getLocalVolumeCapacities() {
107+
return localVolumeCapacities;
108+
}
109+
110+
public void setLocalVolumeCapacities(List<LocalVolumeCapacityForDescribeDedicatedHostsOutput> localVolumeCapacities) {
111+
this.localVolumeCapacities = localVolumeCapacities;
112+
}
113+
81114
public CapacityForDescribeDedicatedHostsOutput totalMemory(Integer totalMemory) {
82115
this.totalMemory = totalMemory;
83116
return this;
@@ -126,13 +159,14 @@ public boolean equals(java.lang.Object o) {
126159
CapacityForDescribeDedicatedHostsOutput capacityForDescribeDedicatedHostsOutput = (CapacityForDescribeDedicatedHostsOutput) o;
127160
return Objects.equals(this.availableMemory, capacityForDescribeDedicatedHostsOutput.availableMemory) &&
128161
Objects.equals(this.availableVcpus, capacityForDescribeDedicatedHostsOutput.availableVcpus) &&
162+
Objects.equals(this.localVolumeCapacities, capacityForDescribeDedicatedHostsOutput.localVolumeCapacities) &&
129163
Objects.equals(this.totalMemory, capacityForDescribeDedicatedHostsOutput.totalMemory) &&
130164
Objects.equals(this.totalVcpus, capacityForDescribeDedicatedHostsOutput.totalVcpus);
131165
}
132166

133167
@Override
134168
public int hashCode() {
135-
return Objects.hash(availableMemory, availableVcpus, totalMemory, totalVcpus);
169+
return Objects.hash(availableMemory, availableVcpus, localVolumeCapacities, totalMemory, totalVcpus);
136170
}
137171

138172

@@ -143,6 +177,7 @@ public String toString() {
143177

144178
sb.append(" availableMemory: ").append(toIndentedString(availableMemory)).append("\n");
145179
sb.append(" availableVcpus: ").append(toIndentedString(availableVcpus)).append("\n");
180+
sb.append(" localVolumeCapacities: ").append(toIndentedString(localVolumeCapacities)).append("\n");
146181
sb.append(" totalMemory: ").append(toIndentedString(totalMemory)).append("\n");
147182
sb.append(" totalVcpus: ").append(toIndentedString(totalVcpus)).append("\n");
148183
sb.append("}");

‎volcengine-java-sdk-ecs/src/main/java/com/volcengine/ecs/model/CommandForDescribeCommandsOutput.java‎

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.gson.stream.JsonReader;
2121
import com.google.gson.stream.JsonWriter;
2222
import com.volcengine.ecs.model.ParameterDefinitionForDescribeCommandsOutput;
23+
import com.volcengine.ecs.model.TagForDescribeCommandsOutput;
2324
import io.swagger.v3.oas.annotations.media.Schema;
2425
import java.io.IOException;
2526
import java.util.ArrayList;
@@ -57,9 +58,15 @@ public class CommandForDescribeCommandsOutput {
5758
@SerializedName("ParameterDefinitions")
5859
private List<ParameterDefinitionForDescribeCommandsOutput> parameterDefinitions = null;
5960

61+
@SerializedName("ProjectName")
62+
private String projectName = null;
63+
6064
@SerializedName("Provider")
6165
private String provider = null;
6266

67+
@SerializedName("Tags")
68+
private List<TagForDescribeCommandsOutput> tags = null;
69+
6370
@SerializedName("Timeout")
6471
private Integer timeout = null;
6572

@@ -228,6 +235,24 @@ public void setParameterDefinitions(List<ParameterDefinitionForDescribeCommandsO
228235
this.parameterDefinitions = parameterDefinitions;
229236
}
230237

238+
public CommandForDescribeCommandsOutput projectName(String projectName) {
239+
this.projectName = projectName;
240+
return this;
241+
}
242+
243+
/**
244+
* Get projectName
245+
* @return projectName
246+
**/
247+
@Schema(description = "")
248+
public String getProjectName() {
249+
return projectName;
250+
}
251+
252+
public void setProjectName(String projectName) {
253+
this.projectName = projectName;
254+
}
255+
231256
public CommandForDescribeCommandsOutput provider(String provider) {
232257
this.provider = provider;
233258
return this;
@@ -246,6 +271,33 @@ public void setProvider(String provider) {
246271
this.provider = provider;
247272
}
248273

274+
public CommandForDescribeCommandsOutput tags(List<TagForDescribeCommandsOutput> tags) {
275+
this.tags = tags;
276+
return this;
277+
}
278+
279+
public CommandForDescribeCommandsOutput addTagsItem(TagForDescribeCommandsOutput tagsItem) {
280+
if (this.tags == null) {
281+
this.tags = new ArrayList<TagForDescribeCommandsOutput>();
282+
}
283+
this.tags.add(tagsItem);
284+
return this;
285+
}
286+
287+
/**
288+
* Get tags
289+
* @return tags
290+
**/
291+
@Valid
292+
@Schema(description = "")
293+
public List<TagForDescribeCommandsOutput> getTags() {
294+
return tags;
295+
}
296+
297+
public void setTags(List<TagForDescribeCommandsOutput> tags) {
298+
this.tags = tags;
299+
}
300+
249301
public CommandForDescribeCommandsOutput timeout(Integer timeout) {
250302
this.timeout = timeout;
251303
return this;
@@ -354,7 +406,9 @@ public boolean equals(java.lang.Object o) {
354406
Objects.equals(this.invocationTimes, commandForDescribeCommandsOutput.invocationTimes) &&
355407
Objects.equals(this.name, commandForDescribeCommandsOutput.name) &&
356408
Objects.equals(this.parameterDefinitions, commandForDescribeCommandsOutput.parameterDefinitions) &&
409+
Objects.equals(this.projectName, commandForDescribeCommandsOutput.projectName) &&
357410
Objects.equals(this.provider, commandForDescribeCommandsOutput.provider) &&
411+
Objects.equals(this.tags, commandForDescribeCommandsOutput.tags) &&
358412
Objects.equals(this.timeout, commandForDescribeCommandsOutput.timeout) &&
359413
Objects.equals(this.type, commandForDescribeCommandsOutput.type) &&
360414
Objects.equals(this.updatedAt, commandForDescribeCommandsOutput.updatedAt) &&
@@ -364,7 +418,7 @@ public boolean equals(java.lang.Object o) {
364418

365419
@Override
366420
public int hashCode() {
367-
return Objects.hash(commandContent, commandId, createdAt, description, enableParameter, invocationTimes, name, parameterDefinitions, provider, timeout, type, updatedAt, username, workingDir);
421+
return Objects.hash(commandContent, commandId, createdAt, description, enableParameter, invocationTimes, name, parameterDefinitions, projectName, provider, tags, timeout, type, updatedAt, username, workingDir);
368422
}
369423

370424

@@ -381,7 +435,9 @@ public String toString() {
381435
sb.append(" invocationTimes: ").append(toIndentedString(invocationTimes)).append("\n");
382436
sb.append(" name: ").append(toIndentedString(name)).append("\n");
383437
sb.append(" parameterDefinitions: ").append(toIndentedString(parameterDefinitions)).append("\n");
438+
sb.append(" projectName: ").append(toIndentedString(projectName)).append("\n");
384439
sb.append(" provider: ").append(toIndentedString(provider)).append("\n");
440+
sb.append(" tags: ").append(toIndentedString(tags)).append("\n");
385441
sb.append(" timeout: ").append(toIndentedString(timeout)).append("\n");
386442
sb.append(" type: ").append(toIndentedString(type)).append("\n");
387443
sb.append(" updatedAt: ").append(toIndentedString(updatedAt)).append("\n");

‎volcengine-java-sdk-ecs/src/main/java/com/volcengine/ecs/model/CreateCommandRequest.java‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public class CreateCommandRequest {
3737
@SerializedName("CommandContent")
3838
private String commandContent = null;
3939

40+
@SerializedName("ContentEncoding")
41+
private String contentEncoding = null;
42+
4043
@SerializedName("Description")
4144
private String description = null;
4245

@@ -86,6 +89,24 @@ public void setCommandContent(String commandContent) {
8689
this.commandContent = commandContent;
8790
}
8891

92+
public CreateCommandRequest contentEncoding(String contentEncoding) {
93+
this.contentEncoding = contentEncoding;
94+
return this;
95+
}
96+
97+
/**
98+
* Get contentEncoding
99+
* @return contentEncoding
100+
**/
101+
@Schema(description = "")
102+
public String getContentEncoding() {
103+
return contentEncoding;
104+
}
105+
106+
public void setContentEncoding(String contentEncoding) {
107+
this.contentEncoding = contentEncoding;
108+
}
109+
89110
public CreateCommandRequest description(String description) {
90111
this.description = description;
91112
return this;
@@ -297,6 +318,7 @@ public boolean equals(java.lang.Object o) {
297318
}
298319
CreateCommandRequest createCommandRequest = (CreateCommandRequest) o;
299320
return Objects.equals(this.commandContent, createCommandRequest.commandContent) &&
321+
Objects.equals(this.contentEncoding, createCommandRequest.contentEncoding) &&
300322
Objects.equals(this.description, createCommandRequest.description) &&
301323
Objects.equals(this.enableParameter, createCommandRequest.enableParameter) &&
302324
Objects.equals(this.name, createCommandRequest.name) &&
@@ -311,7 +333,7 @@ public boolean equals(java.lang.Object o) {
311333

312334
@Override
313335
public int hashCode() {
314-
return Objects.hash(commandContent, description, enableParameter, name, parameterDefinitions, projectName, tags, timeout, type, username, workingDir);
336+
return Objects.hash(commandContent, contentEncoding, description, enableParameter, name, parameterDefinitions, projectName, tags, timeout, type, username, workingDir);
315337
}
316338

317339

@@ -321,6 +343,7 @@ public String toString() {
321343
sb.append("class CreateCommandRequest {\n");
322344

323345
sb.append(" commandContent: ").append(toIndentedString(commandContent)).append("\n");
346+
sb.append(" contentEncoding: ").append(toIndentedString(contentEncoding)).append("\n");
324347
sb.append(" description: ").append(toIndentedString(description)).append("\n");
325348
sb.append(" enableParameter: ").append(toIndentedString(enableParameter)).append("\n");
326349
sb.append(" name: ").append(toIndentedString(name)).append("\n");

‎volcengine-java-sdk-ecs/src/main/java/com/volcengine/ecs/model/CreateKeyPairRequest.java‎

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
import com.google.gson.annotations.SerializedName;
2020
import com.google.gson.stream.JsonReader;
2121
import com.google.gson.stream.JsonWriter;
22+
import com.volcengine.ecs.model.TagForCreateKeyPairInput;
2223
import io.swagger.v3.oas.annotations.media.Schema;
2324
import java.io.IOException;
25+
import java.util.ArrayList;
26+
import java.util.List;
2427
import javax.validation.constraints.*;
2528
import javax.validation.Valid;
2629
/**
@@ -42,6 +45,9 @@ public class CreateKeyPairRequest {
4245
@SerializedName("ProjectName")
4346
private String projectName = null;
4447

48+
@SerializedName("Tags")
49+
private List<TagForCreateKeyPairInput> tags = null;
50+
4551
public CreateKeyPairRequest clientToken(String clientToken) {
4652
this.clientToken = clientToken;
4753
return this;
@@ -115,6 +121,33 @@ public void setProjectName(String projectName) {
115121
this.projectName = projectName;
116122
}
117123

124+
public CreateKeyPairRequest tags(List<TagForCreateKeyPairInput> tags) {
125+
this.tags = tags;
126+
return this;
127+
}
128+
129+
public CreateKeyPairRequest addTagsItem(TagForCreateKeyPairInput tagsItem) {
130+
if (this.tags == null) {
131+
this.tags = new ArrayList<TagForCreateKeyPairInput>();
132+
}
133+
this.tags.add(tagsItem);
134+
return this;
135+
}
136+
137+
/**
138+
* Get tags
139+
* @return tags
140+
**/
141+
@Valid
142+
@Schema(description = "")
143+
public List<TagForCreateKeyPairInput> getTags() {
144+
return tags;
145+
}
146+
147+
public void setTags(List<TagForCreateKeyPairInput> tags) {
148+
this.tags = tags;
149+
}
150+
118151

119152
@Override
120153
public boolean equals(java.lang.Object o) {
@@ -128,12 +161,13 @@ public boolean equals(java.lang.Object o) {
128161
return Objects.equals(this.clientToken, createKeyPairRequest.clientToken) &&
129162
Objects.equals(this.description, createKeyPairRequest.description) &&
130163
Objects.equals(this.keyPairName, createKeyPairRequest.keyPairName) &&
131-
Objects.equals(this.projectName, createKeyPairRequest.projectName);
164+
Objects.equals(this.projectName, createKeyPairRequest.projectName) &&
165+
Objects.equals(this.tags, createKeyPairRequest.tags);
132166
}
133167

134168
@Override
135169
public int hashCode() {
136-
return Objects.hash(clientToken, description, keyPairName, projectName);
170+
return Objects.hash(clientToken, description, keyPairName, projectName, tags);
137171
}
138172

139173

@@ -146,6 +180,7 @@ public String toString() {
146180
sb.append(" description: ").append(toIndentedString(description)).append("\n");
147181
sb.append(" keyPairName: ").append(toIndentedString(keyPairName)).append("\n");
148182
sb.append(" projectName: ").append(toIndentedString(projectName)).append("\n");
183+
sb.append(" tags: ").append(toIndentedString(tags)).append("\n");
149184
sb.append("}");
150185
return sb.toString();
151186
}

0 commit comments

Comments
 (0)