Merge 'cbr-Java-2024-03-01-online-2278-2026_02_24_20_35_51' into 'integration_2026-02-26_1118052561922'

feat: [development task] cbr-2278-Java (2130098)

See merge request: !892

Author: BitsAdmin

volcengine-java-sdk-cbr/src/main/java/com/volcengine/cbr/model/DescribeZonesRequest.java

@@ -67,8 +67,7 @@ public DescribeZonesRequest languageCode(String languageCode) {
    * Get languageCode
    * @return languageCode
   **/
-  @NotNull
-  @Schema(required = true, description = "")
+  @Schema(description = "")
   public String getLanguageCode() {
     return languageCode;
   }

volcengine-java-sdk-cbr/src/main/java/com/volcengine/cbr/model/FiltersForDescribeBackupPoliciesInput.java

@@ -31,15 +31,15 @@
 
 public class FiltersForDescribeBackupPoliciesInput {
   @SerializedName("EnablePolicy")
-  private Boolean enablePolicy = null;
+  private String enablePolicy = null;
 
   @SerializedName("Name")
   private String name = null;
 
   @SerializedName("PolicyId")
   private String policyId = null;
 
-  public FiltersForDescribeBackupPoliciesInput enablePolicy(Boolean enablePolicy) {
+  public FiltersForDescribeBackupPoliciesInput enablePolicy(String enablePolicy) {
     this.enablePolicy = enablePolicy;
     return this;
   }
@@ -49,11 +49,11 @@ public FiltersForDescribeBackupPoliciesInput enablePolicy(Boolean enablePolicy)
    * @return enablePolicy
   **/
   @Schema(description = "")
-  public Boolean isEnablePolicy() {
+  public String getEnablePolicy() {
     return enablePolicy;
   }
 
-  public void setEnablePolicy(Boolean enablePolicy) {
+  public void setEnablePolicy(String enablePolicy) {
     this.enablePolicy = enablePolicy;
   }
 

volcengine-java-sdk-cbr/src/main/java/com/volcengine/cbr/model/FiltersForDescribeRestoreJobsInput.java

@@ -33,8 +33,51 @@ public class FiltersForDescribeRestoreJobsInput {
   @SerializedName("RecoveryPointId")
   private String recoveryPointId = null;
 
-  @SerializedName("ResourceType")
-  private String resourceType = null;
+  /**
+   * Gets or Sets resourceType
+   */
+  @JsonAdapter(ResourceTypeEnum.Adapter.class)
+  public enum ResourceTypeEnum {
+    @SerializedName("ECS")
+    ECS("ECS"),
+    @SerializedName("vePFS")
+    VEPFS("vePFS");
+
+    private String value;
+
+    ResourceTypeEnum(String value) {
+      this.value = value;
+    }
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+    public static ResourceTypeEnum fromValue(String input) {
+      for (ResourceTypeEnum b : ResourceTypeEnum.values()) {
+        if (b.value.equals(input)) {
+          return b;
+        }
+      }
+      return null;
+    }
+    public static class Adapter extends TypeAdapter<ResourceTypeEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final ResourceTypeEnum enumeration) throws IOException {
+        jsonWriter.value(String.valueOf(enumeration.getValue()));
+      }
+
+      @Override
+      public ResourceTypeEnum read(final JsonReader jsonReader) throws IOException {
+        Object value = jsonReader.nextString();
+        return ResourceTypeEnum.fromValue((String)(value));
+      }
+    }
+  }  @SerializedName("ResourceType")
+  private ResourceTypeEnum resourceType = null;
 
   @SerializedName("RestoreJobId")
   private String restoreJobId = null;
@@ -60,7 +103,7 @@ public void setRecoveryPointId(String recoveryPointId) {
     this.recoveryPointId = recoveryPointId;
   }
 
-  public FiltersForDescribeRestoreJobsInput resourceType(String resourceType) {
+  public FiltersForDescribeRestoreJobsInput resourceType(ResourceTypeEnum resourceType) {
     this.resourceType = resourceType;
     return this;
   }
@@ -70,11 +113,11 @@ public FiltersForDescribeRestoreJobsInput resourceType(String resourceType) {
    * @return resourceType
   **/
   @Schema(description = "")
-  public String getResourceType() {
+  public ResourceTypeEnum getResourceType() {
     return resourceType;
   }
 
-  public void setResourceType(String resourceType) {
+  public void setResourceType(ResourceTypeEnum resourceType) {
     this.resourceType = resourceType;
   }
 

volcengine-java-sdk-cbr/src/main/java/com/volcengine/cbr/model/JobForDescribeRestoreJobsOutput.java

@@ -91,6 +91,9 @@ public ResourceTypeEnum read(final JsonReader jsonReader) throws IOException {
   }  @SerializedName("ResourceType")
   private ResourceTypeEnum resourceType = null;
 
+  @SerializedName("RestoreOptions")
+  private String restoreOptions = null;
+
   /**
    * Gets or Sets status
    */
@@ -249,6 +252,24 @@ public void setResourceType(ResourceTypeEnum resourceType) {
     this.resourceType = resourceType;
   }
 
+  public JobForDescribeRestoreJobsOutput restoreOptions(String restoreOptions) {
+    this.restoreOptions = restoreOptions;
+    return this;
+  }
+
+   /**
+   * Get restoreOptions
+   * @return restoreOptions
+  **/
+  @Schema(description = "")
+  public String getRestoreOptions() {
+    return restoreOptions;
+  }
+
+  public void setRestoreOptions(String restoreOptions) {
+    this.restoreOptions = restoreOptions;
+  }
+
   public JobForDescribeRestoreJobsOutput status(StatusEnum status) {
     this.status = status;
     return this;
@@ -283,12 +304,13 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.recoveryPointId, jobForDescribeRestoreJobsOutput.recoveryPointId) &&
         Objects.equals(this.recoveryPointName, jobForDescribeRestoreJobsOutput.recoveryPointName) &&
         Objects.equals(this.resourceType, jobForDescribeRestoreJobsOutput.resourceType) &&
+        Objects.equals(this.restoreOptions, jobForDescribeRestoreJobsOutput.restoreOptions) &&
         Objects.equals(this.status, jobForDescribeRestoreJobsOutput.status);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(extraMetadata, jobId, name, recoveryPointId, recoveryPointName, resourceType, status);
+    return Objects.hash(extraMetadata, jobId, name, recoveryPointId, recoveryPointName, resourceType, restoreOptions, status);
   }
 
 
@@ -303,6 +325,7 @@ public String toString() {
     sb.append("    recoveryPointId: ").append(toIndentedString(recoveryPointId)).append("\n");
     sb.append("    recoveryPointName: ").append(toIndentedString(recoveryPointName)).append("\n");
     sb.append("    resourceType: ").append(toIndentedString(resourceType)).append("\n");
+    sb.append("    restoreOptions: ").append(toIndentedString(restoreOptions)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("}");
     return sb.toString();