Commit Graph

2145 Commits

Author SHA1 Message Date
Jave-Chen
90df148497
Merge pull request #1948 from Yeleights/dev-process
Add process null check.
2020-02-15 16:37:41 +08:00
Yeleights
87cb33b233 deal with conflict 2020-02-14 22:46:45 +08:00
qiaozhanwei
c1ee133392
Refactor Architecture Basic modification #1658 (#1946)
* 1,remove dolphinscheduler-rpc module  2,add dolphinscheduler-remote module 3,add dolphinscheduler-service module 4,refactor LoggerServer module (#1925)

* 1,remove dolphinscheduler-rpc module
2,add dolphinscheduler-remote module
3,add dolphinscheduler-service module
4,refactor LoggerServer module

* ProcessUtils modify

* Refactor architecture (#1926)

* 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

* add stringutils ut (#1921)

* add stringutils ut

* Newfeature for #1675. (#1908)

Continue to finish the rest works, add the cache feature for dependence,mr,python,sub_process,procedure and shell.

* Add modify user name for process definition (#1919)

* class overrides equals() and should therefore also override hashCode()

* #1862 add modify user in process difinition list

* #1862 add pg-1.2.2 ddl.sql

* modify ScriptRunnerTest

* add updateProessDifinition UT

* modify updateProcessDifinition UT

* modify updateProcessDifinition UT

* modify mysql 1.2.2 ddl.sql&dml.sql

* add scope test to mysql in pom

* modify pg-1.2.2 ddl.sql

* refactor module

* updates

Co-authored-by: khadgarmage <khadgar.mage@outlook.com>
Co-authored-by: zhukai <boness@qq.com>
Co-authored-by: Yelli <amarantine@my.com>

* dolphinscheduler-common remove spring (#1931)

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* SpringApplicationContext class title add license (#1932)

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* add license (#1934)

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* Refactor architecture (#1936)

* move datasource classes to dao module

* fix send4LetterWord bug

* LoggerServiceTest remove ProcessDao (#1944)

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* dolphinscheduler-common remove spring

* LoggerServiceTest remove ProcessDao

* exclude jasper-compiler in case of runtime conflict (#1938)

* move datasource classes to dao module

* fix send4LetterWord bug

* exclude jasper-compiler in case of runtime conflict

* DataAnaylysisServiceTest and ProcessDefinitionService modify

* remote module add comment

* OSUtilsTest modify

* add finally block to close channel (#1951)

* move datasource classes to dao module

* fix send4LetterWord bug

* exclude jasper-compiler in case of runtime conflict

* add finally block to close channel

Co-authored-by: Tboy <technoboy@yeah.net>
Co-authored-by: khadgarmage <khadgar.mage@outlook.com>
Co-authored-by: zhukai <boness@qq.com>
Co-authored-by: Yelli <amarantine@my.com>
2020-02-14 22:00:20 +08:00
Jave-Chen
cdd53a7673
Fix socket bug: read before sock connect. Add UT for FourLetterWordMain. (#1954)
* Fix socket bug: read before sock connect. Add UT for FourLetterWordMain.

* Fix code smell

   Remove  @Ignore and  @Test from testCmd().

* correct comment
2020-02-14 10:39:02 +08:00
Yeleights
77023aee1b add DagHelperTest to pom 2020-02-13 16:18:26 +08:00
Yeleights
6c90575a39 add process null check
Remove duplicate code in processDefinitionService
add processDefinitionService UT
2020-02-13 15:39:30 +08:00
gabry.wu
44b76468a8
Adapting partial code(file name start with C) to the sonar cloud rules (#1918)
* Adapting partial code(file name start with C) to the sonar cloud rules

* add some UT

* add some UT(rollback JSONUtils.checkJsonVaild)

* add some UT(fix OSUtils.exeCmd UT)
2020-02-13 12:42:08 +08:00
Yelli
768b5d9dfd
add state null check (#1939)
add process definition UT
2020-02-12 15:05:21 +08:00
samz406
e35e8be26f
Merge pull request #1941 from samz406/dev
modify DataAnalysisServiceTest by mock
2020-02-12 13:39:43 +08:00
lilin
735034c72f modify DataAnalysisServiceTest by mock 2020-02-12 10:44:44 +08:00
samz406
4d643ee9ae
Merge pull request #4 from apache/dev
update
2020-02-12 10:41:23 +08:00
khadgarmage
0594a14483
fix powermock coverage 0 (#1935)
* fix powermock coverage 0
2020-02-11 23:32:21 +08:00
samz406
4bb044a41d
Merge pull request #3 from apache/dev
update
2020-02-11 15:49:43 +08:00
samz406
95d62133a4
Merge pull request #1928 from khadgarmage/ut-resinfo
add ResInfoTest.java ut
2020-02-11 09:49:08 +08:00
Jave-Chen
6a94f2d3d2
Merge pull request #1916 from samz406/dev
Modify LoggerServiceTest UT by mock
2020-02-11 09:31:06 +08:00
xiaochun.liu
0ed6156b22 swap param 2020-02-11 09:26:43 +08:00
xiaochun.liu
980b5ae5ea swap param 2020-02-11 09:21:59 +08:00
lilin
1172abee44 add comment 2020-02-11 09:00:56 +08:00
xiaochun.liu
17162341c3 add ResInfoTest.java ut 2020-02-11 00:18:06 +08:00
Yelli
d937a6ae94 Add modify user name for process definition (#1919)
* class overrides equals() and should therefore also override hashCode()

* #1862 add modify user in process difinition list

* #1862 add pg-1.2.2 ddl.sql

* modify ScriptRunnerTest

* add updateProessDifinition UT

* modify updateProcessDifinition UT

* modify updateProcessDifinition UT

* modify mysql 1.2.2 ddl.sql&dml.sql

* add scope test to mysql in pom

* modify pg-1.2.2 ddl.sql
2020-02-10 16:37:51 +08:00
lilin
69fa28357b modify @RunWith(MockitoJUnitRunner.class) 2020-02-10 15:33:37 +08:00
zhukai
bcc734713b Newfeature for #1675. (#1908)
Continue to finish the rest works, add the cache feature for dependence,mr,python,sub_process,procedure and shell.
2020-02-10 14:15:20 +08:00
khadgarmage
c447bb489f add stringutils ut (#1921)
* add stringutils ut
2020-02-10 13:52:32 +08:00
lilin
b3976da5b0 modify LoggerServiceTest ut 2020-02-10 11:35:16 +08:00
gabry.wu
b77dddfeef Adapting partial code(file name start with B) to the sonar cloud rules (#1915)
* Adapting partial code(file name start with B) to the sonar cloud rules

* add @Ignore to BaseTaskQueueTest class
2020-02-09 17:56:55 +08:00
lilin
e00ef4915d modify loggerService UT by Mock 2020-02-09 16:32:10 +08:00
samz406
5c9e8b4b16
Merge pull request #2 from apache/dev
update
2020-02-09 16:27:30 +08:00
Jave-Chen
bae622f96b
Merge pull request #1909 from khadgarmage/ut-scriptrunner
add ScriptRunnerTest.java unit test
2020-02-09 11:39:57 +08:00
xiaochun.liu
2f33a9e2ab delete dup code 2020-02-09 10:20:18 +08:00
xiaochun.liu
bd10b78e29 delete dup code 2020-02-09 10:09:31 +08:00
xiaochun.liu
3364a8c8a9 add script runner ut 2020-02-08 21:22:20 +08:00
samz406
49b4d084b3
Merge pull request #1 from apache/dev
udpate
2020-02-08 18:08:04 +08:00
老佛爷
4a25127f6d
Merge pull request #1904 from lfyee/dev
Remove ScheduleUtil,use the existing CronUtils
2020-02-07 21:35:24 +08:00
zhangzy
0eec3b8661 Remove useless code 2020-02-07 19:17:47 +08:00
zhangzy
6b586f31fc pom add ut, add cronutils ut 2020-02-07 18:34:38 +08:00
zhangzy
61593cfe6b ut change 2020-02-07 17:35:12 +08:00
zhangzy
515255b919 ut 2020-02-07 17:18:27 +08:00
zhangzy
a09d2d9d0a add CronUtils ut 2020-02-07 16:43:24 +08:00
zhangzy
5a8cb0fb21 Merge branch 'dev' of github.com:apache/incubator-dolphinscheduler into dev 2020-02-07 16:32:31 +08:00
Rubik
fccbcc8d7d
fix: The constructor has passed in an taskAppId, no need to get from taskAppId. (#1906) 2020-02-07 16:13:50 +08:00
zhangzy
9d944d3f76 Optimize duplicate code
Use public methods to simplify duplicate code
2020-02-07 15:47:07 +08:00
zhangzy
662233e0dd Remove ScheduleUtil,use the existing CronUtils
CronUtils is a public quartz tools, then the project dolphinscheduler-api can remove dolphinscheduler-server
2020-02-07 10:15:42 +08:00
Jave-Chen
b3b075d915
Fix bug: Use try-with-resources or close this "Statement" in a "finally" clause. (#1702)
* #1701  Fix bug: Use try-with-resources or close this "Statement" in a "finally" clause.

* fix some indent

* refix code smell
2020-02-06 19:32:31 +08:00
dailidong
18750dfc08
remove jasper-runtime jar, not need anymore (#1900)
* update README about DolphinScheduler

* Update issue templates

* update

* regularize api pom xml
update rpc maven compile to 1.8

* regularize api pom xml

* change commons.lang3.StringUtils to common.utils.StringUtils

* update pom.xml

* update

* correct equals method

* jasper-runtime is needed when api server start

* jasper-runtime jar is needed when api server start

* combine logback config of master/worker/alert/api server to one logback.xml

* remove tomcat runtime jar

* add UT

* add license

* remove jasper-runtime jar, not need anymore

Co-authored-by: DS <escheduler@outlook.com>
2020-02-06 18:52:44 +08:00
dailidong
c63cd3e237
combine logback config of master/worker/alert/api server to one (#1898)
* combine logback config of master/worker/alert/api server to one logback.xml
2020-02-06 11:08:06 +08:00
魔方不在手
f942e5ced3
[feature] data synchronization function (#1881)
* feature:data synchronization function

* feature:data synchronization function

* feature:data synchronization function

* fix:add license

* fix:resource close bug

* fix:remove class author

* fix:Improve test coverage

* fix:add UT

* fix:add UT

* fix:data sync node renamed to datax

* fix:add UT

* fix: UT bug

* fix:Optimize variable name

* fix:pom

* fix:Variable name error

* fix:optimize the code
2020-02-06 09:29:23 +08:00
dailidong
dbbc6f58da
jasper-runtime jar is needed when api server start (#1896)
* update README about DolphinScheduler

* Update issue templates

* update

* regularize api pom xml
update rpc maven compile to 1.8

* regularize api pom xml

* change commons.lang3.StringUtils to common.utils.StringUtils

* update pom.xml

* update

* correct equals method

* jasper-runtime is needed when api server start

* jasper-runtime jar is needed when api server start

Co-authored-by: DS <escheduler@outlook.com>
2020-02-05 09:21:21 +08:00
Yelli
78bfe918d0
change datasource null check position (#1883) 2020-02-03 11:07:19 +08:00
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