Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev

.github/workflows/ci_e2e.yml

@@ -49,7 +49,8 @@ jobs:
       - name: Docker Run
         run: |
           VERSION=`cat $(pwd)/pom.xml| grep "SNAPSHOT</version>" | awk -F "-SNAPSHOT" '{print $1}' | awk -F ">" '{print $2}'`
-          docker run -dit -e POSTGRESQL_USERNAME=test -e POSTGRESQL_PASSWORD=test -p 8888:8888 dolphinscheduler:$VERSION all
+          mkdir -p /tmp/logs
+          docker run -dit -e POSTGRESQL_USERNAME=test -e POSTGRESQL_PASSWORD=test -v /tmp/logs:/opt/dolphinscheduler/logs -p 8888:8888 dolphinscheduler:$VERSION all
       - name: Check Server Status
         run: sh ./dockerfile/hooks/check
       - name: Prepare e2e env
@@ -65,7 +66,10 @@ jobs:
       - name: Run e2e Test
         run: cd ./e2e && mvn -B clean test
       - name: Collect logs
-        run: |
-          mkdir -p ${LOG_DIR}
-          docker logs dolphinscheduler > ${LOG_DIR}/dolphinscheduler.txt
-        continue-on-error: true
+        if: failure()
+        uses: actions/upload-artifact@v1
+        with:
+          name: dslogs
+          path: /tmp/logs
+
+

.github/workflows/ci_ut.yml

@@ -15,7 +15,11 @@
 # limitations under the License.
 #
 
-on: ["pull_request", "push"]
+on:
+  pull_request:
+  push:
+    branches:
+      - dev
 env:
   DOCKER_DIR: ./docker
   LOG_DIR: /tmp/dolphinscheduler
@@ -48,19 +52,18 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
+      - name: Git fetch unshallow
+        run: |
+          git fetch --unshallow
+          git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
+          git fetch origin
       - name: Compile
         run: |
           export MAVEN_OPTS='-Dmaven.repo.local=.m2/repository -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g'
           mvn test -B -Dmaven.test.skip=false
       - name: Upload coverage report to codecov
-        if: github.event_name == 'pull_request'
         run: |
           CODECOV_TOKEN="09c2663f-b091-4258-8a47-c981827eb29a" bash <(curl -s https://codecov.io/bash)
-      - name: Git fetch unshallow
-        run: |
-          git fetch --unshallow
-          git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-          git fetch origin
       - name: Run SonarCloud Analysis
         run: >
           mvn verify --batch-mode

CONTRIBUTING.md

@@ -1,35 +1,53 @@
-* First from the remote repository *https://github.com/apache/incubator-dolphinscheduler.git* fork code to your own repository
 
-* there are three branches in the remote repository currently:
-     * master normal delivery branch
-            After the stable version is released, the code for the stable version branch is merged into the master branch.
+# Development
 
-    * dev daily development branch
-            The daily development branch, the newly submitted code can pull requests to this branch.
+Start by forking the dolphinscheduler GitHub repository, make changes in a branch and then send a pull request.
 
+## Set up your dolphinscheduler GitHub Repository
 
-* Clone your own warehouse to your local
+There are three branches in the remote repository currently:
+  - `master` : normal delivery branch. After the stable version is released, the code for the stable version branch is merged into the master branch.
+            
+  - `dev` : daily development branch. The daily development branch, the newly submitted code can pull requests to this branch.
+  
+  - `x.x.x-release` : the stable release version.
 
-    `git clone https://github.com/apache/incubator-dolphinscheduler.git`
+So, you should fork the `dev` branch.
 
-* Add remote repository address, named upstream
+After forking the [dolphinscheduler upstream source repository](https://github.com/apache/incubator-dolphinscheduler/fork) to your personal repository, you can set your  personal development environment.
 
-   `git remote add upstream https://github.com/apache/incubator-dolphinscheduler.git`
+```sh
+$ cd <your work direcotry>
+$ git clone < your personal forked dolphinscheduler repo>
+$ cd incubator-dolphinscheduler
+```
 
-* View repository:
+## Set git remote as ``upstream``
 
-    `git remote -v`
+Add remote repository address, named upstream
 
-> There will be two repositories at this time: origin (your own warehouse) and upstream (remote repository)
+```sh
+git remote add upstream https://github.com/apache/incubator-dolphinscheduler.git
+```
 
-* Get/update remote repository code (already the latest code, skip it)
+View repository:
 
-   `git fetch upstream`
+```sh
+git remote -v
+```
 
+There will be two repositories at this time: origin (your own warehouse) and upstream (remote repository)
 
-* Synchronize remote repository code to local repository
+Get/update remote repository code (already the latest code, skip it).
 
+
+```sh
+git fetch upstream
 ```
+
+Synchronize remote repository code to local repository
+
+```sh
 git checkout origin/dev
 git merge --no-ff upstream/dev
 ```
@@ -41,24 +59,46 @@ git checkout -b dev-1.0 upstream/dev-1.0
 git push --set-upstream origin dev1.0
 ```
 
-* After modifying the code locally, submit it to your own repository:
+## Create your feature branch
+Before making code changes, make sure you create a separate branch for them.
+
+```sh
+$ git checkout -b <your-feature>
+```
+
+## Commit changes
+After modifying the code locally, submit it to your own repository:
+
+```sh
+
+git commit -m 'information about your feature'
+```
+
+## Push to the branch
+
+
+Push your locally committed changes to the remote origin (your fork).
 
-`git commit -m 'test commit'`
-`git push`
+```
+$ git push origin <your-feature>
+```
+
+## Create a pull request
 
-* Submit changes to the remote repository
+After submitting changes to your remote repository, you should click on the new pull request On the following github page.
 
-* On the github page, click on the new pull request.
 <p align = "center">
-<img src = "http://geek.analysys.cn/static/upload/221/2019-04-02/90f3abbf-70ef-4334-b8d6-9014c9cf4c7f.png"width ="60%"/>
-</ p>
+<img src = "http://geek.analysys.cn/static/upload/221/2019-04-02/90f3abbf-70ef-4334-b8d6-9014c9cf4c7f.png" width ="60%"/>
+</p>
+
+
+Select the modified local branch and the branch to merge past to create a pull request.
 
-* Select the modified local branch and the branch to merge past to create a pull request.
 <p align = "center">
-<img src = "http://geek.analysys.cn/static/upload/221/2019-04-02/fe7eecfe-2720-4736-951b-b3387cf1ae41.png"width ="60%"/>
-</ p>
+<img src = "http://geek.analysys.cn/static/upload/221/2019-04-02/fe7eecfe-2720-4736-951b-b3387cf1ae41.png" width ="60%"/>
+</p>
 
-*  Next, the administrator is responsible for **merging** to complete the pull request
+Next, the administrator is responsible for **merging** to complete the pull request.
 
 
 

ambari_plugin/common-services/DOLPHIN/1.2.1/package/scripts/params.py

@@ -7,16 +7,16 @@ to you under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE_2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
 """
 
+
 import sys
 from resource_management import *
 from resource_management.core.logger import Logger

docker/docker-compose.yml

@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 version: '2'
 services:
   zookeeper:

dockerfile/hooks/check

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 echo "------ dolphinscheduler check - server - status -------"
-sleep 20
+sleep 60
 server_num=$(docker top `docker container list | grep '/sbin/tini' | awk '{print $1}'`| grep java | grep "dolphinscheduler" | awk -F 'classpath ' '{print $2}' | awk '{print $2}' | sort | uniq -c | wc -l)
 if [ $server_num -eq 5 ]
 then
@@ -25,3 +25,11 @@ else
     echo "Server start failed "$server_num
     exit 1
 fi
+ready=`curl http://127.0.0.1:8888/dolphinscheduler/login -d 'userName=admin&userPassword=dolphinscheduler123' -v | grep "login success" | wc -l`
+if [ $ready -eq 1 ]
+then
+    echo "Servers is ready"
+else
+    echo "Servers is not ready"
+    exit 1
+fi

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertGroupController.java

@@ -93,11 +93,11 @@ public class AlertGroupController extends  BaseController{
     public Result list(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser) {
         logger.info("login  user {}, query all alertGroup",
                 loginUser.getUserName());
-        try{
+        try {
             HashMap<String, Object> result = alertGroupService.queryAlertgroup();
             return returnDataList(result);
-        }catch (Exception e){
-            logger.error(Status.QUERY_ALL_ALERTGROUP_ERROR.getMsg(),e);
+        } catch (Exception e) {
+            logger.error(Status.QUERY_ALL_ALERTGROUP_ERROR.getMsg(), e);
             return error(Status.QUERY_ALL_ALERTGROUP_ERROR.getCode(), Status.QUERY_ALL_ALERTGROUP_ERROR.getMsg());
         }
     }
@@ -214,12 +214,20 @@ public class AlertGroupController extends  BaseController{
     @GetMapping(value = "/verify-group-name")
     @ResponseStatus(HttpStatus.OK)
     public Result verifyGroupName(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
-                                 @RequestParam(value ="groupName") String groupName
-    ) {
-        logger.info("login user {}, verfiy group name: {}",
-                loginUser.getUserName(),groupName);
+                                 @RequestParam(value ="groupName") String groupName) {
+        logger.info("login user {}, verify group name: {}", loginUser.getUserName(), groupName);
 
-        return alertGroupService.verifyGroupName(loginUser, groupName);
+        boolean exist= alertGroupService.existGroupName(groupName);
+        Result result = new Result();
+        if (exist) {
+            logger.error("group {} has exist, can't create again.", groupName);
+            result.setCode(Status.ALERT_GROUP_EXIST.getCode());
+            result.setMsg(Status.ALERT_GROUP_EXIST.getMsg());
+        } else {
+            result.setCode(Status.SUCCESS.getCode());
+            result.setMsg(Status.SUCCESS.getMsg());
+        }
+        return result;
     }
 
     /**

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java

@@ -391,7 +391,7 @@ public class ProcessInstanceController extends BaseController{
                     }
                 }
             }
-            if(deleteFailedIdList.size() > 0){
+            if(!deleteFailedIdList.isEmpty()){
                 putMsg(result, Status.BATCH_DELETE_PROCESS_INSTANCE_BY_IDS_ERROR, String.join(",", deleteFailedIdList));
             }else{
                 putMsg(result, Status.SUCCESS);

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java

@@ -144,7 +144,7 @@ public class ResourcesController extends BaseController{
                                      @RequestParam(value ="type") ResourceType type
     ){
         try{
-            logger.info("query resource list, login user:{}, resource type:{}", loginUser.getUserName(), type.toString());
+            logger.info("query resource list, login user:{}, resource type:{}", loginUser.getUserName(), type);
             Map<String, Object> result = resourceService.queryResourceList(loginUser, type);
             return returnDataList(result);
         }catch (Exception e){
@@ -180,7 +180,7 @@ public class ResourcesController extends BaseController{
     ){
         try{
             logger.info("query resource list, login user:{}, resource type:{}, search value:{}",
-                    loginUser.getUserName(), type.toString(), searchVal);
+                    loginUser.getUserName(), type, searchVal);
             Map<String, Object> result = checkPageParams(pageNo, pageSize);
             if(result.get(Constants.STATUS) != Status.SUCCESS){
                 return returnDataListPaging(result);
@@ -426,8 +426,6 @@ public class ResourcesController extends BaseController{
                                 @RequestParam(value = "resourceId") int resourceId) {
         logger.info("login user {}, create udf function, type: {},  funcName: {},argTypes: {} ,database: {},desc: {},resourceId: {}",
                 loginUser.getUserName(),type, funcName, argTypes,database,description, resourceId);
-        Result result = new Result();
-
         try {
             return udfFuncService.createUdfFunction(loginUser,funcName,className,argTypes,database,description,type,resourceId);
         } catch (Exception e) {
@@ -563,7 +561,7 @@ public class ResourcesController extends BaseController{
     public Result queryResourceList(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                     @RequestParam("type") UdfType type){
         try{
-            logger.info("query datasource list, user:{}, type:{}", loginUser.getUserName(), type.toString());
+            logger.info("query datasource list, user:{}, type:{}", loginUser.getUserName(), type);
             Map<String, Object> result = udfFuncService.queryResourceList(loginUser,type.ordinal());
             return returnDataList(result);
         }catch (Exception e){

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/ProcessMeta.java

@@ -106,9 +106,6 @@ public class ProcessMeta {
      */
     private String scheduleWorkerGroupName;
 
-    public ProcessMeta() {
-    }
-
     public String getProjectName() {
         return projectName;
     }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java

@@ -43,36 +43,36 @@ public class TaskCountDto {
     }
 
     private void countTaskDtos(List<ExecuteStatusCount> taskInstanceStateCounts){
-        int submitted_success = 0;
-        int running_exeution = 0;
-        int ready_pause = 0;
+        int submittedSuccess = 0;
+        int runningExeution = 0;
+        int readyPause = 0;
         int pause = 0;
-        int ready_stop = 0;
+        int readyStop = 0;
         int stop = 0;
         int failure = 0;
         int success = 0;
-        int need_fault_tolerance = 0;
+        int needFaultTolerance = 0;
         int kill = 0;
-        int waitting_thread = 0;
+        int waittingThread = 0;
 
         for(ExecuteStatusCount taskInstanceStateCount : taskInstanceStateCounts){
             ExecutionStatus status = taskInstanceStateCount.getExecutionStatus();
             totalCount += taskInstanceStateCount.getCount();
             switch (status){
                 case SUBMITTED_SUCCESS:
-                    submitted_success += taskInstanceStateCount.getCount();
+                    submittedSuccess += taskInstanceStateCount.getCount();
                     break;
                 case RUNNING_EXEUTION:
-                    running_exeution += taskInstanceStateCount.getCount();
+                    runningExeution += taskInstanceStateCount.getCount();
                     break;
                 case READY_PAUSE:
-                    ready_pause += taskInstanceStateCount.getCount();
+                    readyPause += taskInstanceStateCount.getCount();
                     break;
                 case PAUSE:
                     pause += taskInstanceStateCount.getCount();
                     break;
                 case READY_STOP:
-                    ready_stop += taskInstanceStateCount.getCount();
+                    readyStop += taskInstanceStateCount.getCount();
                     break;
                 case STOP:
                     stop += taskInstanceStateCount.getCount();
@@ -84,13 +84,13 @@ public class TaskCountDto {
                     success += taskInstanceStateCount.getCount();
                     break;
                 case NEED_FAULT_TOLERANCE:
-                    need_fault_tolerance += taskInstanceStateCount.getCount();
+                    needFaultTolerance += taskInstanceStateCount.getCount();
                     break;
                 case KILL:
                     kill += taskInstanceStateCount.getCount();
                     break;
                 case WAITTING_THREAD:
-                    waitting_thread += taskInstanceStateCount.getCount();
+                    waittingThread += taskInstanceStateCount.getCount();
                     break;
 
                     default:
@@ -98,17 +98,17 @@ public class TaskCountDto {
             }
         }
         this.taskCountDtos = new ArrayList<>();
-        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.SUBMITTED_SUCCESS, submitted_success));
-        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.RUNNING_EXEUTION, running_exeution));
-        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.READY_PAUSE, ready_pause));
+        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.SUBMITTED_SUCCESS, submittedSuccess));
+        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.RUNNING_EXEUTION, runningExeution));
+        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.READY_PAUSE, readyPause));
         this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.PAUSE, pause));
-        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.READY_STOP, ready_stop));
+        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.READY_STOP, readyStop));
         this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.STOP, stop));
         this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.FAILURE, failure));
         this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.SUCCESS, success));
-        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.NEED_FAULT_TOLERANCE, need_fault_tolerance));
+        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.NEED_FAULT_TOLERANCE, needFaultTolerance));
         this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.KILL, kill));
-        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.WAITTING_THREAD, waitting_thread));
+        this.taskCountDtos.add(new TaskStateCount(ExecutionStatus.WAITTING_THREAD, waittingThread));
     }
 
 

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertGroupService.java

@@ -16,17 +16,17 @@
  */
 package org.apache.dolphinscheduler.api.service;
 
+import java.util.*;
 import org.apache.dolphinscheduler.api.enums.Status;
 import org.apache.dolphinscheduler.api.utils.PageInfo;
-import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.AlertType;
+import org.apache.dolphinscheduler.common.utils.CollectionUtils;
 import org.apache.dolphinscheduler.common.utils.StringUtils;
 import org.apache.dolphinscheduler.dao.entity.AlertGroup;
 import org.apache.dolphinscheduler.dao.entity.User;
 import org.apache.dolphinscheduler.dao.entity.UserAlertGroup;
 import org.apache.dolphinscheduler.dao.mapper.AlertGroupMapper;
-import org.apache.dolphinscheduler.dao.mapper.UserAlertGroupMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.slf4j.Logger;
@@ -35,11 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * alert group service
  */
@@ -52,8 +47,7 @@ public class AlertGroupService extends BaseService{
     private AlertGroupMapper alertGroupMapper;
 
     @Autowired
-    private UserAlertGroupMapper userAlertGroupMapper;
-
+    private UserAlertGroupService userAlertGroupService;
     /**
      * query alert group list
      *
@@ -122,7 +116,7 @@ public class AlertGroupService extends BaseService{
         alertGroup.setCreateTime(now);
         alertGroup.setUpdateTime(now);
 
-        // insert 
+        // insert
         int insert = alertGroupMapper.insert(alertGroup);
 
         if (insert > 0) {
@@ -199,7 +193,7 @@ public class AlertGroupService extends BaseService{
             return result;
         }
 
-        userAlertGroupMapper.deleteByAlertgroupId(id);
+        userAlertGroupService.deleteByAlertGroupId(id);
         alertGroupMapper.deleteById(id);
         putMsg(result, Status.SUCCESS);
         return result;
@@ -223,22 +217,26 @@ public class AlertGroupService extends BaseService{
             return result;
         }
 
-        userAlertGroupMapper.deleteByAlertgroupId(alertgroupId);
+        userAlertGroupService.deleteByAlertGroupId(alertgroupId);
         if (StringUtils.isEmpty(userIds)) {
             putMsg(result, Status.SUCCESS);
             return result;
         }
 
         String[] userIdsArr = userIds.split(",");
-
+        Date now = new Date();
+        List<UserAlertGroup> alertGroups = new ArrayList<>(userIds.length());
         for (String userId : userIdsArr) {
-            Date now = new Date();
             UserAlertGroup userAlertGroup = new UserAlertGroup();
             userAlertGroup.setAlertgroupId(alertgroupId);
             userAlertGroup.setUserId(Integer.parseInt(userId));
             userAlertGroup.setCreateTime(now);
             userAlertGroup.setUpdateTime(now);
-            userAlertGroupMapper.insert(userAlertGroup);
+            alertGroups.add(userAlertGroup);
+        }
+
+        if (CollectionUtils.isNotEmpty(alertGroups)) {
+            userAlertGroupService.saveBatch(alertGroups);
         }
 
         putMsg(result, Status.SUCCESS);
@@ -248,22 +246,11 @@ public class AlertGroupService extends BaseService{
     /**
      * verify group name exists
      *
-     * @param loginUser login user
      * @param groupName group name
      * @return check result code
      */
-    public Result verifyGroupName(User loginUser, String groupName) {
-        Result result = new Result();
+    public boolean existGroupName(String groupName) {
         List<AlertGroup> alertGroup = alertGroupMapper.queryByGroupName(groupName);
-        if (alertGroup != null && alertGroup.size() > 0) {
-            logger.error("group {} has exist, can't create again.", groupName);
-            result.setCode(Status.ALERT_GROUP_EXIST.getCode());
-            result.setMsg(Status.ALERT_GROUP_EXIST.getMsg());
-        } else {
-            result.setCode(Status.SUCCESS.getCode());
-            result.setMsg(Status.SUCCESS.getMsg());
-        }
-
-        return result;
+        return CollectionUtils.isNotEmpty(alertGroup);
     }
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java

@@ -148,7 +148,7 @@ public class ProcessDefinitionService extends BaseDAGService {
 
         //custom global params
         List<Property> globalParamsList = processData.getGlobalParams();
-        if (globalParamsList != null && globalParamsList.size() > 0) {
+        if (CollectionUtils.isNotEmpty(globalParamsList)) {
             Set<Property> globalParamsSet = new HashSet<>(globalParamsList);
             globalParamsList = new ArrayList<>(globalParamsSet);
             processDefine.setGlobalParamList(globalParamsList);
@@ -314,7 +314,7 @@ public class ProcessDefinitionService extends BaseDAGService {
 
         //custom global params
         List<Property> globalParamsList = new ArrayList<>();
-        if (processData.getGlobalParams() != null && processData.getGlobalParams().size() > 0) {
+        if (CollectionUtils.isNotEmpty(processData.getGlobalParams())) {
             Set<Property> userDefParamsSet = new HashSet<>(processData.getGlobalParams());
             globalParamsList = new ArrayList<>(userDefParamsSet);
         }
@@ -453,12 +453,11 @@ public class ProcessDefinitionService extends BaseDAGService {
         ProcessDefinition processDefinition = processDefineMapper.selectById(id);
 
         switch (state) {
-            case ONLINE: {
+            case ONLINE:
                 processDefinition.setReleaseState(state);
                 processDefineMapper.updateById(processDefinition);
                 break;
-            }
-            case OFFLINE: {
+            case OFFLINE:
                 processDefinition.setReleaseState(state);
                 processDefineMapper.updateById(processDefinition);
                 List<Schedule> scheduleList = scheduleMapper.selectAllByProcessDefineArray(
@@ -473,11 +472,9 @@ public class ProcessDefinitionService extends BaseDAGService {
                     SchedulerService.deleteSchedule(project.getId(), schedule.getId());
                 }
                 break;
-            }
-            default: {
+            default:
                 putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, "releaseState");
                 return result;
-            }
         }
 
         putMsg(result, Status.SUCCESS);

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java

@@ -239,7 +239,7 @@ public class ProcessInstanceService extends BaseDAGService {
         }
         ProcessInstance processInstance = processService.findProcessInstanceDetailById(processId);
         List<TaskInstance> taskInstanceList = processService.findValidTaskListByProcessId(processId);
-        AddDependResultForTaskList(taskInstanceList);
+        addDependResultForTaskList(taskInstanceList);
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put(PROCESS_INSTANCE_STATE, processInstance.getState().toString());
         resultMap.put(TASK_LIST, taskInstanceList);
@@ -253,9 +253,9 @@ public class ProcessInstanceService extends BaseDAGService {
      * add dependent result for dependent task
      * @param taskInstanceList
      */
-    private void AddDependResultForTaskList(List<TaskInstance> taskInstanceList) throws IOException {
+    private void addDependResultForTaskList(List<TaskInstance> taskInstanceList) throws IOException {
         for(TaskInstance taskInstance: taskInstanceList){
-            if(taskInstance.getTaskType().toUpperCase().equals(TaskType.DEPENDENT.toString())){
+            if(taskInstance.getTaskType().equalsIgnoreCase(TaskType.DEPENDENT.toString())){
                 Result logResult = loggerService.queryLog(
                         taskInstance.getId(), 0, 4098);
                 if(logResult.getCode() == Status.SUCCESS.ordinal()){
@@ -414,11 +414,10 @@ public class ProcessInstanceService extends BaseDAGService {
             processInstance.setProcessInstanceJson(processInstanceJson);
             processInstance.setGlobalParams(globalParams);
         }
-//        int update = processDao.updateProcessInstance(processInstanceId, processInstanceJson,
-//                globalParams, schedule, flag, locations, connects);
+
         int update = processService.updateProcessInstance(processInstance);
         int updateDefine = 1;
-        if (syncDefine && StringUtils.isNotEmpty(processInstanceJson)) {
+        if (Boolean.TRUE.equals(syncDefine) && StringUtils.isNotEmpty(processInstanceJson)) {
             processDefinition.setProcessDefinitionJson(processInstanceJson);
             processDefinition.setGlobalParams(originDefParams);
             processDefinition.setLocations(locations);
@@ -544,7 +543,7 @@ public class ProcessInstanceService extends BaseDAGService {
                     nodeValueSb.append(ipSb);
                 }
 
-                logger.info("delete task queue node : {}",nodeValueSb.toString());
+                logger.info("delete task queue node : {}",nodeValueSb);
                 tasksQueue.removeNode(org.apache.dolphinscheduler.common.Constants.DOLPHINSCHEDULER_TASKS_QUEUE, nodeValueSb.toString());
 
             }
@@ -621,7 +620,7 @@ public class ProcessInstanceService extends BaseDAGService {
                 Map<String,Object> localParamsMap = new HashMap<>();
                 localParamsMap.put("taskType",taskNode.getType());
                 localParamsMap.put("localParamsList",localParamsList);
-                if (localParamsList.size() > 0) {
+                if (CollectionUtils.isNotEmpty(localParamsList)) {
                     localUserDefParams.put(taskNode.getName(), localParamsMap);
                 }
             }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/QueueService.java

@@ -20,6 +20,7 @@ import org.apache.dolphinscheduler.api.enums.Status;
 import org.apache.dolphinscheduler.api.utils.PageInfo;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
+import org.apache.dolphinscheduler.common.utils.CollectionUtils;
 import org.apache.dolphinscheduler.dao.entity.Queue;
 import org.apache.dolphinscheduler.dao.entity.User;
 import org.apache.dolphinscheduler.dao.mapper.QueueMapper;
@@ -43,7 +44,7 @@ import java.util.Map;
 @Service
 public class QueueService extends BaseService {
 
-    private static final Logger logger = LoggerFactory.getLogger(TenantService.class);
+    private static final Logger logger = LoggerFactory.getLogger(QueueService.class);
 
     @Autowired
     private QueueMapper queueMapper;
@@ -186,19 +187,16 @@ public class QueueService extends BaseService {
         }
 
         // check queue name is exist
-        if (!queueName.equals(queueObj.getQueueName())) {
-            if (checkQueueNameExist(queueName)) {
-                putMsg(result, Status.QUEUE_NAME_EXIST, queueName);
-                return result;
-            }
+        if (!queueName.equals(queueObj.getQueueName())
+                && checkQueueNameExist(queueName)) {
+            putMsg(result, Status.QUEUE_NAME_EXIST, queueName);
+            return result;
         }
 
         // check queue value is exist
-        if (!queue.equals(queueObj.getQueue())) {
-            if (checkQueueExist(queue)) {
-                putMsg(result, Status.QUEUE_VALUE_EXIST, queue);
-                return result;
-            }
+        if (!queue.equals(queueObj.getQueue()) && checkQueueExist(queue)) {
+            putMsg(result, Status.QUEUE_VALUE_EXIST, queue);
+            return result;
         }
 
         // check old queue using by any user
@@ -267,7 +265,7 @@ public class QueueService extends BaseService {
      * @return true if the queue not exists, otherwise return false
      */
     private boolean checkQueueExist(String queue) {
-        return queueMapper.queryAllQueueList(queue, null).size() > 0;
+        return CollectionUtils.isNotEmpty(queueMapper.queryAllQueueList(queue, null));
     }
 
     /**
@@ -278,7 +276,7 @@ public class QueueService extends BaseService {
      * @return true if the queue name not exists, otherwise return false
      */
     private boolean checkQueueNameExist(String queueName) {
-        return queueMapper.queryAllQueueList(null, queueName).size() > 0;
+        return CollectionUtils.isNotEmpty(queueMapper.queryAllQueueList(null, queueName));
     }
 
     /**
@@ -290,7 +288,7 @@ public class QueueService extends BaseService {
      * @return true if need to update user
      */
     private boolean checkIfQueueIsInUsing (String oldQueue, String newQueue) {
-        return !oldQueue.equals(newQueue) && userMapper.queryUserListByQueue(oldQueue).size() > 0;
+        return !oldQueue.equals(newQueue) && CollectionUtils.isNotEmpty(userMapper.queryUserListByQueue(oldQueue));
     }
 
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java

@@ -24,10 +24,7 @@ import org.apache.dolphinscheduler.api.utils.PageInfo;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.ResourceType;
-import org.apache.dolphinscheduler.common.utils.FileUtils;
-import org.apache.dolphinscheduler.common.utils.HadoopUtils;
-import org.apache.dolphinscheduler.common.utils.PropertyUtils;
-import org.apache.dolphinscheduler.common.utils.StringUtils;
+import org.apache.dolphinscheduler.common.utils.*;
 import org.apache.dolphinscheduler.dao.entity.Resource;
 import org.apache.dolphinscheduler.dao.entity.Tenant;
 import org.apache.dolphinscheduler.dao.entity.UdfFunc;
@@ -141,7 +138,7 @@ public class ResourcesService extends BaseService {
 
             putMsg(result, Status.SUCCESS);
             Map<Object, Object> dataMap = new BeanMap(resource);
-            Map<String, Object> resultMap = new HashMap<String, Object>();
+            Map<String, Object> resultMap = new HashMap<>();
             for (Map.Entry<Object, Object> entry: dataMap.entrySet()) {
                 if (!"class".equalsIgnoreCase(entry.getKey().toString())) {
                     resultMap.put(entry.getKey().toString(), entry.getValue());
@@ -171,12 +168,8 @@ public class ResourcesService extends BaseService {
      * @return true if resource exists
      */
     private boolean checkResourceExists(String alias, int userId, int type ){
-
         List<Resource> resources = resourcesMapper.queryResourceList(alias, userId, type);
-        if (resources != null && resources.size() > 0) {
-            return true;
-        }
-        return false;
+        return CollectionUtils.isNotEmpty(resources);
     }
 
 
@@ -237,7 +230,7 @@ public class ResourcesService extends BaseService {
 
         //get the file suffix
         String originResourceName = resource.getAlias();
-        String suffix = originResourceName.substring(originResourceName.lastIndexOf("."));
+        String suffix = originResourceName.substring(originResourceName.lastIndexOf('.'));
 
         //if the name without suffix then add it ,else use the origin name
         String nameWithSuffix = name;
@@ -746,8 +739,7 @@ public class ResourcesService extends BaseService {
         logger.info("resource hdfs path is {} ", hdfsFileName);
 
         HadoopUtils.getInstance().copyHdfsToLocal(hdfsFileName, localFileName, false, true);
-        org.springframework.core.io.Resource file = org.apache.dolphinscheduler.api.utils.FileUtils.file2Resource(localFileName);
-        return file;
+        return org.apache.dolphinscheduler.api.utils.FileUtils.file2Resource(localFileName);
     }
 
 
@@ -766,7 +758,7 @@ public class ResourcesService extends BaseService {
         }
         List<Resource> resourceList = resourcesMapper.queryResourceExceptUserId(userId);
         List<Object> list ;
-        if (resourceList != null && resourceList.size() > 0) {
+        if (CollectionUtils.isNotEmpty(resourceList)) {
             Set<Resource> resourceSet = new HashSet<>(resourceList);
             List<Resource> authedResourceList = resourcesMapper.queryAuthorizedResourceList(userId);
 
@@ -801,7 +793,7 @@ public class ResourcesService extends BaseService {
         List<UdfFunc> udfFuncList = udfFunctionMapper.queryUdfFuncExceptUserId(userId);
         List<UdfFunc> resultList = new ArrayList<>();
         Set<UdfFunc> udfFuncSet = null;
-        if (udfFuncList != null && udfFuncList.size() > 0) {
+        if (CollectionUtils.isNotEmpty(udfFuncList)) {
             udfFuncSet = new HashSet<>(udfFuncList);
 
             List<UdfFunc> authedUDFFuncList = udfFunctionMapper.queryAuthedUdfFunc(userId);
@@ -897,10 +889,9 @@ public class ResourcesService extends BaseService {
      */
     private void getAuthorizedResourceList(Set<?> resourceSet, List<?> authedResourceList) {
         Set<?> authedResourceSet = null;
-        if (authedResourceList != null && authedResourceList.size() > 0) {
+        if (CollectionUtils.isNotEmpty(authedResourceList)) {
             authedResourceSet = new HashSet<>(authedResourceList);
             resourceSet.removeAll(authedResourceSet);
-
         }
     }
 

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskInstanceService.java

@@ -32,8 +32,6 @@ import org.apache.dolphinscheduler.dao.entity.User;
 import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
 import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper;
 import org.apache.dolphinscheduler.service.process.ProcessService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -46,8 +44,6 @@ import java.util.*;
 @Service
 public class TaskInstanceService extends BaseService {
 
-    private static final Logger logger = LoggerFactory.getLogger(TaskInstanceService.class);
-
     @Autowired
     ProjectMapper projectMapper;
 

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskRecordService.java

@@ -21,8 +21,6 @@ import org.apache.dolphinscheduler.api.utils.PageInfo;
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.dao.TaskRecordDao;
 import org.apache.dolphinscheduler.dao.entity.TaskRecord;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -37,8 +35,6 @@ import static org.apache.dolphinscheduler.common.Constants.*;
 @Service
 public class TaskRecordService extends BaseService{
 
-    private static final Logger logger = LoggerFactory.getLogger(TaskRecordService.class);
-
     /**
      * query task record list paging
      *

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TenantService.java

@@ -310,7 +310,7 @@ public class TenantService extends BaseService{
     Map<String, Object> result = new HashMap<>(5);
 
     List<Tenant> resourceList = tenantMapper.queryByTenantCode(tenantCode);
-    if (resourceList != null && resourceList.size() > 0) {
+    if (CollectionUtils.isNotEmpty(resourceList)) {
       result.put(Constants.DATA_LIST, resourceList);
       putMsg(result, Status.SUCCESS);
     } else {
@@ -346,6 +346,6 @@ public class TenantService extends BaseService{
    */
   private boolean checkTenantExists(String tenantCode) {
       List<Tenant> tenants = tenantMapper.queryByTenantCode(tenantCode);
-      return (tenants != null && tenants.size() > 0);
+      return CollectionUtils.isNotEmpty(tenants);
   }
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UserAlertGroupService.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dolphinscheduler.api.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.dolphinscheduler.dao.entity.UserAlertGroup;
+import org.apache.dolphinscheduler.dao.mapper.UserAlertGroupMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class UserAlertGroupService extends ServiceImpl<UserAlertGroupMapper, UserAlertGroup> {
+
+    @Autowired
+    private UserAlertGroupMapper userAlertGroupMapper;
+
+    boolean deleteByAlertGroupId(Integer groupId) {
+        return userAlertGroupMapper.deleteByAlertgroupId(groupId) >= 1;
+    }
+
+}

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java

@@ -111,7 +111,7 @@ public class WorkerGroupService extends BaseService {
 
         List<WorkerGroup> workerGroupList = workerGroupMapper.queryWorkerGroupByName(workerGroup.getName());
 
-        if(workerGroupList.size() > 0 ){
+        if(CollectionUtils.isNotEmpty(workerGroupList)){
             // new group has same name..
             if(workerGroup.getId() == 0){
                 return true;

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/LoginControllerTest.java

@@ -36,7 +36,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
  * login controller test
  */
 public class LoginControllerTest extends AbstractControllerTest{
-    private static Logger logger = LoggerFactory.getLogger(SchedulerControllerTest.class);
+    private static Logger logger = LoggerFactory.getLogger(LoginControllerTest.class);
 
 
     @Test

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TaskRecordControllerTest.java

@@ -33,7 +33,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 public class TaskRecordControllerTest extends AbstractControllerTest {
-    private static final Logger logger = LoggerFactory.getLogger(TaskInstanceController.class);
+    private static final Logger logger = LoggerFactory.getLogger(TaskRecordControllerTest.class);
 
     @Test
     public void testQueryTaskRecordListPaging() throws Exception {

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/UsersControllerTest.java

@@ -37,7 +37,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
  * users controller test
  */
 public class UsersControllerTest extends AbstractControllerTest{
-    private static Logger logger = LoggerFactory.getLogger(QueueControllerTest.class);
+    private static Logger logger = LoggerFactory.getLogger(UsersControllerTest.class);
 
     @Test
     public void testCreateUser() throws Exception {

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AlertGroupServiceTest.java

@@ -18,9 +18,12 @@ package org.apache.dolphinscheduler.api.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import org.apache.dolphinscheduler.api.enums.Status;
 import org.apache.dolphinscheduler.api.utils.PageInfo;
-import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.AlertType;
 import org.apache.dolphinscheduler.common.enums.UserType;
@@ -31,9 +34,12 @@ import org.apache.dolphinscheduler.dao.mapper.AlertGroupMapper;
 import org.apache.dolphinscheduler.dao.mapper.UserAlertGroupMapper;
 import org.junit.After;
 import org.junit.Assert;
+import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import static org.mockito.ArgumentMatchers.*;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -41,14 +47,6 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-
 @RunWith(MockitoJUnitRunner.class)
 public class AlertGroupServiceTest {
 
@@ -60,6 +58,8 @@ public class AlertGroupServiceTest {
     private AlertGroupMapper alertGroupMapper;
     @Mock
     private UserAlertGroupMapper userAlertGroupMapper;
+    @Mock
+    UserAlertGroupService userAlertGroupService;
 
     private String groupName = "AlertGroupServiceTest";
 
@@ -160,25 +160,34 @@ public class AlertGroupServiceTest {
 
 
     }
+
     @Test
-    public  void testGrantUser(){
+    public void testGrantUser() {
+
+        Integer groupId = 1;
+
+        ArgumentCaptor<Integer> groupArgument = ArgumentCaptor.forClass(Integer.class);
+
+        Mockito.when(userAlertGroupService.deleteByAlertGroupId(anyInt())).thenReturn(true);
+
+        Map<String, Object> result = alertGroupService.grantUser(getLoginUser(), groupId, "123,321");
+        Mockito.verify(userAlertGroupService).deleteByAlertGroupId(groupArgument.capture());
 
-        Map<String, Object>  result = alertGroupService.grantUser(getLoginUser(),1,"123,321");
         logger.info(result.toString());
-        Assert.assertEquals(Status.SUCCESS,result.get(Constants.STATUS));
+        assertEquals(groupArgument.getValue(), groupId);
+        assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
     }
+
     @Test
-    public  void testVerifyGroupName(){
+    public void testVerifyGroupName() {
         //group name not exist
-        Result result = alertGroupService.verifyGroupName(getLoginUser(), groupName);
-        logger.info(result.toString());
-        Assert.assertEquals(Status.SUCCESS.getMsg(),result.getMsg());
+        boolean result = alertGroupService.existGroupName(groupName);
+        Assert.assertFalse(result);
         Mockito.when(alertGroupMapper.queryByGroupName(groupName)).thenReturn(getList());
 
         //group name exist
-        result = alertGroupService.verifyGroupName(getLoginUser(), groupName);
-        logger.info(result.toString());
-        Assert.assertEquals(Status.ALERT_GROUP_EXIST.getMsg(),result.getMsg());
+        result = alertGroupService.existGroupName(groupName);
+        Assert.assertTrue(result);
     }
 
 

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UserAlertGroupServiceTest.java

@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dolphinscheduler.api.service;
+
+import org.apache.dolphinscheduler.dao.mapper.UserAlertGroupMapper;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+/**
+ *
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class UserAlertGroupServiceTest {
+
+    @InjectMocks
+    UserAlertGroupService userAlertGroupService;
+
+    @Mock
+    UserAlertGroupMapper userAlertGroupMapper;
+
+    @Test
+    public void deleteByAlertGroupId() {
+
+        Integer groupId = 1;
+        userAlertGroupService.deleteByAlertGroupId(groupId);
+        ArgumentCaptor<Integer> argumentCaptor = ArgumentCaptor.forClass(Integer.class);
+
+        Mockito.verify(userAlertGroupMapper).deleteByAlertgroupId(argumentCaptor.capture());
+        assertEquals(argumentCaptor.getValue(), groupId);
+
+    }
+
+}

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/CheckUtilsTest.java

@@ -211,6 +211,7 @@ public class CheckUtilsTest {
         // DataxParameters
         DataxParameters dataxParameters = new DataxParameters();
         assertFalse(CheckUtils.checkTaskNodeParameters(JSONUtils.toJsonString(dataxParameters), TaskType.DATAX.toString()));
+        dataxParameters.setCustomConfig(0);
         dataxParameters.setDataSource(111);
         dataxParameters.setDataTarget(333);
         dataxParameters.setSql("sql");

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java

@@ -60,7 +60,7 @@ public enum TaskStateType {
                 default:
                     break;
         }
-        return null;
+        return new int[0];
     }
 
 }

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNode.java

@@ -293,14 +293,14 @@ public class TaskNode {
   public TaskTimeoutParameter getTaskTimeoutParameter() {
     if(StringUtils.isNotEmpty(this.getTimeout())){
       String formatStr = String.format("%s,%s", TaskTimeoutStrategy.WARN.name(), TaskTimeoutStrategy.FAILED.name());
-      String timeout = this.getTimeout().replace(formatStr,TaskTimeoutStrategy.WARNFAILED.name());
-      return JSON.parseObject(timeout,TaskTimeoutParameter.class);
+      String taskTimeout = this.getTimeout().replace(formatStr,TaskTimeoutStrategy.WARNFAILED.name());
+      return JSON.parseObject(taskTimeout,TaskTimeoutParameter.class);
     }
     return new TaskTimeoutParameter(false);
   }
 
   public boolean isConditionsTask(){
-    return this.getType().toUpperCase().equals(TaskType.CONDITIONS.toString());
+    return TaskType.CONDITIONS.toString().equalsIgnoreCase(this.getType());
   }
 
   @Override

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/datax/DataxParameters.java

@@ -27,6 +27,16 @@ import org.apache.dolphinscheduler.common.task.AbstractParameters;
  */
 public class DataxParameters extends AbstractParameters {
 
+    /**
+     * if custom json config，eg  0, 1
+     */
+    private Integer customConfig;
+
+    /**
+     * if customConfig eq 1 ,then json is usable
+     */
+    private String json;
+
     /**
      * data source type，eg  MYSQL, POSTGRES ...
      */
@@ -77,6 +87,22 @@ public class DataxParameters extends AbstractParameters {
      */
     private int jobSpeedRecord;
 
+    public Integer getCustomConfig() {
+        return customConfig;
+    }
+
+    public void setCustomConfig(Integer customConfig) {
+        this.customConfig = customConfig;
+    }
+
+    public String getJson() {
+        return json;
+    }
+
+    public void setJson(String json) {
+        this.json = json;
+    }
+
     public String getDsType() {
         return dsType;
     }
@@ -157,16 +183,18 @@ public class DataxParameters extends AbstractParameters {
         this.jobSpeedRecord = jobSpeedRecord;
     }
 
+
     @Override
     public boolean checkParameters() {
-        if (!(dataSource != 0
-                && dataTarget != 0
-                && StringUtils.isNotEmpty(sql)
-                && StringUtils.isNotEmpty(targetTable))) {
-            return false;
+        if (customConfig == null) return false;
+        if (customConfig == 0) {
+            return dataSource != 0
+                    && dataTarget != 0
+                    && StringUtils.isNotEmpty(sql)
+                    && StringUtils.isNotEmpty(targetTable);
+        } else {
+            return StringUtils.isNotEmpty(json);
         }
-
-        return true;
     }
 
     @Override
@@ -177,7 +205,9 @@ public class DataxParameters extends AbstractParameters {
     @Override
     public String toString() {
         return "DataxParameters{" +
-                "dsType='" + dsType + '\'' +
+                "customConfig=" + customConfig +
+                ", json='" + json + '\'' +
+                ", dsType='" + dsType + '\'' +
                 ", dataSource=" + dataSource +
                 ", dtType='" + dtType + '\'' +
                 ", dataTarget=" + dataTarget +

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadPoolExecutors.java

@@ -74,21 +74,21 @@ public class ThreadPoolExecutors {
      * @param event
      */
     public void execute(final Runnable event) {
-        Executor executor = getExecutor();
-        if (executor == null) {
-            logger.error("Cannot execute [" + event + "] because the executor is missing.");
+        Executor eventExecutor = getExecutor();
+        if (eventExecutor == null) {
+            logger.error("Cannot execute [{}}] because the executor is missing.", event);
         } else {
-            executor.execute(event);
+            eventExecutor.execute(event);
         }
     }
 
 
     public Future<?> submit(Runnable event) {
-        Executor executor = getExecutor();
-        if (executor == null) {
-            logger.error("Cannot submit [" + event + "] because the executor is missing.");
+        Executor eventExecutor = getExecutor();
+        if (eventExecutor == null) {
+            logger.error("Cannot submit [{}}] because the executor is missing.", event);
         } else {
-            return executor.submit(event);
+            return eventExecutor.submit(event);
         }
 
         return null;
@@ -97,11 +97,11 @@ public class ThreadPoolExecutors {
 
 
     public Future<?> submit(Callable<?> task) {
-        Executor executor = getExecutor();
-        if (executor == null) {
-            logger.error("Cannot submit [" + task + "] because the executor is missing.");
+        Executor taskExecutor = getExecutor();
+        if (taskExecutor == null) {
+            logger.error("Cannot submit [{}] because the executor is missing.", task);
         } else {
-            return executor.submit(task);
+            return taskExecutor.submit(task);
         }
 
         return null;
@@ -110,8 +110,8 @@ public class ThreadPoolExecutors {
 
 
     public void printStatus() {
-        Executor executor = getExecutor();
-        executor.getStatus().dumpInfo();
+        Executor printExecutor = getExecutor();
+        printExecutor.getStatus().dumpInfo();
     }
 
 
@@ -125,7 +125,7 @@ public class ThreadPoolExecutors {
             List<Runnable> wasRunning = executor.threadPoolExecutor
                     .shutdownNow();
             if (!wasRunning.isEmpty()) {
-                logger.info(executor + " had " + wasRunning + " on shutdown");
+                logger.info("{} had {} on shutdown", executor, wasRunning);
             }
         }
     }
@@ -138,7 +138,7 @@ public class ThreadPoolExecutors {
         /**
          * how long to retain excess threads
          */
-        final long keepAliveTimeInMillis = 1000;
+        static final long KEEP_ALIVE_TIME_IN_MILLIS = 1000;
         /**
          *  the thread pool executor that services the requests
          */
@@ -146,7 +146,7 @@ public class ThreadPoolExecutors {
         /**
          * work queue to use - unbounded queue
          */
-        final BlockingQueue<Runnable> q = new LinkedBlockingQueue<Runnable>();
+        final BlockingQueue<Runnable> q = new LinkedBlockingQueue<>();
         private final String name;
         private static final AtomicLong seqids = new AtomicLong(0);
         private final long id;
@@ -156,7 +156,7 @@ public class ThreadPoolExecutors {
             this.name = name;
             //create the thread pool executor
             this.threadPoolExecutor = new TrackingThreadPoolExecutor(
-                    maxThreads, maxThreads, keepAliveTimeInMillis,
+                    maxThreads, maxThreads, KEEP_ALIVE_TIME_IN_MILLIS,
                     TimeUnit.MILLISECONDS, q);
             // name the threads for this threadpool
             ThreadFactoryBuilder tfb = new ThreadFactoryBuilder();

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ConnectionUtils.java

@@ -16,86 +16,35 @@
  */
 package org.apache.dolphinscheduler.common.utils;
 
+import java.util.Arrays;
+import java.util.Objects;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.sql.*;
-
 public class ConnectionUtils {
 
-	public static final Logger logger = LoggerFactory.getLogger(ConnectionUtils.class);
-
-	private static ConnectionUtils instance;
-
-	ConnectionUtils() {
-	}
-
-	public static ConnectionUtils getInstance() {
-		if (null == instance) {
-			syncInit();
-		}
-		return instance;
-	}
-
-	private static synchronized void syncInit() {
-		if (instance == null) {
-			instance = new ConnectionUtils();
-		}
-	}
-
-	public void release(ResultSet rs, Statement stmt, Connection conn) {
-		try {
-			if (rs != null) {
-				rs.close();
-				rs = null;
-			}
-		} catch (SQLException e) {
-			logger.error(e.getMessage(),e);
-		} finally {
-			try {
-				if (stmt != null) {
-					stmt.close();
-					stmt = null;
-				}
-			} catch (SQLException e) {
-				logger.error(e.getMessage(),e);
-			} finally {
-				try {
-					if (conn != null) {
-						conn.close();
-						conn = null;
-					}
-				} catch (SQLException e) {
-					logger.error(e.getMessage(),e);
-				}
-			}
-		}
-	}
-
-	public static void releaseResource(ResultSet rs, PreparedStatement ps, Connection conn) {
-		ConnectionUtils.getInstance().release(rs,ps,conn);
-		if (null != rs) {
-			try {
-				rs.close();
-			} catch (SQLException e) {
-				logger.error(e.getMessage(),e);
-			}
-		}
-
-		if (null != ps) {
-			try {
-				ps.close();
-			} catch (SQLException e) {
-				logger.error(e.getMessage(),e);
-			}
-		}
-
-		if (null != conn) {
-			try {
-				conn.close();
-			} catch (SQLException e) {
-				logger.error(e.getMessage(),e);
-			}
-		}
-	}
+  public static final Logger logger = LoggerFactory.getLogger(ConnectionUtils.class);
+
+  private ConnectionUtils() {
+    throw new IllegalStateException("ConnectionUtils class");
+  }
+
+  /**
+   * release resource
+   * @param resources resources
+   */
+  public static void releaseResource(AutoCloseable... resources) {
+
+    if (resources == null || resources.length == 0) {
+      return;
+    }
+    Arrays.stream(resources).filter(Objects::nonNull)
+        .forEach(resource -> {
+          try {
+            resource.close();
+          } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+          }
+        });
+  }
 }

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java

@@ -425,13 +425,13 @@ public class OSUtils {
    * @return check memory and cpu usage
    */
   public static Boolean checkResource(double systemCpuLoad, double systemReservedMemory){
-    // judging usage
+    // system load average
     double loadAverage = OSUtils.loadAverage();
-    //
+    // system available physical memory
     double availablePhysicalMemorySize = OSUtils.availablePhysicalMemorySize();
 
     if(loadAverage > systemCpuLoad || availablePhysicalMemorySize < systemReservedMemory){
-      logger.warn("load or availablePhysicalMemorySize(G) is too high, it's availablePhysicalMemorySize(G):{},loadAvg:{}", availablePhysicalMemorySize , loadAverage);
+      logger.warn("load is too high or availablePhysicalMemorySize(G) is too low, it's availablePhysicalMemorySize(G):{},loadAvg:{}", availablePhysicalMemorySize , loadAverage);
       return false;
     }else{
       return true;

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/PropertyUtils.java

@@ -71,7 +71,7 @@ public class PropertyUtils {
      *
      * @return  judge whether resource upload startup
      */
-    public static Boolean getResUploadStartupState(){
+    public static boolean getResUploadStartupState(){
         String resUploadStartupType = PropertyUtils.getString(Constants.RES_UPLOAD_STARTUP_TYPE);
         ResUploadType resUploadType = ResUploadType.valueOf(resUploadStartupType);
         return resUploadType == ResUploadType.HDFS || resUploadType == ResUploadType.S3;

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/TimePlaceholderUtils.java

@@ -35,12 +35,12 @@ public class TimePlaceholderUtils {
     /**
      * Prefix of the position to be replaced
      */
-    public static final String placeholderPrefix = "$[";
+    public static final String PLACEHOLDER_PREFIX = "$[";
 
     /**
      * The suffix of the position to be replaced
      */
-    public static final String placeholderSuffix = "]";
+    public static final String PLACEHOLDER_SUFFIX = "]";
 
     /**
      * Replaces all placeholders of format {@code ${name}} with the value returned
@@ -66,7 +66,7 @@ public class TimePlaceholderUtils {
      * be ignored ({@code true}) or cause an exception ({@code false})
      */
     private static PropertyPlaceholderHelper getPropertyPlaceholderHelper(boolean ignoreUnresolvablePlaceholders) {
-        return new PropertyPlaceholderHelper(placeholderPrefix, placeholderSuffix, null, ignoreUnresolvablePlaceholders);
+        return new PropertyPlaceholderHelper(PLACEHOLDER_PREFIX, PLACEHOLDER_SUFFIX, null, ignoreUnresolvablePlaceholders);
     }
 
     /**
@@ -503,7 +503,7 @@ public class TimePlaceholderUtils {
      * @return calculate need minutes
      */
     public static Integer calcMinutes(String minuteExpression) {
-        int index = minuteExpression.indexOf("/");
+        int index = minuteExpression.indexOf('/');
 
         String calcExpression;
 

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/process/ProcessEnvironmentForWin32.java

@@ -46,22 +46,23 @@ final class ProcessEnvironmentForWin32 extends HashMap<String,String> {
         return (String) o;
     }
 
+    @Override
     public String put(String key, String value) {
         return super.put(validateName(key), validateValue(value));
     }
-
+    @Override
     public String get(Object key) {
         return super.get(nonNullString(key));
     }
-
+    @Override
     public boolean containsKey(Object key) {
         return super.containsKey(nonNullString(key));
     }
-
+    @Override
     public boolean containsValue(Object value) {
         return super.containsValue(nonNullString(value));
     }
-
+    @Override
     public String remove(Object key) {
         return super.remove(nonNullString(key));
     }
@@ -92,6 +93,7 @@ final class ProcessEnvironmentForWin32 extends HashMap<String,String> {
                 public Entry<String,String> next() {
                     return new CheckedEntry(i.next());
                 }
+                @Override
                 public void remove() { i.remove();}
             };
         }
@@ -110,10 +112,14 @@ final class ProcessEnvironmentForWin32 extends HashMap<String,String> {
         private final Collection<String> c;
         public CheckedValues(Collection<String> c) {this.c = c;}
         public int size()                  {return c.size();}
+        @Override
         public boolean isEmpty()           {return c.isEmpty();}
+        @Override
         public void clear()                {       c.clear();}
         public Iterator<String> iterator() {return c.iterator();}
+        @Override
         public boolean contains(Object o)  {return c.contains(nonNullString(o));}
+        @Override
         public boolean remove(Object o)    {return c.remove(nonNullString(o));}
     }
 
@@ -127,15 +133,15 @@ final class ProcessEnvironmentForWin32 extends HashMap<String,String> {
         public boolean contains(Object o)  {return s.contains(nonNullString(o));}
         public boolean remove(Object o)    {return s.remove(nonNullString(o));}
     }
-
+    @Override
     public Set<String> keySet() {
         return new CheckedKeySet(super.keySet());
     }
-
+    @Override
     public Collection<String> values() {
         return new CheckedValues(super.values());
     }
-
+    @Override
     public Set<Entry<String,String>> entrySet() {
         return new CheckedEntrySet(super.entrySet());
     }

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/process/ProcessImplForWin32.java

@@ -32,6 +32,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static com.sun.jna.platform.win32.WinBase.INVALID_HANDLE_VALUE;
 import static com.sun.jna.platform.win32.WinBase.STILL_ACTIVE;
 import static java.util.Objects.requireNonNull;
 
@@ -112,7 +113,7 @@ public class ProcessImplForWin32 extends Process {
     // System-dependent portion of ProcessBuilderForWindows.start()
     static Process start(String username,
                          String password,
-                         String cmdarray[],
+                         String[] cmdarray,
                          java.util.Map<String,String> environment,
                          String dir,
                          ProcessBuilderForWin32.Redirect[] redirects,
@@ -177,10 +178,10 @@ public class ProcessImplForWin32 extends Process {
 
     private static class LazyPattern {
         // Escape-support version:
-        //    "(\")((?:\\\\\\1|.)+?)\\1|([^\\s\"]+)";
+        //    "(\")((?:\\\\\\1|.)+?)\\1|([^\\s\"]+)"
         private static final Pattern PATTERN =
                 Pattern.compile("[^\\s\"]+|\"[^\"]*\"");
-    };
+    }
 
     /* Parses the command string parameter into the executable name and
      * program arguments.
@@ -203,7 +204,7 @@ public class ProcessImplForWin32 extends Process {
     private static final int VERIFICATION_LEGACY = 3;
     // See Command shell overview for documentation of special characters.
     // https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-xp/bb490954(v=technet.10)
-    private static final char ESCAPE_VERIFICATION[][] = {
+    private static final char[][] ESCAPE_VERIFICATION = {
             // We guarantee the only command file execution for implicit [cmd.exe] run.
             //    http://technet.microsoft.com/en-us/library/bb490954.aspx
             {' ', '\t', '<', '>', '&', '|', '^'},
@@ -214,7 +215,7 @@ public class ProcessImplForWin32 extends Process {
 
     private static String createCommandLine(int verificationType,
                                             final String executablePath,
-                                            final String cmd[])
+                                            final String[] cmd)
     {
         StringBuilder cmdbuf = new StringBuilder(80);
 
@@ -309,7 +310,7 @@ public class ProcessImplForWin32 extends Process {
         }
 
         if (!argIsQuoted) {
-            char testEscape[] = ESCAPE_VERIFICATION[verificationType];
+            char[] testEscape = ESCAPE_VERIFICATION[verificationType];
             for (int i = 0; i < testEscape.length; ++i) {
                 if (arg.indexOf(testEscape[i]) >= 0) {
                     return true;
@@ -390,14 +391,14 @@ public class ProcessImplForWin32 extends Process {
     private static final char BACKSLASH = '\\';
 
     private WinNT.HANDLE handle;
-    private OutputStream stdin_stream;
-    private InputStream stdout_stream;
-    private InputStream stderr_stream;
+    private OutputStream stdinStream;
+    private InputStream stdoutStream;
+    private InputStream stderrStream;
 
     private ProcessImplForWin32(
             String username,
             String password,
-            String cmd[],
+            String[] cmd,
             final String envblock,
             final String path,
             final long[] stdHandles,
@@ -472,44 +473,44 @@ public class ProcessImplForWin32 extends Process {
                 new PrivilegedAction<Void>() {
                     public Void run() {
                         if (stdHandles[0] == -1L)
-                            stdin_stream = ProcessBuilderForWin32.NullOutputStream.INSTANCE;
+                            stdinStream = ProcessBuilderForWin32.NullOutputStream.INSTANCE;
                         else {
-                            FileDescriptor stdin_fd = new FileDescriptor();
-                            setHandle(stdin_fd, stdHandles[0]);
-                            stdin_stream = new BufferedOutputStream(
-                                    new FileOutputStream(stdin_fd));
+                            FileDescriptor stdinFd = new FileDescriptor();
+                            setHandle(stdinFd, stdHandles[0]);
+                            stdinStream = new BufferedOutputStream(
+                                    new FileOutputStream(stdinFd));
                         }
 
                         if (stdHandles[1] == -1L)
-                            stdout_stream = ProcessBuilderForWin32.NullInputStream.INSTANCE;
+                            stdoutStream = ProcessBuilderForWin32.NullInputStream.INSTANCE;
                         else {
-                            FileDescriptor stdout_fd = new FileDescriptor();
-                            setHandle(stdout_fd, stdHandles[1]);
-                            stdout_stream = new BufferedInputStream(
-                                    new FileInputStream(stdout_fd));
+                            FileDescriptor stdoutFd = new FileDescriptor();
+                            setHandle(stdoutFd, stdHandles[1]);
+                            stdoutStream = new BufferedInputStream(
+                                    new FileInputStream(stdoutFd));
                         }
 
                         if (stdHandles[2] == -1L)
-                            stderr_stream = ProcessBuilderForWin32.NullInputStream.INSTANCE;
+                            stderrStream = ProcessBuilderForWin32.NullInputStream.INSTANCE;
                         else {
-                            FileDescriptor stderr_fd = new FileDescriptor();
-                            setHandle(stderr_fd, stdHandles[2]);
-                            stderr_stream = new FileInputStream(stderr_fd);
+                            FileDescriptor stderrFd = new FileDescriptor();
+                            setHandle(stderrFd, stdHandles[2]);
+                            stderrStream = new FileInputStream(stderrFd);
                         }
 
                         return null; }});
     }
 
     public OutputStream getOutputStream() {
-        return stdin_stream;
+        return stdinStream;
     }
 
     public InputStream getInputStream() {
-        return stdout_stream;
+        return stdoutStream;
     }
 
     public InputStream getErrorStream() {
-        return stderr_stream;
+        return stderrStream;
     }
 
     protected void finalize() {
@@ -557,11 +558,12 @@ public class ProcessImplForWin32 extends Process {
 
     public void destroy() { terminateProcess(handle); }
 
+    @Override
     public Process destroyForcibly() {
         destroy();
         return this;
     }
-
+    @Override
     public boolean isAlive() {
         return isProcessAlive(handle);
     }
@@ -582,7 +584,7 @@ public class ProcessImplForWin32 extends Process {
                 pjhandles.setValue(thisProcessEnd);
             }
         }
-        Kernel32.INSTANCE.SetHandleInformation(phStd.getValue(), Kernel32.HANDLE_FLAG_INHERIT, Kernel32.HANDLE_FLAG_INHERIT);
+        Kernel32.INSTANCE.SetHandleInformation(phStd.getValue(), WinBase.HANDLE_FLAG_INHERIT, WinBase.HANDLE_FLAG_INHERIT);
         return true;
     }
 
@@ -596,17 +598,17 @@ public class ProcessImplForWin32 extends Process {
     private static void prepareIOEHandleState(WinNT.HANDLE[] stdIOE, Boolean[] inherit) {
         for(int i = 0; i < HANDLE_STORAGE_SIZE; ++i) {
             WinNT.HANDLE hstd = stdIOE[i];
-            if (!Kernel32.INVALID_HANDLE_VALUE.equals(hstd)) {
+            if (!WinBase.INVALID_HANDLE_VALUE.equals(hstd)) {
                 inherit[i] = Boolean.TRUE;
-                Kernel32.INSTANCE.SetHandleInformation(hstd, Kernel32.HANDLE_FLAG_INHERIT, 0);
+                Kernel32.INSTANCE.SetHandleInformation(hstd, WinBase.HANDLE_FLAG_INHERIT, 0);
             }
         }
     }
 
     private static void restoreIOEHandleState(WinNT.HANDLE[] stdIOE, Boolean[] inherit) {
         for (int i = HANDLE_STORAGE_SIZE - 1; i >= 0; --i) {
-            if (!Kernel32.INVALID_HANDLE_VALUE.equals(stdIOE[i])) {
-                Kernel32.INSTANCE.SetHandleInformation(stdIOE[i], Kernel32.HANDLE_FLAG_INHERIT, inherit[i] ? Kernel32.HANDLE_FLAG_INHERIT : 0);
+            if (!WinBase.INVALID_HANDLE_VALUE.equals(stdIOE[i])) {
+                Kernel32.INSTANCE.SetHandleInformation(stdIOE[i], WinBase.HANDLE_FLAG_INHERIT, Boolean.TRUE.equals(inherit[i]) ? WinBase.HANDLE_FLAG_INHERIT : 0);
             }
         }
     }
@@ -621,12 +623,12 @@ public class ProcessImplForWin32 extends Process {
         WinNT.HANDLE ret = new WinNT.HANDLE(Pointer.createConstant(0));
 
         WinNT.HANDLE[] stdIOE = new WinNT.HANDLE[] {
-                Kernel32.INVALID_HANDLE_VALUE, Kernel32.INVALID_HANDLE_VALUE, Kernel32.INVALID_HANDLE_VALUE,
+                WinBase.INVALID_HANDLE_VALUE, WinBase.INVALID_HANDLE_VALUE, WinBase.INVALID_HANDLE_VALUE,
                 stdHandles[0].getValue(), stdHandles[1].getValue(), stdHandles[2].getValue()
         };
-        stdIOE[0] = Kernel32.INSTANCE.GetStdHandle(Kernel32.STD_INPUT_HANDLE);
-        stdIOE[1] = Kernel32.INSTANCE.GetStdHandle(Kernel32.STD_OUTPUT_HANDLE);
-        stdIOE[2] = Kernel32.INSTANCE.GetStdHandle(Kernel32.STD_ERROR_HANDLE);
+        stdIOE[0] = Kernel32.INSTANCE.GetStdHandle(Wincon.STD_INPUT_HANDLE);
+        stdIOE[1] = Kernel32.INSTANCE.GetStdHandle(Wincon.STD_OUTPUT_HANDLE);
+        stdIOE[2] = Kernel32.INSTANCE.GetStdHandle(Wincon.STD_ERROR_HANDLE);
 
         Boolean[] inherit = new Boolean[] {
                 Boolean.FALSE, Boolean.FALSE, Boolean.FALSE,
@@ -638,17 +640,17 @@ public class ProcessImplForWin32 extends Process {
         // input
         WinNT.HANDLEByReference hStdInput = new WinNT.HANDLEByReference();
         WinNT.HANDLEByReference[] pipeIn = new WinNT.HANDLEByReference[] {
-                new WinNT.HANDLEByReference(Kernel32.INVALID_HANDLE_VALUE), new WinNT.HANDLEByReference(Kernel32.INVALID_HANDLE_VALUE) };
+                new WinNT.HANDLEByReference(WinBase.INVALID_HANDLE_VALUE), new WinNT.HANDLEByReference(WinBase.INVALID_HANDLE_VALUE) };
 
         // output
         WinNT.HANDLEByReference hStdOutput = new WinNT.HANDLEByReference();
         WinNT.HANDLEByReference[] pipeOut = new WinNT.HANDLEByReference[] {
-                new WinNT.HANDLEByReference(Kernel32.INVALID_HANDLE_VALUE), new WinNT.HANDLEByReference(Kernel32.INVALID_HANDLE_VALUE) };
+                new WinNT.HANDLEByReference(WinBase.INVALID_HANDLE_VALUE), new WinNT.HANDLEByReference(WinBase.INVALID_HANDLE_VALUE) };
 
         // error
         WinNT.HANDLEByReference hStdError = new WinNT.HANDLEByReference();
         WinNT.HANDLEByReference[] pipeError = new WinNT.HANDLEByReference[] {
-                new WinNT.HANDLEByReference(Kernel32.INVALID_HANDLE_VALUE), new WinNT.HANDLEByReference(Kernel32.INVALID_HANDLE_VALUE) };
+                new WinNT.HANDLEByReference(WinBase.INVALID_HANDLE_VALUE), new WinNT.HANDLEByReference(WinBase.INVALID_HANDLE_VALUE) };
 
         boolean success;
         if (initHolder(stdHandles[0], pipeIn, OFFSET_READ, hStdInput)) {
@@ -668,8 +670,8 @@ public class ProcessImplForWin32 extends Process {
 
                 if (success) {
                     WTypes.LPSTR lpEnvironment = envblock == null ? new WTypes.LPSTR() : new WTypes.LPSTR(envblock);
-                    Kernel32.PROCESS_INFORMATION pi = new WinBase.PROCESS_INFORMATION();
-                    si.dwFlags = Kernel32.STARTF_USESTDHANDLES;
+                    WinBase.PROCESS_INFORMATION pi = new WinBase.PROCESS_INFORMATION();
+                    si.dwFlags = WinBase.STARTF_USESTDHANDLES;
                     if (!Advapi32.INSTANCE.CreateProcessWithLogonW(
                             username
                             , null
@@ -677,7 +679,7 @@ public class ProcessImplForWin32 extends Process {
                             , Advapi32.LOGON_WITH_PROFILE
                             , null
                             , cmd
-                            , Kernel32.CREATE_NO_WINDOW
+                            , WinBase.CREATE_NO_WINDOW
                             , lpEnvironment.getPointer()
                             , path
                             , si
@@ -709,13 +711,11 @@ public class ProcessImplForWin32 extends Process {
         for (int i = 0; i < stdHandles.length; i++) {
             handles[i] = new WinNT.HANDLEByReference(new WinNT.HANDLE(Pointer.createConstant(stdHandles[i])));
         }
-
-        if (cmd != null) {
-            if (username != null && password != null) {
-                ret = processCreate(username, password, cmd, envblock, path, handles, redirectErrorStream);
-            }
+        
+        if (cmd != null && username != null && password != null) {
+            ret = processCreate(username, password, cmd, envblock, path, handles, redirectErrorStream);
         }
-
+        
         for (int i = 0; i < stdHandles.length; i++) {
             stdHandles[i] = handles[i].getPointer().getLong(0);
         }
@@ -742,7 +742,9 @@ public class ProcessImplForWin32 extends Process {
     }
 
     private static void closeHandle(WinNT.HANDLE handle) {
-        Kernel32Util.closeHandle(handle);
+        if (!handle.equals(INVALID_HANDLE_VALUE)) {
+            Kernel32Util.closeHandle(handle);
+        }
     }
 
     /**
@@ -753,15 +755,15 @@ public class ProcessImplForWin32 extends Process {
      * @return the native HANDLE
      */
     private static long openForAtomicAppend(String path) throws IOException {
-        int access = Kernel32.GENERIC_READ | Kernel32.GENERIC_WRITE;
-        int sharing = Kernel32.FILE_SHARE_READ | Kernel32.FILE_SHARE_WRITE;
-        int disposition = Kernel32.OPEN_ALWAYS;
-        int flagsAndAttributes = Kernel32.FILE_ATTRIBUTE_NORMAL;
+        int access = WinNT.GENERIC_READ | WinNT.GENERIC_WRITE;
+        int sharing = WinNT.FILE_SHARE_READ | WinNT.FILE_SHARE_WRITE;
+        int disposition = WinNT.OPEN_ALWAYS;
+        int flagsAndAttributes = WinNT.FILE_ATTRIBUTE_NORMAL;
         if (path == null || path.isEmpty()) {
             return -1;
         } else {
             WinNT.HANDLE handle = Kernel32.INSTANCE.CreateFile(path, access, sharing, null, disposition, flagsAndAttributes, null);
-            if (handle == Kernel32.INVALID_HANDLE_VALUE) {
+            if (handle == WinBase.INVALID_HANDLE_VALUE) {
                 throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
             }
             return handle.getPointer().getLong(0);
@@ -769,15 +771,15 @@ public class ProcessImplForWin32 extends Process {
     }
 
     private static void waitForInterruptibly(WinNT.HANDLE handle) {
-        int result = Kernel32.INSTANCE.WaitForMultipleObjects(1, new WinNT.HANDLE[]{handle}, false, Kernel32.INFINITE);
-        if (result == Kernel32.WAIT_FAILED) {
+        int result = Kernel32.INSTANCE.WaitForMultipleObjects(1, new WinNT.HANDLE[]{handle}, false, WinBase.INFINITE);
+        if (result == WinBase.WAIT_FAILED) {
             throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
         }
     }
 
     private static void waitForTimeoutInterruptibly(WinNT.HANDLE handle, long timeout) {
         int result = Kernel32.INSTANCE.WaitForMultipleObjects(1, new WinNT.HANDLE[]{handle}, false, (int) timeout);
-        if (result == Kernel32.WAIT_FAILED) {
+        if (result == WinBase.WAIT_FAILED) {
             throw new Win32Exception(Kernel32.INSTANCE.GetLastError());
         }
     }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java

@@ -99,13 +99,7 @@ public class AlertDao extends AbstractBaseDao {
         String content = String.format("[{'type':'%s','host':'%s','event':'server down','warning level':'serious'}]",
                 serverType, host);
         alert.setTitle("Fault tolerance warning");
-        alert.setShowType(ShowType.TABLE);
-        alert.setContent(content);
-        alert.setAlertType(AlertType.EMAIL);
-        alert.setAlertGroupId(alertgroupId);
-        alert.setCreateTime(new Date());
-        alert.setUpdateTime(new Date());
-        alertMapper.insert(alert);
+        saveTaskTimeoutAlert(alert, content, alertgroupId, null, null);
     }
 
     /**
@@ -121,6 +115,11 @@ public class AlertDao extends AbstractBaseDao {
         String content = String.format("[{'id':'%d','name':'%s','event':'timeout','warnLevel':'middle'}]",
                 processInstance.getId(), processInstance.getName());
         alert.setTitle("Process Timeout Warn");
+        saveTaskTimeoutAlert(alert, content, alertgroupId, receivers, receiversCc);
+    }
+
+    private void  saveTaskTimeoutAlert(Alert alert, String content, int alertgroupId,
+                                    String receivers,  String receiversCc){
         alert.setShowType(ShowType.TABLE);
         alert.setContent(content);
         alert.setAlertType(AlertType.EMAIL);
@@ -150,19 +149,7 @@ public class AlertDao extends AbstractBaseDao {
         String content = String.format("[{'process instance id':'%d','task name':'%s','task id':'%d','task name':'%s'," +
                         "'event':'timeout','warnLevel':'middle'}]", processInstanceId, processInstanceName, taskId, taskName);
         alert.setTitle("Task Timeout Warn");
-        alert.setShowType(ShowType.TABLE);
-        alert.setContent(content);
-        alert.setAlertType(AlertType.EMAIL);
-        alert.setAlertGroupId(alertgroupId);
-        if (StringUtils.isNotEmpty(receivers)) {
-            alert.setReceivers(receivers);
-        }
-        if (StringUtils.isNotEmpty(receiversCc)) {
-            alert.setReceiversCc(receiversCc);
-        }
-        alert.setCreateTime(new Date());
-        alert.setUpdateTime(new Date());
-        alertMapper.insert(alert);
+        saveTaskTimeoutAlert(alert, content, alertgroupId, receivers, receiversCc);
     }
 
     /**
@@ -182,5 +169,11 @@ public class AlertDao extends AbstractBaseDao {
         return userAlertGroupMapper.listUserByAlertgroupId(alertgroupId);
     }
 
-
+    /**
+     * for test
+     * @return
+     */
+    public AlertMapper getAlertMapper() {
+        return alertMapper;
+    }
 }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/MonitorDBDao.java

@@ -18,10 +18,10 @@ package org.apache.dolphinscheduler.dao;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import java.sql.Connection;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.dolphinscheduler.common.enums.DbType;
+import org.apache.dolphinscheduler.common.utils.ConnectionUtils;
 import org.apache.dolphinscheduler.dao.entity.MonitorRecord;
 import org.apache.dolphinscheduler.dao.utils.MysqlPerformance;
 import org.apache.dolphinscheduler.dao.utils.PostgrePerformance;
@@ -63,13 +63,7 @@ public class MonitorDBDao {
         }catch (Exception e) {
             logger.error("SQLException: {}", e.getMessage(), e);
         }finally {
-            try {
-                if (conn != null) {
-                    conn.close();
-                }
-            } catch (SQLException e) {
-                logger.error("SQLException ", e);
-            }
+            ConnectionUtils.releaseResource(conn);
         }
         return monitorRecord;
     }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/TaskRecordDao.java

@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.dao;
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.TaskRecordStatus;
 import org.apache.dolphinscheduler.common.utils.CollectionUtils;
+import org.apache.dolphinscheduler.common.utils.ConnectionUtils;
 import org.apache.dolphinscheduler.common.utils.DateUtils;
 import org.apache.dolphinscheduler.common.utils.StringUtils;
 import org.apache.dolphinscheduler.dao.entity.TaskRecord;
@@ -84,9 +85,9 @@ public class TaskRecordDao {
             Class.forName(driver);
             conn = DriverManager.getConnection(url, username, password);
         } catch (ClassNotFoundException e) {
-            logger.error("Exception ", e);
+            logger.error("Class not found Exception ", e);
         } catch (SQLException e) {
-            logger.error("Exception ", e);
+            logger.error("SQL Exception ", e);
         }
         return conn;
     }
@@ -163,14 +164,14 @@ public class TaskRecordDao {
             sql += getWhereString(filterMap);
             pstmt = conn.prepareStatement(sql);
             rs = pstmt.executeQuery();
-            while (rs.next()) {
+            while (rs.next()){
                 count = rs.getInt("count");
                 break;
             }
         } catch (SQLException e) {
             logger.error("Exception ", e);
-        } finally {
-            closeResource(rs, pstmt, conn);
+        }finally {
+            ConnectionUtils.releaseResource(rs, pstmt, conn);
         }
         return count;
     }
@@ -254,8 +255,8 @@ public class TaskRecordDao {
             }
         } catch (SQLException e) {
             logger.error("Exception ", e);
-        } finally {
-            closeResource(rs, pstmt, conn);
+        }finally {
+            ConnectionUtils.releaseResource(rs, pstmt, conn);
         }
         return recordList;
     }
@@ -292,28 +293,4 @@ public class TaskRecordDao {
 
         }
     }
-
-    private static void closeResource(ResultSet rs, PreparedStatement pstmt, Connection conn) {
-        if (rs != null) {
-            try {
-                rs.close();
-            } catch (SQLException e) {
-                logger.error("Exception ", e);
-            }
-        }
-        if (pstmt != null) {
-            try {
-                pstmt.close();
-            } catch (SQLException e) {
-                logger.error("Exception ", e);
-            }
-        }
-        if (conn != null) {
-            try {
-                conn.close();
-            } catch (SQLException e) {
-                logger.error("Exception ", e);
-            }
-        }
-    }
 }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java

@@ -16,10 +16,21 @@
  */
 package org.apache.dolphinscheduler.dao.datasource;
 
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import org.apache.dolphinscheduler.common.enums.DbType;
+import org.apache.dolphinscheduler.common.utils.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * data source base class
  */
 public abstract class BaseDataSource {
+
+  private static final Logger logger = LoggerFactory.getLogger(BaseDataSource.class);
+
   /**
    * user name
    */
@@ -57,17 +68,105 @@ public abstract class BaseDataSource {
   public void setPrincipal(String principal) {
     this.principal = principal;
   }
+
   /**
-   * test whether the data source can be connected successfully
-   * @throws Exception
+   * @return driver class
+   */
+  public abstract String driverClassSelector();
+
+  /**
+   * @return db type
    */
-  public abstract void isConnectable() throws Exception;
+  public abstract DbType dbTypeSelector();
 
   /**
    * gets the JDBC url for the data source connection
-   * @return
    */
-  public abstract String getJdbcUrl();
+  public String getJdbcUrl() {
+    StringBuilder jdbcUrl = new StringBuilder(getAddress());
+
+    appendDatabase(jdbcUrl);
+    appendPrincipal(jdbcUrl);
+    appendOther(jdbcUrl);
+
+    return jdbcUrl.toString();
+  }
+
+  /**
+   * append database
+   * @param jdbcUrl jdbc url
+   */
+  private void appendDatabase(StringBuilder jdbcUrl) {
+    if (dbTypeSelector() == DbType.SQLSERVER) {
+      jdbcUrl.append(";databaseName=").append(getDatabase());
+    } else {
+      if (getAddress().lastIndexOf('/') != (jdbcUrl.length() - 1)) {
+        jdbcUrl.append("/");
+      }
+      jdbcUrl.append(getDatabase());
+    }
+  }
+
+  /**
+   * append principal
+   * @param jdbcUrl jdbc url
+   */
+  private void appendPrincipal(StringBuilder jdbcUrl) {
+    boolean tag = dbTypeSelector() == DbType.HIVE || dbTypeSelector() == DbType.SPARK;
+    if (tag && StringUtils.isNotEmpty(getPrincipal())) {
+      jdbcUrl.append(";principal=").append(getPrincipal());
+    }
+  }
+
+  /**
+   * append other
+   * @param jdbcUrl jdbc url
+   */
+  private void appendOther(StringBuilder jdbcUrl) {
+    if (StringUtils.isNotEmpty(getOther())) {
+      String separator = "";
+      switch (dbTypeSelector()) {
+        case CLICKHOUSE:
+        case MYSQL:
+        case ORACLE:
+        case POSTGRESQL:
+          separator = "?";
+          break;
+        case DB2:
+          separator = ":";
+          break;
+        case HIVE:
+        case SPARK:
+        case SQLSERVER:
+          separator = ";";
+          break;
+        default:
+          logger.error("Db type mismatch!");
+      }
+      jdbcUrl.append(separator).append(getOther());
+    }
+  }
+
+  /**
+   * test whether the data source can be connected successfully
+   */
+  public void isConnectable() {
+    Connection con = null;
+    try {
+      Class.forName(driverClassSelector());
+      con = DriverManager.getConnection(getJdbcUrl(), getUser(), getPassword());
+    } catch (ClassNotFoundException | SQLException e) {
+      logger.error("Get connection error: {}", e.getMessage());
+    } finally {
+      if (con != null) {
+        try {
+          con.close();
+        } catch (SQLException e) {
+          logger.error(e.getMessage(), e);
+        }
+      }
+    }
+  }
 
   public String getUser() {
     return user;

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/ClickHouseDataSource.java

@@ -17,59 +17,26 @@
 package org.apache.dolphinscheduler.dao.datasource;
 
 import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.common.utils.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
+import org.apache.dolphinscheduler.common.enums.DbType;
 
 /**
  * data source of ClickHouse
  */
 public class ClickHouseDataSource extends BaseDataSource {
-    private static final Logger logger = LoggerFactory.getLogger(ClickHouseDataSource.class);
 
     /**
-     * gets the JDBC url for the data source connection
-     * @return
+     * @return driver class
      */
     @Override
-    public String getJdbcUrl() {
-        String jdbcUrl = getAddress();
-        if (jdbcUrl.lastIndexOf('/') != (jdbcUrl.length() - 1)) {
-            jdbcUrl += "/";
-        }
-
-        jdbcUrl += getDatabase();
-
-        if (StringUtils.isNotEmpty(getOther())) {
-            jdbcUrl += "?" + getOther();
-        }
-
-        return jdbcUrl;
+    public String driverClassSelector() {
+        return Constants.COM_CLICKHOUSE_JDBC_DRIVER;
     }
 
     /**
-     * test whether the data source can be connected successfully
-     * @throws Exception
+     * @return db type
      */
     @Override
-    public void isConnectable() throws Exception {
-        Connection con = null;
-        try {
-            Class.forName(Constants.COM_CLICKHOUSE_JDBC_DRIVER);
-            con = DriverManager.getConnection(getJdbcUrl(), getUser(), getPassword());
-        } finally {
-            if (con != null) {
-                try {
-                    con.close();
-                } catch (SQLException e) {
-                    logger.error("ClickHouse datasource try conn close conn error", e);
-                }
-            }
-        }
-
+    public DbType dbTypeSelector() {
+        return DbType.CLICKHOUSE;
     }
 }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/ConnectionFactory.java

@@ -51,6 +51,7 @@ public class ConnectionFactory extends SpringConnectionFactory {
 
     private ConnectionFactory() {
         try {
+            dataSource = buildDataSource();
             sqlSessionFactory = getSqlSessionFactory();
             sqlSessionTemplate = getSqlSessionTemplate();
         } catch (Exception e) {
@@ -69,12 +70,18 @@ public class ConnectionFactory extends SpringConnectionFactory {
      */
     private SqlSessionTemplate sqlSessionTemplate;
 
+    private DataSource dataSource;
+
+    public DataSource getDataSource() {
+        return dataSource;
+    }
+
     /**
      * get the data source
      *
      * @return druid dataSource
      */
-    public DruidDataSource getDataSource() {
+    private DataSource buildDataSource() {
 
         DruidDataSource druidDataSource = new DruidDataSource();
 
@@ -112,10 +119,9 @@ public class ConnectionFactory extends SpringConnectionFactory {
      * @throws Exception sqlSessionFactory exception
      */
     private SqlSessionFactory getSqlSessionFactory() throws Exception {
-        DataSource dataSource = getDataSource();
         TransactionFactory transactionFactory = new JdbcTransactionFactory();
 
-        Environment environment = new Environment("development", transactionFactory, dataSource);
+        Environment environment = new Environment("development", transactionFactory, getDataSource());
 
         MybatisConfiguration configuration = new MybatisConfiguration();
         configuration.setEnvironment(environment);
@@ -125,7 +131,7 @@ public class ConnectionFactory extends SpringConnectionFactory {
 
         MybatisSqlSessionFactoryBean sqlSessionFactoryBean = new MybatisSqlSessionFactoryBean();
         sqlSessionFactoryBean.setConfiguration(configuration);
-        sqlSessionFactoryBean.setDataSource(dataSource);
+        sqlSessionFactoryBean.setDataSource(getDataSource());
 
         sqlSessionFactoryBean.setTypeEnumsPackage("org.apache.dolphinscheduler.*.enums");
         sqlSessionFactory = sqlSessionFactoryBean.getObject();

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DB2ServerDataSource.java

@@ -17,58 +17,26 @@
 package org.apache.dolphinscheduler.dao.datasource;
 
 import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.common.utils.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
+import org.apache.dolphinscheduler.common.enums.DbType;
 
 /**
  * data source of DB2 Server
  */
 public class DB2ServerDataSource extends BaseDataSource {
-    private static final Logger logger = LoggerFactory.getLogger(DB2ServerDataSource.class);
 
     /**
-     * gets the JDBC url for the data source connection
-     * @return
+     * @return driver class
      */
     @Override
-    public String getJdbcUrl() {
-        String jdbcUrl = getAddress();
-        if (jdbcUrl.lastIndexOf("/") != (jdbcUrl.length() - 1)) {
-            jdbcUrl += "/";
-        }
-
-        jdbcUrl += getDatabase();
-
-        if (StringUtils.isNotEmpty(getOther())) {
-            jdbcUrl += ":" + getOther();
-        }
-        return jdbcUrl;
+    public String driverClassSelector() {
+        return Constants.COM_DB2_JDBC_DRIVER;
     }
 
     /**
-     * test whether the data source can be connected successfully
-     * @throws Exception
+     * @return db type
      */
     @Override
-    public void isConnectable() throws Exception {
-        Connection con = null;
-        try {
-            Class.forName(Constants.COM_DB2_JDBC_DRIVER);
-            con = DriverManager.getConnection(getJdbcUrl(), getUser(), getPassword());
-        } finally {
-            if (con != null) {
-                try {
-                    con.close();
-                } catch (SQLException e) {
-                    logger.error("DB2 Server datasource try conn close conn error", e);
-                }
-            }
-        }
-
+    public DbType dbTypeSelector() {
+        return DbType.DB2;
     }
 }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/HiveDataSource.java

@@ -17,63 +17,26 @@
 package org.apache.dolphinscheduler.dao.datasource;
 
 import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.common.utils.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
+import org.apache.dolphinscheduler.common.enums.DbType;
 
 /**
  * data source of hive
  */
 public class HiveDataSource extends BaseDataSource {
 
-  private static final Logger logger = LoggerFactory.getLogger(HiveDataSource.class);
-
   /**
-   * gets the JDBC url for the data source connection
-   * @return
+   * @return driver class
    */
   @Override
-  public String getJdbcUrl() {
-    String jdbcUrl = getAddress();
-    if (jdbcUrl.lastIndexOf('/') != (jdbcUrl.length() - 1)) {
-      jdbcUrl += "/";
-    }
-
-    jdbcUrl += getDatabase();
-
-    if (StringUtils.isNotEmpty(getPrincipal())){
-      jdbcUrl += ";principal=" + getPrincipal();
-    }
-
-    if (StringUtils.isNotEmpty(getOther())) {
-      jdbcUrl += ";" + getOther();
-    }
-
-    return jdbcUrl;
+  public String driverClassSelector() {
+    return Constants.ORG_APACHE_HIVE_JDBC_HIVE_DRIVER;
   }
 
   /**
-   * test whether the data source can be connected successfully
-   * @throws Exception
+   * @return db type
    */
   @Override
-  public void isConnectable() throws Exception {
-    Connection con = null;
-    try {
-      Class.forName(Constants.ORG_APACHE_HIVE_JDBC_HIVE_DRIVER);
-      con = DriverManager.getConnection(getJdbcUrl(), getUser(), "");
-    } finally {
-      if (con != null) {
-        try {
-          con.close();
-        } catch (SQLException e) {
-          logger.error("hive datasource try conn close conn error", e);
-        }
-      }
-    }
+  public DbType dbTypeSelector() {
+    return DbType.HIVE;
   }
 }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/MySQLDataSource.java

@@ -17,57 +17,27 @@
 package org.apache.dolphinscheduler.dao.datasource;
 
 import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.common.utils.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
+import org.apache.dolphinscheduler.common.enums.DbType;
 
 /**
  * data source of mySQL
  */
 public class MySQLDataSource extends BaseDataSource {
 
-  private static final Logger logger = LoggerFactory.getLogger(MySQLDataSource.class);
-
   /**
-   * gets the JDBC url for the data source connection
-   * @return
+   * @return driver class
    */
   @Override
-  public String getJdbcUrl() {
-    String address = getAddress();
-    if (address.lastIndexOf('/') != (address.length() - 1)) {
-      address += "/";
-    }
-    String jdbcUrl = address + getDatabase();
-    if (StringUtils.isNotEmpty(getOther())) {
-      jdbcUrl += "?" + getOther();
-    }
-    return jdbcUrl;
+  public String driverClassSelector() {
+    return Constants.COM_MYSQL_JDBC_DRIVER;
   }
 
   /**
-   * test whether the data source can be connected successfully
-   * @throws Exception
+   * @return db type
    */
   @Override
-  public void isConnectable() throws Exception {
-    Connection con = null;
-    try {
-      Class.forName(Constants.COM_MYSQL_JDBC_DRIVER);
-      con = DriverManager.getConnection(getJdbcUrl(), getUser(), getPassword());
-    } finally {
-      if (con != null) {
-        try {
-          con.close();
-        } catch (SQLException e) {
-          logger.error("Mysql datasource try conn close conn error", e);
-        }
-      }
-    }
+  public DbType dbTypeSelector() {
+    return DbType.MYSQL;
   }
 
 }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/OracleDataSource.java

@@ -17,59 +17,26 @@
 package org.apache.dolphinscheduler.dao.datasource;
 
 import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.common.utils.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
+import org.apache.dolphinscheduler.common.enums.DbType;
 
 /**
  * data source of Oracle
  */
 public class OracleDataSource extends BaseDataSource {
-    private static final Logger logger = LoggerFactory.getLogger(OracleDataSource.class);
 
     /**
-     * gets the JDBC url for the data source connection
-     * @return
+     * @return driver class
      */
     @Override
-    public String getJdbcUrl() {
-        String jdbcUrl = getAddress();
-        if (jdbcUrl.lastIndexOf("/") != (jdbcUrl.length() - 1)) {
-            jdbcUrl += "/";
-        }
-
-        jdbcUrl += getDatabase();
-
-        if (StringUtils.isNotEmpty(getOther())) {
-            jdbcUrl += "?" + getOther();
-        }
-
-        return jdbcUrl;
+    public String driverClassSelector() {
+        return Constants.COM_ORACLE_JDBC_DRIVER;
     }
 
     /**
-     * test whether the data source can be connected successfully
-     * @throws Exception
+     * @return db type
      */
     @Override
-    public void isConnectable() throws Exception {
-        Connection con = null;
-        try {
-            Class.forName(Constants.COM_ORACLE_JDBC_DRIVER);
-            con = DriverManager.getConnection(getJdbcUrl(), getUser(), getPassword());
-        } finally {
-            if (con != null) {
-                try {
-                    con.close();
-                } catch (SQLException e) {
-                    logger.error("Oracle datasource try conn close conn error", e);
-                }
-            }
-        }
-
+    public DbType dbTypeSelector() {
+        return DbType.ORACLE;
     }
 }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/PostgreDataSource.java

@@ -17,61 +17,26 @@
 package org.apache.dolphinscheduler.dao.datasource;
 
 import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.common.utils.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
+import org.apache.dolphinscheduler.common.enums.DbType;
 
 /**
  * data source of postgreSQL
  */
 public class PostgreDataSource extends BaseDataSource {
 
-  private static final Logger logger = LoggerFactory.getLogger(PostgreDataSource.class);
-
-
   /**
-   * gets the JDBC url for the data source connection
-   * @return
+   * @return driver class
    */
   @Override
-  public String getJdbcUrl() {
-    String jdbcUrl = getAddress();
-    if (jdbcUrl.lastIndexOf('/') != (jdbcUrl.length() - 1)) {
-      jdbcUrl += "/";
-    }
-
-    jdbcUrl += getDatabase();
-
-    if (StringUtils.isNotEmpty(getOther())) {
-      jdbcUrl += "?" + getOther();
-    }
-
-    return jdbcUrl;
+  public String driverClassSelector() {
+    return Constants.ORG_POSTGRESQL_DRIVER;
   }
 
   /**
-   * test whether the data source can be connected successfully
-   * @throws Exception
+   * @return db type
    */
   @Override
-  public void isConnectable() throws Exception {
-    Connection con = null;
-    try {
-      Class.forName(Constants.ORG_POSTGRESQL_DRIVER);
-      con = DriverManager.getConnection(getJdbcUrl(), getUser(), getPassword());
-    } finally {
-      if (con != null) {
-        try {
-          con.close();
-        } catch (SQLException e) {
-          logger.error("Postgre datasource try conn close conn error", e);
-        }
-      }
-    }
-
+  public DbType dbTypeSelector() {
+    return DbType.POSTGRESQL;
   }
 }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SQLServerDataSource.java

@@ -17,55 +17,26 @@
 package org.apache.dolphinscheduler.dao.datasource;
 
 import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.common.utils.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
+import org.apache.dolphinscheduler.common.enums.DbType;
 
 /**
  * data source of SQL Server
  */
 public class SQLServerDataSource extends BaseDataSource {
-    private static final Logger logger = LoggerFactory.getLogger(SQLServerDataSource.class);
-
-    /**
-     * gets the JDBC url for the data source connection
-     * @return
-     */
-    @Override
-    public String getJdbcUrl() {
-        String jdbcUrl = getAddress();
-        jdbcUrl += ";databaseName=" + getDatabase();
-
-        if (StringUtils.isNotEmpty(getOther())) {
-            jdbcUrl += ";" + getOther();
-        }
-
-        return jdbcUrl;
-    }
-
-    /**
-     * test whether the data source can be connected successfully
-     * @throws Exception
-     */
-    @Override
-    public void isConnectable() throws Exception {
-        Connection con = null;
-        try {
-            Class.forName(Constants.COM_SQLSERVER_JDBC_DRIVER);
-            con = DriverManager.getConnection(getJdbcUrl(), getUser(), getPassword());
-        } finally {
-            if (con != null) {
-                try {
-                    con.close();
-                } catch (SQLException e) {
-                    logger.error("SQL Server datasource try conn close conn error", e);
-                }
-            }
-        }
 
-    }
+  /**
+   * @return driver class
+   */
+  @Override
+  public String driverClassSelector() {
+    return Constants.COM_SQLSERVER_JDBC_DRIVER;
+  }
+
+  /**
+   * @return db type
+   */
+  @Override
+  public DbType dbTypeSelector() {
+    return DbType.SQLSERVER;
+  }
 }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SparkDataSource.java

@@ -17,64 +17,26 @@
 package org.apache.dolphinscheduler.dao.datasource;
 
 import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.common.utils.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
+import org.apache.dolphinscheduler.common.enums.DbType;
 
 /**
  * data source of spark
  */
 public class SparkDataSource extends BaseDataSource {
 
-  private static final Logger logger = LoggerFactory.getLogger(SparkDataSource.class);
-
   /**
-   * gets the JDBC url for the data source connection
-   * @return
+   * @return driver class
    */
   @Override
-  public String getJdbcUrl() {
-    String jdbcUrl = getAddress();
-    if (jdbcUrl.lastIndexOf("/") != (jdbcUrl.length() - 1)) {
-      jdbcUrl += "/";
-    }
-
-    jdbcUrl += getDatabase();
-
-    if (StringUtils.isNotEmpty(getPrincipal())){
-      jdbcUrl += ";principal=" + getPrincipal();
-    }
-
-    if (StringUtils.isNotEmpty(getOther())) {
-      jdbcUrl += ";" + getOther();
-    }
-
-    return jdbcUrl;
+  public String driverClassSelector() {
+    return Constants.ORG_APACHE_HIVE_JDBC_HIVE_DRIVER;
   }
 
   /**
-   * test whether the data source can be connected successfully
-   * @throws Exception
+   * @return db type
    */
   @Override
-  public void isConnectable() throws Exception {
-    Connection con = null;
-    try {
-      Class.forName(Constants.ORG_APACHE_HIVE_JDBC_HIVE_DRIVER);
-      con = DriverManager.getConnection(getJdbcUrl(), getUser(), "");
-    } finally {
-      if (con != null) {
-        try {
-          con.close();
-        } catch (SQLException e) {
-          logger.error("Spark datasource try conn close conn error", e);
-        }
-      }
-    }
-
+  public DbType dbTypeSelector() {
+    return DbType.SPARK;
   }
 }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java

@@ -366,7 +366,7 @@ public class ProcessInstance {
     }
 
 
-    public boolean IsProcessInstanceStop(){
+    public boolean isProcessInstanceStop(){
         return this.state.typeIsFinished();
     }
 

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/MysqlUpgradeDao.java

@@ -66,7 +66,7 @@ public class MysqlUpgradeDao extends UpgradeDao {
             logger.error(e.getMessage(),e);
             throw new RuntimeException(e.getMessage(),e);
         } finally {
-            ConnectionUtils.releaseResource(rs, null, conn);
+            ConnectionUtils.releaseResource(rs, conn);
         }
 
     }
@@ -89,7 +89,7 @@ public class MysqlUpgradeDao extends UpgradeDao {
             logger.error(e.getMessage(),e);
             throw new RuntimeException(e.getMessage(),e);
         } finally {
-            ConnectionUtils.releaseResource(null, null, conn);
+            ConnectionUtils.releaseResource(conn);
         }
 
     }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/PostgresqlUpgradeDao.java

@@ -96,7 +96,7 @@ public class PostgresqlUpgradeDao extends UpgradeDao {
             logger.error(e.getMessage(),e);
             throw new RuntimeException(e.getMessage(),e);
         } finally {
-            ConnectionUtils.releaseResource(rs, null, conn);
+            ConnectionUtils.releaseResource(rs, conn);
         }
 
     }
@@ -119,7 +119,7 @@ public class PostgresqlUpgradeDao extends UpgradeDao {
             logger.error(e.getMessage(),e);
             throw new RuntimeException(e.getMessage(),e);
         } finally {
-            ConnectionUtils.releaseResource(rs, null, conn);
+            ConnectionUtils.releaseResource(rs, conn);
 
         }
 

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/UpgradeDao.java

@@ -27,6 +27,7 @@ import org.apache.dolphinscheduler.dao.datasource.ConnectionFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.sql.DataSource;
 import java.io.*;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -40,7 +41,7 @@ public abstract class UpgradeDao extends AbstractBaseDao {
     private static final String T_VERSION_NAME = "t_escheduler_version";
     private static final String T_NEW_VERSION_NAME = "t_ds_version";
     private static final String rootDir = System.getProperty("user.dir");
-    protected static final DruidDataSource dataSource = getDataSource();
+    protected static final DataSource dataSource = getDataSource();
     private static final DbType dbType = getCurrentDbType();
 
     @Override
@@ -52,13 +53,8 @@ public abstract class UpgradeDao extends AbstractBaseDao {
      * get datasource
      * @return DruidDataSource
      */
-    public static DruidDataSource getDataSource(){
-        DruidDataSource dataSource = ConnectionFactory.getInstance().getDataSource();
-        dataSource.setInitialSize(2);
-        dataSource.setMinIdle(2);
-        dataSource.setMaxActive(2);
-
-        return dataSource;
+    public static DataSource getDataSource(){
+        return ConnectionFactory.getInstance().getDataSource();
     }
 
     /**
@@ -83,7 +79,7 @@ public abstract class UpgradeDao extends AbstractBaseDao {
             logger.error(e.getMessage(),e);
             return null;
         }finally {
-            ConnectionUtils.releaseResource(null, null, conn);
+            ConnectionUtils.releaseResource(conn);
         }
     }
 
@@ -164,7 +160,7 @@ public abstract class UpgradeDao extends AbstractBaseDao {
             logger.error(e.getMessage(),e);
             throw new RuntimeException(e.getMessage(),e);
         } finally {
-            ConnectionUtils.releaseResource(null, null, conn);
+            ConnectionUtils.releaseResource(conn);
 
         }
 
@@ -197,7 +193,7 @@ public abstract class UpgradeDao extends AbstractBaseDao {
             logger.error(e.getMessage(),e);
             throw new RuntimeException(e.getMessage(),e);
         } finally {
-            ConnectionUtils.releaseResource(null, null, conn);
+            ConnectionUtils.releaseResource(conn);
 
         }
 
@@ -333,7 +329,7 @@ public abstract class UpgradeDao extends AbstractBaseDao {
             logger.error(e.getMessage(),e);
             throw new RuntimeException(e.getMessage(),e);
         } finally {
-            ConnectionUtils.releaseResource(null, pstmt, conn);
+            ConnectionUtils.releaseResource(pstmt, conn);
         }
 
     }
@@ -376,7 +372,7 @@ public abstract class UpgradeDao extends AbstractBaseDao {
             logger.error(e.getMessage(),e);
             throw new RuntimeException(e.getMessage(),e);
         } finally {
-            ConnectionUtils.releaseResource(null, pstmt, conn);
+            ConnectionUtils.releaseResource(pstmt, conn);
         }
 
     }
@@ -405,7 +401,7 @@ public abstract class UpgradeDao extends AbstractBaseDao {
             logger.error(e.getMessage(),e);
             throw new RuntimeException("sql: " + upgradeSQL, e);
         } finally {
-            ConnectionUtils.releaseResource(null, pstmt, conn);
+            ConnectionUtils.releaseResource(pstmt, conn);
         }
 
     }

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/AlertDaoTest.java

@@ -16,19 +16,42 @@
  */
 package org.apache.dolphinscheduler.dao;
 
+import org.apache.dolphinscheduler.common.enums.AlertStatus;
+import org.apache.dolphinscheduler.common.enums.AlertType;
+import org.apache.dolphinscheduler.common.enums.ShowType;
+import org.apache.dolphinscheduler.dao.entity.Alert;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class AlertDaoTest {
-    private static final Logger logger = LoggerFactory.getLogger(AlertDaoTest.class);
+import java.util.Arrays;
+import java.util.List;
 
+public class AlertDaoTest {
     @Test
-    public void testGetAlertDao() {
-        logger.info("testGetAlertDao start");
+    public void testAlertDao(){
         AlertDao alertDao = DaoFactory.getDaoInstance(AlertDao.class);
-        Assert.assertNotNull(alertDao);
-        logger.info("testGetAlertDao end");
+        Alert alert = new Alert();
+        alert.setTitle("Mysql Exception");
+        alert.setShowType(ShowType.TEXT);
+        alert.setContent("[\"alarm time：2018-02-05\", \"service name：MYSQL_ALTER\", \"alarm name：MYSQL_ALTER_DUMP\", " +
+                "\"get the alarm exception.！，interface error，exception information：timed out\", \"request address：http://blog.csdn.net/dreamInTheWorld/article/details/78539286\"]");
+        alert.setAlertType(AlertType.EMAIL);
+        alert.setAlertGroupId(1);
+        alert.setAlertStatus(AlertStatus.WAIT_EXECUTION);
+        alertDao.addAlert(alert);
+
+
+        List<Alert> alerts = alertDao.listWaitExecutionAlert();
+        Assert.assertNotNull(alerts);
+        Assert.assertNotEquals(0, alerts.size());
+        int id = alerts.get(0).getId();
+        AlertStatus alertStatus = alerts.get(0).getAlertStatus();
+        alertDao.updateAlert(AlertStatus.EXECUTION_SUCCESS, "", id);
+
+        alerts = alertDao.listWaitExecutionAlert();
+        Assert.assertEquals(0, alerts.size());
+        alertDao.getAlertMapper().deleteById(id);
     }
 }

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSourceTest.java

@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dolphinscheduler.dao.datasource;
+
+import org.apache.dolphinscheduler.common.Constants;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class BaseDataSourceTest {
+
+  @Test
+  public void testDriverClassSelector() {
+    String mysqlDriverClass = new MySQLDataSource().driverClassSelector();
+    Assert.assertEquals(Constants.COM_MYSQL_JDBC_DRIVER, mysqlDriverClass);
+
+    String clickHouseDriverClass = new ClickHouseDataSource().driverClassSelector();
+    Assert.assertEquals(Constants.COM_CLICKHOUSE_JDBC_DRIVER, clickHouseDriverClass);
+
+    String db2ServerDriverClass = new DB2ServerDataSource().driverClassSelector();
+    Assert.assertEquals(Constants.COM_DB2_JDBC_DRIVER, db2ServerDriverClass);
+
+    String oracleDriverClass = new OracleDataSource().driverClassSelector();
+    Assert.assertEquals(Constants.COM_ORACLE_JDBC_DRIVER, oracleDriverClass);
+
+    String postgreDriverClass = new PostgreDataSource().driverClassSelector();
+    Assert.assertEquals(Constants.ORG_POSTGRESQL_DRIVER, postgreDriverClass);
+
+    String sqlServerDriverClass = new SQLServerDataSource().driverClassSelector();
+    Assert.assertEquals(Constants.COM_SQLSERVER_JDBC_DRIVER, sqlServerDriverClass);
+
+    String hiveDriverClass = new HiveDataSource().driverClassSelector();
+    Assert.assertEquals(Constants.ORG_APACHE_HIVE_JDBC_HIVE_DRIVER, hiveDriverClass);
+
+    String sparkDriverClass = new SparkDataSource().driverClassSelector();
+    Assert.assertEquals(Constants.ORG_APACHE_HIVE_JDBC_HIVE_DRIVER, sparkDriverClass);
+  }
+
+  @Test
+  public void testGetJdbcUrl() {
+    BaseDataSource hiveDataSource = new HiveDataSource();
+    hiveDataSource.setAddress("jdbc:hive2://127.0.0.1:10000");
+    hiveDataSource.setDatabase("test");
+    hiveDataSource.setPassword("123456");
+    hiveDataSource.setUser("test");
+    Assert.assertEquals("jdbc:hive2://127.0.0.1:10000/test", hiveDataSource.getJdbcUrl());
+    //set principal
+    hiveDataSource.setPrincipal("hive/test.com@TEST.COM");
+    Assert.assertEquals("jdbc:hive2://127.0.0.1:10000/test;principal=hive/test.com@TEST.COM",
+        hiveDataSource.getJdbcUrl());
+    //set fake other
+    hiveDataSource.setOther("charset=UTF-8");
+    Assert.assertEquals(
+        "jdbc:hive2://127.0.0.1:10000/test;principal=hive/test.com@TEST.COM;charset=UTF-8",
+        hiveDataSource.getJdbcUrl());
+
+    BaseDataSource clickHouseDataSource = new ClickHouseDataSource();
+    clickHouseDataSource.setAddress("jdbc:clickhouse://127.0.0.1:8123");
+    clickHouseDataSource.setDatabase("test");
+    clickHouseDataSource.setPassword("123456");
+    clickHouseDataSource.setUser("test");
+    Assert.assertEquals("jdbc:clickhouse://127.0.0.1:8123/test", clickHouseDataSource.getJdbcUrl());
+    //set fake principal
+    clickHouseDataSource.setPrincipal("fake principal");
+    Assert.assertEquals("jdbc:clickhouse://127.0.0.1:8123/test", clickHouseDataSource.getJdbcUrl());
+    //set fake other
+    clickHouseDataSource.setOther("charset=UTF-8");
+    Assert.assertEquals("jdbc:clickhouse://127.0.0.1:8123/test?charset=UTF-8",
+        clickHouseDataSource.getJdbcUrl());
+
+    BaseDataSource sqlServerDataSource = new SQLServerDataSource();
+    sqlServerDataSource.setAddress("jdbc:sqlserver://127.0.0.1:1433");
+    sqlServerDataSource.setDatabase("test");
+    sqlServerDataSource.setPassword("123456");
+    sqlServerDataSource.setUser("test");
+    Assert.assertEquals("jdbc:sqlserver://127.0.0.1:1433;databaseName=test",
+        sqlServerDataSource.getJdbcUrl());
+    //set fake principal
+    sqlServerDataSource.setPrincipal("fake principal");
+    Assert.assertEquals("jdbc:sqlserver://127.0.0.1:1433;databaseName=test",
+        sqlServerDataSource.getJdbcUrl());
+    //set fake other
+    sqlServerDataSource.setOther("charset=UTF-8");
+    Assert.assertEquals("jdbc:sqlserver://127.0.0.1:1433;databaseName=test;charset=UTF-8",
+        sqlServerDataSource.getJdbcUrl());
+
+    BaseDataSource db2DataSource = new DB2ServerDataSource();
+    db2DataSource.setAddress("jdbc:db2://127.0.0.1:50000");
+    db2DataSource.setDatabase("test");
+    db2DataSource.setPassword("123456");
+    db2DataSource.setUser("test");
+    Assert.assertEquals("jdbc:db2://127.0.0.1:50000/test", db2DataSource.getJdbcUrl());
+    //set fake principal
+    db2DataSource.setPrincipal("fake principal");
+    Assert.assertEquals("jdbc:db2://127.0.0.1:50000/test", db2DataSource.getJdbcUrl());
+    //set fake other
+    db2DataSource.setOther("charset=UTF-8");
+    Assert.assertEquals("jdbc:db2://127.0.0.1:50000/test:charset=UTF-8", db2DataSource.getJdbcUrl());
+
+
+  }
+}

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ConnectionFactoryTest.java

@@ -31,7 +31,7 @@ public class ConnectionFactoryTest {
      */
     @Test
     public void testConnection()throws Exception{
-        Connection connection = ConnectionFactory.getInstance().getDataSource().getPooledConnection().getConnection();
+        Connection connection = ConnectionFactory.getInstance().getDataSource().getConnection();
         Assert.assertTrue(connection != null);
     }
 }

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapperTest.java

@@ -60,7 +60,7 @@ public class ProcessInstanceMapMapperTest {
         //update
         processInstanceMap.setParentProcessInstanceId(1);
         int update = processInstanceMapMapper.updateById(processInstanceMap);
-        Assert.assertEquals(update, 1);
+        Assert.assertEquals(1, update);
         processInstanceMapMapper.deleteById(processInstanceMap.getId());
     }
 
@@ -71,7 +71,7 @@ public class ProcessInstanceMapMapperTest {
     public void testDelete(){
         ProcessInstanceMap processInstanceMap = insertOne();
         int delete = processInstanceMapMapper.deleteById(processInstanceMap.getId());
-        Assert.assertEquals(delete, 1);
+        Assert.assertEquals(1, delete);
     }
 
     /**
@@ -132,7 +132,7 @@ public class ProcessInstanceMapMapperTest {
         int delete = processInstanceMapMapper.deleteByParentProcessId(
                 processInstanceMap.getParentProcessInstanceId()
         );
-        Assert.assertEquals(delete, 1);
+        Assert.assertEquals(1, delete);
     }
 
     /**

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java

@@ -74,7 +74,7 @@ public class ProcessInstanceMapperTest {
         ProcessInstance processInstanceMap = insertOne();
         //update
         int update = processInstanceMapper.updateById(processInstanceMap);
-        Assert.assertEquals(update, 1);
+        Assert.assertEquals(1, update);
         processInstanceMapper.deleteById(processInstanceMap.getId());
     }
 
@@ -85,7 +85,7 @@ public class ProcessInstanceMapperTest {
     public void testDelete(){
         ProcessInstance processInstanceMap = insertOne();
         int delete = processInstanceMapper.deleteById(processInstanceMap.getId());
-        Assert.assertEquals(delete, 1);
+        Assert.assertEquals(1, delete);
     }
 
     /**
@@ -197,7 +197,7 @@ public class ProcessInstanceMapperTest {
         Assert.assertNotEquals(update, 0);
 
         processInstance = processInstanceMapper.selectById(processInstance.getId());
-        Assert.assertEquals(processInstance.getHost(), null);
+        Assert.assertNull(processInstance.getHost());
         processInstanceMapper.deleteById(processInstance.getId());
     }
 
@@ -217,7 +217,7 @@ public class ProcessInstanceMapperTest {
         ProcessInstance processInstance1 = processInstanceMapper.selectById(processInstance.getId());
 
         processInstanceMapper.deleteById(processInstance.getId());
-        Assert.assertEquals(processInstance1.getState(), ExecutionStatus.SUCCESS);
+        Assert.assertEquals(ExecutionStatus.SUCCESS, processInstance1.getState());
 
     }
 
@@ -261,10 +261,10 @@ public class ProcessInstanceMapperTest {
 
 
         List<ProcessInstance> processInstances = processInstanceMapper.queryByProcessDefineId(processInstance.getProcessDefinitionId(), 1);
-        Assert.assertEquals(processInstances.size(), 1);
+        Assert.assertEquals(1, processInstances.size());
 
         processInstances = processInstanceMapper.queryByProcessDefineId(processInstance.getProcessDefinitionId(), 2);
-        Assert.assertEquals(processInstances.size(), 2);
+        Assert.assertEquals(2, processInstances.size());
 
         processInstanceMapper.deleteById(processInstance.getId());
         processInstanceMapper.deleteById(processInstance1.getId());
@@ -320,7 +320,7 @@ public class ProcessInstanceMapperTest {
         start = new Date(2019-1900, 1-1, 01, 1, 0, 0);
         processInstance1 = processInstanceMapper.queryLastManualProcess(processInstance.getProcessDefinitionId(),start, end
                 );
-        Assert.assertEquals(processInstance1, null);
+        Assert.assertNull(processInstance1);
 
         processInstanceMapper.deleteById(processInstance.getId());
 

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/QueueMapperTest.java

@@ -64,7 +64,7 @@ public class QueueMapperTest {
         queue.setCreateTime(new Date());
         //update
         int update = queueMapper.updateById(queue);
-        Assert.assertEquals(update, 1);
+        Assert.assertEquals(1, update);
         queueMapper.deleteById(queue.getId());
     }
 
@@ -75,7 +75,7 @@ public class QueueMapperTest {
     public void testDelete(){
         Queue queue = insertOne();
         int delete = queueMapper.deleteById(queue.getId());
-        Assert.assertEquals(delete, 1);
+        Assert.assertEquals(1, delete);
     }
 
     /**

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapperTest.java

@@ -138,7 +138,7 @@ public class ResourceMapperTest {
         resource.setCreateTime(new Date());
         //update
         int update = resourceMapper.updateById(resource);
-        Assert.assertEquals(update, 1);
+        Assert.assertEquals(1, update);
         resourceMapper.deleteById(resource.getId());
     }
 
@@ -149,7 +149,7 @@ public class ResourceMapperTest {
     public void testDelete(){
         Resource resourceMap = insertOne();
         int delete = resourceMapper.deleteById(resourceMap.getId());
-        Assert.assertEquals(delete, 1);
+        Assert.assertEquals(1, delete);
     }
 
     /**
@@ -236,8 +236,8 @@ public class ResourceMapperTest {
 
         resourceUserMapper.deleteById(resourcesUser.getId());
         resourceMapper.deleteById(resource.getId());
-        Assert.assertEquals(resources.size(), 0);
-        Assert.assertNotEquals(resources1.size(), 0);
+        Assert.assertEquals(0, resources.size());
+        Assert.assertNotEquals(0, resources1.size());
 
     }
 
@@ -251,7 +251,7 @@ public class ResourceMapperTest {
         List<Resource> resources = resourceMapper.queryAuthorizedResourceList(resource.getUserId());
 
         resourceMapper.deleteById(resource.getId());
-        Assert.assertEquals(resources.size(), 0);
+        Assert.assertEquals(0, resources.size());
     }
 
     /**
@@ -293,7 +293,7 @@ public class ResourceMapperTest {
         );
 
 
-        Assert.assertEquals(resource1, "ut tenant code for resource");
+        Assert.assertEquals("ut tenant code for resource", resource1);
         resourceMapper.deleteById(resource.getId());
 
     }

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapperTest.java

@@ -62,7 +62,7 @@ public class ResourceUserMapperTest {
         queue.setCreateTime(new Date());
         //update
         int update = resourceUserMapper.updateById(queue);
-        Assert.assertEquals(update, 1);
+        Assert.assertEquals(1, update);
         resourceUserMapper.deleteById(queue.getId());
     }
 
@@ -73,7 +73,7 @@ public class ResourceUserMapperTest {
     public void testDelete(){
         ResourcesUser queue = insertOne();
         int delete = resourceUserMapper.deleteById(queue.getId());
-        Assert.assertEquals(delete, 1);
+        Assert.assertEquals(1, delete);
     }
 
     /**

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java

@@ -78,7 +78,7 @@ public class TaskInstanceMapperTest {
         TaskInstance taskInstance = insertOne();
         //update
         int update = taskInstanceMapper.updateById(taskInstance);
-        Assert.assertEquals(update, 1);
+        Assert.assertEquals(1, update);
         taskInstanceMapper.deleteById(taskInstance.getId());
     }
 
@@ -89,7 +89,7 @@ public class TaskInstanceMapperTest {
     public void testDelete(){
         TaskInstance taskInstance = insertOne();
         int delete = taskInstanceMapper.deleteById(taskInstance.getId());
-        Assert.assertEquals(delete, 1);
+        Assert.assertEquals(1, delete);
     }
 
     /**

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TenantMapperTest.java

@@ -64,7 +64,7 @@ public class TenantMapperTest {
         tenant.setUpdateTime(new Date());
         //update
         int update = tenantMapper.updateById(tenant);
-        Assert.assertEquals(update, 1);
+        Assert.assertEquals(1, update);
         tenantMapper.deleteById(tenant.getId());
     }
 
@@ -75,7 +75,7 @@ public class TenantMapperTest {
     public void testDelete(){
         Tenant tenant = insertOne();
         int delete = tenantMapper.deleteById(tenant.getId());
-        Assert.assertEquals(delete, 1);
+        Assert.assertEquals(1, delete);
     }
 
     /**

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapperTest.java

@@ -65,7 +65,7 @@ public class WorkerGroupMapperTest {
         workerGroup.setName("workerGroup11");
         int update = workerGroupMapper.updateById(workerGroup);
         workerGroupMapper.deleteById(workerGroup.getId());
-        Assert.assertEquals(update, 1);
+        Assert.assertEquals(1, update);
     }
 
     /**
@@ -77,7 +77,7 @@ public class WorkerGroupMapperTest {
         WorkerGroup workerGroup = insertOne();
         //delete
         int delete = workerGroupMapper.deleteById(workerGroup.getId());
-        Assert.assertEquals(delete, 1);
+        Assert.assertEquals(1, delete);
     }
 
     /**

dolphinscheduler-remote/pom.xml

@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>

dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/NettyRemotingClient.java

@@ -301,7 +301,7 @@ public class NettyRemotingClient {
                 return channel;
             }
         } catch (Exception ex) {
-            logger.info("connect to {} error  {}", address, ex);
+            logger.error("connect to {} error", address, ex);
         }
         return null;
     }

dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/future/ResponseFuture.java

@@ -32,9 +32,9 @@ import java.util.concurrent.*;
  */
 public class ResponseFuture {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(ResponseFuture.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ResponseFuture.class);
 
-    private final static ConcurrentHashMap<Long,ResponseFuture> FUTURE_TABLE = new ConcurrentHashMap<>(256);
+    private static final ConcurrentHashMap<Long,ResponseFuture> FUTURE_TABLE = new ConcurrentHashMap<>(256);
 
     /**
      *  request unique identification
@@ -63,11 +63,11 @@ public class ResponseFuture {
     /**
      *  response command
      */
-    private volatile Command responseCommand;
+    private Command responseCommand;
 
     private volatile boolean sendOk = true;
 
-    private volatile Throwable cause;
+    private Throwable cause;
 
     public ResponseFuture(long opaque, long timeoutMillis, InvokeCallback invokeCallback, ReleaseSemaphore releaseSemaphore) {
         this.opaque = opaque;

dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/handler/NettyServerHandler.java

@@ -117,7 +117,7 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter {
                     try {
                         pair.getLeft().process(channel, msg);
                     } catch (Throwable ex) {
-                        logger.error("process msg {} error : {}", msg, ex);
+                        logger.error("process msg {} error", msg, ex);
                     }
                 }
             };

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java

@@ -674,9 +674,9 @@ public class MasterExecThread implements Runnable {
         TaskNode taskNode = dag.getNode(taskName);
         List<String> depNameList = taskNode.getDepList();
         for(String depsNode : depNameList ){
-
-            if(forbiddenTaskList.containsKey(depsNode) ||
-                    skipTaskNodeList.containsKey(depsNode)){
+            if(!dag.containsNode(depsNode)
+                    || forbiddenTaskList.containsKey(depsNode)
+                    || skipTaskNodeList.containsKey(depsNode)){
                 continue;
             }
             // dependencies must be fully completed
@@ -937,7 +937,7 @@ public class MasterExecThread implements Runnable {
         // submit start node
         submitPostNode(null);
         boolean sendTimeWarning = false;
-        while(!processInstance.IsProcessInstanceStop()){
+        while(!processInstance.isProcessInstanceStop()){
 
             // send warning email if process time out.
             if( !sendTimeWarning && checkProcessTimeOut(processInstance) ){

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/RemoveZKNode.java

@@ -28,7 +28,7 @@ import org.springframework.context.annotation.ComponentScan;
 @ComponentScan("org.apache.dolphinscheduler")
 public class RemoveZKNode implements CommandLineRunner {
 
-    private static Integer ARGS_LENGTH = 1;
+    private static final Integer ARGS_LENGTH = 1;
 
     private static final Logger logger = LoggerFactory.getLogger(RemoveZKNode.class);
 

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java

@@ -52,7 +52,6 @@ import org.springframework.context.annotation.FilterType;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import java.util.Set;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -255,7 +254,7 @@ public class WorkerServer implements IStoppable {
      */
     private Runnable heartBeatThread(){
         logger.info("start worker heart beat thread...");
-        Runnable heartBeatThread  = new Runnable() {
+        return new Runnable() {
             @Override
             public void run() {
                 // send heartbeat to zk
@@ -266,7 +265,6 @@ public class WorkerServer implements IStoppable {
                 zkWorkerClient.heartBeatForZk(zkWorkerClient.getWorkerZNode() , Constants.WORKER_PREFIX);
             }
         };
-        return heartBeatThread;
     }
 
 
@@ -276,7 +274,7 @@ public class WorkerServer implements IStoppable {
      * @return kill process thread
      */
     private Runnable getKillProcessThread(){
-        Runnable killProcessThread  = new Runnable() {
+        return new Runnable() {
             @Override
             public void run() {
                 logger.info("start listening kill process thread...");
@@ -297,7 +295,6 @@ public class WorkerServer implements IStoppable {
                 }
             }
         };
-        return killProcessThread;
     }
 
     /**
@@ -307,17 +304,17 @@ public class WorkerServer implements IStoppable {
      * @param pd        process dao
      */
     private void killTask(String taskInfo, ProcessService pd) {
-        logger.info("get one kill command from tasks kill queue: " + taskInfo);
+        logger.info("get one kill command from tasks kill queue: {}" , taskInfo);
         String[] taskInfoArray = taskInfo.split("-");
         if(taskInfoArray.length != 2){
-            logger.error("error format kill info: " + taskInfo);
+            logger.error("error format kill info: {}", taskInfo);
             return ;
         }
         String host = taskInfoArray[0];
         int taskInstanceId = Integer.parseInt(taskInfoArray[1]);
         TaskInstance taskInstance = pd.getTaskInstanceDetailByTaskId(taskInstanceId);
         if(taskInstance == null){
-            logger.error("cannot find the kill task :" + taskInfo);
+            logger.error("cannot find the kill task : {}", taskInfo);
             return;
         }
 
@@ -332,8 +329,7 @@ public class WorkerServer implements IStoppable {
             }else if(!taskInstance.getState().typeIsFinished()){
                 ProcessUtils.kill(taskInstance);
             }else{
-                logger.info("the task aleady finish: task id: " + taskInstance.getId()
-                        + " state: " + taskInstance.getState().toString());
+                logger.info("the task aleady finish: task id: {} state: {}", taskInstance.getId(), taskInstance.getState());
             }
         }
     }
@@ -347,7 +343,7 @@ public class WorkerServer implements IStoppable {
     private void deleteTaskFromQueue(TaskInstance taskInstance, ProcessService pd){
         // creating distributed locks, lock path /dolphinscheduler/lock/worker
         InterProcessMutex mutex = null;
-        logger.info("delete task from tasks queue: " + taskInstance.getId());
+        logger.info("delete task from tasks queue: {}", taskInstance.getId());
 
         try {
             mutex = zkWorkerClient.acquireZkLock(zkWorkerClient.getZkClient(),

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/config/WorkerConfig.java

@@ -34,7 +34,7 @@ public class WorkerConfig {
     @Value("${worker.max.cpuload.avg}")
     private int workerMaxCpuloadAvg;
 
-    @Value("${master.reserved.memory}")
+    @Value("${worker.reserved.memory}")
     private double workerReservedMemory;
 
     public int getWorkerExecThreads() {

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskScheduleThread.java

@@ -230,7 +230,7 @@ public class TaskScheduleThread implements Runnable {
                         taskInstance.getId() + ".log";
             }
         }catch (Exception e){
-            logger.error("logger" + e);
+            logger.error("logger {}", e.getMessage(), e);
             logPath = "";
         }
         return logPath;

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/datax/DataxTask.java

@@ -192,24 +192,47 @@ public class DataxTask extends AbstractTask {
         throws Exception {
         // generate json
         String fileName = String.format("%s/%s_job.json", taskDir, taskProps.getTaskAppId());
+        String json;
 
         Path path = new File(fileName).toPath();
         if (Files.exists(path)) {
             return fileName;
         }
 
-        JSONObject job = new JSONObject();
-        job.put("content", buildDataxJobContentJson());
-        job.put("setting", buildDataxJobSettingJson());
 
-        JSONObject root = new JSONObject();
-        root.put("job", job);
-        root.put("core", buildDataxCoreJson());
 
-        logger.debug("datax job json : {}", root.toString());
+        if (dataXParameters.getCustomConfig() == 1){
+
+            json = dataXParameters.getJson().replaceAll("\\r\\n", "\n");
+
+            /**
+             *  combining local and global parameters
+             */
+            Map<String, Property> paramsMap = ParamUtils.convert(taskProps.getUserDefParamsMap(),
+                    taskProps.getDefinedParams(),
+                    dataXParameters.getLocalParametersMap(),
+                    taskProps.getCmdTypeIfComplement(),
+                    taskProps.getScheduleTime());
+            if (paramsMap != null){
+                json = ParameterUtils.convertParameterPlaceholders(json, ParamUtils.convert(paramsMap));
+            }
+
+        }else {
+
+            JSONObject job = new JSONObject();
+            job.put("content", buildDataxJobContentJson());
+            job.put("setting", buildDataxJobSettingJson());
+
+            JSONObject root = new JSONObject();
+            root.put("job", job);
+            root.put("core", buildDataxCoreJson());
+            json = root.toString();
+        }
+
+        logger.debug("datax job json : {}", json);
 
         // create datax json file
-        FileUtils.writeStringToFile(new File(fileName), root.toString(), StandardCharsets.UTF_8);
+        FileUtils.writeStringToFile(new File(fileName), json, StandardCharsets.UTF_8);
         return fileName;
     }
 

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/shell/ShellTask.java

@@ -134,7 +134,6 @@ public class ShellTask extends AbstractTask {
 
     String script = shellParameters.getRawScript().replaceAll("\\r\\n", "\n");
 
-
     /**
      *  combining local and global parameters
      */
@@ -143,13 +142,9 @@ public class ShellTask extends AbstractTask {
             shellParameters.getLocalParametersMap(),
             taskProps.getCmdTypeIfComplement(),
             taskProps.getScheduleTime());
-//    if (paramsMap != null){
-//      script = ParameterUtils.convertParameterPlaceholders(script, ParamUtils.convert(paramsMap));
-//    }
 
-    //new
 //    replace variable TIME with $[YYYYmmddd...] in shell file when history run job and batch complement job
-    if (paramsMap != null) {
+    if(paramsMap != null && taskProps.getScheduleTime()!=null) {
       String dateTime = DateUtils.format(taskProps.getScheduleTime(), Constants.PARAMETER_FORMAT_TIME);
       Property p = new Property();
       p.setValue(dateTime);
@@ -182,6 +177,4 @@ public class ShellTask extends AbstractTask {
     return shellParameters;
   }
 
-
-
 }

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java

@@ -140,7 +140,6 @@ public class SqlTask extends AbstractTask {
                 dataSource.getUserId(),
                 dataSource.getConnectionParams());
 
-        Connection con = null;
         List<String> createFuncs = null;
         try {
             // load class
@@ -178,18 +177,10 @@ public class SqlTask extends AbstractTask {
             }
 
             // execute sql task
-            con = executeFuncAndSql(mainSqlBinds, preStatementSqlBinds, postStatementSqlBinds, createFuncs);
+            executeFuncAndSql(mainSqlBinds, preStatementSqlBinds, postStatementSqlBinds, createFuncs);
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
             throw e;
-        } finally {
-            if (con != null) {
-                try {
-                    con.close();
-                } catch (SQLException e) {
-                    logger.error(e.getMessage(),e);
-                }
-            }
         }
     }
 
@@ -249,9 +240,8 @@ public class SqlTask extends AbstractTask {
      * @param preStatementsBinds    pre statements binds
      * @param postStatementsBinds   post statements binds
      * @param createFuncs           create functions
-     * @return Connection
      */
-    public Connection executeFuncAndSql(SqlBinds mainSqlBinds,
+    public void executeFuncAndSql(SqlBinds mainSqlBinds,
                                         List<SqlBinds> preStatementsBinds,
                                         List<SqlBinds> postStatementsBinds,
                                         List<String> createFuncs){
@@ -343,13 +333,9 @@ public class SqlTask extends AbstractTask {
             logger.error(e.getMessage(),e);
             throw new RuntimeException(e.getMessage());
         } finally {
-            try {
-                connection.close();
-            } catch (Exception e) {
-                logger.error(e.getMessage(), e);
-            }
+            ConnectionUtils.releaseResource(connection);
         }
-        return connection;
+
     }
 
     /**
@@ -363,20 +349,20 @@ public class SqlTask extends AbstractTask {
         // is the timeout set
         boolean timeoutFlag = taskProps.getTaskTimeoutStrategy() == TaskTimeoutStrategy.FAILED ||
                 taskProps.getTaskTimeoutStrategy() == TaskTimeoutStrategy.WARNFAILED;
-        try (PreparedStatement  stmt = connection.prepareStatement(sqlBinds.getSql())) {
-            if(timeoutFlag){
-                stmt.setQueryTimeout(taskProps.getTaskTimeout());
-            }
-            Map<Integer, Property> params = sqlBinds.getParamsMap();
-            if(params != null) {
-                for (Map.Entry<Integer, Property> entry : params.entrySet()) {
-                    Property prop = entry.getValue();
-                    ParameterUtils.setInParameter(entry.getKey(), stmt, prop.getType(), prop.getValue());
-                }
+        // prepare statement
+        PreparedStatement stmt = connection.prepareStatement(sqlBinds.getSql());
+        if(timeoutFlag){
+            stmt.setQueryTimeout(taskProps.getTaskTimeout());
+        }
+        Map<Integer, Property> params = sqlBinds.getParamsMap();
+        if(params != null) {
+            for (Map.Entry<Integer, Property> entry : params.entrySet()) {
+                Property prop = entry.getValue();
+                ParameterUtils.setInParameter(entry.getKey(), stmt, prop.getType(), prop.getValue());
             }
-            logger.info("prepare statement replace sql : {} ", stmt);
-            return stmt;
         }
+        logger.info("prepare statement replace sql : {} ", stmt);
+        return stmt;
     }
 
     /**

dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/datax/DataxTaskTest.java

@@ -44,6 +44,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 
+import static org.apache.dolphinscheduler.common.enums.CommandType.START_PROCESS;
+
 /**
  * DataxTask Tester.
  */
@@ -59,6 +61,8 @@ public class DataxTaskTest {
 
     private ApplicationContext applicationContext;
 
+    private TaskProps props = new TaskProps();
+
     @Before
     public void before()
         throws Exception {
@@ -70,7 +74,6 @@ public class DataxTaskTest {
         springApplicationContext.setApplicationContext(applicationContext);
         Mockito.when(applicationContext.getBean(ProcessService.class)).thenReturn(processService);
 
-        TaskProps props = new TaskProps();
         props.setTaskDir("/tmp");
         props.setTaskAppId(String.valueOf(System.currentTimeMillis()));
         props.setTaskInstId(1);
@@ -78,10 +81,8 @@ public class DataxTaskTest {
         props.setEnvFile(".dolphinscheduler_env.sh");
         props.setTaskStartTime(new Date());
         props.setTaskTimeout(0);
-        props.setTaskParams(
-            "{\"targetTable\":\"test\",\"postStatements\":[],\"jobSpeedByte\":1024,\"jobSpeedRecord\":1000,\"dtType\":\"MYSQL\",\"datasource\":1,\"dsType\":\"MYSQL\",\"datatarget\":2,\"jobSpeedByte\":0,\"sql\":\"select 1 as test from dual\",\"preStatements\":[\"delete from test\"],\"postStatements\":[\"delete from test\"]}");
-        dataxTask = PowerMockito.spy(new DataxTask(props, logger));
-        dataxTask.init();
+        props.setCmdTypeIfComplement(START_PROCESS);
+        setTaskParems(0);
 
         Mockito.when(processService.findDataSourceById(1)).thenReturn(getDataSource());
         Mockito.when(processService.findDataSourceById(2)).thenReturn(getDataSource());
@@ -91,6 +92,22 @@ public class DataxTaskTest {
         Mockito.when(shellCommandExecutor.run(fileName, processService)).thenReturn(0);
     }
 
+    private void setTaskParems(Integer customConfig) {
+        if (customConfig == 1) {
+            props.setTaskParams(
+                    "{\"customConfig\":1, \"localParams\":[{\"prop\":\"test\",\"value\":\"38294729\"}],\"json\":\"{\\\"job\\\":{\\\"setting\\\":{\\\"speed\\\":{\\\"byte\\\":1048576},\\\"errorLimit\\\":{\\\"record\\\":0,\\\"percentage\\\":0.02}},\\\"content\\\":[{\\\"reader\\\":{\\\"name\\\":\\\"rdbmsreader\\\",\\\"parameter\\\":{\\\"username\\\":\\\"xxx\\\",\\\"password\\\":\\\"${test}\\\",\\\"column\\\":[\\\"id\\\",\\\"name\\\"],\\\"splitPk\\\":\\\"pk\\\",\\\"connection\\\":[{\\\"querySql\\\":[\\\"SELECT * from dual\\\"],\\\"jdbcUrl\\\":[\\\"jdbc:dm://ip:port/database\\\"]}],\\\"fetchSize\\\":1024,\\\"where\\\":\\\"1 = 1\\\"}},\\\"writer\\\":{\\\"name\\\":\\\"streamwriter\\\",\\\"parameter\\\":{\\\"print\\\":true}}}]}}\"}");
+
+//                    "{\"customConfig\":1,\"json\":\"{\\\"job\\\":{\\\"setting\\\":{\\\"speed\\\":{\\\"byte\\\":1048576},\\\"errorLimit\\\":{\\\"record\\\":0,\\\"percentage\\\":0.02}},\\\"content\\\":[{\\\"reader\\\":{\\\"name\\\":\\\"rdbmsreader\\\",\\\"parameter\\\":{\\\"username\\\":\\\"xxx\\\",\\\"password\\\":\\\"xxx\\\",\\\"column\\\":[\\\"id\\\",\\\"name\\\"],\\\"splitPk\\\":\\\"pk\\\",\\\"connection\\\":[{\\\"querySql\\\":[\\\"SELECT * from dual\\\"],\\\"jdbcUrl\\\":[\\\"jdbc:dm://ip:port/database\\\"]}],\\\"fetchSize\\\":1024,\\\"where\\\":\\\"1 = 1\\\"}},\\\"writer\\\":{\\\"name\\\":\\\"streamwriter\\\",\\\"parameter\\\":{\\\"print\\\":true}}}]}}\"}");
+        } else {
+            props.setTaskParams(
+                    "{\"customConfig\":0,\"targetTable\":\"test\",\"postStatements\":[],\"jobSpeedByte\":1024,\"jobSpeedRecord\":1000,\"dtType\":\"MYSQL\",\"datasource\":1,\"dsType\":\"MYSQL\",\"datatarget\":2,\"jobSpeedByte\":0,\"sql\":\"select 1 as test from dual\",\"preStatements\":[\"delete from test\"],\"postStatements\":[\"delete from test\"]}");
+
+        }
+
+        dataxTask = PowerMockito.spy(new DataxTask(props, logger));
+        dataxTask.init();
+    }
+
     private DataSource getDataSource() {
         DataSource dataSource = new DataSource();
         dataSource.setType(DbType.MYSQL);
@@ -102,7 +119,7 @@ public class DataxTaskTest {
 
     private ProcessInstance getProcessInstance() {
         ProcessInstance processInstance = new ProcessInstance();
-        processInstance.setCommandType(CommandType.START_PROCESS);
+        processInstance.setCommandType(START_PROCESS);
         processInstance.setScheduleTime(new Date());
         return processInstance;
     }
@@ -229,18 +246,24 @@ public class DataxTaskTest {
      */
     @Test
     public void testBuildDataxJsonFile()
-        throws Exception {
+            throws Exception {
         try {
-            Method method = DataxTask.class.getDeclaredMethod("buildDataxJsonFile");
-            method.setAccessible(true);
-            String filePath = (String) method.invoke(dataxTask, null);
-            Assert.assertNotNull(filePath);
-        }
-        catch (Exception e) {
+            setTaskParems(1);
+            buildDataJson();
+            setTaskParems(0);
+            buildDataJson();
+        } catch (Exception e) {
             Assert.fail(e.getMessage());
         }
     }
 
+    public void buildDataJson() throws Exception {
+        Method method = DataxTask.class.getDeclaredMethod("buildDataxJsonFile");
+        method.setAccessible(true);
+        String filePath = (String) method.invoke(dataxTask, null);
+        Assert.assertNotNull(filePath);
+    }
+
     /**
      * Method: buildDataxJobContentJson()
      */

dolphinscheduler-service/pom.xml

@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/QuartzExecutors.java

@@ -70,9 +70,10 @@ public class QuartzExecutors {
       synchronized (QuartzExecutors.class) {
         // when more than two threads run into the first null check same time, to avoid instanced more than one time, it needs to be checked again.
         if (INSTANCE == null) {
-          INSTANCE = new QuartzExecutors();
+          QuartzExecutors quartzExecutors = new QuartzExecutors();
           //finish QuartzExecutors init
-          INSTANCE.init();
+          quartzExecutors.init();
+          INSTANCE = quartzExecutors;
         }
       }
     }

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue/TaskQueueZkImpl.java

@@ -18,6 +18,7 @@ package org.apache.dolphinscheduler.service.queue;
 
 
 import org.apache.dolphinscheduler.common.Constants;
+import org.apache.dolphinscheduler.common.utils.CollectionUtils;
 import org.apache.dolphinscheduler.common.utils.IpUtils;
 import org.apache.dolphinscheduler.common.utils.OSUtils;
 import org.apache.dolphinscheduler.service.zk.ZookeeperOperator;
@@ -67,8 +68,7 @@ public class TaskQueueZkImpl implements ITaskQueue {
     @Override
     public List<String> getAllTasks(String key) {
         try {
-            List<String> list = zookeeperOperator.getChildrenKeys(getTasksPath(key));
-            return list;
+            return zookeeperOperator.getChildrenKeys(getTasksPath(key));
         } catch (Exception e) {
             logger.error("get all tasks from tasks queue exception",e);
         }
@@ -141,7 +141,7 @@ public class TaskQueueZkImpl implements ITaskQueue {
         try{
             List<String> list = zookeeperOperator.getChildrenKeys(getTasksPath(key));
 
-            if(list != null && list.size() > 0){
+            if(CollectionUtils.isNotEmpty(list)){
 
                 String workerIp = OSUtils.getHost();
                 String workerIpLongStr = String.valueOf(IpUtils.ipToLong(workerIp));

dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/queue/TaskQueueZKImplTest.java

@@ -58,11 +58,11 @@ public class TaskQueueZKImplTest extends BaseTaskQueueTest  {
         init();
         // get all
         List<String> allTasks = tasksQueue.getAllTasks(Constants.DOLPHINSCHEDULER_TASKS_QUEUE);
-        assertEquals(allTasks.size(),2);
+        assertEquals(2, allTasks.size());
         //delete all
         tasksQueue.delete();
         allTasks = tasksQueue.getAllTasks(Constants.DOLPHINSCHEDULER_TASKS_QUEUE);
-        assertEquals(allTasks.size(),0);
+        assertEquals(0, allTasks.size());
     }
     @Test
     public void hasTask(){
@@ -126,10 +126,10 @@ public class TaskQueueZKImplTest extends BaseTaskQueueTest  {
         //add
         init();
         List<String> taskList = tasksQueue.poll(Constants.DOLPHINSCHEDULER_TASKS_QUEUE, 2);
-        assertEquals(taskList.size(),2);
+        assertEquals(2, taskList.size());
 
-        assertEquals(taskList.get(0),"0_1_1_1_-1");
-        assertEquals(taskList.get(1),"1_0_1_1_-1");
+        assertEquals("0_1_1_1_-1", taskList.get(0));
+        assertEquals("1_0_1_1_-1", taskList.get(1));
     }
 
     /**
@@ -153,7 +153,7 @@ public class TaskQueueZKImplTest extends BaseTaskQueueTest  {
         String task = "1_0_1_1_-1";
         tasksQueue.sadd(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,task);
         //check size
-        assertEquals(tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size(),1);
+        assertEquals(1, tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size());
     }
 
 
@@ -166,10 +166,10 @@ public class TaskQueueZKImplTest extends BaseTaskQueueTest  {
         String task = "1_0_1_1_-1";
         tasksQueue.sadd(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,task);
         //check size
-        assertEquals(tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size(),1);
+        assertEquals(1, tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size());
         //remove and get size
         tasksQueue.srem(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,task);
-        assertEquals(tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size(),0);
+        assertEquals(0, tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size());
     }
 
     /**
@@ -179,17 +179,17 @@ public class TaskQueueZKImplTest extends BaseTaskQueueTest  {
     public void smembers(){
 
         //first init
-        assertEquals(tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size(),0);
+        assertEquals(0, tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size());
         //add
         String task = "1_0_1_1_-1";
         tasksQueue.sadd(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,task);
         //check size
-        assertEquals(tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size(),1);
+        assertEquals(1, tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size());
         //add
         task = "0_1_1_1_";
         tasksQueue.sadd(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,task);
         //check size
-        assertEquals(tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size(),2);
+        assertEquals(2, tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size());
     }
 
 
@@ -222,7 +222,7 @@ public class TaskQueueZKImplTest extends BaseTaskQueueTest  {
         }
 
         String node1 = tasksQueue.poll(Constants.DOLPHINSCHEDULER_TASKS_QUEUE, 1).get(0);
-        assertEquals(node1,"0");
+        assertEquals("0", node1);
 
     }
 

dolphinscheduler-ui/package.json

@@ -26,6 +26,7 @@
     "js-cookie": "^2.2.1",
     "jsplumb": "^2.8.6",
     "lodash": "^4.17.11",
+    "normalize.css": "^8.0.1",
     "vue": "^2.5.17",
     "vue-router": "2.7.0",
     "vuex": "^3.0.0",

dolphinscheduler-ui/src/js/conf/home/index.js

@@ -31,6 +31,7 @@ import Permissions from '@/module/permissions'
 import 'ans-ui/lib/ans-ui.min.css'
 import ans from 'ans-ui/lib/ans-ui.min'
 import en_US from 'ans-ui/lib/locale/en' // eslint-disable-line
+import'normalize.css/normalize.css'
 import 'sass/conf/home/index.scss'
 import'bootstrap/dist/css/bootstrap.min.css'
 

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss

@@ -135,7 +135,7 @@
         width: 36px;
         height: 36px;
         float: left;
-        margin-bottom: 11px;
+        margin-bottom: 8px;
         border-radius: 3px;
         .disabled {
           .icos {

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue

@@ -326,45 +326,62 @@
        * Storage interface
        */
       _save (sourceType) {
-        return new Promise((resolve, reject) => {
-          this.spinnerLoading = true
-          // Storage store
-          Dag.saveStore().then(res => {
-            if (this.urlParam.id) {
-              /**
-               * Edit
-               * @param saveInstanceEditDAGChart => Process instance editing
-               * @param saveEditDAGChart => Process definition editing
-               */
-              this[this.type === 'instance' ? 'updateInstance' : 'updateDefinition'](this.urlParam.id).then(res => {
-                this.$message.success(res.msg)
-                this.spinnerLoading = false
-                resolve()
-              }).catch(e => {
-                this.$message.error(e.msg || '')
-                this.spinnerLoading = false
-                reject(e)
-              })
-            } else {
-              // New
-              this.saveDAGchart().then(res => {
-                this.$message.success(res.msg)
-                this.spinnerLoading = false
-                // source @/conf/home/pages/dag/_source/editAffirmModel/index.js
-                if (sourceType !== 'affirm') {
-                  // Jump process definition
-                  this.$router.push({ name: 'projects-definition-list' })
-                }
-                resolve()
-              }).catch(e => {
-                this.$message.error(e.msg || '')
-                this.setName('')
-                this.spinnerLoading = false
-                reject(e)
-              })
-            }
+        if(this._verifConditions()) {
+          return new Promise((resolve, reject) => {
+            this.spinnerLoading = true
+            // Storage store
+            Dag.saveStore().then(res => {
+              if (this.urlParam.id) {
+                /**
+                 * Edit
+                 * @param saveInstanceEditDAGChart => Process instance editing
+                 * @param saveEditDAGChart => Process definition editing
+                 */
+                this[this.type === 'instance' ? 'updateInstance' : 'updateDefinition'](this.urlParam.id).then(res => {
+                  this.$message.success(res.msg)
+                  this.spinnerLoading = false
+                  resolve()
+                }).catch(e => {
+                  this.$message.error(e.msg || '')
+                  this.spinnerLoading = false
+                  reject(e)
+                })
+              } else {
+                // New
+                this.saveDAGchart().then(res => {
+                  this.$message.success(res.msg)
+                  this.spinnerLoading = false
+                  // source @/conf/home/pages/dag/_source/editAffirmModel/index.js
+                  if (sourceType !== 'affirm') {
+                    // Jump process definition
+                    this.$router.push({ name: 'projects-definition-list' })
+                  }
+                  resolve()
+                }).catch(e => {
+                  this.$message.error(e.msg || '')
+                  this.setName('')
+                  this.spinnerLoading = false
+                  reject(e)
+                })
+              }
+            })
           })
+        }
+      },
+      _verifConditions () {
+        let tasks = this.$store.state.dag.tasks
+        let bool = true
+        tasks.map(v=>{
+          if(v.type == 'CONDITIONS' && (v.conditionResult.successNode[0] =='' || v.conditionResult.successNode[0] == null || v.conditionResult.failedNode[0] =='' || v.conditionResult.failedNode[0] == null)) {
+            bool = false
+            return false
+          }
         })
+        if(!bool) {
+          this.$message.warning(`${i18n.$t('Successful branch flow and failed branch flow are required')}`)
+          return false
+        }
+        return true
       },
       /**
        * Global parameter

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

@@ -430,7 +430,7 @@
        * return params
        */
       _onParams (o) {
-        this.params = Object.assign(this.params, {}, o)
+        this.params = Object.assign({}, o)
       },
 
       _onCacheParams (o) {
@@ -470,7 +470,7 @@
           this.$message.warning(`${i18n.$t('Please enter name (required)')}`)
           return false
         }
-        if (this.successBranch !='' && this.successBranch == this.failedBranch) {
+        if (this.successBranch !='' && this.successBranch !=null && this.successBranch == this.failedBranch) {
           this.$message.warning(`${i18n.$t('Cannot select the same node for successful branch flow and failed branch flow')}`)
           return false
         }

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue

@@ -128,10 +128,6 @@
             this.store.dispatch('dag/getProcessTasksList', { processDefinitionId: ids }).then(res => {
               resolve(['ALL'].concat(_.map(res, v => v.name)))
             })
-          } else {
-            this.store.dispatch('dag/getTaskListDefIdAll', { processDefinitionIdList: ids }).then(res => {
-              resolve(res)
-            })
           }
         })
       },

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue

@@ -17,90 +17,127 @@
 <template>
   <div class="datax-model">
     <m-list-box>
-      <div slot="text">{{$t('Datasource')}}</div>
+      <div slot="text">{{$t('Custom template')}}</div>
       <div slot="content">
-        <m-datasource
-                ref="refDs"
-                @on-dsData="_onDsData"
-                :supportType="['MYSQL','POSTGRESQL', 'ORACLE', 'SQLSERVER']"
-                :data="{ type:dsType,datasource:datasource }">
-        </m-datasource>
+        <label class="label-box">
+          <div style="padding-top: 5px;">
+            <x-switch v-model="enable" @on-click="_onSwitch" :disabled="isDetails"></x-switch>
+          </div>
+        </label>
       </div>
     </m-list-box>
-    <m-list-box>
-      <div slot="text">{{$t('SQL Statement')}}</div>
-      <div slot="content">
-        <div class="from-mirror">
-          <textarea
-            id="code-sql-mirror"
-            name="code-sql-mirror"
-            style="opacity: 0;">
-          </textarea>
+    <div v-if="!enable">
+      <m-list-box>
+        <div slot="text">{{$t('Datasource')}}</div>
+        <div slot="content">
+          <m-datasource
+                  ref="refDs"
+                  @on-dsData="_onDsData"
+                  :supportType="['MYSQL','POSTGRESQL', 'ORACLE', 'SQLSERVER']"
+                  :data="{ type:dsType,datasource:datasource }">
+          </m-datasource>
         </div>
-      </div>
-    </m-list-box>
-    <m-list-box>
-      <div slot="text">{{$t('TargetDataBase')}}</div>
-      <div slot="content">
-        <m-datasource
-                ref="refDt"
-                @on-dsData="_onDtData"
-                :supportType="['MYSQL','POSTGRESQL', 'ORACLE', 'SQLSERVER']"
-                :data="{ type:dtType,datasource:datatarget }">
-        </m-datasource>
-      </div>
-    </m-list-box>
-    <m-list-box>
-      <div slot="text">{{$t('TargetTable')}}</div>
-      <div slot="content">
-        <x-input
-          type="input"
-          v-model="targetTable"
-          :placeholder="$t('Please enter the table of target')"
-          autocomplete="off">
-        </x-input>
-      </div>
-    </m-list-box>
-    <m-list-box>
-      <div slot="text">{{$t('TargetDataBase')}}{{$t('Pre Statement')}}</div>
-      <div slot="content">
-        <m-statement-list
-          ref="refPreStatements"
-          @on-statement-list="_onPreStatements"
-          :statement-list="preStatements">
-        </m-statement-list>
-      </div>
-    </m-list-box>
-    <m-list-box>
-      <div slot="text">{{$t('TargetDataBase')}}{{$t('Post Statement')}}</div>
-      <div slot="content">
-        <m-statement-list
-          ref="refPostStatements"
-          @on-statement-list="_onPostStatements"
-          :statement-list="postStatements">
-        </m-statement-list>
-      </div>
-    </m-list-box>
-    <m-list-box>
-      <div slot="text">
-        <span>{{$t('SpeedByte')}}</span>
-      </div>
-      <div slot="content">
-        <m-select-input v-model="jobSpeedByte" :list="[0,1,10,50,100,512]">
-        </m-select-input>
-        <span>({{$t('0 means unlimited by byte')}})</span>
-      </div>
-    </m-list-box>
-    <m-list-box>
-      <div slot="text">
-        <span>{{$t('SpeedRecord')}}</span>
-      </div>
-      <div slot="content">
-        <m-select-input v-model="jobSpeedRecord" :list="[0,500,1000,1500,2000,2500,3000]">
-        </m-select-input>
-        <span>({{$t('0 means unlimited by count')}})</span>
-      </div>
-    </m-list-box>
+      </m-list-box>
+      <m-list-box>
+        <div slot="text">{{$t('SQL Statement')}}</div>
+        <div slot="content">
+          <div class="from-mirror">
+            <textarea
+              id="code-sql-mirror"
+              name="code-sql-mirror"
+              style="opacity: 0;">
+            </textarea>
+          </div>
+        </div>
+      </m-list-box>
+      <m-list-box>
+        <div slot="text">{{$t('TargetDataBase')}}</div>
+        <div slot="content">
+          <m-datasource
+                  ref="refDt"
+                  @on-dsData="_onDtData"
+                  :supportType="['MYSQL','POSTGRESQL', 'ORACLE', 'SQLSERVER']"
+                  :data="{ type:dtType,datasource:datatarget }">
+          </m-datasource>
+        </div>
+      </m-list-box>
+      <m-list-box>
+        <div slot="text">{{$t('TargetTable')}}</div>
+        <div slot="content">
+          <x-input
+            type="input"
+            v-model="targetTable"
+            :placeholder="$t('Please enter the table of target')"
+            autocomplete="off">
+          </x-input>
+        </div>
+      </m-list-box>
+      <m-list-box>
+        <div slot="text">{{$t('TargetDataBase')}}{{$t('Pre Statement')}}</div>
+        <div slot="content">
+          <m-statement-list
+            ref="refPreStatements"
+            @on-statement-list="_onPreStatements"
+            :statement-list="preStatements">
+          </m-statement-list>
+        </div>
+      </m-list-box>
+      <m-list-box>
+        <div slot="text">{{$t('TargetDataBase')}}{{$t('Post Statement')}}</div>
+        <div slot="content">
+          <m-statement-list
+            ref="refPostStatements"
+            @on-statement-list="_onPostStatements"
+            :statement-list="postStatements">
+          </m-statement-list>
+        </div>
+      </m-list-box>
+      <m-list-box>
+        <div slot="text">
+          <span>{{$t('SpeedByte')}}</span>
+        </div>
+        <div slot="content">
+          <m-select-input v-model="jobSpeedByte" :list="[0,1,10,50,100,512]">
+          </m-select-input>
+          <span>({{$t('0 means unlimited by byte')}})</span>
+        </div>
+      </m-list-box>
+      <m-list-box>
+        <div slot="text">
+          <span>{{$t('SpeedRecord')}}</span>
+        </div>
+        <div slot="content">
+          <m-select-input v-model="jobSpeedRecord" :list="[0,500,1000,1500,2000,2500,3000]">
+          </m-select-input>
+          <span>({{$t('0 means unlimited by count')}})</span>
+        </div>
+      </m-list-box>
+    </div>
+    <div v-else>
+      <m-list-box>
+        <div slot="text">json</div>
+        <div slot="content">
+          <div class="from-mirror">
+            <textarea
+              id="code-json-mirror"
+              name="code-json-mirror"
+              style="opacity: 0;">
+            </textarea>
+          </div>
+        </div>
+      </m-list-box>
+      <m-list-box>
+        <div slot="text">{{$t('Custom Parameters')}}</div>
+        <div slot="content">
+          <m-local-params
+                  ref="refLocalParams"
+                  @on-local-params="_onLocalParams"
+                  :udp-list="localParams"
+                  :hide="false">
+          </m-local-params>
+        </div>
+      </m-list-box>
+    </div>
   </div>
 </template>
 <script>
@@ -115,12 +152,15 @@
   import codemirror from '@/conf/home/pages/resource/pages/file/pages/_source/codemirror'
 
   let editor
+  let jsonEditor
 
   export default {
     name: 'datax',
 
     data () {
       return {
+        // Data Custom template
+        enable: false,
         // Data source type
         dsType: '',
         // data source
@@ -135,6 +175,7 @@
         rtDatatarget: '',
         // Sql statement
         sql: '',
+        json: '',
         // target table
         targetTable: '',
         // Pre statements
@@ -145,6 +186,9 @@
         jobSpeedByte: 0,
         // speed record
         jobSpeedRecord: 1000,
+        // Custom parameter
+        localParams: [],
+        customConfig: 0,
       }
     },
     mixins: [disabledState],
@@ -153,6 +197,19 @@
       createNodeId: Number
     },
     methods: {
+      _onSwitch (is) {
+        if(is) {
+          this.customConfig = 1
+          setTimeout(() => {
+            this._handlerJsonEditor()
+          }, 200)
+        } else {
+          this.customConfig = 0
+          setTimeout(() => {
+            this._handlerEditor()
+          }, 200)
+        }
+      },
       /**
        * return data source
        */
@@ -183,50 +240,66 @@
        * verification
        */
       _verification () {
-        if (!editor.getValue()) {
-          this.$message.warning(`${i18n.$t('Please enter a SQL Statement(required)')}`)
-          return false
-        }
+        if(this.customConfig) {
+          if (!jsonEditor.getValue()) {
+            this.$message.warning(`${i18n.$t('Please enter a JSON Statement(required)')}`)
+            return false
+          }
 
-        // datasource Subcomponent verification
-        if (!this.$refs.refDs._verifDatasource()) {
-          return false
-        }
+          // storage
+          this.$emit('on-params', {
+            customConfig: this.customConfig,
+            json: jsonEditor.getValue(),
+            localParams: this.localParams
+          })
+          return true
+        } else {
+          if (!editor.getValue()) {
+            this.$message.warning(`${i18n.$t('Please enter a SQL Statement(required)')}`)
+            return false
+          }
 
-        // datasource Subcomponent verification
-        if (!this.$refs.refDt._verifDatasource()) {
-          return false
-        }
+          // datasource Subcomponent verification
+          if (!this.$refs.refDs._verifDatasource()) {
+            return false
+          }
 
-        if (!this.targetTable) {
-          this.$message.warning(`${i18n.$t('Please enter a Target Table(required)')}`)
-          return false
-        }
+          // datasource Subcomponent verification
+          if (!this.$refs.refDt._verifDatasource()) {
+            return false
+          }
 
-        // preStatements Subcomponent verification
-        if (!this.$refs.refPreStatements._verifProp()) {
-          return false
-        }
+          if (!this.targetTable) {
+            this.$message.warning(`${i18n.$t('Please enter a Target Table(required)')}`)
+            return false
+          }
 
-        // postStatements Subcomponent verification
-        if (!this.$refs.refPostStatements._verifProp()) {
-          return false
-        }
+          // preStatements Subcomponent verification
+          if (!this.$refs.refPreStatements._verifProp()) {
+            return false
+          }
 
-        // storage
-        this.$emit('on-params', {
-          dsType: this.dsType,
-          dataSource: this.rtDatasource,
-          dtType: this.dtType,
-          dataTarget: this.rtDatatarget,
-          sql: editor.getValue(),
-          targetTable: this.targetTable,
-          jobSpeedByte: this.jobSpeedByte * 1024,
-          jobSpeedRecord: this.jobSpeedRecord,
-          preStatements: this.preStatements,
-          postStatements: this.postStatements
-        })
-        return true
+          // postStatements Subcomponent verification
+          if (!this.$refs.refPostStatements._verifProp()) {
+            return false
+          }
+
+          // storage
+          this.$emit('on-params', {
+            customConfig: this.customConfig,
+            dsType: this.dsType,
+            dataSource: this.rtDatasource,
+            dtType: this.dtType,
+            dataTarget: this.rtDatatarget,
+            sql: editor.getValue(),
+            targetTable: this.targetTable,
+            jobSpeedByte: this.jobSpeedByte * 1024,
+            jobSpeedRecord: this.jobSpeedRecord,
+            preStatements: this.preStatements,
+            postStatements: this.postStatements
+          })
+          return true
+        }
       },
       /**
        * Processing code highlighting
@@ -259,6 +332,34 @@
 
         return editor
       },
+      _handlerJsonEditor () {
+        this._destroyJsonEditor()
+
+        // jsonEditor
+        jsonEditor = codemirror('code-json-mirror', {
+          mode: 'json',
+          readOnly: this.isDetails
+        })
+
+        this.keypress = () => {
+          if (!jsonEditor.getOption('readOnly')) {
+            jsonEditor.showHint({
+              completeSingle: false
+            })
+          }
+        }
+
+        // Monitor keyboard
+        jsonEditor.on('keypress', this.keypress)
+
+        jsonEditor.on('changes', () => {
+          // this._cacheParams()
+        })
+
+        jsonEditor.setValue(this.json)
+
+        return jsonEditor
+      },
       _cacheParams () {
         this.$emit('on-cache-params', {
           dsType: this.dsType,
@@ -279,6 +380,13 @@
           editor.off($('.code-sql-mirror'), 'keypress', this.keypress)
           editor.off($('.code-sql-mirror'), 'changes', this.changes)
         }
+      },
+      _destroyJsonEditor () {
+         if (jsonEditor) {
+          jsonEditor.toTextArea() // Uninstall
+          jsonEditor.off($('.code-json-mirror'), 'keypress', this.keypress)
+          jsonEditor.off($('.code-json-mirror'), 'changes', this.changes)
+        }
       }
     },
     created () {
@@ -287,22 +395,37 @@
       // Non-null objects represent backfill
       if (!_.isEmpty(o)) {
         // backfill
-        this.dsType = o.params.dsType || ''
-        this.datasource = o.params.dataSource || ''
-        this.dtType = o.params.dtType || ''
-        this.datatarget = o.params.dataTarget || ''
-        this.sql = o.params.sql || ''
-        this.targetTable = o.params.targetTable || ''
-        this.jobSpeedByte = o.params.jobSpeedByte / 1024 || 0
-        this.jobSpeedRecord = o.params.jobSpeedRecord || 0
-        this.preStatements = o.params.preStatements || []
-        this.postStatements = o.params.postStatements || []
+        if(o.params.customConfig == 0) {
+          this.customConfig = 0
+          this.enable = false
+          this.dsType = o.params.dsType || ''
+          this.datasource = o.params.dataSource || ''
+          this.dtType = o.params.dtType || ''
+          this.datatarget = o.params.dataTarget || ''
+          this.sql = o.params.sql || ''
+          this.targetTable = o.params.targetTable || ''
+          this.jobSpeedByte = o.params.jobSpeedByte / 1024 || 0
+          this.jobSpeedRecord = o.params.jobSpeedRecord || 0
+          this.preStatements = o.params.preStatements || []
+          this.postStatements = o.params.postStatements || []
+        } else {
+          this.customConfig = 1
+          this.enable = true
+          this.json = o.params.json || []
+          this.localParams = o.params.localParams || ''
+        }
       }
     },
     mounted () {
-      setTimeout(() => {
-        this._handlerEditor()
-      }, 200)
+      if(this.customConfig) {
+        setTimeout(() => {
+          this._handlerJsonEditor()
+        }, 200)
+      } else {
+        setTimeout(() => {
+          this._handlerEditor()
+        }, 200)
+      }
     },
     destroyed () {
       /**
@@ -312,6 +435,10 @@
         editor.toTextArea() // Uninstall
         editor.off($('.code-sql-mirror'), 'keypress', this.keypress)
       }
+      if (jsonEditor) {
+        jsonEditor.toTextArea() // Uninstall
+        jsonEditor.off($('.code-json-mirror'), 'keypress', this.keypress)
+      }
     },
     watch: {
       //Watch the cacheParams

dolphinscheduler-ui/src/js/module/components/transfer/resource.vue

@@ -20,8 +20,8 @@
       <div class="clearfix transfer-model" style="width: 660px">
         <div>
             <x-button-group v-model="checkedValue" size="small">
-                <x-button type="ghost" value="fileResource" @click="_ckFile">{{$t('File resources')}}</x-button>
-                <x-button type="ghost" value="udfResource" @click="_ckUDf">{{$t('UDF resources')}}</x-button>
+              <x-button type="ghost" value="fileResource" @click="_ckFile">{{$t('File resources')}}</x-button>
+              <x-button type="ghost" value="udfResource" @click="_ckUDf">{{$t('UDF resources')}}</x-button>
             </x-button-group>
         </div>
         <div class="select-list-box">

dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

@@ -90,6 +90,7 @@ export default {
   'Please enter other parameters': 'Please enter other parameters',
   'Resources': 'Resources',
   'Custom Parameters': 'Custom Parameters',
+  'Custom template': 'Custom template',
   'Datasource': 'Datasource',
   'methods': 'methods',
   'Please enter method(optional)': 'Please enter method(optional)',
@@ -119,6 +120,7 @@ export default {
   'SQL Statement': 'SQL Statement',
   'UDF Function': 'UDF Function',
   'Please enter a SQL Statement(required)': 'Please enter a SQL Statement(required)',
+  'Please enter a JSON Statement(required)': 'Please enter a JSON Statement(required)',
   'One form or attachment must be selected': 'One form or attachment must be selected',
   'Recipient required': 'Recipient required',
   'Mail subject required': 'Mail subject required',
@@ -568,5 +570,6 @@ export default {
   'All Columns': 'All Columns',
   'Some Columns': 'Some Columns',
   'Branch flow': 'Branch flow',
-  'Cannot select the same node for successful branch flow and failed branch flow': 'Cannot select the same node for successful branch flow and failed branch flow'
+  'Cannot select the same node for successful branch flow and failed branch flow': 'Cannot select the same node for successful branch flow and failed branch flow',
+  'Successful branch flow and failed branch flow are required': 'Successful branch flow and failed branch flow are required'
 }

dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

@@ -90,6 +90,7 @@ export default {
   'Please enter other parameters': '请输入其他参数',
   'Resources': '资源',
   'Custom Parameters': '自定义参数',
+  'Custom template': '自定义模版',
   'Please enter main class': '请填写主函数的class',
   'Datasource': '数据源',
   'methods': '方法',
@@ -120,6 +121,7 @@ export default {
   'SQL Statement': 'sql语句',
   'UDF Function': 'UDF函数',
   'Please enter a SQL Statement(required)': '请输入sql语句(必填)',
+  'Please enter a JSON Statement(required)': '请输入json语句(必填)',
   'One form or attachment must be selected': '表格、附件必须勾选一个',
   'Recipient required': '收件人邮箱必填',
   'Mail subject required': '邮件主题必填',
@@ -568,5 +570,6 @@ export default {
   'All Columns': '全表导入',
   'Some Columns': '选择列',
   'Branch flow': '分支流转',
-  'Cannot select the same node for successful branch flow and failed branch flow': '成功分支流转和失败分支流转不能选择同一个节点'
+  'Cannot select the same node for successful branch flow and failed branch flow': '成功分支流转和失败分支流转不能选择同一个节点',
+  'Successful branch flow and failed branch flow are required': '成功分支流转和失败分支流转必填',
 }

dolphinscheduler-ui/src/lib/external/config.js

@@ -1,7 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * project external config
  */
 export default {
   // task record switch
   recordSwitch:false
-}
+}

dolphinscheduler-ui/src/lib/external/email.js

@@ -1 +1,17 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 export default ["test@analysys.com.cn"]

dolphinscheduler-ui/src/sass/common/_animation.scss

@@ -1,13 +1,20 @@
-/* stylelint-disable */
-@charset "UTF-8";
-/*!
- * animate.css -http://daneden.me/animate
- * Version - 3.7.0
- * Licensed under the MIT license - http://opensource.org/licenses/MIT
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
- * Copyright (c) 2018 Daniel Eden
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
+@charset "UTF-8";
 @-webkit-keyframes bounce {
   from,
   20%,

dolphinscheduler-ui/src/sass/common/_normalize.scss

@@ -1,303 +0,0 @@
-/* stylelint-disable */
-/*! normalize.css v8.0.0 | MIT License | github.com/necolas/normalize.css */
-/* Document
-   ========================================================================== */
-/**
- * 1. Correct the line height in all browsers.
- * 2. Prevent adjustments of font size after orientation changes in iOS.
- */
-
-html {
-  line-height: 1.15; /* 1 */
-  -webkit-text-size-adjust: 100%; /* 2 */
-}
-/* Sections
-   ========================================================================== */
-/**
- * Remove the margin in all browsers.
- */
-
-body {
-  margin: 0;
-}
-/**
- * Correct the font size and margin on `h1` elements within `section` and
- * `article` contexts in Chrome, Firefox, and Safari.
- */
-
-h1 {
-  font-size: 2em;
-  margin: .67em 0;
-}
-/* Grouping content
-   ========================================================================== */
-/**
- * 1. Add the correct box sizing in Firefox.
- * 2. Show the overflow in Edge and IE.
- */
-
-hr {
-  box-sizing: content-box; /* 1 */
-  height: 0; /* 1 */
-  overflow: visible; /* 2 */
-}
-/**
- * 1. Correct the inheritance and scaling of font size in all browsers.
- * 2. Correct the odd `em` font sizing in all browsers.
- */
-
-pre {
-  font-family: monospace, monospace; /* 1 */
-  font-size: 1em; /* 2 */
-}
-/* Text-level semantics
-   ========================================================================== */
-/**
- * Remove the gray background on active links in IE 10.
- */
-
-a {
-  background-color: transparent;
-}
-/**
- * 1. Remove the bottom border in Chrome 57-
- * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
- */
-
-abbr[title] {
-  border-bottom: none; /* 1 */
-  text-decoration: underline; /* 2 */
-  text-decoration: underline dotted; /* 2 */
-}
-/**
- * Add the correct font weight in Chrome, Edge, and Safari.
- */
-
-b,
-strong {
-  font-weight: bolder;
-}
-/**
- * 1. Correct the inheritance and scaling of font size in all browsers.
- * 2. Correct the odd `em` font sizing in all browsers.
- */
-
-code,
-kbd,
-samp {
-  font-family: monospace, monospace; /* 1 */
-  font-size: 1em; /* 2 */
-}
-/**
- * Add the correct font size in all browsers.
- */
-
-small {
-  font-size: 80%;
-}
-/**
- * Prevent `sub` and `sup` elements from affecting the line height in
- * all browsers.
- */
-
-sub,
-sup {
-  font-size: 75%;
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline;
-}
-
-sub {
-  bottom: -.25em;
-}
-
-sup {
-  top: -.5em;
-}
-/* Embedded content
-   ========================================================================== */
-/**
- * Remove the border on images inside links in IE 10.
- */
-
-img {
-  border-style: none;
-}
-/* Forms
-   ========================================================================== */
-/**
- * 1. Change the font styles in all browsers.
- * 2. Remove the margin in Firefox and Safari.
- */
-
-button,
-input,
-optgroup,
-select,
-textarea {
-  font-family: inherit; /* 1 */
-  font-size: 100%; /* 1 */
-  line-height: 1.15; /* 1 */
-  margin: 0; /* 2 */
-}
-/**
- * Show the overflow in IE.
- * 1. Show the overflow in Edge.
- */
-
-button,
-input { /* 1 */
-  overflow: visible;
-}
-/**
- * Remove the inheritance of text transform in Edge, Firefox, and IE.
- * 1. Remove the inheritance of text transform in Firefox.
- */
-
-button,
-select { /* 1 */
-  text-transform: none;
-}
-/**
- * Correct the inability to style clickable types in iOS and Safari.
- */
-
-button,
-[type="button"],
-[type="reset"],
-[type="submit"] {
-  -webkit-appearance: button;
-}
-/**
- * Remove the inner border and padding in Firefox.
- */
-
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0;
-}
-/**
- * Restore the focus styles unset by the previous rule.
- */
-
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText;
-}
-/**
- * Correct the padding in Firefox.
- */
-
-fieldset {
-  padding: .35em .75em .625em;
-}
-/**
- * 1. Correct the text wrapping in Edge and IE.
- * 2. Correct the color inheritance from `fieldset` elements in IE.
- * 3. Remove the padding so developers are not caught out when they zero out
- *    `fieldset` elements in all browsers.
- */
-
-legend {
-  box-sizing: border-box; /* 1 */
-  color: inherit; /* 2 */
-  display: table; /* 1 */
-  max-width: 100%; /* 1 */
-  padding: 0; /* 3 */
-  white-space: normal; /* 1 */
-}
-/**
- * Add the correct vertical alignment in Chrome, Firefox, and Opera.
- */
-
-progress {
-  vertical-align: baseline;
-}
-/**
- * Remove the default vertical scrollbar in IE 10+.
- */
-
-textarea {
-  overflow: auto;
-}
-/**
- * 1. Add the correct box sizing in IE 10.
- * 2. Remove the padding in IE 10.
- */
-
-[type="checkbox"],
-[type="radio"] {
-  box-sizing: border-box; /* 1 */
-  padding: 0; /* 2 */
-}
-/**
- * Correct the cursor style of increment and decrement buttons in Chrome.
- */
-
-[type="number"]::-webkit-inner-spin-button,
-[type="number"]::-webkit-outer-spin-button {
-  height: auto;
-}
-/**
- * 1. Correct the odd appearance in Chrome and Safari.
- * 2. Correct the outline style in Safari.
- */
-
-[type="search"] {
-  -webkit-appearance: textfield; /* 1 */
-  outline-offset: -2px; /* 2 */
-}
-/**
- * Remove the inner padding in Chrome and Safari on macOS.
- */
-
-[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-/**
- * 1. Correct the inability to style clickable types in iOS and Safari.
- * 2. Change font properties to `inherit` in Safari.
- */
-
-::-webkit-file-upload-button {
-  -webkit-appearance: button; /* 1 */
-  font: inherit; /* 2 */
-}
-/* Interactive
-   ========================================================================== */
-/*
- * Add the correct display in Edge, IE 10+, and Firefox.
- */
-
-details {
-  display: block;
-}
-/*
- * Add the correct display in all browsers.
- */
-
-summary {
-  display: list-item;
-}
-/* Misc
-   ========================================================================== */
-/**
- * Add the correct display in IE 10+.
- */
-
-template {
-  display: none;
-}
-/**
- * Add the correct display in IE 10.
- */
-
-[hidden] {
-  display: none;
-}

dolphinscheduler-ui/src/sass/common/index.scss

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-@import "normalize";
 @import "mixin";
 @import "animation";
 @import "scrollbar";

e2e/pom.xml

@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

e2e/src/main/java/org/apache/dolphinscheduler/constant/TestConstant.java

@@ -20,18 +20,16 @@ public class TestConstant {
     /**
      * 1000
      */
-    public static final int ONE_THOUSANG = 1000;
-
-
+    public static final int ONE_THOUSAND = 1000;
 
     /**
      * 3000
      */
-    public static final int THREE_THOUSANG = 3000;
+    public static final int THREE_THOUSAND = 3000;
 
     /**
      * 10000
      */
-    public static final int TEN_THOUSANG = 10000;
+    public static final int TEN_THOUSAND = 10000;
 
 }

e2e/src/main/java/org/apache/dolphinscheduler/util/RedisUtil.java

@@ -115,9 +115,9 @@ public class RedisUtil {
         try {
             System.out.println("redis init");
             if (redisPwd.isEmpty())
-                jedisPool = new JedisPool(jedisPoolConfig, redisIp, redisPort, TestConstant.THREE_THOUSANG);
+                jedisPool = new JedisPool(jedisPoolConfig, redisIp, redisPort, TestConstant.THREE_THOUSAND);
             else {
-                jedisPool = new JedisPool(jedisPoolConfig, redisIp, redisPort, TestConstant.TEN_THOUSANG, redisPwd);
+                jedisPool = new JedisPool(jedisPoolConfig, redisIp, redisPort, TestConstant.TEN_THOUSAND, redisPwd);
             }
         } catch (Exception e) {
             e.printStackTrace();