[Improvement] Merge redundant codes (apache#7550)

Lucaszlei · Dec 26, 2021 · e424338 · e424338
1 parent 4e7b0ef
commit e424338
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 36 deletions.
diff --git a/...-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractYarnTask.java b/...-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractYarnTask.java
@@ -17,6 +17,7 @@
 
 package org.apache.dolphinscheduler.plugin.task.api;
 
+import org.apache.dolphinscheduler.spi.task.ResourceInfo;
 import org.apache.dolphinscheduler.spi.task.request.TaskRequest;
 
 /**
@@ -80,4 +81,21 @@ public void cancelApplication(boolean status) throws Exception {
      * set main jar name
      */
     protected abstract void setMainJarName();
+
+    /**
+     * Get name of jar resource.
+     *
+     * @param mainJar
+     * @return
+     */
+    protected String getResourceNameOfMainJar(ResourceInfo mainJar) {
+        if (null == mainJar) {
+            throw new RuntimeException("The jar for the task is required.");
+        }
+
+        return mainJar.getId() == 0
+                ? mainJar.getRes()
+                // when update resource maybe has error
+                : mainJar.getResourceName().replaceFirst("/", "");
+    }
 }
diff --git a/...ler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkTask.java b/...ler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkTask.java
@@ -116,17 +116,9 @@ protected String buildCommand() {
     protected void setMainJarName() {
         // main jar
         ResourceInfo mainJar = flinkParameters.getMainJar();
-        if (mainJar != null) {
-            int resourceId = mainJar.getId();
-            String resourceName;
-            if (resourceId == 0) {
-                resourceName = mainJar.getRes();
-            } else {
-                resourceName = mainJar.getResourceName().replaceFirst("/", "");
-            }
-            mainJar.setRes(resourceName);
-            flinkParameters.setMainJar(mainJar);
-        }
+        String resourceName = getResourceNameOfMainJar(mainJar);
+        mainJar.setRes(resourceName);
+        flinkParameters.setMainJar(mainJar);
     }
 
     @Override

diff --git a/...duler-task-mr/src/main/java/org/apache/dolphinscheduler/plugin/task/mr/MapReduceTask.java b/...duler-task-mr/src/main/java/org/apache/dolphinscheduler/plugin/task/mr/MapReduceTask.java
@@ -119,17 +119,9 @@ protected String buildCommand() {
     protected void setMainJarName() {
         // main jar
         ResourceInfo mainJar = mapreduceParameters.getMainJar();
-        if (mainJar != null) {
-            int resourceId = mainJar.getId();
-            String resourceName;
-            if (resourceId == 0) {
-                resourceName = mainJar.getRes();
-            } else {
-                resourceName = mainJar.getResourceName().replaceFirst("/", "");
-            }
-            mainJar.setRes(resourceName);
-            mapreduceParameters.setMainJar(mainJar);
-        }
+        String resourceName = getResourceNameOfMainJar(mainJar);
+        mainJar.setRes(resourceName);
+        mapreduceParameters.setMainJar(mainJar);
     }
 
     @Override

diff --git a/...ler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTask.java b/...ler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTask.java
@@ -121,22 +121,9 @@ protected String buildCommand() {
     protected void setMainJarName() {
         // main jar
         ResourceInfo mainJar = sparkParameters.getMainJar();
-
-        if (null == mainJar) {
-            throw new RuntimeException("Spark task jar params is null");
-        }
-
-        int resourceId = mainJar.getId();
-        String resourceName;
-        if (resourceId == 0) {
-            resourceName = mainJar.getRes();
-        } else {
-            //when update resource maybe has error
-            resourceName = mainJar.getResourceName().replaceFirst("/", "");
-        }
+        String resourceName = getResourceNameOfMainJar(mainJar);
         mainJar.setRes(resourceName);
         sparkParameters.setMainJar(mainJar);
-
     }
 
     @Override