Optimize Code

apache · Aug 29, 2023 · 79623d1 · 79623d1
1 parent 77472ff
commit 79623d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/...ain/java/org/apache/linkis/cli/application/interactor/job/interactive/InteractiveJob.java b/...ain/java/org/apache/linkis/cli/application/interactor/job/interactive/InteractiveJob.java
@@ -217,8 +217,7 @@ private LinkisOperResultAdapter waitJobComplete(String user, String jobId)
       // query progress
       try {
         jobInfoResult = oper.queryJobInfo(user, jobId);
-        oper.queryJobStatus(
-            jobInfoResult.getUser(), jobInfoResult.getJobID(), jobInfoResult.getStrongerExecId());
+        oper.queryJobStatus(user, jobId, jobInfoResult.getStrongerExecId());
       } catch (Exception e) {
         logger.warn("", e);
         retryCnt++;

diff --git a/...-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java b/...-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
@@ -359,14 +359,11 @@ public Message executeECMOperation(HttpServletRequest req, @RequestBody JsonNode
           "Fail to process the operation parameters, cased by "
               + ExceptionUtils.getRootCauseMessage(e));
     }
-    if (parameters.containsKey("engineConnInstance")) {
-      return executeECMOperation(
-          ecmNode,
-          parameters.get("engineConnInstance").toString(),
-          new ECMOperateRequest(userName, parameters));
-    } else {
-      return executeECMOperation(ecmNode, "", new ECMOperateRequest(userName, parameters));
-    }
+
+    return executeECMOperation(
+        ecmNode,
+        parameters.getOrDefault("engineConnInstance", "").toString(),
+        new ECMOperateRequest(userName, parameters));
   }
 
   @ApiOperation(value = "openEngineLog", notes = "open Engine log", response = Message.class)