From bc7b067d49dbaf811d2c580cf0a35f3b0de7fb18 Mon Sep 17 00:00:00 2001 From: Mohammad Arshad Date: Wed, 4 Sep 2024 23:31:34 +0530 Subject: [PATCH] Changed /seatunnel/api/v1/task/metrics parameter from jobDefineName to taskName as taskName is referred everywhere in UI. --- .../seatunnel/app/controller/TaskInstanceController.java | 2 +- .../app/controller/TaskInstanceControllerWrapper.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/TaskInstanceController.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/TaskInstanceController.java index cdcd35a2f..f459c2d49 100644 --- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/TaskInstanceController.java +++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/controller/TaskInstanceController.java @@ -41,7 +41,7 @@ public class TaskInstanceController { @ApiOperation(value = "get the jobMetrics list ", httpMethod = "GET") public Result> getTaskInstanceList( @RequestAttribute(name = "userId") Integer userId, - @RequestParam(name = "jobDefineName", required = false) String jobDefineName, + @RequestParam(name = "taskName", required = false) String jobDefineName, @RequestParam(name = "executorName", required = false) String executorName, @RequestParam(name = "stateType", required = false) String stateType, @RequestParam(name = "startDate", required = false) String startTime, diff --git a/seatunnel-web-it/src/test/java/org/apache/seatunnel/app/controller/TaskInstanceControllerWrapper.java b/seatunnel-web-it/src/test/java/org/apache/seatunnel/app/controller/TaskInstanceControllerWrapper.java index 7285c8b69..d07a06a54 100644 --- a/seatunnel-web-it/src/test/java/org/apache/seatunnel/app/controller/TaskInstanceControllerWrapper.java +++ b/seatunnel-web-it/src/test/java/org/apache/seatunnel/app/controller/TaskInstanceControllerWrapper.java @@ -37,7 +37,7 @@ public class TaskInstanceControllerWrapper extends SeatunnelWebTestingBase { private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); public Result> getTaskInstanceList( - String jobDefineName, + String taskName, String executorName, String stateType, String startTime, @@ -48,8 +48,8 @@ public Result> getTaskInstanceList( String response = sendRequest( urlWithParam( - "task/jobMetrics?jobDefineName=" - + jobDefineName + "task/jobMetrics?taskName=" + + taskName + "&executorName=" + executorName + "&stateType="