[incubator-streampark] branch dev updated: [Bug] Copy application function defect (#1997)

[be...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/dev by this push:
     new 5f5b98bed [Bug] Copy application function defect (#1997)
5f5b98bed is described below

commit 5f5b98bed45e0d3cf76370290a0de27569addff4
Author: xujiangfeng001 <10...@users.noreply.github.com>
AuthorDate: Thu Nov 10 14:22:10 2022 +0800

    [Bug] Copy application function defect (#1997)
    
    * [Bug] Copy application function defect #1994
---
 .../console/core/service/impl/ApplicationServiceImpl.java        | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
index 6e86f0240..e137cbceb 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ApplicationServiceImpl.java
@@ -634,12 +634,10 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
 
         Application newApp = new Application();
         String jobName = appParam.getJobName();
-        String args = appParam.getArgs();
 
         newApp.setJobName(jobName);
-        newApp.setClusterId(oldApp.getExecutionModeEnum() == ExecutionMode.KUBERNETES_NATIVE_SESSION ? oldApp.getClusterId() : jobName);
-        args = args != null && !"".equals(args) ? args : oldApp.getArgs();
-        newApp.setArgs(args);
+        newApp.setClusterId(ExecutionMode.isSessionMode(oldApp.getExecutionModeEnum()) ? oldApp.getClusterId() : jobName);
+        newApp.setArgs(appParam.getArgs());
         newApp.setVersionId(oldApp.getVersionId());
 
         newApp.setFlinkClusterId(oldApp.getFlinkClusterId());
@@ -667,13 +665,12 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
         newApp.setProjectId(oldApp.getProjectId());
         newApp.setModule(oldApp.getModule());
         newApp.setDefaultModeIngress(oldApp.getDefaultModeIngress());
-
         newApp.setUserId(commonService.getUserId());
         newApp.setState(FlinkAppState.ADDED.getValue());
         newApp.setLaunch(LaunchState.NEED_LAUNCH.get());
         newApp.setOptionState(OptionState.NONE.getValue());
         newApp.setCreateTime(new Date());
-        newApp.doSetHotParams();
+        newApp.setHotParams(oldApp.getHotParams());
 
         newApp.setJar(oldApp.getJar());
         newApp.setJarCheckSum(oldApp.getJarCheckSum());