Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove common-lang package adaptation after linkis1.2.0 #1015

Merged
merged 3 commits into from
Dec 29, 2022
Merged

Remove common-lang package adaptation after linkis1.2.0 #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3dbc59
Add version 1.1.0 to 1.1.1 sql.
zqburde Dec 8, 2022
ccc13dd
Merge pull request #1004 from WeDataSphere/master
zqburde Dec 8, 2022
c04e8d9
Linkis removes common lang package adaptation
zhangwejun Dec 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions db/version_update/from_v110_to_v111.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 2 additions & 2 deletions ...webank/wedatasphere/dss/linkis/node/execution/execution/impl/LinkisNodeExecutionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...xecution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/job/Builder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...on/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/parser/CodeParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions ...va/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/webank/wedatasphere/dss/linkis/node/execution/utils/LinkisJobExecutionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down