Commit Graph

145 Commits

Author SHA1 Message Date
Yelli
38f30b5c4d add null check when import process has sub-process (#1806)
* fix bug: zk hasTask method NPE

* add retMap null check for AlertSender

* add null check when import process has sub-process
2020-01-13 10:11:35 +08:00
Yelli
1c5c8b75b9 refactor import process (#1804)
* refactor import process

* add refactor import process UT

* add import process UT

* add null check UT for import process metadata

* add UT for import process

* modify dependentparam UT

* modify testAddImportDependentSpecialParam

* modify DependentParamTest

* modify processDefinitionService UT
2020-01-11 15:05:30 +08:00
Tboy
3cf21dcac0 delete CombinedApplicationServer (#1763)
* move version to parent pom

* move version properties to parent pom for easy management

* remove freemarker dependency

* delete CombinedApplicationServer
2020-01-09 10:40:03 +08:00
Yelli
7dfa9976a0 refactor export process (#1772)
* refactor process export

* comment & null check for export process

* add License

* add javadoc

* add DataSourceParamTest and DependentParamTest

* refactor process export & add exportProcessMetaDataStr UT
2020-01-09 10:35:52 +08:00
Yelli
23cec993f9 fix bug: fix ResourcesServiceTest (#1759) 2020-01-08 09:59:49 +08:00
Tboy
074fd41aa6 remove freemarker dependency (#1757)
* remove freemarker dependency
2020-01-07 22:33:31 +08:00
Jave-Chen
4b027fbf02 Fix SonarCloud bug “Resources should be closed” (#1667)
#1666 Fix SonarCloud bug “Resources should be closed”
2020-01-07 21:53:55 +08:00
Yelli
8125974c61 ds.server regularize log print (#1751)
* ds.server regularize log print

* log print modify

* log print modify

* modify lang3 to lang
2020-01-07 17:29:19 +08:00
elonlo
8ae401e3d7 Refactor login verification process (#1543)
* Refactor login verification process

* Delete application-combined.properties

application-combined.properties doesn't needed

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-01-07 16:23:23 +08:00
Yelli
7762a62270 add null check in SubProcessTaskExecThread (#1737)
* modify FileUtils.readFile2Str

* #1300 Add right alignment function in sql email content

* cancel formatted for alert_mail_template.ftl

* #747 sql task password Log desensitization

* cancel mail_temple

* edit ExcelUtils

* modify test method name

* #747 sql task password Log desensitization

* #1544 workflow import

* Constants add DATASOURCE_PASSWORD_REGEX

* #747 sql task password Log desensitization

* deal with import project have sub process

* modify export process addTaskNodeParam method name

* add testAddTaskNodeSpecialParam UT

* add ProcessDefinitionServiceTest-ut to pom

* add testImportSubProcess in ProcessDefinitionServiceTest

* add testImportSubProcess in ProcessDefinitionServiceTest

* add testImportProcessDefinition

* fix sonar bug: not enough arguments

* fix sonar bug: change condition & not enough arguments

* fix bug sonar: add null check in daghelper && add hashcode method in ProcessData

* fix bug sonar: add null check in daghelper

* CollectionUtils.isEmpty()

* add hashcode() && null check

* merge if

* remove hashcode

* remove e.getMessage
2020-01-07 11:07:23 +08:00
Tboy
4cc058c931 move version properties to parent pom for easy management of api module (#1736)
* move version to parent pom

* move version properties to parent pom for easy management
2020-01-07 10:22:11 +08:00
dailidong
0628aec535 regularize api module pom.xml and rpc module compile to 1.8 (#1733)
* update README about DolphinScheduler

* Update issue templates

* update

* regularize api pom xml
update rpc maven compile to 1.8

* regularize api pom xml

Co-authored-by: DS <escheduler@outlook.com>
2020-01-06 22:53:38 +08:00
samz406
15ae4dfa74 fix get tenantCode my NPE (#1684)
* modify UdfFuncServiceTest UT

* fix get tenantCode my NPE

* add  ResourcesServiceTest

* add error log
2020-01-06 19:47:29 +08:00
Tboy
94fa1adf9b move version to parent pom (#1722) 2020-01-06 11:35:29 +08:00
qiaozhanwei
1f7db8f797 Revert "move version to parent pom (#1712)" (#1715)
This reverts commit 87e8f0d83b.
2020-01-04 23:38:08 +08:00
Tboy
87e8f0d83b move version to parent pom (#1712)
* remove commons-lang3 dependancy

* remove commons-lang3 dependancy

* remove unused import

* all the submodule should not contain version, so move version to parent,
2020-01-04 23:11:13 +08:00
Tboy
4d1abb3fc7 remove commons-lang3 dependancy (#1709)
* remove commons-lang3 dependancy

* remove commons-lang3 dependancy

* remove unused import
2020-01-04 18:01:10 +08:00
Yelli
7ecd38f7d6 fix sonar bug: change condition & not enough arguments (#1692)
* modify FileUtils.readFile2Str

* #1300 Add right alignment function in sql email content

* cancel formatted for alert_mail_template.ftl

* #747 sql task password Log desensitization

* cancel mail_temple

* edit ExcelUtils

* modify test method name

* #747 sql task password Log desensitization

* #1544 workflow import

* Constants add DATASOURCE_PASSWORD_REGEX

* #747 sql task password Log desensitization

* deal with import project have sub process

* modify export process addTaskNodeParam method name

* add testAddTaskNodeSpecialParam UT

* add ProcessDefinitionServiceTest-ut to pom

* add testImportSubProcess in ProcessDefinitionServiceTest

* add testImportSubProcess in ProcessDefinitionServiceTest

* add testImportProcessDefinition

* fix sonar bug: not enough arguments

* fix sonar bug: change condition & not enough arguments
2020-01-04 11:32:07 +08:00
Tboy
884237487c remove commons-lang3 dependancy, using common-module instead for server module (#1698)
* remove commons-lang3 dependancy

* remove commons-lang3 and commons-lang dependancy

* remove commons-collections4/commons-logging/commons-io dependancy

* tmp add commons-lang3 for compile

* remove commons-lang3 dependancy, using common-module instead

* remove common StringUtils instead of lang3

* add tmp lang3 for compile
2020-01-03 19:23:05 +08:00
Yelli
216154dc06 fix sonar bug: null check & clean throw exception (#1690)
* fix sonar bug: null check & clean throw exception

* fix sonar bug: null check & clean throw exception
2020-01-03 11:46:51 +08:00
Yelli
a80e90276f fix sonar bug: not enough arguments (#1687)
* modify FileUtils.readFile2Str

* #1300 Add right alignment function in sql email content

* cancel formatted for alert_mail_template.ftl

* #747 sql task password Log desensitization

* cancel mail_temple

* edit ExcelUtils

* modify test method name

* #747 sql task password Log desensitization

* #1544 workflow import

* Constants add DATASOURCE_PASSWORD_REGEX

* #747 sql task password Log desensitization

* deal with import project have sub process

* modify export process addTaskNodeParam method name

* add testAddTaskNodeSpecialParam UT

* add ProcessDefinitionServiceTest-ut to pom

* add testImportSubProcess in ProcessDefinitionServiceTest

* add testImportSubProcess in ProcessDefinitionServiceTest

* add testImportProcessDefinition

* fix sonar bug: not enough arguments
2020-01-03 11:24:01 +08:00
Tboy
95dedd94f3
Merge pull request #1686 from clay4444/fixSignOutBug
Fix SessionService signOut method exception handle bug
2020-01-03 10:06:03 +08:00
loushang
65bb0e03b7 fix SessionServiceTest testSignOut bug (add mock) 2020-01-02 20:08:14 +08:00
Yelli
26ed786c4d #1544 fix bug: workflow import (#1676)
* modify FileUtils.readFile2Str

* #1300 Add right alignment function in sql email content

* cancel formatted for alert_mail_template.ftl

* #747 sql task password Log desensitization

* cancel mail_temple

* edit ExcelUtils

* modify test method name

* #747 sql task password Log desensitization

* #1544 workflow import

* Constants add DATASOURCE_PASSWORD_REGEX

* #747 sql task password Log desensitization

* deal with import project have sub process

* modify export process addTaskNodeParam method name

* add testAddTaskNodeSpecialParam UT

* add ProcessDefinitionServiceTest-ut to pom

* add testImportSubProcess in ProcessDefinitionServiceTest

* add testImportSubProcess in ProcessDefinitionServiceTest

* add testImportProcessDefinition
2020-01-02 19:45:05 +08:00
loushang
5949c8d6fb fix SessionService signOut method exception bug 2020-01-02 17:20:57 +08:00
samz406
dc6c18902a modify UdfFuncServiceTest UT (#1644) 2019-12-31 23:21:09 +08:00
loushang
b549ee3901 fix zk monitor bug 2019-12-31 10:30:20 +08:00
loushang
dc4e46db41 fix Monitor bug 2019-12-30 18:58:38 +08:00
Tboy
4032c4e64b
Merge pull request #1618 from samz406/1227-2
before delete Udf check exist
2019-12-30 18:30:49 +08:00
lilin
96d49a0950 remove delete check exist 2019-12-30 18:26:10 +08:00
bao liang
d16500e8be [Feature] merge some configurations #1635 (#1636)
* merge hadoop.properties into common.properties

* merge hadoop,zookeeper.properties into common.properties
remove combined.properties/master.properties/worker.properties

* change db user/pwd to test/test
2019-12-30 18:14:31 +08:00
samz406
503be5f400 add service UT (#1637)
* User update  not check params

* user phone update when noteEmpty

* modify saveWorkerGroup may NPE

* add some service UT

* add  service ut include
2019-12-30 17:24:34 +08:00
samz406
6d4a3410c8 modify saveWorkerGroup may NPE (#1629)
* User update  not check params

* user phone update when noteEmpty

* modify saveWorkerGroup may NPE
2019-12-30 10:31:35 +08:00
Tboy
87738af235
Merge pull request #1615 from samz406/1227-queue
queue return info is not correct
2019-12-29 10:20:18 +08:00
samz406
b03632bc6d User update not check params (#1619)
* misspell  words

* modify common queue TaskQueueZKImplTest.java unit test

* extends  BaseTaskQueueTest get zkServer

* modify zk config

* User update  not check params

* user phone update when noteEmpty
2019-12-29 10:13:14 +08:00
Tboy
49181fd08e
Merge pull request #1607 from samz406/1227-token
project checkResult may NPE
2019-12-28 19:57:42 +08:00
lilin
62f54eed7f 1 Modify judgment order(调整顺序,先判断是否存在)
2 before delete check entity exist
2019-12-27 18:21:21 +08:00
lilin
759d997616 Merge branch '1227-2' of ssh://github.com/samz406/EasyScheduler into 1227-2 2019-12-27 18:15:35 +08:00
lilin
ce76f3eab7 1 Modify judgment order
2 before delete check entity exist
2019-12-27 18:11:48 +08:00
lilin
d91e0155c7 1when queue or queName is null,return info param is null
2 update queue may NPE
2019-12-27 17:35:15 +08:00
samz406
be5fc116ef update resource may NPE (#1610)
* misspell  words

* modify common queue TaskQueueZKImplTest.java unit test

* extends  BaseTaskQueueTest get zkServer

* modify zk config

* update resource may NPE
2019-12-27 17:20:34 +08:00
samz406
597d685955 delAlertgroupById add entity exist check (#1602)
* misspell  words

* modify common queue TaskQueueZKImplTest.java unit test

* extends  BaseTaskQueueTest get zkServer

* modify zk config

* add MonitorServiceTest

* mobile phone need 11 number

* delete file

* delAlertgroupById add entity exist check
2019-12-27 17:00:33 +08:00
samz406
f3f3ada959
Merge pull request #14 from apache/dev
update
2019-12-27 15:41:16 +08:00
lilin
6736765844 1 word error
2 modify check project perm may NPE
3  modify checkResult  may NPE
4 update project add desc check
2019-12-27 15:22:25 +08:00
samz406
7826843620 update token add exist check (#1598)
* misspell  words

* modify common queue TaskQueueZKImplTest.java unit test

* extends  BaseTaskQueueTest get zkServer

* modify zk config

* updateToken add entity exist check
2019-12-27 15:02:49 +08:00
lilin
05a5a413cf delAlertgroupById add entity exist check 2019-12-27 14:57:55 +08:00
lilin
3cccfa3037 updateToken add entity exist check 2019-12-27 14:44:01 +08:00
samz406
fe9344d4be mobile phone need 11 number (#1596)
* misspell  words

* modify common queue TaskQueueZKImplTest.java unit test

* extends  BaseTaskQueueTest get zkServer

* modify zk config

* add MonitorServiceTest

* mobile phone need 11 number

* delete file
2019-12-27 14:42:21 +08:00
lilin
9c6f9fce20 delete file 2019-12-27 14:21:48 +08:00
lilin
6bec773792 mobile phone need 11 number 2019-12-27 14:18:44 +08:00