Skip to content

Commit 51e8cf8

Browse files
author
BitsAdmin
committed
Merge branch 'vke-Java-2022-05-12-online-1127-2025_04_24_15_45_08' into 'integration_2025-04-28_881148411650'
feat: [development task] vke-1127-Java (1191506) See merge request iaasng/volcengine-java-sdk!463
2 parents 4a614dc + 9742642 commit 51e8cf8

8 files changed

+694
-4
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
* Note
99

1010
### Requirements ###
11+
1112
运行 SDK需要jdk **Java 1.8.0_131+**. 你可以下载最新的版本： http://developers.sun.com/downloads/.
1213
如果 SDK版本 高于或者等于 **Java 9** 请依赖javax.annotation-api
1314
由于在高于或者等于 **Java 9** 中 javax.annotation-api 被移除

‎volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/FilterForListNodesInput.java‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ public class FilterForListNodesInput {
4242
@SerializedName("Ids")
4343
private List<String> ids = null;
4444

45+
@SerializedName("InstanceIds")
46+
private List<String> instanceIds = null;
47+
4548
@SerializedName("Name")
4649
private String name = null;
4750

@@ -124,6 +127,32 @@ public void setIds(List<String> ids) {
124127
this.ids = ids;
125128
}
126129

130+
public FilterForListNodesInput instanceIds(List<String> instanceIds) {
131+
this.instanceIds = instanceIds;
132+
return this;
133+
}
134+
135+
public FilterForListNodesInput addInstanceIdsItem(String instanceIdsItem) {
136+
if (this.instanceIds == null) {
137+
this.instanceIds = new ArrayList<String>();
138+
}
139+
this.instanceIds.add(instanceIdsItem);
140+
return this;
141+
}
142+
143+
/**
144+
* Get instanceIds
145+
* @return instanceIds
146+
**/
147+
@Schema(description = "")
148+
public List<String> getInstanceIds() {
149+
return instanceIds;
150+
}
151+
152+
public void setInstanceIds(List<String> instanceIds) {
153+
this.instanceIds = instanceIds;
154+
}
155+
127156
public FilterForListNodesInput name(String name) {
128157
this.name = name;
129158
return this;
@@ -234,6 +263,7 @@ public boolean equals(java.lang.Object o) {
234263
return Objects.equals(this.clusterIds, filterForListNodesInput.clusterIds) &&
235264
Objects.equals(this.createClientToken, filterForListNodesInput.createClientToken) &&
236265
Objects.equals(this.ids, filterForListNodesInput.ids) &&
266+
Objects.equals(this.instanceIds, filterForListNodesInput.instanceIds) &&
237267
Objects.equals(this.name, filterForListNodesInput.name) &&
238268
Objects.equals(this.nodePoolIds, filterForListNodesInput.nodePoolIds) &&
239269
Objects.equals(this.statuses, filterForListNodesInput.statuses) &&
@@ -242,7 +272,7 @@ public boolean equals(java.lang.Object o) {
242272

243273
@Override
244274
public int hashCode() {
245-
return Objects.hash(clusterIds, createClientToken, ids, name, nodePoolIds, statuses, zoneIds);
275+
return Objects.hash(clusterIds, createClientToken, ids, instanceIds, name, nodePoolIds, statuses, zoneIds);
246276
}
247277

248278

@@ -254,6 +284,7 @@ public String toString() {
254284
sb.append(" clusterIds: ").append(toIndentedString(clusterIds)).append("\n");
255285
sb.append(" createClientToken: ").append(toIndentedString(createClientToken)).append("\n");
256286
sb.append(" ids: ").append(toIndentedString(ids)).append("\n");
287+
sb.append(" instanceIds: ").append(toIndentedString(instanceIds)).append("\n");
257288
sb.append(" name: ").append(toIndentedString(name)).append("\n");
258289
sb.append(" nodePoolIds: ").append(toIndentedString(nodePoolIds)).append("\n");
259290
sb.append(" statuses: ").append(toIndentedString(statuses)).append("\n");

‎volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/NodeConfigForCreateNodePoolInput.java‎

Lines changed: 49 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.vke.model.DataVolumeForCreateNodePoolInput;
23+
import com.volcengine.vke.model.PublicAccessConfigForCreateNodePoolInput;
2324
import com.volcengine.vke.model.SecurityForCreateNodePoolInput;
2425
import com.volcengine.vke.model.SystemVolumeForCreateNodePoolInput;
2526
import com.volcengine.vke.model.TagForCreateNodePoolInput;
@@ -121,6 +122,12 @@ public InstanceChargeTypeEnum read(final JsonReader jsonReader) throws IOExcepti
121122
@SerializedName("ProjectName")
122123
private String projectName = null;
123124

125+
@SerializedName("PublicAccessConfig")
126+
private PublicAccessConfigForCreateNodePoolInput publicAccessConfig = null;
127+
128+
@SerializedName("PublicAccessEnabled")
129+
private Boolean publicAccessEnabled = null;
130+
124131
@SerializedName("Security")
125132
private SecurityForCreateNodePoolInput security = null;
126133

@@ -410,6 +417,43 @@ public void setProjectName(String projectName) {
410417
this.projectName = projectName;
411418
}
412419

420+
public NodeConfigForCreateNodePoolInput publicAccessConfig(PublicAccessConfigForCreateNodePoolInput publicAccessConfig) {
421+
this.publicAccessConfig = publicAccessConfig;
422+
return this;
423+
}
424+
425+
/**
426+
* Get publicAccessConfig
427+
* @return publicAccessConfig
428+
**/
429+
@Valid
430+
@Schema(description = "")
431+
public PublicAccessConfigForCreateNodePoolInput getPublicAccessConfig() {
432+
return publicAccessConfig;
433+
}
434+
435+
public void setPublicAccessConfig(PublicAccessConfigForCreateNodePoolInput publicAccessConfig) {
436+
this.publicAccessConfig = publicAccessConfig;
437+
}
438+
439+
public NodeConfigForCreateNodePoolInput publicAccessEnabled(Boolean publicAccessEnabled) {
440+
this.publicAccessEnabled = publicAccessEnabled;
441+
return this;
442+
}
443+
444+
/**
445+
* Get publicAccessEnabled
446+
* @return publicAccessEnabled
447+
**/
448+
@Schema(description = "")
449+
public Boolean isPublicAccessEnabled() {
450+
return publicAccessEnabled;
451+
}
452+
453+
public void setPublicAccessEnabled(Boolean publicAccessEnabled) {
454+
this.publicAccessEnabled = publicAccessEnabled;
455+
}
456+
413457
public NodeConfigForCreateNodePoolInput security(SecurityForCreateNodePoolInput security) {
414458
this.security = security;
415459
return this;
@@ -525,6 +569,8 @@ public boolean equals(java.lang.Object o) {
525569
Objects.equals(this.namePrefix, nodeConfigForCreateNodePoolInput.namePrefix) &&
526570
Objects.equals(this.period, nodeConfigForCreateNodePoolInput.period) &&
527571
Objects.equals(this.projectName, nodeConfigForCreateNodePoolInput.projectName) &&
572+
Objects.equals(this.publicAccessConfig, nodeConfigForCreateNodePoolInput.publicAccessConfig) &&
573+
Objects.equals(this.publicAccessEnabled, nodeConfigForCreateNodePoolInput.publicAccessEnabled) &&
528574
Objects.equals(this.security, nodeConfigForCreateNodePoolInput.security) &&
529575
Objects.equals(this.subnetIds, nodeConfigForCreateNodePoolInput.subnetIds) &&
530576
Objects.equals(this.systemVolume, nodeConfigForCreateNodePoolInput.systemVolume) &&
@@ -533,7 +579,7 @@ public boolean equals(java.lang.Object o) {
533579

534580
@Override
535581
public int hashCode() {
536-
return Objects.hash(additionalContainerStorageEnabled, autoRenew, autoRenewPeriod, dataVolumes, deploymentSetGroupNumber, deploymentSetId, hpcClusterIds, imageId, initializeScript, instanceChargeType, instanceTypeIds, namePrefix, period, projectName, security, subnetIds, systemVolume, tags);
582+
return Objects.hash(additionalContainerStorageEnabled, autoRenew, autoRenewPeriod, dataVolumes, deploymentSetGroupNumber, deploymentSetId, hpcClusterIds, imageId, initializeScript, instanceChargeType, instanceTypeIds, namePrefix, period, projectName, publicAccessConfig, publicAccessEnabled, security, subnetIds, systemVolume, tags);
537583
}
538584

539585

@@ -556,6 +602,8 @@ public String toString() {
556602
sb.append(" namePrefix: ").append(toIndentedString(namePrefix)).append("\n");
557603
sb.append(" period: ").append(toIndentedString(period)).append("\n");
558604
sb.append(" projectName: ").append(toIndentedString(projectName)).append("\n");
605+
sb.append(" publicAccessConfig: ").append(toIndentedString(publicAccessConfig)).append("\n");
606+
sb.append(" publicAccessEnabled: ").append(toIndentedString(publicAccessEnabled)).append("\n");
559607
sb.append(" security: ").append(toIndentedString(security)).append("\n");
560608
sb.append(" subnetIds: ").append(toIndentedString(subnetIds)).append("\n");
561609
sb.append(" systemVolume: ").append(toIndentedString(systemVolume)).append("\n");

‎volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/NodeConfigForListNodePoolsOutput.java‎

Lines changed: 49 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.vke.model.DataVolumeForListNodePoolsOutput;
23+
import com.volcengine.vke.model.PublicAccessConfigForListNodePoolsOutput;
2324
import com.volcengine.vke.model.SecurityForListNodePoolsOutput;
2425
import com.volcengine.vke.model.SystemVolumeForListNodePoolsOutput;
2526
import com.volcengine.vke.model.TagForListNodePoolsOutput;
@@ -121,6 +122,12 @@ public InstanceChargeTypeEnum read(final JsonReader jsonReader) throws IOExcepti
121122
@SerializedName("ProjectName")
122123
private String projectName = null;
123124

125+
@SerializedName("PublicAccessConfig")
126+
private PublicAccessConfigForListNodePoolsOutput publicAccessConfig = null;
127+
128+
@SerializedName("PublicAccessEnabled")
129+
private Boolean publicAccessEnabled = null;
130+
124131
@SerializedName("Security")
125132
private SecurityForListNodePoolsOutput security = null;
126133

@@ -410,6 +417,43 @@ public void setProjectName(String projectName) {
410417
this.projectName = projectName;
411418
}
412419

420+
public NodeConfigForListNodePoolsOutput publicAccessConfig(PublicAccessConfigForListNodePoolsOutput publicAccessConfig) {
421+
this.publicAccessConfig = publicAccessConfig;
422+
return this;
423+
}
424+
425+
/**
426+
* Get publicAccessConfig
427+
* @return publicAccessConfig
428+
**/
429+
@Valid
430+
@Schema(description = "")
431+
public PublicAccessConfigForListNodePoolsOutput getPublicAccessConfig() {
432+
return publicAccessConfig;
433+
}
434+
435+
public void setPublicAccessConfig(PublicAccessConfigForListNodePoolsOutput publicAccessConfig) {
436+
this.publicAccessConfig = publicAccessConfig;
437+
}
438+
439+
public NodeConfigForListNodePoolsOutput publicAccessEnabled(Boolean publicAccessEnabled) {
440+
this.publicAccessEnabled = publicAccessEnabled;
441+
return this;
442+
}
443+
444+
/**
445+
* Get publicAccessEnabled
446+
* @return publicAccessEnabled
447+
**/
448+
@Schema(description = "")
449+
public Boolean isPublicAccessEnabled() {
450+
return publicAccessEnabled;
451+
}
452+
453+
public void setPublicAccessEnabled(Boolean publicAccessEnabled) {
454+
this.publicAccessEnabled = publicAccessEnabled;
455+
}
456+
413457
public NodeConfigForListNodePoolsOutput security(SecurityForListNodePoolsOutput security) {
414458
this.security = security;
415459
return this;
@@ -525,6 +569,8 @@ public boolean equals(java.lang.Object o) {
525569
Objects.equals(this.namePrefix, nodeConfigForListNodePoolsOutput.namePrefix) &&
526570
Objects.equals(this.period, nodeConfigForListNodePoolsOutput.period) &&
527571
Objects.equals(this.projectName, nodeConfigForListNodePoolsOutput.projectName) &&
572+
Objects.equals(this.publicAccessConfig, nodeConfigForListNodePoolsOutput.publicAccessConfig) &&
573+
Objects.equals(this.publicAccessEnabled, nodeConfigForListNodePoolsOutput.publicAccessEnabled) &&
528574
Objects.equals(this.security, nodeConfigForListNodePoolsOutput.security) &&
529575
Objects.equals(this.subnetIds, nodeConfigForListNodePoolsOutput.subnetIds) &&
530576
Objects.equals(this.systemVolume, nodeConfigForListNodePoolsOutput.systemVolume) &&
@@ -533,7 +579,7 @@ public boolean equals(java.lang.Object o) {
533579

534580
@Override
535581
public int hashCode() {
536-
return Objects.hash(additionalContainerStorageEnabled, autoRenew, autoRenewPeriod, dataVolumes, deploymentSetGroupNumber, deploymentSetId, hpcClusterIds, imageId, initializeScript, instanceChargeType, instanceTypeIds, namePrefix, period, projectName, security, subnetIds, systemVolume, tags);
582+
return Objects.hash(additionalContainerStorageEnabled, autoRenew, autoRenewPeriod, dataVolumes, deploymentSetGroupNumber, deploymentSetId, hpcClusterIds, imageId, initializeScript, instanceChargeType, instanceTypeIds, namePrefix, period, projectName, publicAccessConfig, publicAccessEnabled, security, subnetIds, systemVolume, tags);
537583
}
538584

539585

@@ -556,6 +602,8 @@ public String toString() {
556602
sb.append(" namePrefix: ").append(toIndentedString(namePrefix)).append("\n");
557603
sb.append(" period: ").append(toIndentedString(period)).append("\n");
558604
sb.append(" projectName: ").append(toIndentedString(projectName)).append("\n");
605+
sb.append(" publicAccessConfig: ").append(toIndentedString(publicAccessConfig)).append("\n");
606+
sb.append(" publicAccessEnabled: ").append(toIndentedString(publicAccessEnabled)).append("\n");
559607
sb.append(" security: ").append(toIndentedString(security)).append("\n");
560608
sb.append(" subnetIds: ").append(toIndentedString(subnetIds)).append("\n");
561609
sb.append(" systemVolume: ").append(toIndentedString(systemVolume)).append("\n");

‎volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/NodeConfigForUpdateNodePoolConfigInput.java‎

Lines changed: 49 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.vke.model.DataVolumeForUpdateNodePoolConfigInput;
23+
import com.volcengine.vke.model.PublicAccessConfigForUpdateNodePoolConfigInput;
2324
import com.volcengine.vke.model.SecurityForUpdateNodePoolConfigInput;
2425
import com.volcengine.vke.model.SystemVolumeForUpdateNodePoolConfigInput;
2526
import com.volcengine.vke.model.TagForUpdateNodePoolConfigInput;
@@ -69,6 +70,12 @@ public class NodeConfigForUpdateNodePoolConfigInput {
6970
@SerializedName("ProjectName")
7071
private String projectName = null;
7172

73+
@SerializedName("PublicAccessConfig")
74+
private PublicAccessConfigForUpdateNodePoolConfigInput publicAccessConfig = null;
75+
76+
@SerializedName("PublicAccessEnabled")
77+
private Boolean publicAccessEnabled = null;
78+
7279
@SerializedName("Security")
7380
private SecurityForUpdateNodePoolConfigInput security = null;
7481

@@ -304,6 +311,43 @@ public void setProjectName(String projectName) {
304311
this.projectName = projectName;
305312
}
306313

314+
public NodeConfigForUpdateNodePoolConfigInput publicAccessConfig(PublicAccessConfigForUpdateNodePoolConfigInput publicAccessConfig) {
315+
this.publicAccessConfig = publicAccessConfig;
316+
return this;
317+
}
318+
319+
/**
320+
* Get publicAccessConfig
321+
* @return publicAccessConfig
322+
**/
323+
@Valid
324+
@Schema(description = "")
325+
public PublicAccessConfigForUpdateNodePoolConfigInput getPublicAccessConfig() {
326+
return publicAccessConfig;
327+
}
328+
329+
public void setPublicAccessConfig(PublicAccessConfigForUpdateNodePoolConfigInput publicAccessConfig) {
330+
this.publicAccessConfig = publicAccessConfig;
331+
}
332+
333+
public NodeConfigForUpdateNodePoolConfigInput publicAccessEnabled(Boolean publicAccessEnabled) {
334+
this.publicAccessEnabled = publicAccessEnabled;
335+
return this;
336+
}
337+
338+
/**
339+
* Get publicAccessEnabled
340+
* @return publicAccessEnabled
341+
**/
342+
@Schema(description = "")
343+
public Boolean isPublicAccessEnabled() {
344+
return publicAccessEnabled;
345+
}
346+
347+
public void setPublicAccessEnabled(Boolean publicAccessEnabled) {
348+
this.publicAccessEnabled = publicAccessEnabled;
349+
}
350+
307351
public NodeConfigForUpdateNodePoolConfigInput security(SecurityForUpdateNodePoolConfigInput security) {
308352
this.security = security;
309353
return this;
@@ -416,6 +460,8 @@ public boolean equals(java.lang.Object o) {
416460
Objects.equals(this.namePrefix, nodeConfigForUpdateNodePoolConfigInput.namePrefix) &&
417461
Objects.equals(this.period, nodeConfigForUpdateNodePoolConfigInput.period) &&
418462
Objects.equals(this.projectName, nodeConfigForUpdateNodePoolConfigInput.projectName) &&
463+
Objects.equals(this.publicAccessConfig, nodeConfigForUpdateNodePoolConfigInput.publicAccessConfig) &&
464+
Objects.equals(this.publicAccessEnabled, nodeConfigForUpdateNodePoolConfigInput.publicAccessEnabled) &&
419465
Objects.equals(this.security, nodeConfigForUpdateNodePoolConfigInput.security) &&
420466
Objects.equals(this.subnetIds, nodeConfigForUpdateNodePoolConfigInput.subnetIds) &&
421467
Objects.equals(this.systemVolume, nodeConfigForUpdateNodePoolConfigInput.systemVolume) &&
@@ -424,7 +470,7 @@ public boolean equals(java.lang.Object o) {
424470

425471
@Override
426472
public int hashCode() {
427-
return Objects.hash(additionalContainerStorageEnabled, autoRenew, autoRenewPeriod, dataVolumes, hpcClusterIds, imageId, initializeScript, instanceTypeIds, namePrefix, period, projectName, security, subnetIds, systemVolume, tags);
473+
return Objects.hash(additionalContainerStorageEnabled, autoRenew, autoRenewPeriod, dataVolumes, hpcClusterIds, imageId, initializeScript, instanceTypeIds, namePrefix, period, projectName, publicAccessConfig, publicAccessEnabled, security, subnetIds, systemVolume, tags);
428474
}
429475

430476

@@ -444,6 +490,8 @@ public String toString() {
444490
sb.append(" namePrefix: ").append(toIndentedString(namePrefix)).append("\n");
445491
sb.append(" period: ").append(toIndentedString(period)).append("\n");
446492
sb.append(" projectName: ").append(toIndentedString(projectName)).append("\n");
493+
sb.append(" publicAccessConfig: ").append(toIndentedString(publicAccessConfig)).append("\n");
494+
sb.append(" publicAccessEnabled: ").append(toIndentedString(publicAccessEnabled)).append("\n");
447495
sb.append(" security: ").append(toIndentedString(security)).append("\n");
448496
sb.append(" subnetIds: ").append(toIndentedString(subnetIds)).append("\n");
449497
sb.append(" systemVolume: ").append(toIndentedString(systemVolume)).append("\n");

0 commit comments

Comments
 (0)