test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-12-03 20:58:11 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity
1,983 Commits 27 Branches 59 Tags 276 MiB
42b3e5bd10
Commit Graph

158 Commits

Author SHA1 Message Date
Tboy
42b3e5bd10
fix api server startup failure (#1886) 
* move version to parent pom

* move version properties to parent pom for easy management

* remove freemarker dependency

* delete CombinedApplicationServer

* #1871 correct spelling

* #1873 some updates for TaskQueueZkImpl

* #1875 remove unused properties in pom

* #1878
1. remove tomcat dependency
2. remove combined_logback.xml in api module
3. format pom.xml for not aligning

* #1885 fix api server startup failure
1. add jsp-2.1 dependency
2. remove jasper-runtime dependency
 2020-02-03 11:06:31 +08:00
Yelli
5169689c35
class overrides equals() and should therefore also override hashCode() (#1882) 2020-02-03 10:24:24 +08:00
Tboy
6b0debec79
some updates for pom (#1879) 
* move version to parent pom

* move version properties to parent pom for easy management

* remove freemarker dependency

* delete CombinedApplicationServer

* #1871 correct spelling

* #1873 some updates for TaskQueueZkImpl

* #1875 remove unused properties in pom

* #1878
1. remove tomcat dependency
2. remove combined_logback.xml in api module
3. format pom.xml for not aligning
 2020-02-01 16:10:17 +08:00
Jave-Chen
ff9009a5ae #1864 fix dependency and createCommand date check (#1865) 2020-01-22 23:16:13 +08:00
gabry.wu
a1b918c364 [Feature] createSchedule should return schedule's Id (#1861) 
issue: https://github.com/apache/incubator-dolphinscheduler/issues/1860
 2020-01-20 16:35:17 +08:00
liwenhe1993
30db5c1467 Api module relp server module/1756 (#1766) 
* Remove server module on api module

1. Remove server module and add dao module.
2. Move quartz in server module to dao module.
3. Update config and class.


to resolve conflicts，I deleted CombinedApplicationServer.java

Co-authored-by: dailidong <dailidong66@gmail.com>
 2020-01-20 16:26:23 +08:00
Jave-Chen
16913bacd7 fix return, obj error (#1855) 2020-01-17 21:55:50 +08:00
Jave-Chen
d371745ddf Fix bug: Use try-with-resources or close this "Socket" in a "finally" clause. (#1716) 
* #1714
 2020-01-17 19:17:30 +08:00
Jave-Chen
c522ea7ebb Fix bug: NullPointerException etc. (#1721) 
* #1720 Fix bug: NullPointerException etc.

* fix code smell

* Update DateInterval.java

refactor equals method

Co-authored-by: dailidong <dailidong66@gmail.com>
 2020-01-17 16:55:01 +08:00
老佛爷
1c77708a89 Supplementary data by schedule (#1830) 
* Supplementary data by schedule

* fix sonar check bug

* fix code duplicated blocks

* ut

* loop by day

* MasterExecThread test

* test add licene

Co-authored-by: dailidong <dailidong66@gmail.com>
 2020-01-16 15:33:00 +08:00
qiaozhanwei
53814425b7 revert #1686 (#1840) 
* remove LogViewServiceGrpc.java file and pom modify

* remove kazoo

* remove kazoo

* remove kazoo

* remove common monitor package

* add license

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* install.sh remove python kazoo

* add system param whether repeat running

* remove kazoo modify

* BusinessTimeUtils remove whther repeat running inner param

* add AccessTokenMapperTest UT

* CI UT yml modify，start postgresql and zookeeper by default

* add AlertGroupMapperTest UT in github action

* Conflicts reslove

* AlertMappert UT modify

* AlertMappert UT modify

* AlertMappert UT modify

* CommandMapperTest UT modify

* DataSourceMapperTest UT modify

* fix #1775 bug，delete process definition when process instance is running

* verifyTenantIsNull remove process definnition id print log

* revert #1686

* revert #1686
 2020-01-16 15:09:13 +08:00
samz406
c558da0b75 add BaseServiceTest BaseDAGServiceTest UT (#1835) 
* modify UdfFuncServiceTest UT

* fix get tenantCode my NPE

* add  ResourcesServiceTest

* add error log

* add BaseServiceTest BaseServiceTest UT

* update
 2020-01-16 11:25:40 +08:00
Yelli
8399ab4718 add null check in markdownTable & modify EnterpriseWeChatManager logger class (#1809) 2020-01-14 14:36:38 +08:00
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