Skip to content

Commit cca9825

Browse files
author
BitsAdmin
committed
Merge branch 'kms-Java-2021-02-18-online-1087-2025_04_03_09_38_55' into 'integration_2025-04-17_864613236738'
feat: [development task] kms-1087-Java (1163165) See merge request iaasng/volcengine-java-sdk!443
2 parents d523926 + 8d64660 commit cca9825

24 files changed

+2737
-12
lines changed

‎volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/KmsApi.java‎

Lines changed: 380 additions & 2 deletions
Large diffs are not rendered by default.

‎volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/model/ConvertReplicaKeyForReplicateKeyOutput.java‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@
2020
import com.google.gson.stream.JsonReader;
2121
import com.google.gson.stream.JsonWriter;
2222
import com.volcengine.kms.model.MultiRegionConfigurationForReplicateKeyOutput;
23+
import com.volcengine.kms.model.TagForReplicateKeyOutput;
2324
import io.swagger.v3.oas.annotations.media.Schema;
2425
import java.io.IOException;
26+
import java.util.ArrayList;
27+
import java.util.List;
2528
import javax.validation.constraints.*;
2629
import javax.validation.Valid;
2730
/**
@@ -79,6 +82,9 @@ public class ConvertReplicaKeyForReplicateKeyOutput {
7982
@SerializedName("ScheduleRotationTime")
8083
private String scheduleRotationTime = null;
8184

85+
@SerializedName("Tags")
86+
private List<TagForReplicateKeyOutput> tags = null;
87+
8288
@SerializedName("Trn")
8389
private String trn = null;
8490

@@ -374,6 +380,33 @@ public void setScheduleRotationTime(String scheduleRotationTime) {
374380
this.scheduleRotationTime = scheduleRotationTime;
375381
}
376382

383+
public ConvertReplicaKeyForReplicateKeyOutput tags(List<TagForReplicateKeyOutput> tags) {
384+
this.tags = tags;
385+
return this;
386+
}
387+
388+
public ConvertReplicaKeyForReplicateKeyOutput addTagsItem(TagForReplicateKeyOutput tagsItem) {
389+
if (this.tags == null) {
390+
this.tags = new ArrayList<TagForReplicateKeyOutput>();
391+
}
392+
this.tags.add(tagsItem);
393+
return this;
394+
}
395+
396+
/**
397+
* Get tags
398+
* @return tags
399+
**/
400+
@Valid
401+
@Schema(description = "")
402+
public List<TagForReplicateKeyOutput> getTags() {
403+
return tags;
404+
}
405+
406+
public void setTags(List<TagForReplicateKeyOutput> tags) {
407+
this.tags = tags;
408+
}
409+
377410
public ConvertReplicaKeyForReplicateKeyOutput trn(String trn) {
378411
this.trn = trn;
379412
return this;
@@ -436,13 +469,14 @@ public boolean equals(java.lang.Object o) {
436469
Objects.equals(this.rotationState, convertReplicaKeyForReplicateKeyOutput.rotationState) &&
437470
Objects.equals(this.scheduleDeleteTime, convertReplicaKeyForReplicateKeyOutput.scheduleDeleteTime) &&
438471
Objects.equals(this.scheduleRotationTime, convertReplicaKeyForReplicateKeyOutput.scheduleRotationTime) &&
472+
Objects.equals(this.tags, convertReplicaKeyForReplicateKeyOutput.tags) &&
439473
Objects.equals(this.trn, convertReplicaKeyForReplicateKeyOutput.trn) &&
440474
Objects.equals(this.updateDate, convertReplicaKeyForReplicateKeyOutput.updateDate);
441475
}
442476

443477
@Override
444478
public int hashCode() {
445-
return Objects.hash(creationDate, description, ID, keyMaterialExpireTime, keyName, keySpec, keyState, keyUsage, lastRotationTime, multiRegion, multiRegionConfiguration, origin, protectionLevel, rotationState, scheduleDeleteTime, scheduleRotationTime, trn, updateDate);
479+
return Objects.hash(creationDate, description, ID, keyMaterialExpireTime, keyName, keySpec, keyState, keyUsage, lastRotationTime, multiRegion, multiRegionConfiguration, origin, protectionLevel, rotationState, scheduleDeleteTime, scheduleRotationTime, tags, trn, updateDate);
446480
}
447481

448482

@@ -467,6 +501,7 @@ public String toString() {
467501
sb.append(" rotationState: ").append(toIndentedString(rotationState)).append("\n");
468502
sb.append(" scheduleDeleteTime: ").append(toIndentedString(scheduleDeleteTime)).append("\n");
469503
sb.append(" scheduleRotationTime: ").append(toIndentedString(scheduleRotationTime)).append("\n");
504+
sb.append(" tags: ").append(toIndentedString(tags)).append("\n");
470505
sb.append(" trn: ").append(toIndentedString(trn)).append("\n");
471506
sb.append(" updateDate: ").append(toIndentedString(updateDate)).append("\n");
472507
sb.append("}");

‎volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/model/CreateKeyRequest.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.kms.model.TagForCreateKeyInput;
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
/**
@@ -57,6 +60,9 @@ public class CreateKeyRequest {
5760
@SerializedName("RotateState")
5861
private String rotateState = null;
5962

63+
@SerializedName("Tags")
64+
private List<TagForCreateKeyInput> tags = null;
65+
6066
public CreateKeyRequest description(String description) {
6167
this.description = description;
6268
return this;
@@ -221,6 +227,33 @@ public void setRotateState(String rotateState) {
221227
this.rotateState = rotateState;
222228
}
223229

230+
public CreateKeyRequest tags(List<TagForCreateKeyInput> tags) {
231+
this.tags = tags;
232+
return this;
233+
}
234+
235+
public CreateKeyRequest addTagsItem(TagForCreateKeyInput tagsItem) {
236+
if (this.tags == null) {
237+
this.tags = new ArrayList<TagForCreateKeyInput>();
238+
}
239+
this.tags.add(tagsItem);
240+
return this;
241+
}
242+
243+
/**
244+
* Get tags
245+
* @return tags
246+
**/
247+
@Valid
248+
@Schema(description = "")
249+
public List<TagForCreateKeyInput> getTags() {
250+
return tags;
251+
}
252+
253+
public void setTags(List<TagForCreateKeyInput> tags) {
254+
this.tags = tags;
255+
}
256+
224257

225258
@Override
226259
public boolean equals(java.lang.Object o) {
@@ -239,12 +272,13 @@ public boolean equals(java.lang.Object o) {
239272
Objects.equals(this.multiRegion, createKeyRequest.multiRegion) &&
240273
Objects.equals(this.origin, createKeyRequest.origin) &&
241274
Objects.equals(this.protectionLevel, createKeyRequest.protectionLevel) &&
242-
Objects.equals(this.rotateState, createKeyRequest.rotateState);
275+
Objects.equals(this.rotateState, createKeyRequest.rotateState) &&
276+
Objects.equals(this.tags, createKeyRequest.tags);
243277
}
244278

245279
@Override
246280
public int hashCode() {
247-
return Objects.hash(description, keyName, keySpec, keyUsage, keyringName, multiRegion, origin, protectionLevel, rotateState);
281+
return Objects.hash(description, keyName, keySpec, keyUsage, keyringName, multiRegion, origin, protectionLevel, rotateState, tags);
248282
}
249283

250284

@@ -262,6 +296,7 @@ public String toString() {
262296
sb.append(" origin: ").append(toIndentedString(origin)).append("\n");
263297
sb.append(" protectionLevel: ").append(toIndentedString(protectionLevel)).append("\n");
264298
sb.append(" rotateState: ").append(toIndentedString(rotateState)).append("\n");
299+
sb.append(" tags: ").append(toIndentedString(tags)).append("\n");
265300
sb.append("}");
266301
return sb.toString();
267302
}

‎volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/model/DescribeKeysRequest.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.kms.model.TagFilterForDescribeKeysInput;
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
/**
@@ -45,6 +48,9 @@ public class DescribeKeysRequest {
4548
@SerializedName("PageSize")
4649
private Integer pageSize = null;
4750

51+
@SerializedName("TagFilters")
52+
private List<TagFilterForDescribeKeysInput> tagFilters = null;
53+
4854
public DescribeKeysRequest currentPage(Integer currentPage) {
4955
this.currentPage = currentPage;
5056
return this;
@@ -138,6 +144,33 @@ public void setPageSize(Integer pageSize) {
138144
this.pageSize = pageSize;
139145
}
140146

147+
public DescribeKeysRequest tagFilters(List<TagFilterForDescribeKeysInput> tagFilters) {
148+
this.tagFilters = tagFilters;
149+
return this;
150+
}
151+
152+
public DescribeKeysRequest addTagFiltersItem(TagFilterForDescribeKeysInput tagFiltersItem) {
153+
if (this.tagFilters == null) {
154+
this.tagFilters = new ArrayList<TagFilterForDescribeKeysInput>();
155+
}
156+
this.tagFilters.add(tagFiltersItem);
157+
return this;
158+
}
159+
160+
/**
161+
* Get tagFilters
162+
* @return tagFilters
163+
**/
164+
@Valid
165+
@Schema(description = "")
166+
public List<TagFilterForDescribeKeysInput> getTagFilters() {
167+
return tagFilters;
168+
}
169+
170+
public void setTagFilters(List<TagFilterForDescribeKeysInput> tagFilters) {
171+
this.tagFilters = tagFilters;
172+
}
173+
141174

142175
@Override
143176
public boolean equals(java.lang.Object o) {
@@ -152,12 +185,13 @@ public boolean equals(java.lang.Object o) {
152185
Objects.equals(this.filters, describeKeysRequest.filters) &&
153186
Objects.equals(this.keyringID, describeKeysRequest.keyringID) &&
154187
Objects.equals(this.keyringName, describeKeysRequest.keyringName) &&
155-
Objects.equals(this.pageSize, describeKeysRequest.pageSize);
188+
Objects.equals(this.pageSize, describeKeysRequest.pageSize) &&
189+
Objects.equals(this.tagFilters, describeKeysRequest.tagFilters);
156190
}
157191

158192
@Override
159193
public int hashCode() {
160-
return Objects.hash(currentPage, filters, keyringID, keyringName, pageSize);
194+
return Objects.hash(currentPage, filters, keyringID, keyringName, pageSize, tagFilters);
161195
}
162196

163197

@@ -171,6 +205,7 @@ public String toString() {
171205
sb.append(" keyringID: ").append(toIndentedString(keyringID)).append("\n");
172206
sb.append(" keyringName: ").append(toIndentedString(keyringName)).append("\n");
173207
sb.append(" pageSize: ").append(toIndentedString(pageSize)).append("\n");
208+
sb.append(" tagFilters: ").append(toIndentedString(tagFilters)).append("\n");
174209
sb.append("}");
175210
return sb.toString();
176211
}

‎volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/model/KeyForCreateKeyOutput.java‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@
2020
import com.google.gson.stream.JsonReader;
2121
import com.google.gson.stream.JsonWriter;
2222
import com.volcengine.kms.model.MultiRegionConfigurationForCreateKeyOutput;
23+
import com.volcengine.kms.model.TagForCreateKeyOutput;
2324
import io.swagger.v3.oas.annotations.media.Schema;
2425
import java.io.IOException;
26+
import java.util.ArrayList;
27+
import java.util.List;
2528
import javax.validation.constraints.*;
2629
import javax.validation.Valid;
2730
/**
@@ -79,6 +82,9 @@ public class KeyForCreateKeyOutput {
7982
@SerializedName("ScheduleRotationTime")
8083
private String scheduleRotationTime = null;
8184

85+
@SerializedName("Tags")
86+
private List<TagForCreateKeyOutput> tags = null;
87+
8288
@SerializedName("Trn")
8389
private String trn = null;
8490

@@ -374,6 +380,33 @@ public void setScheduleRotationTime(String scheduleRotationTime) {
374380
this.scheduleRotationTime = scheduleRotationTime;
375381
}
376382

383+
public KeyForCreateKeyOutput tags(List<TagForCreateKeyOutput> tags) {
384+
this.tags = tags;
385+
return this;
386+
}
387+
388+
public KeyForCreateKeyOutput addTagsItem(TagForCreateKeyOutput tagsItem) {
389+
if (this.tags == null) {
390+
this.tags = new ArrayList<TagForCreateKeyOutput>();
391+
}
392+
this.tags.add(tagsItem);
393+
return this;
394+
}
395+
396+
/**
397+
* Get tags
398+
* @return tags
399+
**/
400+
@Valid
401+
@Schema(description = "")
402+
public List<TagForCreateKeyOutput> getTags() {
403+
return tags;
404+
}
405+
406+
public void setTags(List<TagForCreateKeyOutput> tags) {
407+
this.tags = tags;
408+
}
409+
377410
public KeyForCreateKeyOutput trn(String trn) {
378411
this.trn = trn;
379412
return this;
@@ -436,13 +469,14 @@ public boolean equals(java.lang.Object o) {
436469
Objects.equals(this.rotationState, keyForCreateKeyOutput.rotationState) &&
437470
Objects.equals(this.scheduleDeleteTime, keyForCreateKeyOutput.scheduleDeleteTime) &&
438471
Objects.equals(this.scheduleRotationTime, keyForCreateKeyOutput.scheduleRotationTime) &&
472+
Objects.equals(this.tags, keyForCreateKeyOutput.tags) &&
439473
Objects.equals(this.trn, keyForCreateKeyOutput.trn) &&
440474
Objects.equals(this.updateDate, keyForCreateKeyOutput.updateDate);
441475
}
442476

443477
@Override
444478
public int hashCode() {
445-
return Objects.hash(creationDate, description, ID, keyMaterialExpireTime, keyName, keySpec, keyState, keyUsage, lastRotationTime, multiRegion, multiRegionConfiguration, origin, protectionLevel, rotationState, scheduleDeleteTime, scheduleRotationTime, trn, updateDate);
479+
return Objects.hash(creationDate, description, ID, keyMaterialExpireTime, keyName, keySpec, keyState, keyUsage, lastRotationTime, multiRegion, multiRegionConfiguration, origin, protectionLevel, rotationState, scheduleDeleteTime, scheduleRotationTime, tags, trn, updateDate);
446480
}
447481

448482

@@ -467,6 +501,7 @@ public String toString() {
467501
sb.append(" rotationState: ").append(toIndentedString(rotationState)).append("\n");
468502
sb.append(" scheduleDeleteTime: ").append(toIndentedString(scheduleDeleteTime)).append("\n");
469503
sb.append(" scheduleRotationTime: ").append(toIndentedString(scheduleRotationTime)).append("\n");
504+
sb.append(" tags: ").append(toIndentedString(tags)).append("\n");
470505
sb.append(" trn: ").append(toIndentedString(trn)).append("\n");
471506
sb.append(" updateDate: ").append(toIndentedString(updateDate)).append("\n");
472507
sb.append("}");

‎volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/model/KeyForDescribeKeyOutput.java‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@
2020
import com.google.gson.stream.JsonReader;
2121
import com.google.gson.stream.JsonWriter;
2222
import com.volcengine.kms.model.MultiRegionConfigurationForDescribeKeyOutput;
23+
import com.volcengine.kms.model.TagForDescribeKeyOutput;
2324
import io.swagger.v3.oas.annotations.media.Schema;
2425
import java.io.IOException;
26+
import java.util.ArrayList;
27+
import java.util.List;
2528
import javax.validation.constraints.*;
2629
import javax.validation.Valid;
2730
/**
@@ -79,6 +82,9 @@ public class KeyForDescribeKeyOutput {
7982
@SerializedName("ScheduleRotationTime")
8083
private String scheduleRotationTime = null;
8184

85+
@SerializedName("Tags")
86+
private List<TagForDescribeKeyOutput> tags = null;
87+
8288
@SerializedName("Trn")
8389
private String trn = null;
8490

@@ -374,6 +380,33 @@ public void setScheduleRotationTime(String scheduleRotationTime) {
374380
this.scheduleRotationTime = scheduleRotationTime;
375381
}
376382

383+
public KeyForDescribeKeyOutput tags(List<TagForDescribeKeyOutput> tags) {
384+
this.tags = tags;
385+
return this;
386+
}
387+
388+
public KeyForDescribeKeyOutput addTagsItem(TagForDescribeKeyOutput tagsItem) {
389+
if (this.tags == null) {
390+
this.tags = new ArrayList<TagForDescribeKeyOutput>();
391+
}
392+
this.tags.add(tagsItem);
393+
return this;
394+
}
395+
396+
/**
397+
* Get tags
398+
* @return tags
399+
**/
400+
@Valid
401+
@Schema(description = "")
402+
public List<TagForDescribeKeyOutput> getTags() {
403+
return tags;
404+
}
405+
406+
public void setTags(List<TagForDescribeKeyOutput> tags) {
407+
this.tags = tags;
408+
}
409+
377410
public KeyForDescribeKeyOutput trn(String trn) {
378411
this.trn = trn;
379412
return this;
@@ -436,13 +469,14 @@ public boolean equals(java.lang.Object o) {
436469
Objects.equals(this.rotationState, keyForDescribeKeyOutput.rotationState) &&
437470
Objects.equals(this.scheduleDeleteTime, keyForDescribeKeyOutput.scheduleDeleteTime) &&
438471
Objects.equals(this.scheduleRotationTime, keyForDescribeKeyOutput.scheduleRotationTime) &&
472+
Objects.equals(this.tags, keyForDescribeKeyOutput.tags) &&
439473
Objects.equals(this.trn, keyForDescribeKeyOutput.trn) &&
440474
Objects.equals(this.updateDate, keyForDescribeKeyOutput.updateDate);
441475
}
442476

443477
@Override
444478
public int hashCode() {
445-
return Objects.hash(creationDate, description, ID, keyMaterialExpireTime, keyName, keySpec, keyState, keyUsage, lastRotationTime, multiRegion, multiRegionConfiguration, origin, protectionLevel, rotationState, scheduleDeleteTime, scheduleRotationTime, trn, updateDate);
479+
return Objects.hash(creationDate, description, ID, keyMaterialExpireTime, keyName, keySpec, keyState, keyUsage, lastRotationTime, multiRegion, multiRegionConfiguration, origin, protectionLevel, rotationState, scheduleDeleteTime, scheduleRotationTime, tags, trn, updateDate);
446480
}
447481

448482

@@ -467,6 +501,7 @@ public String toString() {
467501
sb.append(" rotationState: ").append(toIndentedString(rotationState)).append("\n");
468502
sb.append(" scheduleDeleteTime: ").append(toIndentedString(scheduleDeleteTime)).append("\n");
469503
sb.append(" scheduleRotationTime: ").append(toIndentedString(scheduleRotationTime)).append("\n");
504+
sb.append(" tags: ").append(toIndentedString(tags)).append("\n");
470505
sb.append(" trn: ").append(toIndentedString(trn)).append("\n");
471506
sb.append(" updateDate: ").append(toIndentedString(updateDate)).append("\n");
472507
sb.append("}");

0 commit comments

Comments
 (0)