Merge pull request #1015 from zhangwejun/master

Remove common-lang package adaptation after linkis1.2.0
WeBankFinTech · Dec 29, 2022 · d608084 · d608084
2 parents 207caa0 + c04e8d9
commit d608084
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/db/version_update/from_v110_to_v111.sql b/db/version_update/from_v110_to_v111.sql
@@ -0,0 +1,8 @@
+select @schedulis_appconn_id:=id from dss_appconn where appconn_name='schedulis';
+update dss_appconn_instance set enhance_json = '{"reqUri":""}', homepage_uri = '/manager' where appconn_id = @schedulis_appconn_id;
+
+select @qualitis_appconn_id:=id from dss_appconn where appconn_name='qualitis';
+update dss_appconn_instance set enhance_json = '{"reqUri":""}', homepage_uri = '#/dashboard' where appconn_id = @qualitis_appconn_id;
+
+select @dolphinscheduler_appconn_id:=id from dss_appconn where appconn_name='dolphinscheduler';
+update dss_appconn_instance set enhance_json = '{"reqUri":"dolphinscheduler/projects/analysis/define-user-count"}', homepage_uri = 'dolphinscheduler' where appconn_id = @dolphinscheduler_appconn_id;
diff --git a/...webank/wedatasphere/dss/linkis/node/execution/execution/impl/LinkisNodeExecutionImpl.java b/...webank/wedatasphere/dss/linkis/node/execution/execution/impl/LinkisNodeExecutionImpl.java
@@ -39,7 +39,7 @@
 import org.apache.linkis.ujes.client.response.JobInfoResult;
 import org.apache.linkis.ujes.client.response.JobLogResult;
 import org.apache.linkis.ujes.client.response.OpenLogResult;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import scala.tools.nsc.settings.Final;
 
 import java.text.MessageFormat;
@@ -49,7 +49,7 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 
 public class LinkisNodeExecutionImpl implements LinkisNodeExecution , LinkisExecutionListener {

diff --git a/...xecution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/job/Builder.java b/...xecution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/job/Builder.java
@@ -23,7 +23,7 @@
 import com.webank.wedatasphere.dss.linkis.node.execution.utils.LinkisJobExecutionUtils;
 import com.webank.wedatasphere.dss.linkis.node.execution.utils.LinkisUjesClientUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.linkis.common.utils.JsonUtils;
 import org.apache.linkis.httpclient.dws.DWSHttpClient;
 import org.apache.linkis.httpclient.dws.config.DWSClientConfig;

diff --git a/...on/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/parser/CodeParser.java b/...on/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/parser/CodeParser.java
@@ -35,7 +35,7 @@
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 
 public class CodeParser implements JobParser {

diff --git a/...va/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java b/...va/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java
@@ -22,8 +22,8 @@
 import com.webank.wedatasphere.dss.linkis.node.execution.job.Job;
 import com.webank.wedatasphere.dss.linkis.node.execution.job.LinkisJob;
 import com.webank.wedatasphere.dss.linkis.node.execution.service.BuildJobAction;
-import org.apache.commons.lang.SerializationUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.SerializationUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.linkis.manager.label.constant.LabelKeyConstant;
 import org.apache.linkis.manager.label.entity.engine.EngineTypeLabel;
 import org.apache.linkis.manager.label.utils.EngineTypeLabelCreator;

diff --git a/...java/com/webank/wedatasphere/dss/linkis/node/execution/utils/LinkisJobExecutionUtils.java b/...java/com/webank/wedatasphere/dss/linkis/node/execution/utils/LinkisJobExecutionUtils.java
@@ -21,7 +21,7 @@
 import com.google.gson.reflect.TypeToken;
 import com.webank.wedatasphere.dss.linkis.node.execution.conf.LinkisJobExecutionConfiguration;
 import com.webank.wedatasphere.dss.linkis.node.execution.entity.BMLResource;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.*;