From a7ddfac360091cab4f6e6e3103327ad365954b37 Mon Sep 17 00:00:00 2001
From: lgcareer <18610854716@163.com>
Date: Wed, 27 Nov 2019 14:36:13 +0800
Subject: [PATCH] modify annotation and enum desc (#1342)

* rename from DatasourceUserMapper to DataSourceUserMapper

* add unit test in UserMapper and WorkerGroupMapper

* change cn.escheduler to org.apache.dolphinscheduler

* add unit test in UdfFuncMapperTest

* add unit test in UdfFuncMapperTest

* remove DatabaseConfiguration

* add ConnectionFactoryTest

* cal duration in processInstancesList

* change desc to description

* change table name in mysql ddl

* change table name in mysql ddl

* change escheduler to dolphinscheduler

* change escheduler to dolphinscheduler

* change escheduler to dolphinscheduler

* remove log4j-1.2-api and modify AlertMapperTest

* remove log4j-1.2-api

* Add alertDao to spring management

* Add alertDao to spring management

* get SqlSessionFactory from MybatisSqlSessionFactoryBean

* get processDao by DaoFactory

* read druid properties in ConneciontFactory

* read druid properties in ConneciontFactory

* change get alertDao by spring to DaoFactory

* add log4j to resolve #967

* resole verify udf name error and delete udf error

* Determine if principal is empty

* Determine whether the logon user has the right to delete the project

* Fixed an issue that produced attatch file named such as ATT00002.bin

* fix too many connection in upgrade or create

* fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail

* Added a judgment on whether the currently login user is an administrator

* fix update udf database not change and create time is changed

* add enterprise.wechat.enable to decide whether to send enterprise WeChat

* change method check

* Remove the administrator's judgment on query access token list

* only admin can create worker group

* delete alert group need delete the relation of user and alert group

* add timeout in proxy when upload large resource

* add gets scheduled times by expect fire times

* add gets scheduled times by expect fire times

* Increase the judgment of whether it is admin

* Increase the judgment of whether it is admin

* when delete access token add whether login user has perm to delete

* change mysql-connector-java scope to test

* update scm test

* add profile test

* Add method and parameters comments

* roll back

* modify annotation and enum desc
---
 .../common/enums/CommandType.java             | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
index a40024e499..d6ba6e31af 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
@@ -29,27 +29,27 @@ public enum CommandType {
      * command types
      * 0 start a new process
      * 1 start a new process from current nodes
-     * 2 recover tolerance fault work flow
-     * 3 start process from paused task nodes
+     * 2 recover tolerance fault process
+     * 3 recover suspended process
      * 4 start process from failure task nodes
      * 5 complement data
      * 6 start a new process from scheduler
-     * 7 repeat running a work flow
+     * 7 repeat running a process
      * 8 pause a process
      * 9 stop a process
      * 10 recover waiting thread
      */
     START_PROCESS(0, "start a new process"),
     START_CURRENT_TASK_PROCESS(1, "start a new process from current nodes"),
-    RECOVER_TOLERANCE_FAULT_PROCESS(2, "recover tolerance fault work flow"),
-    RECOVER_SUSPENDED_PROCESS(3, "start process from paused task nodes"),
-    START_FAILURE_TASK_PROCESS(4, "start a new process"),
+    RECOVER_TOLERANCE_FAULT_PROCESS(2, "recover tolerance fault process"),
+    RECOVER_SUSPENDED_PROCESS(3, "recover suspended process"),
+    START_FAILURE_TASK_PROCESS(4, "start process from failure task nodes"),
     COMPLEMENT_DATA(5, "complement data"),
     SCHEDULER(6, "start a new process from scheduler"),
-    REPEAT_RUNNING(7, "start a new process"),
-    PAUSE(8, "start a new process"),
-    STOP(9, "start a new process"),
-    RECOVER_WAITTING_THREAD(10, "start a new process");
+    REPEAT_RUNNING(7, "repeat running a process"),
+    PAUSE(8, "pause a process"),
+    STOP(9, "stop a process"),
+    RECOVER_WAITTING_THREAD(10, "recover waitting thread");
 
     CommandType(int code, String descp){
         this.code = code;