Merge branch 'kms-Java-2021-02-18-online-794-2024_11_21_10_33_58' int…

…o 'integration_2024-11-21_605223123202' feat: [development task] kms-794-Java (867151) See merge request iaasng/volcengine-java-sdk!297
volcengine · Nov 21, 2024 · a08409b · a08409b
2 parents 1bb37c5 + 15a1586
commit a08409b
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 22 deletions.
diff --git a/volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/model/DecryptRequest.java b/volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/model/DecryptRequest.java
@@ -21,6 +21,9 @@
 import com.google.gson.stream.JsonWriter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 /**
@@ -34,7 +37,7 @@ public class DecryptRequest {
   private String ciphertextBlob = null;
 
   @SerializedName("EncryptionContext")
-  private String encryptionContext = null;
+  private Map<String, String> encryptionContext = null;
 
   public DecryptRequest ciphertextBlob(String ciphertextBlob) {
     this.ciphertextBlob = ciphertextBlob;
@@ -55,21 +58,29 @@ public void setCiphertextBlob(String ciphertextBlob) {
     this.ciphertextBlob = ciphertextBlob;
   }
 
-  public DecryptRequest encryptionContext(String encryptionContext) {
+  public DecryptRequest encryptionContext(Map<String, String> encryptionContext) {
     this.encryptionContext = encryptionContext;
     return this;
   }
 
+  public DecryptRequest putEncryptionContextItem(String key, String encryptionContextItem) {
+    if (this.encryptionContext == null) {
+      this.encryptionContext = new HashMap<String, String>();
+    }
+    this.encryptionContext.put(key, encryptionContextItem);
+    return this;
+  }
+
    /**
    * Get encryptionContext
    * @return encryptionContext
   **/
   @Schema(description = "")
-  public String getEncryptionContext() {
+  public Map<String, String> getEncryptionContext() {
     return encryptionContext;
   }
 
-  public void setEncryptionContext(String encryptionContext) {
+  public void setEncryptionContext(Map<String, String> encryptionContext) {
     this.encryptionContext = encryptionContext;
   }
 

diff --git a/volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/model/DescribeKeyringsRequest.java b/volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/model/DescribeKeyringsRequest.java
@@ -33,6 +33,9 @@ public class DescribeKeyringsRequest {
   @SerializedName("CurrentPage")
   private Integer currentPage = null;
 
+  @SerializedName("Filters")
+  private String filters = null;
+
   @SerializedName("PageSize")
   private Integer pageSize = null;
 
@@ -58,6 +61,24 @@ public void setCurrentPage(Integer currentPage) {
     this.currentPage = currentPage;
   }
 
+  public DescribeKeyringsRequest filters(String filters) {
+    this.filters = filters;
+    return this;
+  }
+
+   /**
+   * Get filters
+   * @return filters
+  **/
+ @Size(max=2048)  @Schema(description = "")
+  public String getFilters() {
+    return filters;
+  }
+
+  public void setFilters(String filters) {
+    this.filters = filters;
+  }
+
   public DescribeKeyringsRequest pageSize(Integer pageSize) {
     this.pageSize = pageSize;
     return this;
@@ -107,13 +128,14 @@ public boolean equals(java.lang.Object o) {
     }
     DescribeKeyringsRequest describeKeyringsRequest = (DescribeKeyringsRequest) o;
     return Objects.equals(this.currentPage, describeKeyringsRequest.currentPage) &&
+        Objects.equals(this.filters, describeKeyringsRequest.filters) &&
         Objects.equals(this.pageSize, describeKeyringsRequest.pageSize) &&
         Objects.equals(this.projectName, describeKeyringsRequest.projectName);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(currentPage, pageSize, projectName);
+    return Objects.hash(currentPage, filters, pageSize, projectName);
   }
 
 
@@ -123,6 +145,7 @@ public String toString() {
     sb.append("class DescribeKeyringsRequest {\n");
 
     sb.append("    currentPage: ").append(toIndentedString(currentPage)).append("\n");
+    sb.append("    filters: ").append(toIndentedString(filters)).append("\n");
     sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
     sb.append("    projectName: ").append(toIndentedString(projectName)).append("\n");
     sb.append("}");

diff --git a/volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/model/DescribeKeysRequest.java b/volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/model/DescribeKeysRequest.java
@@ -33,6 +33,9 @@ public class DescribeKeysRequest {
   @SerializedName("CurrentPage")
   private Integer currentPage = null;
 
+  @SerializedName("Filters")
+  private String filters = null;
+
   @SerializedName("KeyringName")
   private String keyringName = null;
 
@@ -58,6 +61,24 @@ public void setCurrentPage(Integer currentPage) {
     this.currentPage = currentPage;
   }
 
+  public DescribeKeysRequest filters(String filters) {
+    this.filters = filters;
+    return this;
+  }
+
+   /**
+   * Get filters
+   * @return filters
+  **/
+ @Size(max=2048)  @Schema(description = "")
+  public String getFilters() {
+    return filters;
+  }
+
+  public void setFilters(String filters) {
+    this.filters = filters;
+  }
+
   public DescribeKeysRequest keyringName(String keyringName) {
     this.keyringName = keyringName;
     return this;
@@ -108,13 +129,14 @@ public boolean equals(java.lang.Object o) {
     }
     DescribeKeysRequest describeKeysRequest = (DescribeKeysRequest) o;
     return Objects.equals(this.currentPage, describeKeysRequest.currentPage) &&
+        Objects.equals(this.filters, describeKeysRequest.filters) &&
         Objects.equals(this.keyringName, describeKeysRequest.keyringName) &&
         Objects.equals(this.pageSize, describeKeysRequest.pageSize);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(currentPage, keyringName, pageSize);
+    return Objects.hash(currentPage, filters, keyringName, pageSize);
   }
 
 
@@ -124,6 +146,7 @@ public String toString() {
     sb.append("class DescribeKeysRequest {\n");
 
     sb.append("    currentPage: ").append(toIndentedString(currentPage)).append("\n");
+    sb.append("    filters: ").append(toIndentedString(filters)).append("\n");
     sb.append("    keyringName: ").append(toIndentedString(keyringName)).append("\n");
     sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
     sb.append("}");

diff --git a/volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/model/EncryptRequest.java b/volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/model/EncryptRequest.java
@@ -21,6 +21,9 @@
 import com.google.gson.stream.JsonWriter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 /**
@@ -31,7 +34,7 @@
 
 public class EncryptRequest {
   @SerializedName("EncryptionContext")
-  private String encryptionContext = null;
+  private Map<String, String> encryptionContext = null;
 
   @SerializedName("KeyID")
   private String keyID = null;
@@ -45,21 +48,29 @@ public class EncryptRequest {
   @SerializedName("Plaintext")
   private String plaintext = null;
 
-  public EncryptRequest encryptionContext(String encryptionContext) {
+  public EncryptRequest encryptionContext(Map<String, String> encryptionContext) {
     this.encryptionContext = encryptionContext;
     return this;
   }
 
+  public EncryptRequest putEncryptionContextItem(String key, String encryptionContextItem) {
+    if (this.encryptionContext == null) {
+      this.encryptionContext = new HashMap<String, String>();
+    }
+    this.encryptionContext.put(key, encryptionContextItem);
+    return this;
+  }
+
    /**
    * Get encryptionContext
    * @return encryptionContext
   **/
   @Schema(description = "")
-  public String getEncryptionContext() {
+  public Map<String, String> getEncryptionContext() {
     return encryptionContext;
   }
 
-  public void setEncryptionContext(String encryptionContext) {
+  public void setEncryptionContext(Map<String, String> encryptionContext) {
     this.encryptionContext = encryptionContext;
   }
 

diff --git a/volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/model/GenerateDataKeyRequest.java b/volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/model/GenerateDataKeyRequest.java
@@ -21,6 +21,9 @@
 import com.google.gson.stream.JsonWriter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 /**
@@ -31,7 +34,7 @@
 
 public class GenerateDataKeyRequest {
   @SerializedName("EncryptionContext")
-  private String encryptionContext = null;
+  private Map<String, String> encryptionContext = null;
 
   @SerializedName("KeyID")
   private String keyID = null;
@@ -45,21 +48,29 @@ public class GenerateDataKeyRequest {
   @SerializedName("NumberOfBytes")
   private Integer numberOfBytes = null;
 
-  public GenerateDataKeyRequest encryptionContext(String encryptionContext) {
+  public GenerateDataKeyRequest encryptionContext(Map<String, String> encryptionContext) {
     this.encryptionContext = encryptionContext;
     return this;
   }
 
+  public GenerateDataKeyRequest putEncryptionContextItem(String key, String encryptionContextItem) {
+    if (this.encryptionContext == null) {
+      this.encryptionContext = new HashMap<String, String>();
+    }
+    this.encryptionContext.put(key, encryptionContextItem);
+    return this;
+  }
+
    /**
    * Get encryptionContext
    * @return encryptionContext
   **/
   @Schema(description = "")
-  public String getEncryptionContext() {
+  public Map<String, String> getEncryptionContext() {
     return encryptionContext;
   }
 
-  public void setEncryptionContext(String encryptionContext) {
+  public void setEncryptionContext(Map<String, String> encryptionContext) {
     this.encryptionContext = encryptionContext;
   }
 

diff --git a/volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/model/ReEncryptRequest.java b/volcengine-java-sdk-kms/src/main/java/com/volcengine/kms/model/ReEncryptRequest.java
@@ -21,6 +21,9 @@
 import com.google.gson.stream.JsonWriter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 /**
@@ -34,7 +37,7 @@ public class ReEncryptRequest {
   private String ciphertextBlob = null;
 
   @SerializedName("NewEncryptionContext")
-  private String newEncryptionContext = null;
+  private Map<String, String> newEncryptionContext = null;
 
   @SerializedName("NewKeyName")
   private String newKeyName = null;
@@ -43,7 +46,7 @@ public class ReEncryptRequest {
   private String newKeyringName = null;
 
   @SerializedName("OldEncryptionContext")
-  private String oldEncryptionContext = null;
+  private Map<String, String> oldEncryptionContext = null;
 
   public ReEncryptRequest ciphertextBlob(String ciphertextBlob) {
     this.ciphertextBlob = ciphertextBlob;
@@ -64,21 +67,29 @@ public void setCiphertextBlob(String ciphertextBlob) {
     this.ciphertextBlob = ciphertextBlob;
   }
 
-  public ReEncryptRequest newEncryptionContext(String newEncryptionContext) {
+  public ReEncryptRequest newEncryptionContext(Map<String, String> newEncryptionContext) {
     this.newEncryptionContext = newEncryptionContext;
     return this;
   }
 
+  public ReEncryptRequest putNewEncryptionContextItem(String key, String newEncryptionContextItem) {
+    if (this.newEncryptionContext == null) {
+      this.newEncryptionContext = new HashMap<String, String>();
+    }
+    this.newEncryptionContext.put(key, newEncryptionContextItem);
+    return this;
+  }
+
    /**
    * Get newEncryptionContext
    * @return newEncryptionContext
   **/
   @Schema(description = "")
-  public String getNewEncryptionContext() {
+  public Map<String, String> getNewEncryptionContext() {
     return newEncryptionContext;
   }
 
-  public void setNewEncryptionContext(String newEncryptionContext) {
+  public void setNewEncryptionContext(Map<String, String> newEncryptionContext) {
     this.newEncryptionContext = newEncryptionContext;
   }
 
@@ -120,21 +131,29 @@ public void setNewKeyringName(String newKeyringName) {
     this.newKeyringName = newKeyringName;
   }
 
-  public ReEncryptRequest oldEncryptionContext(String oldEncryptionContext) {
+  public ReEncryptRequest oldEncryptionContext(Map<String, String> oldEncryptionContext) {
     this.oldEncryptionContext = oldEncryptionContext;
     return this;
   }
 
+  public ReEncryptRequest putOldEncryptionContextItem(String key, String oldEncryptionContextItem) {
+    if (this.oldEncryptionContext == null) {
+      this.oldEncryptionContext = new HashMap<String, String>();
+    }
+    this.oldEncryptionContext.put(key, oldEncryptionContextItem);
+    return this;
+  }
+
    /**
    * Get oldEncryptionContext
    * @return oldEncryptionContext
   **/
   @Schema(description = "")
-  public String getOldEncryptionContext() {
+  public Map<String, String> getOldEncryptionContext() {
     return oldEncryptionContext;
   }
 
-  public void setOldEncryptionContext(String oldEncryptionContext) {
+  public void setOldEncryptionContext(Map<String, String> oldEncryptionContext) {
     this.oldEncryptionContext = oldEncryptionContext;
   }