[Improve][SeaTunnel-Web] Change JobStatus to enum type to avoid hard …

…coding
apache · Sep 7, 2024 · 1f21f24 · 1f21f24
1 parent 0095599
commit 1f21f24
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/...main/java/org/apache/seatunnel/app/thirdparty/engine/SeaTunnelEngineMetricsExtractor.java b/...main/java/org/apache/seatunnel/app/thirdparty/engine/SeaTunnelEngineMetricsExtractor.java
@@ -401,7 +401,10 @@ private JobMetrics getOrCreatePipelineMetricsMap(
         if (currPipelineMetrics == null) {
             currPipelineMetrics = new JobMetrics();
             metricsMap.put(pipelineId, currPipelineMetrics);
-            currPipelineMetrics.setStatus(JobStatus.valueOf(jobPipelineStatus.get(pipelineId)));
+            currPipelineMetrics.setStatus(
+                    "DEPLOYING".equals(jobPipelineStatus.get(pipelineId))
+                            ? JobStatus.SCHEDULED
+                            : JobStatus.valueOf(jobPipelineStatus.get(pipelineId)));
             currPipelineMetrics.setPipelineId(pipelineId);
         }
         return currPipelineMetrics;

diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/utils/JobUtils.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/utils/JobUtils.java
@@ -21,6 +21,7 @@
 
 import org.apache.seatunnel.app.dal.entity.JobTask;
 import org.apache.seatunnel.app.domain.request.job.JobExecParam;
+import org.apache.seatunnel.engine.core.job.JobStatus;
 
 import java.util.List;
 import java.util.Map;
@@ -98,9 +99,9 @@ public static void updateDataSource(JobExecParam jobExecParam, List<JobTask> tas
                         });
     }
 
-    public static boolean isJobEndStatus(String jobStatus) {
-        return "finished".equalsIgnoreCase(jobStatus)
-                || "canceled".equalsIgnoreCase(jobStatus)
-                || "failed".equalsIgnoreCase(jobStatus);
+    public static boolean isJobEndStatus(JobStatus jobStatus) {
+        return JobStatus.FINISHED == jobStatus
+                || JobStatus.CANCELED == jobStatus
+                || JobStatus.FAILED == jobStatus;
     }
 }