Merge "integration_2025-09-25_1060179278594" into "cloudmonitor-Java-2018-01-01-online-1568-2025_09_12_15_40_03"

Conflicts:
pom.xml
volcengine-java-sdk-bom/pom.xml

Author: bytestarter

pom.xml

@@ -307,5 +307,6 @@
         <module>volcengine-java-sdk-cloudidentity</module>
         <module>volcengine-java-sdk-vikingdb</module>
         <module>volcengine-java-sdk-cloudmonitor</module>
+        <module>volcengine-java-sdk-resourceshare</module>
     </modules>
 </project>

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/images/generation/ImagesResponse.java

@@ -72,6 +72,9 @@ public static class Image {
         @JsonProperty("b64_json")
         private String b64Json;
 
+        @JsonProperty("size")
+        private String size;
+
         public String getUrl() {
             return url;
         }
@@ -88,11 +91,20 @@ public void setB64Json(String b64Json) {
             this.b64Json = b64Json;
         }
 
+        public String getSize() {
+            return size;
+        }
+
+        public void setSize(String size) {
+            this.size = size;
+        }
+
         @Override
         public String toString() {
             return "Image{" +
                     "url=" + url +
                     "b64Json=" + b64Json +
+                    "size=" + size +
                     '}';
         }
     }

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/service/ArkService.java

@@ -192,6 +192,10 @@ public ChatCompletionResult createChatCompletion(ChatCompletionRequest request,
         return execute(api.createChatCompletion(request, request.getModel(), customHeaders));
     }
 
+    public ChatCompletionResult createBatchChatCompletion(ChatCompletionRequest request, Map<String, String> customHeaders) {
+        return execute(api.createBatchChatCompletion(request, request.getModel(), customHeaders));
+    }
+
     public Flowable<ChatCompletionChunk> streamChatCompletion(ChatCompletionRequest request) {
         request.setStream(true);
 

volcengine-java-sdk-bom/pom.xml

@@ -601,6 +601,12 @@
                 <optional>false</optional>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.volcengine</groupId>
+                <artifactId>volcengine-java-sdk-resourceshare</artifactId>
+                <optional>false</optional>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

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

@@ -19,8 +19,11 @@
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import com.volcengine.ecs.model.TagForCreateHpcClusterInput;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 /**
@@ -39,6 +42,12 @@ public class CreateHpcClusterRequest {
   @SerializedName("Name")
   private String name = null;
 
+  @SerializedName("ProjectName")
+  private String projectName = null;
+
+  @SerializedName("Tags")
+  private List<TagForCreateHpcClusterInput> tags = null;
+
   @SerializedName("ZoneId")
   private String zoneId = null;
 
@@ -97,6 +106,51 @@ public void setName(String name) {
     this.name = name;
   }
 
+  public CreateHpcClusterRequest projectName(String projectName) {
+    this.projectName = projectName;
+    return this;
+  }
+
+   /**
+   * Get projectName
+   * @return projectName
+  **/
+  @Schema(description = "")
+  public String getProjectName() {
+    return projectName;
+  }
+
+  public void setProjectName(String projectName) {
+    this.projectName = projectName;
+  }
+
+  public CreateHpcClusterRequest tags(List<TagForCreateHpcClusterInput> tags) {
+    this.tags = tags;
+    return this;
+  }
+
+  public CreateHpcClusterRequest addTagsItem(TagForCreateHpcClusterInput tagsItem) {
+    if (this.tags == null) {
+      this.tags = new ArrayList<TagForCreateHpcClusterInput>();
+    }
+    this.tags.add(tagsItem);
+    return this;
+  }
+
+   /**
+   * Get tags
+   * @return tags
+  **/
+  @Valid
+  @Schema(description = "")
+  public List<TagForCreateHpcClusterInput> getTags() {
+    return tags;
+  }
+
+  public void setTags(List<TagForCreateHpcClusterInput> tags) {
+    this.tags = tags;
+  }
+
   public CreateHpcClusterRequest zoneId(String zoneId) {
     this.zoneId = zoneId;
     return this;
@@ -129,12 +183,14 @@ public boolean equals(java.lang.Object o) {
     return Objects.equals(this.clientToken, createHpcClusterRequest.clientToken) &&
         Objects.equals(this.description, createHpcClusterRequest.description) &&
         Objects.equals(this.name, createHpcClusterRequest.name) &&
+        Objects.equals(this.projectName, createHpcClusterRequest.projectName) &&
+        Objects.equals(this.tags, createHpcClusterRequest.tags) &&
         Objects.equals(this.zoneId, createHpcClusterRequest.zoneId);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(clientToken, description, name, zoneId);
+    return Objects.hash(clientToken, description, name, projectName, tags, zoneId);
   }
 
 
@@ -146,6 +202,8 @@ public String toString() {
     sb.append("    clientToken: ").append(toIndentedString(clientToken)).append("\n");
     sb.append("    description: ").append(toIndentedString(description)).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    projectName: ").append(toIndentedString(projectName)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    zoneId: ").append(toIndentedString(zoneId)).append("\n");
     sb.append("}");
     return sb.toString();

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

@@ -19,6 +19,7 @@
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import com.volcengine.ecs.model.TagFilterForDescribeHpcClustersInput;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -47,6 +48,12 @@ public class DescribeHpcClustersRequest {
   @SerializedName("NextToken")
   private String nextToken = null;
 
+  @SerializedName("ProjectName")
+  private String projectName = null;
+
+  @SerializedName("TagFilters")
+  private List<TagFilterForDescribeHpcClustersInput> tagFilters = null;
+
   @SerializedName("ZoneId")
   private String zoneId = null;
 
@@ -148,6 +155,51 @@ public void setNextToken(String nextToken) {
     this.nextToken = nextToken;
   }
 
+  public DescribeHpcClustersRequest projectName(String projectName) {
+    this.projectName = projectName;
+    return this;
+  }
+
+   /**
+   * Get projectName
+   * @return projectName
+  **/
+  @Schema(description = "")
+  public String getProjectName() {
+    return projectName;
+  }
+
+  public void setProjectName(String projectName) {
+    this.projectName = projectName;
+  }
+
+  public DescribeHpcClustersRequest tagFilters(List<TagFilterForDescribeHpcClustersInput> tagFilters) {
+    this.tagFilters = tagFilters;
+    return this;
+  }
+
+  public DescribeHpcClustersRequest addTagFiltersItem(TagFilterForDescribeHpcClustersInput tagFiltersItem) {
+    if (this.tagFilters == null) {
+      this.tagFilters = new ArrayList<TagFilterForDescribeHpcClustersInput>();
+    }
+    this.tagFilters.add(tagFiltersItem);
+    return this;
+  }
+
+   /**
+   * Get tagFilters
+   * @return tagFilters
+  **/
+  @Valid
+  @Schema(description = "")
+  public List<TagFilterForDescribeHpcClustersInput> getTagFilters() {
+    return tagFilters;
+  }
+
+  public void setTagFilters(List<TagFilterForDescribeHpcClustersInput> tagFilters) {
+    this.tagFilters = tagFilters;
+  }
+
   public DescribeHpcClustersRequest zoneId(String zoneId) {
     this.zoneId = zoneId;
     return this;
@@ -181,12 +233,14 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.maxResults, describeHpcClustersRequest.maxResults) &&
         Objects.equals(this.name, describeHpcClustersRequest.name) &&
         Objects.equals(this.nextToken, describeHpcClustersRequest.nextToken) &&
+        Objects.equals(this.projectName, describeHpcClustersRequest.projectName) &&
+        Objects.equals(this.tagFilters, describeHpcClustersRequest.tagFilters) &&
         Objects.equals(this.zoneId, describeHpcClustersRequest.zoneId);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(clientToken, hpcClusterIds, maxResults, name, nextToken, zoneId);
+    return Objects.hash(clientToken, hpcClusterIds, maxResults, name, nextToken, projectName, tagFilters, zoneId);
   }
 
 
@@ -200,6 +254,8 @@ public String toString() {
     sb.append("    maxResults: ").append(toIndentedString(maxResults)).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    nextToken: ").append(toIndentedString(nextToken)).append("\n");
+    sb.append("    projectName: ").append(toIndentedString(projectName)).append("\n");
+    sb.append("    tagFilters: ").append(toIndentedString(tagFilters)).append("\n");
     sb.append("    zoneId: ").append(toIndentedString(zoneId)).append("\n");
     sb.append("}");
     return sb.toString();

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

@@ -1,5 +1,5 @@
 /*
- * transitrouter
+ * ecs
  * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
  *
  * OpenAPI spec version: common-version
@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 
-package com.volcengine.transitrouter.model;
+package com.volcengine.ecs.model;
 
 import java.util.Objects;
 import java.util.Arrays;
@@ -24,32 +24,32 @@
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 /**
- * AcceptSharedTransitRouterRequest
+ * DescribeSystemEventDefaultActionRequest
  */
 
 
 
-public class AcceptSharedTransitRouterRequest {
-  @SerializedName("TransitRouterId")
-  private String transitRouterId = null;
+public class DescribeSystemEventDefaultActionRequest {
+  @SerializedName("EventId")
+  private String eventId = null;
 
-  public AcceptSharedTransitRouterRequest transitRouterId(String transitRouterId) {
-    this.transitRouterId = transitRouterId;
+  public DescribeSystemEventDefaultActionRequest eventId(String eventId) {
+    this.eventId = eventId;
     return this;
   }
 
    /**
-   * Get transitRouterId
-   * @return transitRouterId
+   * Get eventId
+   * @return eventId
   **/
   @NotNull
   @Schema(required = true, description = "")
-  public String getTransitRouterId() {
-    return transitRouterId;
+  public String getEventId() {
+    return eventId;
   }
 
-  public void setTransitRouterId(String transitRouterId) {
-    this.transitRouterId = transitRouterId;
+  public void setEventId(String eventId) {
+    this.eventId = eventId;
   }
 
 
@@ -61,22 +61,22 @@ public boolean equals(java.lang.Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    AcceptSharedTransitRouterRequest acceptSharedTransitRouterRequest = (AcceptSharedTransitRouterRequest) o;
-    return Objects.equals(this.transitRouterId, acceptSharedTransitRouterRequest.transitRouterId);
+    DescribeSystemEventDefaultActionRequest describeSystemEventDefaultActionRequest = (DescribeSystemEventDefaultActionRequest) o;
+    return Objects.equals(this.eventId, describeSystemEventDefaultActionRequest.eventId);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(transitRouterId);
+    return Objects.hash(eventId);
   }
 
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class AcceptSharedTransitRouterRequest {\n");
+    sb.append("class DescribeSystemEventDefaultActionRequest {\n");
 
-    sb.append("    transitRouterId: ").append(toIndentedString(transitRouterId)).append("\n");
+    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
     sb.append("}");
     return sb.toString();
   }