ECM code optimization (#4449)

* ECM code optimization
apache · Apr 16, 2023 · c8d1512 · c8d1512
1 parent af40a99
commit c8d1512
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 82 deletions.
diff --git a/...ernance-common/src/main/scala/org/apache/linkis/governance/common/utils/ECPathUtils.scala b/...ernance-common/src/main/scala/org/apache/linkis/governance/common/utils/ECPathUtils.scala
@@ -25,24 +25,16 @@ import java.nio.file.Paths
 
 object ECPathUtils {
 
-  def getECWOrkDirPathSuffix(
-      user: String,
-      ticketId: String,
-      engineType: String,
-      timeStamp: Long = System.currentTimeMillis()
-  ): String = {
-    val suffix = if (StringUtils.isBlank(engineType)) {
-      Paths
-        .get(user, DateFormatUtils.format(System.currentTimeMillis(), "yyyyMMdd"))
-        .toFile
-        .getPath
-    } else {
-      Paths
-        .get(user, DateFormatUtils.format(System.currentTimeMillis(), "yyyyMMdd"), engineType)
-        .toFile
-        .getPath
-    }
-    suffix + File.separator + ticketId
+  def getECWOrkDirPathSuffix(user: String, ticketId: String, engineType: String): String = {
+    Paths
+      .get(
+        user,
+        DateFormatUtils.format(System.currentTimeMillis(), "yyyyMMdd"),
+        if (StringUtils.isBlank(engineType)) "" else engineType
+      )
+      .toFile
+      .getPath + File.separator + ticketId
+
   }
 
 }
diff --git a/...governance-common/src/main/scala/org/apache/linkis/governance/common/utils/JobUtils.scala b/...governance-common/src/main/scala/org/apache/linkis/governance/common/utils/JobUtils.scala
@@ -19,6 +19,8 @@ package org.apache.linkis.governance.common.utils
 
 import org.apache.linkis.governance.common.constant.job.JobRequestConstants
 
+import org.apache.commons.collections.MapUtils
+
 import java.util;
 
 object JobUtils {
@@ -34,13 +36,7 @@ object JobUtils {
   }
 
   def getJobIdFromStringMap(map: util.Map[String, String]): String = {
-    if (null != map && map.containsKey(JobRequestConstants.JOB_ID)) {
-      val value = map.get(JobRequestConstants.JOB_ID)
-      if (null != value) {
-        return value
-      }
-    }
-    null
+    if (MapUtils.isNotEmpty(map)) map.getOrDefault(JobRequestConstants.JOB_ID, null) else null
   }
 
 }
diff --git a/...n-manager-server/src/main/scala/org/apache/linkis/ecm/server/hook/JarUDFLoadECMHook.scala b/...n-manager-server/src/main/scala/org/apache/linkis/ecm/server/hook/JarUDFLoadECMHook.scala
@@ -113,7 +113,6 @@ class JarUDFLoadECMHook extends ECMHook with Logging {
               )
           }
         }
-        //        LaunchConstants.addPathToClassPath(pel.environment, udfDir + File.separator + "*")
         val udfJars = fileNameSet.map(udfDir + File.separator + _)
         pel.environment.put(Environment.UDF_JARS.toString, udfJars.mkString(","));
     }

diff --git a/...anager-server/src/main/scala/org/apache/linkis/ecm/server/service/ECMMetricsService.scala b/...anager-server/src/main/scala/org/apache/linkis/ecm/server/service/ECMMetricsService.scala
diff --git a/...main/scala/org/apache/linkis/ecm/server/service/impl/BmlResourceLocalizationService.scala b/...main/scala/org/apache/linkis/ecm/server/service/impl/BmlResourceLocalizationService.scala
@@ -120,8 +120,6 @@ class BmlResourceLocalizationService extends ResourceLocalizationService with Lo
     }
   }
 
-  private val bmlResourceSuffix = ".zip"
-
   private def createDirIfNotExit(noSchemaPath: String): String = {
     val fsPath = new FsPath(schema + noSchemaPath)
     if (!fs.exists(fsPath)) {

diff --git a/...r/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultECMMetricsService.scala b/...r/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultECMMetricsService.scala
diff --git a/...nager-common/src/main/java/org/apache/linkis/manager/common/protocol/bml/BmlResource.java b/...nager-common/src/main/java/org/apache/linkis/manager/common/protocol/bml/BmlResource.java
@@ -80,13 +80,4 @@ public static enum BmlResourceVisibility {
     Private,
     Label
   }
-
-  /*    @Override
-  public String toString() {
-      return "{" +
-              "fileName='" + fileName + '\'' +
-              ", resourceId='" + resourceId + '\'' +
-              ", version='" + version + '\'' +
-              '}';
-  }*/
 }