Merge 'integration_2025-04-24_877340287234' into 'master'

merge branch integration_2025-04-24_877340287234 into master

See merge request: !458

Author: volc-sdk-team

README.md

@@ -8,8 +8,7 @@
 * Note
 
 ### Requirements ###
-
-运行 SDK需要jdk **Java 1.7+**. 你可以下载最新的版本： http://developers.sun.com/downloads/.
+运行 SDK需要jdk **Java 1.8.0_131+**. 你可以下载最新的版本： http://developers.sun.com/downloads/.
 如果 SDK版本 高于或者等于 **Java 9** 请依赖javax.annotation-api
 由于在高于或者等于 **Java 9** 中 javax.annotation-api 被移除
 
@@ -62,7 +61,7 @@
         <dependency>
             <groupId>com.volcengine</groupId>
             <artifactId>volcengine-java-sdk-bom</artifactId>
-            <version>0.2.4</version>
+            <version>0.2.5</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
@@ -78,12 +77,12 @@
     <dependency>
         <groupId>com.volcengine</groupId>
         <artifactId>volcengine-java-sdk-vpc</artifactId>
-        <version>0.2.4</version>
+        <version>0.2.5</version>
     </dependency>
     <dependency>
         <groupId>com.volcengine</groupId>
         <artifactId>volcengine-java-sdk-ecs</artifactId>
-        <version>0.2.4</version>
+        <version>0.2.5</version>
     </dependency>
 </dependencies>
 ```

meta.json

@@ -1,4 +1,4 @@
 {
-	"lasted": "0.2.4",
-	"meta_commit": "b192f0522b722cbf25c0ac72943ff44004d8245c"
+	"lasted": "0.2.5",
+	"meta_commit": "16bc2e75c0bb7f181f0f94f6144a503f8939fcbb"
 }

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.volcengine</groupId>
     <artifactId>volcengine-java-sdk</artifactId>
     <packaging>pom</packaging>
-    <version>0.2.4</version>
+    <version>0.2.5</version>
     <name>volcengine-java-sdk</name>
     <url>https://open.volcengineapi.com</url>
     <description>The Java SDK For Volcengine</description>
@@ -273,5 +273,9 @@
         <module>volcengine-java-sdk-rdspostgresql</module>
         <module>volcengine-java-sdk-clouddetect</module>
         <module>volcengine-java-sdk-translate20250301</module>
+        <module>volcengine-java-sdk-edx</module>
+        <module>volcengine-java-sdk-wafruntime</module>
+        <module>volcengine-java-sdk-volccontentplatform</module>
+        <module>volcengine-java-sdk-mlplatform20240701</module>
     </modules>
 </project>

volcengine-java-sdk-advdefence/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.2.4</version>
+        <version>0.2.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

volcengine-java-sdk-advdefence20230308/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.2.4</version>
+        <version>0.2.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

volcengine-java-sdk-alb/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.2.4</version>
+        <version>0.2.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

volcengine-java-sdk-alb/src/main/java/com/volcengine/alb/AlbApi.java

@@ -95,6 +95,8 @@
 import com.volcengine.alb.model.DescribeRulesResponse;
 import com.volcengine.alb.model.DescribeServerGroupAttributesRequest;
 import com.volcengine.alb.model.DescribeServerGroupAttributesResponse;
+import com.volcengine.alb.model.DescribeServerGroupBackendServersRequest;
+import com.volcengine.alb.model.DescribeServerGroupBackendServersResponse;
 import com.volcengine.alb.model.DescribeServerGroupsRequest;
 import com.volcengine.alb.model.DescribeServerGroupsResponse;
 import com.volcengine.alb.model.DescribeZonesRequest;
@@ -4395,6 +4397,130 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
+    /**
+     * Build call for describeServerGroupBackendServers
+     * @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 describeServerGroupBackendServersCall(DescribeServerGroupBackendServersRequest body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = body;
+        
+        // create path and map variables
+        String localVarPath = "/DescribeServerGroupBackendServers/2020-04-01/alb/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 describeServerGroupBackendServersValidateBeforeCall(DescribeServerGroupBackendServersRequest 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 describeServerGroupBackendServers(Async)");
+        }
+        
+        com.squareup.okhttp.Call call = describeServerGroupBackendServersCall(body, progressListener, progressRequestListener);
+        return call;
+
+        
+        
+        
+        
+    }
+
+    /**
+     * 
+     * 
+     * @param body  (required)
+     * @return DescribeServerGroupBackendServersResponse
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public DescribeServerGroupBackendServersResponse describeServerGroupBackendServers(DescribeServerGroupBackendServersRequest body) throws ApiException {
+        ApiResponse<DescribeServerGroupBackendServersResponse> resp = describeServerGroupBackendServersWithHttpInfo(body);
+        return resp.getData();
+    }
+
+    /**
+     * 
+     * 
+     * @param body  (required)
+     * @return ApiResponse&lt;DescribeServerGroupBackendServersResponse&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<DescribeServerGroupBackendServersResponse> describeServerGroupBackendServersWithHttpInfo( @NotNull DescribeServerGroupBackendServersRequest body) throws ApiException {
+        com.squareup.okhttp.Call call = describeServerGroupBackendServersValidateBeforeCall(body, null, null);
+        Type localVarReturnType = new TypeToken<DescribeServerGroupBackendServersResponse>(){}.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 describeServerGroupBackendServersAsync(DescribeServerGroupBackendServersRequest body, final ApiCallback<DescribeServerGroupBackendServersResponse> 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 = describeServerGroupBackendServersValidateBeforeCall(body, progressListener, progressRequestListener);
+        Type localVarReturnType = new TypeToken<DescribeServerGroupBackendServersResponse>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
     /**
      * Build call for describeServerGroups
      * @param body  (required)

volcengine-java-sdk-alb/src/main/java/com/volcengine/alb/model/AclForDescribeAclsOutput.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.alb.model.TagForDescribeAclsOutput;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -56,6 +57,9 @@ public class AclForDescribeAclsOutput {
   @SerializedName("Status")
   private String status = null;
 
+  @SerializedName("Tags")
+  private List<TagForDescribeAclsOutput> tags = null;
+
   @SerializedName("UpdateTime")
   private String updateTime = null;
 
@@ -211,6 +215,33 @@ public void setStatus(String status) {
     this.status = status;
   }
 
+  public AclForDescribeAclsOutput tags(List<TagForDescribeAclsOutput> tags) {
+    this.tags = tags;
+    return this;
+  }
+
+  public AclForDescribeAclsOutput addTagsItem(TagForDescribeAclsOutput tagsItem) {
+    if (this.tags == null) {
+      this.tags = new ArrayList<TagForDescribeAclsOutput>();
+    }
+    this.tags.add(tagsItem);
+    return this;
+  }
+
+   /**
+   * Get tags
+   * @return tags
+  **/
+  @Valid
+  @Schema(description = "")
+  public List<TagForDescribeAclsOutput> getTags() {
+    return tags;
+  }
+
+  public void setTags(List<TagForDescribeAclsOutput> tags) {
+    this.tags = tags;
+  }
+
   public AclForDescribeAclsOutput updateTime(String updateTime) {
     this.updateTime = updateTime;
     return this;
@@ -247,12 +278,13 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.listeners, aclForDescribeAclsOutput.listeners) &&
         Objects.equals(this.projectName, aclForDescribeAclsOutput.projectName) &&
         Objects.equals(this.status, aclForDescribeAclsOutput.status) &&
+        Objects.equals(this.tags, aclForDescribeAclsOutput.tags) &&
         Objects.equals(this.updateTime, aclForDescribeAclsOutput.updateTime);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(aclEntryCount, aclId, aclName, createTime, description, listeners, projectName, status, updateTime);
+    return Objects.hash(aclEntryCount, aclId, aclName, createTime, description, listeners, projectName, status, tags, updateTime);
   }
 
 
@@ -269,6 +301,7 @@ public String toString() {
     sb.append("    listeners: ").append(toIndentedString(listeners)).append("\n");
     sb.append("    projectName: ").append(toIndentedString(projectName)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    updateTime: ").append(toIndentedString(updateTime)).append("\n");
     sb.append("}");
     return sb.toString();

volcengine-java-sdk-alb/src/main/java/com/volcengine/alb/model/AddAclEntriesRequest.java

@@ -75,7 +75,8 @@ public AddAclEntriesRequest aclId(String aclId) {
    * Get aclId
    * @return aclId
   **/
-  @Schema(description = "")
+  @NotNull
+  @Schema(required = true, description = "")
   public String getAclId() {
     return aclId;
   }

volcengine-java-sdk-alb/src/main/java/com/volcengine/alb/model/AddServerGroupBackendServersRequest.java

@@ -48,7 +48,8 @@ public AddServerGroupBackendServersRequest serverGroupId(String serverGroupId) {
    * Get serverGroupId
    * @return serverGroupId
   **/
-  @Schema(description = "")
+  @NotNull
+  @Schema(required = true, description = "")
   public String getServerGroupId() {
     return serverGroupId;
   }