Skip to content

Commit e824695

Browse files
author
BitsAdmin
committed
Merge branch 'emr-Java-2023-08-15-online-1277-2025_06_10_22_36_00' into 'integration_2025-06-19_956533420802'
feat: [development task] emr-1277-Java (1359917) See merge request iaasng/volcengine-java-sdk!543
2 parents ceeba01 + 1327b4b commit e824695

File tree

3 files changed

+186
-9
lines changed

3 files changed

+186
-9
lines changed

‎volcengine-java-sdk-emr/src/main/java/com/volcengine/emr/model/BootstrapScriptForCreateClusterInput.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
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.emr.model.EffectiveScopeForCreateClusterInput;
2223
import io.swagger.v3.oas.annotations.media.Schema;
2324
import java.io.IOException;
2425
import javax.validation.constraints.*;
@@ -31,7 +32,7 @@
3132

3233
public class BootstrapScriptForCreateClusterInput {
3334
@SerializedName("EffectiveScope")
34-
private String effectiveScope = null;
35+
private EffectiveScopeForCreateClusterInput effectiveScope = null;
3536

3637
/**
3738
* Gets or Sets executionFailStrategy
@@ -84,10 +85,10 @@ public ExecutionFailStrategyEnum read(final JsonReader jsonReader) throws IOExce
8485
*/
8586
@JsonAdapter(ExecutionMomentEnum.Adapter.class)
8687
public enum ExecutionMomentEnum {
87-
@SerializedName("BEFORE_APP_INSTALL")
88-
BEFORE_APP_INSTALL("BEFORE_APP_INSTALL"),
89-
@SerializedName("AFTER_APP_STARTED")
90-
AFTER_APP_STARTED("AFTER_APP_STARTED");
88+
@SerializedName("BEFORE_APPLICATION_INSTALL")
89+
BEFORE_APPLICATION_INSTALL("BEFORE_APPLICATION_INSTALL"),
90+
@SerializedName("AFTER_APPLICATION_STARTED")
91+
AFTER_APPLICATION_STARTED("AFTER_APPLICATION_STARTED");
9192

9293
private String value;
9394

@@ -183,7 +184,7 @@ public ScriptTypeEnum read(final JsonReader jsonReader) throws IOException {
183184
} @SerializedName("ScriptType")
184185
private ScriptTypeEnum scriptType = null;
185186

186-
public BootstrapScriptForCreateClusterInput effectiveScope(String effectiveScope) {
187+
public BootstrapScriptForCreateClusterInput effectiveScope(EffectiveScopeForCreateClusterInput effectiveScope) {
187188
this.effectiveScope = effectiveScope;
188189
return this;
189190
}
@@ -192,12 +193,13 @@ public BootstrapScriptForCreateClusterInput effectiveScope(String effectiveScope
192193
* Get effectiveScope
193194
* @return effectiveScope
194195
**/
196+
@Valid
195197
@Schema(description = "")
196-
public String getEffectiveScope() {
198+
public EffectiveScopeForCreateClusterInput getEffectiveScope() {
197199
return effectiveScope;
198200
}
199201

200-
public void setEffectiveScope(String effectiveScope) {
202+
public void setEffectiveScope(EffectiveScopeForCreateClusterInput effectiveScope) {
201203
this.effectiveScope = effectiveScope;
202204
}
203205

‎volcengine-java-sdk-emr/src/main/java/com/volcengine/emr/model/ItemForListClustersOutput.java‎

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@
2121
import com.google.gson.stream.JsonWriter;
2222
import com.volcengine.emr.model.NodeAttributeForListClustersOutput;
2323
import com.volcengine.emr.model.StateChangeReasonForListClustersOutput;
24+
import com.volcengine.emr.model.TagForListClustersOutput;
2425
import io.swagger.v3.oas.annotations.media.Schema;
2526
import java.io.IOException;
27+
import java.util.ArrayList;
28+
import java.util.List;
2629
import javax.validation.constraints.*;
2730
import javax.validation.Valid;
2831
/**
@@ -53,6 +56,9 @@ public class ItemForListClustersOutput {
5356
@SerializedName("CreateTime")
5457
private Long createTime = null;
5558

59+
@SerializedName("CreateTimeStr")
60+
private String createTimeStr = null;
61+
5662
@SerializedName("Creator")
5763
private String creator = null;
5864

@@ -80,6 +86,9 @@ public class ItemForListClustersOutput {
8086
@SerializedName("StateChangeReason")
8187
private StateChangeReasonForListClustersOutput stateChangeReason = null;
8288

89+
@SerializedName("Tags")
90+
private List<TagForListClustersOutput> tags = null;
91+
8392
@SerializedName("TerminateTime")
8493
private Long terminateTime = null;
8594

@@ -212,6 +221,24 @@ public void setCreateTime(Long createTime) {
212221
this.createTime = createTime;
213222
}
214223

224+
public ItemForListClustersOutput createTimeStr(String createTimeStr) {
225+
this.createTimeStr = createTimeStr;
226+
return this;
227+
}
228+
229+
/**
230+
* Get createTimeStr
231+
* @return createTimeStr
232+
**/
233+
@Schema(description = "")
234+
public String getCreateTimeStr() {
235+
return createTimeStr;
236+
}
237+
238+
public void setCreateTimeStr(String createTimeStr) {
239+
this.createTimeStr = createTimeStr;
240+
}
241+
215242
public ItemForListClustersOutput creator(String creator) {
216243
this.creator = creator;
217244
return this;
@@ -376,6 +403,33 @@ public void setStateChangeReason(StateChangeReasonForListClustersOutput stateCha
376403
this.stateChangeReason = stateChangeReason;
377404
}
378405

406+
public ItemForListClustersOutput tags(List<TagForListClustersOutput> tags) {
407+
this.tags = tags;
408+
return this;
409+
}
410+
411+
public ItemForListClustersOutput addTagsItem(TagForListClustersOutput tagsItem) {
412+
if (this.tags == null) {
413+
this.tags = new ArrayList<TagForListClustersOutput>();
414+
}
415+
this.tags.add(tagsItem);
416+
return this;
417+
}
418+
419+
/**
420+
* Get tags
421+
* @return tags
422+
**/
423+
@Valid
424+
@Schema(description = "")
425+
public List<TagForListClustersOutput> getTags() {
426+
return tags;
427+
}
428+
429+
public void setTags(List<TagForListClustersOutput> tags) {
430+
this.tags = tags;
431+
}
432+
379433
public ItemForListClustersOutput terminateTime(Long terminateTime) {
380434
this.terminateTime = terminateTime;
381435
return this;
@@ -429,6 +483,7 @@ public boolean equals(java.lang.Object o) {
429483
Objects.equals(this.clusterState, itemForListClustersOutput.clusterState) &&
430484
Objects.equals(this.clusterType, itemForListClustersOutput.clusterType) &&
431485
Objects.equals(this.createTime, itemForListClustersOutput.createTime) &&
486+
Objects.equals(this.createTimeStr, itemForListClustersOutput.createTimeStr) &&
432487
Objects.equals(this.creator, itemForListClustersOutput.creator) &&
433488
Objects.equals(this.expireTime, itemForListClustersOutput.expireTime) &&
434489
Objects.equals(this.nodeAttribute, itemForListClustersOutput.nodeAttribute) &&
@@ -438,13 +493,14 @@ public boolean equals(java.lang.Object o) {
438493
Objects.equals(this.releaseVersion, itemForListClustersOutput.releaseVersion) &&
439494
Objects.equals(this.securityGroupId, itemForListClustersOutput.securityGroupId) &&
440495
Objects.equals(this.stateChangeReason, itemForListClustersOutput.stateChangeReason) &&
496+
Objects.equals(this.tags, itemForListClustersOutput.tags) &&
441497
Objects.equals(this.terminateTime, itemForListClustersOutput.terminateTime) &&
442498
Objects.equals(this.vpcId, itemForListClustersOutput.vpcId);
443499
}
444500

445501
@Override
446502
public int hashCode() {
447-
return Objects.hash(accountId, chargeType, clusterId, clusterName, clusterState, clusterType, createTime, creator, expireTime, nodeAttribute, projectName, readyTime, regionId, releaseVersion, securityGroupId, stateChangeReason, terminateTime, vpcId);
503+
return Objects.hash(accountId, chargeType, clusterId, clusterName, clusterState, clusterType, createTime, createTimeStr, creator, expireTime, nodeAttribute, projectName, readyTime, regionId, releaseVersion, securityGroupId, stateChangeReason, tags, terminateTime, vpcId);
448504
}
449505

450506

@@ -460,6 +516,7 @@ public String toString() {
460516
sb.append(" clusterState: ").append(toIndentedString(clusterState)).append("\n");
461517
sb.append(" clusterType: ").append(toIndentedString(clusterType)).append("\n");
462518
sb.append(" createTime: ").append(toIndentedString(createTime)).append("\n");
519+
sb.append(" createTimeStr: ").append(toIndentedString(createTimeStr)).append("\n");
463520
sb.append(" creator: ").append(toIndentedString(creator)).append("\n");
464521
sb.append(" expireTime: ").append(toIndentedString(expireTime)).append("\n");
465522
sb.append(" nodeAttribute: ").append(toIndentedString(nodeAttribute)).append("\n");
@@ -469,6 +526,7 @@ public String toString() {
469526
sb.append(" releaseVersion: ").append(toIndentedString(releaseVersion)).append("\n");
470527
sb.append(" securityGroupId: ").append(toIndentedString(securityGroupId)).append("\n");
471528
sb.append(" stateChangeReason: ").append(toIndentedString(stateChangeReason)).append("\n");
529+
sb.append(" tags: ").append(toIndentedString(tags)).append("\n");
472530
sb.append(" terminateTime: ").append(toIndentedString(terminateTime)).append("\n");
473531
sb.append(" vpcId: ").append(toIndentedString(vpcId)).append("\n");
474532
sb.append("}");

‎volcengine-java-sdk-emr/src/main/java/com/volcengine/emr/model/TagForListClustersOutput.java‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
/*
2+
* emr
3+
* No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
4+
*
5+
* OpenAPI spec version: common-version
6+
*
7+
*
8+
* NOTE: This class is auto generated by the swagger code generator program.
9+
* https://github.com/swagger-api/swagger-codegen.git
10+
* Do not edit the class manually.
11+
*/
12+
13+
package com.volcengine.emr.model;
14+
15+
import java.util.Objects;
16+
import java.util.Arrays;
17+
import com.google.gson.TypeAdapter;
18+
import com.google.gson.annotations.JsonAdapter;
19+
import com.google.gson.annotations.SerializedName;
20+
import com.google.gson.stream.JsonReader;
21+
import com.google.gson.stream.JsonWriter;
22+
import io.swagger.v3.oas.annotations.media.Schema;
23+
import java.io.IOException;
24+
import javax.validation.constraints.*;
25+
import javax.validation.Valid;
26+
/**
27+
* TagForListClustersOutput
28+
*/
29+
30+
31+
32+
public class TagForListClustersOutput {
33+
@SerializedName("Key")
34+
private String key = null;
35+
36+
@SerializedName("Value")
37+
private String value = null;
38+
39+
public TagForListClustersOutput key(String key) {
40+
this.key = key;
41+
return this;
42+
}
43+
44+
/**
45+
* Get key
46+
* @return key
47+
**/
48+
@Schema(description = "")
49+
public String getKey() {
50+
return key;
51+
}
52+
53+
public void setKey(String key) {
54+
this.key = key;
55+
}
56+
57+
public TagForListClustersOutput value(String value) {
58+
this.value = value;
59+
return this;
60+
}
61+
62+
/**
63+
* Get value
64+
* @return value
65+
**/
66+
@Schema(description = "")
67+
public String getValue() {
68+
return value;
69+
}
70+
71+
public void setValue(String value) {
72+
this.value = value;
73+
}
74+
75+
76+
@Override
77+
public boolean equals(java.lang.Object o) {
78+
if (this == o) {
79+
return true;
80+
}
81+
if (o == null || getClass() != o.getClass()) {
82+
return false;
83+
}
84+
TagForListClustersOutput tagForListClustersOutput = (TagForListClustersOutput) o;
85+
return Objects.equals(this.key, tagForListClustersOutput.key) &&
86+
Objects.equals(this.value, tagForListClustersOutput.value);
87+
}
88+
89+
@Override
90+
public int hashCode() {
91+
return Objects.hash(key, value);
92+
}
93+
94+
95+
@Override
96+
public String toString() {
97+
StringBuilder sb = new StringBuilder();
98+
sb.append("class TagForListClustersOutput {\n");
99+
100+
sb.append(" key: ").append(toIndentedString(key)).append("\n");
101+
sb.append(" value: ").append(toIndentedString(value)).append("\n");
102+
sb.append("}");
103+
return sb.toString();
104+
}
105+
106+
/**
107+
* Convert the given object to string with each line indented by 4 spaces
108+
* (except the first line).
109+
*/
110+
private String toIndentedString(java.lang.Object o) {
111+
if (o == null) {
112+
return "null";
113+
}
114+
return o.toString().replace("\n", "\n ");
115+
}
116+
117+
}

0 commit comments

Comments
 (0)