Skip to content

Commit a659d91

Browse files
author
BitsAdmin
committed
Merge branch 'kms-Java-2021-02-18-online-917-2025_01_06_14_58_48' into 'integration_2025-01-09_670294536194'
feat: [development task] kms-917-Java (964709) See merge request iaasng/volcengine-java-sdk!353
2 parents 979c7f9 + 1af3402 commit a659d91

25 files changed

+562
-177
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public com.squareup.okhttp.Call archiveKeyCall(ArchiveKeyRequest body, final Pro
157157
Object localVarPostBody = body;
158158

159159
// create path and map variables
160-
String localVarPath = "/ArchiveKey/2021-02-18/kms/post/application_json/";
160+
String localVarPath = "/ArchiveKey/2021-02-18/kms/get/text_plain/";
161161

162162
List<Pair> localVarQueryParams = new ArrayList<Pair>();
163163
List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
@@ -3133,7 +3133,7 @@ public com.squareup.okhttp.Call disableKeyRotationCall(DisableKeyRotationRequest
31333133
Object localVarPostBody = body;
31343134

31353135
// create path and map variables
3136-
String localVarPath = "/DisableKeyRotation/2021-02-18/kms/post/application_json/";
3136+
String localVarPath = "/DisableKeyRotation/2021-02-18/kms/get/text_plain/";
31373137

31383138
List<Pair> localVarQueryParams = new ArrayList<Pair>();
31393139
List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
@@ -3257,7 +3257,7 @@ public com.squareup.okhttp.Call enableKeyCall(EnableKeyRequest body, final Progr
32573257
Object localVarPostBody = body;
32583258

32593259
// create path and map variables
3260-
String localVarPath = "/EnableKey/2021-02-18/kms/post/application_json/";
3260+
String localVarPath = "/EnableKey/2021-02-18/kms/get/text_plain/";
32613261

32623262
List<Pair> localVarQueryParams = new ArrayList<Pair>();
32633263
List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
@@ -4373,7 +4373,7 @@ public com.squareup.okhttp.Call queryKeyringCall(QueryKeyringRequest body, final
43734373
Object localVarPostBody = body;
43744374

43754375
// create path and map variables
4376-
String localVarPath = "/QueryKeyring/2021-02-18/kms/post/application_json/";
4376+
String localVarPath = "/QueryKeyring/2021-02-18/kms/get/text_plain/";
43774377

43784378
List<Pair> localVarQueryParams = new ArrayList<Pair>();
43794379
List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
@@ -5365,7 +5365,7 @@ public com.squareup.okhttp.Call updateKeyringCall(UpdateKeyringRequest body, fin
53655365
Object localVarPostBody = body;
53665366

53675367
// create path and map variables
5368-
String localVarPath = "/UpdateKeyring/2021-02-18/kms/post/application_json/";
5368+
String localVarPath = "/UpdateKeyring/2021-02-18/kms/get/text_plain/";
53695369

53705370
List<Pair> localVarQueryParams = new ArrayList<Pair>();
53715371
List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();

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

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,33 @@
3030

3131

3232
public class ArchiveKeyRequest {
33+
@SerializedName("KeyID")
34+
private String keyID = null;
35+
3336
@SerializedName("KeyName")
3437
private String keyName = null;
3538

3639
@SerializedName("KeyringName")
3740
private String keyringName = null;
3841

42+
public ArchiveKeyRequest keyID(String keyID) {
43+
this.keyID = keyID;
44+
return this;
45+
}
46+
47+
/**
48+
* Get keyID
49+
* @return keyID
50+
**/
51+
@Schema(description = "")
52+
public String getKeyID() {
53+
return keyID;
54+
}
55+
56+
public void setKeyID(String keyID) {
57+
this.keyID = keyID;
58+
}
59+
3960
public ArchiveKeyRequest keyName(String keyName) {
4061
this.keyName = keyName;
4162
return this;
@@ -45,8 +66,7 @@ public ArchiveKeyRequest keyName(String keyName) {
4566
* Get keyName
4667
* @return keyName
4768
**/
48-
@NotNull
49-
@Size(min=2,max=31) @Schema(required = true, description = "")
69+
@Size(min=2,max=31) @Schema(description = "")
5070
public String getKeyName() {
5171
return keyName;
5272
}
@@ -64,8 +84,7 @@ public ArchiveKeyRequest keyringName(String keyringName) {
6484
* Get keyringName
6585
* @return keyringName
6686
**/
67-
@NotNull
68-
@Size(min=2,max=31) @Schema(required = true, description = "")
87+
@Size(min=2,max=31) @Schema(description = "")
6988
public String getKeyringName() {
7089
return keyringName;
7190
}
@@ -84,13 +103,14 @@ public boolean equals(java.lang.Object o) {
84103
return false;
85104
}
86105
ArchiveKeyRequest archiveKeyRequest = (ArchiveKeyRequest) o;
87-
return Objects.equals(this.keyName, archiveKeyRequest.keyName) &&
106+
return Objects.equals(this.keyID, archiveKeyRequest.keyID) &&
107+
Objects.equals(this.keyName, archiveKeyRequest.keyName) &&
88108
Objects.equals(this.keyringName, archiveKeyRequest.keyringName);
89109
}
90110

91111
@Override
92112
public int hashCode() {
93-
return Objects.hash(keyName, keyringName);
113+
return Objects.hash(keyID, keyName, keyringName);
94114
}
95115

96116

@@ -99,6 +119,7 @@ public String toString() {
99119
StringBuilder sb = new StringBuilder();
100120
sb.append("class ArchiveKeyRequest {\n");
101121

122+
sb.append(" keyID: ").append(toIndentedString(keyID)).append("\n");
102123
sb.append(" keyName: ").append(toIndentedString(keyName)).append("\n");
103124
sb.append(" keyringName: ").append(toIndentedString(keyringName)).append("\n");
104125
sb.append("}");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public AsymmetricEncryptRequest plaintext(String plaintext) {
128128
* @return plaintext
129129
**/
130130
@NotNull
131-
@Size(min=1,max=4096) @Schema(required = true, description = "")
131+
@Size(min=1,max=1024) @Schema(required = true, description = "")
132132
public String getPlaintext() {
133133
return plaintext;
134134
}

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

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,33 @@
3030

3131

3232
public class CancelArchiveKeyRequest {
33+
@SerializedName("KeyID")
34+
private String keyID = null;
35+
3336
@SerializedName("KeyName")
3437
private String keyName = null;
3538

3639
@SerializedName("KeyringName")
3740
private String keyringName = null;
3841

42+
public CancelArchiveKeyRequest keyID(String keyID) {
43+
this.keyID = keyID;
44+
return this;
45+
}
46+
47+
/**
48+
* Get keyID
49+
* @return keyID
50+
**/
51+
@Schema(description = "")
52+
public String getKeyID() {
53+
return keyID;
54+
}
55+
56+
public void setKeyID(String keyID) {
57+
this.keyID = keyID;
58+
}
59+
3960
public CancelArchiveKeyRequest keyName(String keyName) {
4061
this.keyName = keyName;
4162
return this;
@@ -45,8 +66,7 @@ public CancelArchiveKeyRequest keyName(String keyName) {
4566
* Get keyName
4667
* @return keyName
4768
**/
48-
@NotNull
49-
@Size(min=2,max=31) @Schema(required = true, description = "")
69+
@Size(min=2,max=31) @Schema(description = "")
5070
public String getKeyName() {
5171
return keyName;
5272
}
@@ -64,8 +84,7 @@ public CancelArchiveKeyRequest keyringName(String keyringName) {
6484
* Get keyringName
6585
* @return keyringName
6686
**/
67-
@NotNull
68-
@Size(min=2,max=31) @Schema(required = true, description = "")
87+
@Size(min=2,max=31) @Schema(description = "")
6988
public String getKeyringName() {
7089
return keyringName;
7190
}
@@ -84,13 +103,14 @@ public boolean equals(java.lang.Object o) {
84103
return false;
85104
}
86105
CancelArchiveKeyRequest cancelArchiveKeyRequest = (CancelArchiveKeyRequest) o;
87-
return Objects.equals(this.keyName, cancelArchiveKeyRequest.keyName) &&
106+
return Objects.equals(this.keyID, cancelArchiveKeyRequest.keyID) &&
107+
Objects.equals(this.keyName, cancelArchiveKeyRequest.keyName) &&
88108
Objects.equals(this.keyringName, cancelArchiveKeyRequest.keyringName);
89109
}
90110

91111
@Override
92112
public int hashCode() {
93-
return Objects.hash(keyName, keyringName);
113+
return Objects.hash(keyID, keyName, keyringName);
94114
}
95115

96116

@@ -99,6 +119,7 @@ public String toString() {
99119
StringBuilder sb = new StringBuilder();
100120
sb.append("class CancelArchiveKeyRequest {\n");
101121

122+
sb.append(" keyID: ").append(toIndentedString(keyID)).append("\n");
102123
sb.append(" keyName: ").append(toIndentedString(keyName)).append("\n");
103124
sb.append(" keyringName: ").append(toIndentedString(keyringName)).append("\n");
104125
sb.append("}");

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

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,33 @@
3030

3131

3232
public class CancelKeyDeletionRequest {
33+
@SerializedName("KeyID")
34+
private String keyID = null;
35+
3336
@SerializedName("KeyName")
3437
private String keyName = null;
3538

3639
@SerializedName("KeyringName")
3740
private String keyringName = null;
3841

42+
public CancelKeyDeletionRequest keyID(String keyID) {
43+
this.keyID = keyID;
44+
return this;
45+
}
46+
47+
/**
48+
* Get keyID
49+
* @return keyID
50+
**/
51+
@Schema(description = "")
52+
public String getKeyID() {
53+
return keyID;
54+
}
55+
56+
public void setKeyID(String keyID) {
57+
this.keyID = keyID;
58+
}
59+
3960
public CancelKeyDeletionRequest keyName(String keyName) {
4061
this.keyName = keyName;
4162
return this;
@@ -45,8 +66,7 @@ public CancelKeyDeletionRequest keyName(String keyName) {
4566
* Get keyName
4667
* @return keyName
4768
**/
48-
@NotNull
49-
@Size(min=2,max=31) @Schema(required = true, description = "")
69+
@Size(min=2,max=31) @Schema(description = "")
5070
public String getKeyName() {
5171
return keyName;
5272
}
@@ -64,8 +84,7 @@ public CancelKeyDeletionRequest keyringName(String keyringName) {
6484
* Get keyringName
6585
* @return keyringName
6686
**/
67-
@NotNull
68-
@Size(min=2,max=31) @Schema(required = true, description = "")
87+
@Size(min=2,max=31) @Schema(description = "")
6988
public String getKeyringName() {
7089
return keyringName;
7190
}
@@ -84,13 +103,14 @@ public boolean equals(java.lang.Object o) {
84103
return false;
85104
}
86105
CancelKeyDeletionRequest cancelKeyDeletionRequest = (CancelKeyDeletionRequest) o;
87-
return Objects.equals(this.keyName, cancelKeyDeletionRequest.keyName) &&
106+
return Objects.equals(this.keyID, cancelKeyDeletionRequest.keyID) &&
107+
Objects.equals(this.keyName, cancelKeyDeletionRequest.keyName) &&
88108
Objects.equals(this.keyringName, cancelKeyDeletionRequest.keyringName);
89109
}
90110

91111
@Override
92112
public int hashCode() {
93-
return Objects.hash(keyName, keyringName);
113+
return Objects.hash(keyID, keyName, keyringName);
94114
}
95115

96116

@@ -99,6 +119,7 @@ public String toString() {
99119
StringBuilder sb = new StringBuilder();
100120
sb.append("class CancelKeyDeletionRequest {\n");
101121

122+
sb.append(" keyID: ").append(toIndentedString(keyID)).append("\n");
102123
sb.append(" keyName: ").append(toIndentedString(keyName)).append("\n");
103124
sb.append(" keyringName: ").append(toIndentedString(keyringName)).append("\n");
104125
sb.append("}");

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

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,33 @@
3030

3131

3232
public class DeleteKeyMaterialRequest {
33+
@SerializedName("KeyID")
34+
private String keyID = null;
35+
3336
@SerializedName("KeyName")
3437
private String keyName = null;
3538

3639
@SerializedName("KeyringName")
3740
private String keyringName = null;
3841

42+
public DeleteKeyMaterialRequest keyID(String keyID) {
43+
this.keyID = keyID;
44+
return this;
45+
}
46+
47+
/**
48+
* Get keyID
49+
* @return keyID
50+
**/
51+
@Schema(description = "")
52+
public String getKeyID() {
53+
return keyID;
54+
}
55+
56+
public void setKeyID(String keyID) {
57+
this.keyID = keyID;
58+
}
59+
3960
public DeleteKeyMaterialRequest keyName(String keyName) {
4061
this.keyName = keyName;
4162
return this;
@@ -45,8 +66,7 @@ public DeleteKeyMaterialRequest keyName(String keyName) {
4566
* Get keyName
4667
* @return keyName
4768
**/
48-
@NotNull
49-
@Size(min=2,max=31) @Schema(required = true, description = "")
69+
@Size(min=2,max=31) @Schema(description = "")
5070
public String getKeyName() {
5171
return keyName;
5272
}
@@ -64,8 +84,7 @@ public DeleteKeyMaterialRequest keyringName(String keyringName) {
6484
* Get keyringName
6585
* @return keyringName
6686
**/
67-
@NotNull
68-
@Size(min=2,max=31) @Schema(required = true, description = "")
87+
@Size(min=2,max=31) @Schema(description = "")
6988
public String getKeyringName() {
7089
return keyringName;
7190
}
@@ -84,13 +103,14 @@ public boolean equals(java.lang.Object o) {
84103
return false;
85104
}
86105
DeleteKeyMaterialRequest deleteKeyMaterialRequest = (DeleteKeyMaterialRequest) o;
87-
return Objects.equals(this.keyName, deleteKeyMaterialRequest.keyName) &&
106+
return Objects.equals(this.keyID, deleteKeyMaterialRequest.keyID) &&
107+
Objects.equals(this.keyName, deleteKeyMaterialRequest.keyName) &&
88108
Objects.equals(this.keyringName, deleteKeyMaterialRequest.keyringName);
89109
}
90110

91111
@Override
92112
public int hashCode() {
93-
return Objects.hash(keyName, keyringName);
113+
return Objects.hash(keyID, keyName, keyringName);
94114
}
95115

96116

@@ -99,6 +119,7 @@ public String toString() {
99119
StringBuilder sb = new StringBuilder();
100120
sb.append("class DeleteKeyMaterialRequest {\n");
101121

122+
sb.append(" keyID: ").append(toIndentedString(keyID)).append("\n");
102123
sb.append(" keyName: ").append(toIndentedString(keyName)).append("\n");
103124
sb.append(" keyringName: ").append(toIndentedString(keyringName)).append("\n");
104125
sb.append("}");

0 commit comments

Comments
 (0)