Merge 'emr-Java-2023-08-15-online-2036-2026_01_14_16_17_55' into 'integration_2026-02-05_1111767210754'

feat: [development task] emr-2036-Java (2097999)

See merge request: !877

Author: BitsAdmin

volcengine-java-sdk-emr/src/main/java/com/volcengine/emr/EmrApi.java

@@ -24,6 +24,7 @@
 import com.volcengine.emr.model.ChargePreConfigForCreateClusterInput;
 import com.volcengine.emr.model.NodeAttributeForCreateClusterInput;
 import com.volcengine.emr.model.NodeGroupAttributeForCreateClusterInput;
+import com.volcengine.emr.model.TagForCreateClusterInput;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -83,7 +84,7 @@ public class CreateClusterRequest {
   private String securityMode = null;
 
   @SerializedName("Tags")
-  private List<String> tags = null;
+  private List<TagForCreateClusterInput> tags = null;
 
   @SerializedName("VpcId")
   private String vpcId = null;
@@ -400,14 +401,14 @@ public void setSecurityMode(String securityMode) {
     this.securityMode = securityMode;
   }
 
-  public CreateClusterRequest tags(List<String> tags) {
+  public CreateClusterRequest tags(List<TagForCreateClusterInput> tags) {
     this.tags = tags;
     return this;
   }
 
-  public CreateClusterRequest addTagsItem(String tagsItem) {
+  public CreateClusterRequest addTagsItem(TagForCreateClusterInput tagsItem) {
     if (this.tags == null) {
-      this.tags = new ArrayList<String>();
+      this.tags = new ArrayList<TagForCreateClusterInput>();
     }
     this.tags.add(tagsItem);
     return this;
@@ -417,12 +418,13 @@ public CreateClusterRequest addTagsItem(String tagsItem) {
    * Get tags
    * @return tags
   **/
+  @Valid
   @Schema(description = "")
-  public List<String> getTags() {
+  public List<TagForCreateClusterInput> getTags() {
     return tags;
   }
 
-  public void setTags(List<String> tags) {
+  public void setTags(List<TagForCreateClusterInput> tags) {
     this.tags = tags;
   }
 

volcengine-java-sdk-emr/src/main/java/com/volcengine/emr/model/CreateClusterRequest.java

@@ -33,6 +33,9 @@ public class CreateNodeGroupResponse extends com.volcengine.model.AbstractRespon
   @SerializedName("ClusterId")
   private String clusterId = null;
 
+  @SerializedName("NodeGroupId")
+  private String nodeGroupId = null;
+
   @SerializedName("OperationId")
   private String operationId = null;
 
@@ -54,6 +57,24 @@ public void setClusterId(String clusterId) {
     this.clusterId = clusterId;
   }
 
+  public CreateNodeGroupResponse nodeGroupId(String nodeGroupId) {
+    this.nodeGroupId = nodeGroupId;
+    return this;
+  }
+
+   /**
+   * Get nodeGroupId
+   * @return nodeGroupId
+  **/
+  @Schema(description = "")
+  public String getNodeGroupId() {
+    return nodeGroupId;
+  }
+
+  public void setNodeGroupId(String nodeGroupId) {
+    this.nodeGroupId = nodeGroupId;
+  }
+
   public CreateNodeGroupResponse operationId(String operationId) {
     this.operationId = operationId;
     return this;
@@ -83,12 +104,13 @@ public boolean equals(java.lang.Object o) {
     }
     CreateNodeGroupResponse createNodeGroupResponse = (CreateNodeGroupResponse) o;
     return Objects.equals(this.clusterId, createNodeGroupResponse.clusterId) &&
+        Objects.equals(this.nodeGroupId, createNodeGroupResponse.nodeGroupId) &&
         Objects.equals(this.operationId, createNodeGroupResponse.operationId);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(clusterId, operationId);
+    return Objects.hash(clusterId, nodeGroupId, operationId);
   }
 
 
@@ -98,6 +120,7 @@ public String toString() {
     sb.append("class CreateNodeGroupResponse {\n");
 
     sb.append("    clusterId: ").append(toIndentedString(clusterId)).append("\n");
+    sb.append("    nodeGroupId: ").append(toIndentedString(nodeGroupId)).append("\n");
     sb.append("    operationId: ").append(toIndentedString(operationId)).append("\n");
     sb.append("}");
     return sb.toString();

volcengine-java-sdk-emr/src/main/java/com/volcengine/emr/model/CreateNodeGroupResponse.java

@@ -21,6 +21,8 @@
 import com.google.gson.stream.JsonWriter;
 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;
 /**
@@ -45,6 +47,9 @@ public class ItemForListClusterUsersOutput {
   @SerializedName("UpdateTime")
   private Long updateTime = null;
 
+  @SerializedName("UserGroupNames")
+  private List<String> userGroupNames = null;
+
   @SerializedName("UserName")
   private String userName = null;
 
@@ -138,6 +143,32 @@ public void setUpdateTime(Long updateTime) {
     this.updateTime = updateTime;
   }
 
+  public ItemForListClusterUsersOutput userGroupNames(List<String> userGroupNames) {
+    this.userGroupNames = userGroupNames;
+    return this;
+  }
+
+  public ItemForListClusterUsersOutput addUserGroupNamesItem(String userGroupNamesItem) {
+    if (this.userGroupNames == null) {
+      this.userGroupNames = new ArrayList<String>();
+    }
+    this.userGroupNames.add(userGroupNamesItem);
+    return this;
+  }
+
+   /**
+   * Get userGroupNames
+   * @return userGroupNames
+  **/
+  @Schema(description = "")
+  public List<String> getUserGroupNames() {
+    return userGroupNames;
+  }
+
+  public void setUserGroupNames(List<String> userGroupNames) {
+    this.userGroupNames = userGroupNames;
+  }
+
   public ItemForListClusterUsersOutput userName(String userName) {
     this.userName = userName;
     return this;
@@ -171,12 +202,13 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.creatorName, itemForListClusterUsersOutput.creatorName) &&
         Objects.equals(this.description, itemForListClusterUsersOutput.description) &&
         Objects.equals(this.updateTime, itemForListClusterUsersOutput.updateTime) &&
+        Objects.equals(this.userGroupNames, itemForListClusterUsersOutput.userGroupNames) &&
         Objects.equals(this.userName, itemForListClusterUsersOutput.userName);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(clusterId, createTime, creatorName, description, updateTime, userName);
+    return Objects.hash(clusterId, createTime, creatorName, description, updateTime, userGroupNames, userName);
   }
 
 
@@ -190,6 +222,7 @@ public String toString() {
     sb.append("    creatorName: ").append(toIndentedString(creatorName)).append("\n");
     sb.append("    description: ").append(toIndentedString(description)).append("\n");
     sb.append("    updateTime: ").append(toIndentedString(updateTime)).append("\n");
+    sb.append("    userGroupNames: ").append(toIndentedString(userGroupNames)).append("\n");
     sb.append("    userName: ").append(toIndentedString(userName)).append("\n");
     sb.append("}");
     return sb.toString();

volcengine-java-sdk-emr/src/main/java/com/volcengine/emr/model/ItemForListClusterUsersOutput.java

@@ -41,6 +41,9 @@ public class ListClusterUsersRequest {
   @SerializedName("CreateorName")
   private String createorName = null;
 
+  @SerializedName("IncludeUserGroup")
+  private Boolean includeUserGroup = null;
+
   @SerializedName("Keyword")
   private String keyword = null;
 
@@ -114,6 +117,24 @@ public void setCreateorName(String createorName) {
     this.createorName = createorName;
   }
 
+  public ListClusterUsersRequest includeUserGroup(Boolean includeUserGroup) {
+    this.includeUserGroup = includeUserGroup;
+    return this;
+  }
+
+   /**
+   * Get includeUserGroup
+   * @return includeUserGroup
+  **/
+  @Schema(description = "")
+  public Boolean isIncludeUserGroup() {
+    return includeUserGroup;
+  }
+
+  public void setIncludeUserGroup(Boolean includeUserGroup) {
+    this.includeUserGroup = includeUserGroup;
+  }
+
   public ListClusterUsersRequest keyword(String keyword) {
     this.keyword = keyword;
     return this;
@@ -243,6 +264,7 @@ public boolean equals(java.lang.Object o) {
     return Objects.equals(this.clusterId, listClusterUsersRequest.clusterId) &&
         Objects.equals(this.createTimeOrder, listClusterUsersRequest.createTimeOrder) &&
         Objects.equals(this.createorName, listClusterUsersRequest.createorName) &&
+        Objects.equals(this.includeUserGroup, listClusterUsersRequest.includeUserGroup) &&
         Objects.equals(this.keyword, listClusterUsersRequest.keyword) &&
         Objects.equals(this.updateTimeOrder, listClusterUsersRequest.updateTimeOrder) &&
         Objects.equals(this.userGroupName, listClusterUsersRequest.userGroupName) &&
@@ -253,7 +275,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(clusterId, createTimeOrder, createorName, keyword, updateTimeOrder, userGroupName, userName, userNameOrder, userNames);
+    return Objects.hash(clusterId, createTimeOrder, createorName, includeUserGroup, keyword, updateTimeOrder, userGroupName, userName, userNameOrder, userNames);
   }
 
 
@@ -265,6 +287,7 @@ public String toString() {
     sb.append("    clusterId: ").append(toIndentedString(clusterId)).append("\n");
     sb.append("    createTimeOrder: ").append(toIndentedString(createTimeOrder)).append("\n");
     sb.append("    createorName: ").append(toIndentedString(createorName)).append("\n");
+    sb.append("    includeUserGroup: ").append(toIndentedString(includeUserGroup)).append("\n");
     sb.append("    keyword: ").append(toIndentedString(keyword)).append("\n");
     sb.append("    updateTimeOrder: ").append(toIndentedString(updateTimeOrder)).append("\n");
     sb.append("    userGroupName: ").append(toIndentedString(userGroupName)).append("\n");