Merge branch 'ecs-Java-2020-04-01-online-1330-2025_06_25_15_57_02' into 'integration_2025-06-26_968300483330'

feat: [development task] ecs-1330-Java (1390141)

See merge request iaasng/volcengine-java-sdk!552

Author: BitsAdmin

volcengine-java-sdk-ecs/src/main/java/com/volcengine/ecs/EcsApi.java

@@ -209,6 +209,8 @@
 import com.volcengine.ecs.model.RenewDedicatedHostResponse;
 import com.volcengine.ecs.model.RenewInstanceRequest;
 import com.volcengine.ecs.model.RenewInstanceResponse;
+import com.volcengine.ecs.model.RepairImageRequest;
+import com.volcengine.ecs.model.RepairImageResponse;
 import com.volcengine.ecs.model.ReplaceSystemVolumeRequest;
 import com.volcengine.ecs.model.ReplaceSystemVolumeResponse;
 import com.volcengine.ecs.model.RunCommandRequest;
@@ -11545,6 +11547,130 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
+    /**
+     * Build call for repairImage
+     * @param body  (required)
+     * @param progressListener Progress listener
+     * @param progressRequestListener Progress request listener
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     */
+    public com.squareup.okhttp.Call repairImageCall(RepairImageRequest body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = body;
+        
+        // create path and map variables
+        String localVarPath = "/RepairImage/2020-04-01/ecs/get/text_plain/";
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "application/json"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            "text/plain"
+        };
+        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
+        localVarHeaderParams.put("Content-Type", localVarContentType);
+
+        if(progressListener != null) {
+            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
+                @Override
+                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
+                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
+                    return originalResponse.newBuilder()
+                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
+                    .build();
+                }
+            });
+        }
+
+        String[] localVarAuthNames = new String[] { "volcengineSign" };
+        return apiClient.buildCall(localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+    }
+    
+    @SuppressWarnings("rawtypes")
+    private com.squareup.okhttp.Call repairImageValidateBeforeCall(RepairImageRequest body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        // verify the required parameter 'body' is set
+        if (body == null) {
+            throw new ApiException("Missing the required parameter 'body' when calling repairImage(Async)");
+        }
+        
+        com.squareup.okhttp.Call call = repairImageCall(body, progressListener, progressRequestListener);
+        return call;
+
+        
+        
+        
+        
+    }
+
+    /**
+     * 
+     * 
+     * @param body  (required)
+     * @return RepairImageResponse
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public RepairImageResponse repairImage(RepairImageRequest body) throws ApiException {
+        ApiResponse<RepairImageResponse> resp = repairImageWithHttpInfo(body);
+        return resp.getData();
+    }
+
+    /**
+     * 
+     * 
+     * @param body  (required)
+     * @return ApiResponse&lt;RepairImageResponse&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<RepairImageResponse> repairImageWithHttpInfo( @NotNull RepairImageRequest body) throws ApiException {
+        com.squareup.okhttp.Call call = repairImageValidateBeforeCall(body, null, null);
+        Type localVarReturnType = new TypeToken<RepairImageResponse>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    /**
+     *  (asynchronously)
+     * 
+     * @param body  (required)
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     */
+    public com.squareup.okhttp.Call repairImageAsync(RepairImageRequest body, final ApiCallback<RepairImageResponse> callback) throws ApiException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
+        }
+
+        com.squareup.okhttp.Call call = repairImageValidateBeforeCall(body, progressListener, progressRequestListener);
+        Type localVarReturnType = new TypeToken<RepairImageResponse>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
     /**
      * Build call for replaceSystemVolume
      * @param body  (required)

volcengine-java-sdk-ecs/src/main/java/com/volcengine/ecs/model/CreateScheduledInstancesRequest.java

@@ -48,6 +48,9 @@ public class CreateScheduledInstancesRequest {
   @SerializedName("CpuMaxFrequency")
   private Float cpuMaxFrequency = null;
 
+  @SerializedName("DeletionProtection")
+  private Boolean deletionProtection = null;
+
   @SerializedName("DeliveryType")
   private String deliveryType = null;
 
@@ -204,6 +207,24 @@ public void setCpuMaxFrequency(Float cpuMaxFrequency) {
     this.cpuMaxFrequency = cpuMaxFrequency;
   }
 
+  public CreateScheduledInstancesRequest deletionProtection(Boolean deletionProtection) {
+    this.deletionProtection = deletionProtection;
+    return this;
+  }
+
+   /**
+   * Get deletionProtection
+   * @return deletionProtection
+  **/
+  @Schema(description = "")
+  public Boolean isDeletionProtection() {
+    return deletionProtection;
+  }
+
+  public void setDeletionProtection(Boolean deletionProtection) {
+    this.deletionProtection = deletionProtection;
+  }
+
   public CreateScheduledInstancesRequest deliveryType(String deliveryType) {
     this.deliveryType = deliveryType;
     return this;
@@ -755,6 +776,7 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.clientToken, createScheduledInstancesRequest.clientToken) &&
         Objects.equals(this.count, createScheduledInstancesRequest.count) &&
         Objects.equals(this.cpuMaxFrequency, createScheduledInstancesRequest.cpuMaxFrequency) &&
+        Objects.equals(this.deletionProtection, createScheduledInstancesRequest.deletionProtection) &&
         Objects.equals(this.deliveryType, createScheduledInstancesRequest.deliveryType) &&
         Objects.equals(this.description, createScheduledInstancesRequest.description) &&
         Objects.equals(this.dryRun, createScheduledInstancesRequest.dryRun) &&
@@ -787,7 +809,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(autoReleaseAt, clientToken, count, cpuMaxFrequency, deliveryType, description, dryRun, eipAddress, elasticScheduledInstanceType, endDeliveryAt, hostname, hpcClusterId, imageId, installRunCommandAgent, instanceName, instanceTypeId, keepImageCredential, keyPairName, minCount, networkInterfaces, password, projectName, scheduledInstanceDescription, scheduledInstanceName, securityEnhancementStrategy, startDeliveryAt, suffixIndex, tags, uniqueSuffix, userData, volumes, zoneId);
+    return Objects.hash(autoReleaseAt, clientToken, count, cpuMaxFrequency, deletionProtection, deliveryType, description, dryRun, eipAddress, elasticScheduledInstanceType, endDeliveryAt, hostname, hpcClusterId, imageId, installRunCommandAgent, instanceName, instanceTypeId, keepImageCredential, keyPairName, minCount, networkInterfaces, password, projectName, scheduledInstanceDescription, scheduledInstanceName, securityEnhancementStrategy, startDeliveryAt, suffixIndex, tags, uniqueSuffix, userData, volumes, zoneId);
   }
 
 
@@ -800,6 +822,7 @@ public String toString() {
     sb.append("    clientToken: ").append(toIndentedString(clientToken)).append("\n");
     sb.append("    count: ").append(toIndentedString(count)).append("\n");
     sb.append("    cpuMaxFrequency: ").append(toIndentedString(cpuMaxFrequency)).append("\n");
+    sb.append("    deletionProtection: ").append(toIndentedString(deletionProtection)).append("\n");
     sb.append("    deliveryType: ").append(toIndentedString(deliveryType)).append("\n");
     sb.append("    description: ").append(toIndentedString(description)).append("\n");
     sb.append("    dryRun: ").append(toIndentedString(dryRun)).append("\n");

volcengine-java-sdk-ecs/src/main/java/com/volcengine/ecs/model/DescribeInstancesRequest.java

@@ -33,6 +33,9 @@
 
 
 public class DescribeInstancesRequest {
+  @SerializedName("AffinityGroupIds")
+  private List<String> affinityGroupIds = null;
+
   @SerializedName("DedicatedHostClusterId")
   private String dedicatedHostClusterId = null;
 
@@ -102,6 +105,32 @@ public class DescribeInstancesRequest {
   @SerializedName("ZoneId")
   private String zoneId = null;
 
+  public DescribeInstancesRequest affinityGroupIds(List<String> affinityGroupIds) {
+    this.affinityGroupIds = affinityGroupIds;
+    return this;
+  }
+
+  public DescribeInstancesRequest addAffinityGroupIdsItem(String affinityGroupIdsItem) {
+    if (this.affinityGroupIds == null) {
+      this.affinityGroupIds = new ArrayList<String>();
+    }
+    this.affinityGroupIds.add(affinityGroupIdsItem);
+    return this;
+  }
+
+   /**
+   * Get affinityGroupIds
+   * @return affinityGroupIds
+  **/
+  @Schema(description = "")
+  public List<String> getAffinityGroupIds() {
+    return affinityGroupIds;
+  }
+
+  public void setAffinityGroupIds(List<String> affinityGroupIds) {
+    this.affinityGroupIds = affinityGroupIds;
+  }
+
   public DescribeInstancesRequest dedicatedHostClusterId(String dedicatedHostClusterId) {
     this.dedicatedHostClusterId = dedicatedHostClusterId;
     return this;
@@ -599,7 +628,8 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     DescribeInstancesRequest describeInstancesRequest = (DescribeInstancesRequest) o;
-    return Objects.equals(this.dedicatedHostClusterId, describeInstancesRequest.dedicatedHostClusterId) &&
+    return Objects.equals(this.affinityGroupIds, describeInstancesRequest.affinityGroupIds) &&
+        Objects.equals(this.dedicatedHostClusterId, describeInstancesRequest.dedicatedHostClusterId) &&
         Objects.equals(this.dedicatedHostId, describeInstancesRequest.dedicatedHostId) &&
         Objects.equals(this.deploymentSetGroupNumbers, describeInstancesRequest.deploymentSetGroupNumbers) &&
         Objects.equals(this.deploymentSetIds, describeInstancesRequest.deploymentSetIds) &&
@@ -626,7 +656,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(dedicatedHostClusterId, dedicatedHostId, deploymentSetGroupNumbers, deploymentSetIds, eipAddresses, hpcClusterId, instanceChargeType, instanceIds, instanceName, instanceTypeFamilies, instanceTypeIds, instanceTypes, ipv6Addresses, keyPairName, maxResults, nextToken, primaryIpAddress, projectName, scheduledInstanceId, status, tagFilters, vpcId, zoneId);
+    return Objects.hash(affinityGroupIds, dedicatedHostClusterId, dedicatedHostId, deploymentSetGroupNumbers, deploymentSetIds, eipAddresses, hpcClusterId, instanceChargeType, instanceIds, instanceName, instanceTypeFamilies, instanceTypeIds, instanceTypes, ipv6Addresses, keyPairName, maxResults, nextToken, primaryIpAddress, projectName, scheduledInstanceId, status, tagFilters, vpcId, zoneId);
   }
 
 
@@ -635,6 +665,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class DescribeInstancesRequest {\n");
 
+    sb.append("    affinityGroupIds: ").append(toIndentedString(affinityGroupIds)).append("\n");
     sb.append("    dedicatedHostClusterId: ").append(toIndentedString(dedicatedHostClusterId)).append("\n");
     sb.append("    dedicatedHostId: ").append(toIndentedString(dedicatedHostId)).append("\n");
     sb.append("    deploymentSetGroupNumbers: ").append(toIndentedString(deploymentSetGroupNumbers)).append("\n");

volcengine-java-sdk-ecs/src/main/java/com/volcengine/ecs/model/ImportDataVolumeForImportImageInput.java

@@ -0,0 +1,94 @@
+/*
+ * ecs
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: common-version
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+package com.volcengine.ecs.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.IOException;
+import javax.validation.constraints.*;
+import javax.validation.Valid;
+/**
+ * ImportDataVolumeForImportImageInput
+ */
+
+
+
+public class ImportDataVolumeForImportImageInput {
+  @SerializedName("DataVolumeUrl")
+  private String dataVolumeUrl = null;
+
+  public ImportDataVolumeForImportImageInput dataVolumeUrl(String dataVolumeUrl) {
+    this.dataVolumeUrl = dataVolumeUrl;
+    return this;
+  }
+
+   /**
+   * Get dataVolumeUrl
+   * @return dataVolumeUrl
+  **/
+  @Schema(description = "")
+  public String getDataVolumeUrl() {
+    return dataVolumeUrl;
+  }
+
+  public void setDataVolumeUrl(String dataVolumeUrl) {
+    this.dataVolumeUrl = dataVolumeUrl;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ImportDataVolumeForImportImageInput importDataVolumeForImportImageInput = (ImportDataVolumeForImportImageInput) o;
+    return Objects.equals(this.dataVolumeUrl, importDataVolumeForImportImageInput.dataVolumeUrl);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(dataVolumeUrl);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ImportDataVolumeForImportImageInput {\n");
+    
+    sb.append("    dataVolumeUrl: ").append(toIndentedString(dataVolumeUrl)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}