From 1a88b1863b9000d7e220461ed44de7c6ab9a8169 Mon Sep 17 00:00:00 2001 From: lvshaokang Date: Fri, 26 Nov 2021 14:43:23 +0800 Subject: [PATCH] [Improvement-5785][common] Fix code format (#6864) * [DS-5785][style] Fix common module code format * [DS-5785][style] Fix common module code format --- .../common/enums/AlertStatus.java | 4 +- .../common/enums/AlertType.java | 4 +- .../common/enums/AuthorizationType.java | 3 +- .../common/enums/CommandType.java | 8 +- .../common/enums/CycleEnum.java | 1 + .../common/enums/DataType.java | 1 + .../common/enums/DependResult.java | 1 + .../common/enums/DependentRelation.java | 1 + .../dolphinscheduler/common/enums/Direct.java | 1 + .../common/enums/FailureStrategy.java | 47 +- .../dolphinscheduler/common/enums/Flag.java | 1 + .../common/enums/HttpCheckCondition.java | 15 +- .../common/enums/HttpMethod.java | 17 +- .../common/enums/HttpParametersType.java | 1 + .../common/enums/NodeType.java | 1 + .../common/enums/Priority.java | 1 + .../common/enums/ProgramType.java | 2 +- .../common/enums/ReleaseState.java | 7 +- .../common/enums/ResUploadType.java | 1 + .../common/enums/RunMode.java | 3 +- .../common/enums/SparkVersion.java | 3 +- .../common/enums/SqoopJobType.java | 3 +- .../common/enums/TaskDependType.java | 43 +- .../common/enums/TaskRecordStatus.java | 2 +- .../common/enums/TaskStateType.java | 1 + .../common/enums/TaskTimeoutStrategy.java | 1 + .../common/enums/TaskType.java | 1 + .../common/enums/UdfType.java | 1 + .../common/enums/UserType.java | 4 +- .../common/enums/WarningType.java | 48 +- .../dolphinscheduler/common/graph/DAG.java | 1 + .../common/model/DateInterval.java | 16 +- .../common/model/DependentTaskModel.java | 1 + .../dolphinscheduler/common/model/Server.java | 8 +- .../common/model/TaskNodeRelation.java | 90 +-- .../common/model/WorkerServerModel.java | 2 +- .../common/process/HttpProperty.java | 186 +++--- .../common/process/ProcessDag.java | 105 ++-- .../common/process/Property.java | 218 ++++--- .../common/process/ResourceInfo.java | 1 + .../common/shell/AbstractShell.java | 582 +++++++++--------- .../common/shell/ShellExecutor.java | 9 +- .../common/task/AbstractParameters.java | 1 + .../common/task/IParameters.java | 1 + .../common/task/TaskTimeoutParameter.java | 1 + .../task/dependent/DependentParameters.java | 3 +- .../common/task/http/HttpParameters.java | 4 +- .../common/task/mr/MapReduceParameters.java | 1 - .../common/task/python/PythonParameters.java | 72 +-- .../common/task/sql/SqlBinds.java | 1 + .../common/task/sql/SqlType.java | 2 +- .../common/task/sqoop/SqoopParameters.java | 1 + .../sqoop/sources/SourceHdfsParameter.java | 1 + .../sqoop/sources/SourceHiveParameter.java | 1 + .../sqoop/sources/SourceMysqlParameter.java | 1 + .../sqoop/targets/TargetHdfsParameter.java | 1 + .../sqoop/targets/TargetHiveParameter.java | 1 + .../sqoop/targets/TargetMysqlParameter.java | 1 + .../task/subprocess/SubProcessParameters.java | 2 +- .../common/thread/Stopper.java | 27 +- .../common/thread/ThreadUtils.java | 3 +- .../common/utils/DependentUtils.java | 2 +- .../common/utils/HadoopUtils.java | 2 +- .../common/utils/OSUtils.java | 1 - .../common/utils/ScriptRunner.java | 1 + .../common/utils/TriFunction.java | 1 + 66 files changed, 803 insertions(+), 775 deletions(-) diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertStatus.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertStatus.java index 42ea05f75d..3457296737 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertStatus.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertStatus.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; @@ -29,8 +30,7 @@ public enum AlertStatus { EXECUTION_SUCCESS(1, "execute successfully"), EXECUTION_FAILURE(2, "execute failed"); - - AlertStatus(int code, String descp){ + AlertStatus(int code, String descp) { this.code = code; this.descp = descp; } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertType.java index 3c757f5337..fb16608906 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertType.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; @@ -28,8 +29,7 @@ public enum AlertType { EMAIL(0, "email"), SMS(1, "SMS"); - - AlertType(int code, String descp){ + AlertType(int code, String descp) { this.code = code; this.descp = descp; } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AuthorizationType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AuthorizationType.java index 633f5f9623..5d7934d069 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AuthorizationType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AuthorizationType.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; @@ -35,7 +36,7 @@ public enum AuthorizationType { DATASOURCE(3, "data source"), UDF(4, "udf function"); - AuthorizationType(int code, String descp){ + AuthorizationType(int code, String descp) { this.code = code; this.descp = descp; } 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 9bff968b73..35b64821af 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 @@ -14,13 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dolphinscheduler.common.enums; -import com.baomidou.mybatisplus.annotation.EnumValue; +package org.apache.dolphinscheduler.common.enums; import java.util.HashMap; import java.util.Map; +import com.baomidou.mybatisplus.annotation.EnumValue; + /** * command types */ @@ -54,7 +55,7 @@ public enum CommandType { RECOVER_SERIAL_WAIT(11, "recover serial wait"), ; - CommandType(int code, String descp){ + CommandType(int code, String descp) { this.code = code; this.descp = descp; } @@ -79,7 +80,6 @@ public enum CommandType { } } - public static CommandType of(Integer status) { if (COMMAND_TYPE_MAP.containsKey(status)) { return COMMAND_TYPE_MAP.get(status); diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CycleEnum.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CycleEnum.java index 633a3da409..7e12b9de60 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CycleEnum.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CycleEnum.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; /** diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DataType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DataType.java index 2b0930d32d..6f4e563a97 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DataType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DataType.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; /** diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependResult.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependResult.java index f906c866aa..a32626a221 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependResult.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependResult.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; /** diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependentRelation.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependentRelation.java index f84a37e4ed..ff4aef0be0 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependentRelation.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependentRelation.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; /** diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Direct.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Direct.java index 2eb9f3106c..f9a761a4e8 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Direct.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Direct.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; /** diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/FailureStrategy.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/FailureStrategy.java index c9c0c32930..7e188e1eae 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/FailureStrategy.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/FailureStrategy.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; @@ -23,27 +24,27 @@ import com.baomidou.mybatisplus.annotation.EnumValue; */ public enum FailureStrategy { - /** - * 0 ending process when some tasks failed. - * 1 continue running when some tasks failed. - **/ - END(0, "end"), - CONTINUE(1, "continue"); - - FailureStrategy(int code, String descp){ - this.code = code; - this.descp = descp; - } - - @EnumValue - private final int code; - private final String descp; - - public int getCode() { - return code; - } - - public String getDescp() { - return descp; - } + /** + * 0 ending process when some tasks failed. + * 1 continue running when some tasks failed. + **/ + END(0, "end"), + CONTINUE(1, "continue"); + + FailureStrategy(int code, String descp) { + this.code = code; + this.descp = descp; + } + + @EnumValue + private final int code; + private final String descp; + + public int getCode() { + return code; + } + + public String getDescp() { + return descp; + } } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java index fa69f2978d..83a7069142 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpCheckCondition.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpCheckCondition.java index 15d0ca4ddf..278e71e738 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpCheckCondition.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpCheckCondition.java @@ -14,17 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; /** * http check condition */ public enum HttpCheckCondition { - /** - * 0 status_code_default:200 - * 1 status_code_custom - * 2 body_contains - * 3 body_not_contains - */ - STATUS_CODE_DEFAULT,STATUS_CODE_CUSTOM, BODY_CONTAINS, BODY_NOT_CONTAINS + /** + * 0 status_code_default:200 + * 1 status_code_custom + * 2 body_contains + * 3 body_not_contains + */ + STATUS_CODE_DEFAULT,STATUS_CODE_CUSTOM, BODY_CONTAINS, BODY_NOT_CONTAINS } \ No newline at end of file diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpMethod.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpMethod.java index abceedd9f6..509fd7c147 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpMethod.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpMethod.java @@ -14,18 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; /** * http method */ public enum HttpMethod { - /** - * 0 get - * 1 post - * 2 head - * 3 put - * 4 delete - */ - GET, POST, HEAD, PUT, DELETE + /** + * 0 get + * 1 post + * 2 head + * 3 put + * 4 delete + */ + GET, POST, HEAD, PUT, DELETE } \ No newline at end of file diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpParametersType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpParametersType.java index 857ebf612d..0f7299ebe5 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpParametersType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpParametersType.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; /** diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/NodeType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/NodeType.java index cb247cf2f4..548b951a30 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/NodeType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/NodeType.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; public enum NodeType { diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java index 53ca3f9c74..1ccfb6fe4e 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ProgramType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ProgramType.java index 45e88d63c2..5064b1f394 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ProgramType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ProgramType.java @@ -14,8 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dolphinscheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * support program types diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ReleaseState.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ReleaseState.java index 51e9a3393b..e5100655e4 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ReleaseState.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ReleaseState.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; @@ -30,7 +31,7 @@ public enum ReleaseState { OFFLINE(0, "offline"), ONLINE(1, "online"); - ReleaseState(int code, String descp){ + ReleaseState(int code, String descp) { this.code = code; this.descp = descp; } @@ -39,9 +40,9 @@ public enum ReleaseState { private final int code; private final String descp; - public static ReleaseState getEnum(int value){ + public static ReleaseState getEnum(int value) { for (ReleaseState e:ReleaseState.values()) { - if(e.ordinal() == value) { + if (e.ordinal() == value) { return e; } } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ResUploadType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ResUploadType.java index 0155c1268c..35372aeff5 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ResUploadType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ResUploadType.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; /** diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/RunMode.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/RunMode.java index 44fdb5b1b6..9d231cce00 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/RunMode.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/RunMode.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; @@ -29,7 +30,7 @@ public enum RunMode { RUN_MODE_SERIAL(0, "serial run"), RUN_MODE_PARALLEL(1, "parallel run"); - RunMode(int code, String descp){ + RunMode(int code, String descp) { this.code = code; this.descp = descp; } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SparkVersion.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SparkVersion.java index 867d063a64..ba5bcdd511 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SparkVersion.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SparkVersion.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; @@ -27,7 +28,7 @@ public enum SparkVersion { SPARK1(0, "SPARK1"), SPARK2(1, "SPARK2"); - SparkVersion(int code, String descp){ + SparkVersion(int code, String descp) { this.code = code; this.descp = descp; } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SqoopJobType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SqoopJobType.java index f1fde27928..2f69f060cc 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SqoopJobType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SqoopJobType.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; @@ -22,7 +23,7 @@ public enum SqoopJobType { CUSTOM(0, "CUSTOM"), TEMPLATE(1, "TEMPLATE"); - SqoopJobType(int code, String descp){ + SqoopJobType(int code, String descp) { this.code = code; this.descp = descp; } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskDependType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskDependType.java index 401fecf3ea..0301947564 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskDependType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskDependType.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; @@ -22,29 +23,29 @@ import com.baomidou.mybatisplus.annotation.EnumValue; * task node depend type */ public enum TaskDependType { - /** - * 0 run current tasks only - * 1 run current tasks and previous tasks - * 2 run current tasks and the other tasks that depend on current tasks; - */ - TASK_ONLY(0, "task only"), - TASK_PRE(1, "task pre"), - TASK_POST(2, "task post"); + /** + * 0 run current tasks only + * 1 run current tasks and previous tasks + * 2 run current tasks and the other tasks that depend on current tasks; + */ + TASK_ONLY(0, "task only"), + TASK_PRE(1, "task pre"), + TASK_POST(2, "task post"); - TaskDependType(int code, String descp){ - this.code = code; - this.descp = descp; - } + TaskDependType(int code, String descp) { + this.code = code; + this.descp = descp; + } - @EnumValue - private final int code; - private final String descp; + @EnumValue + private final int code; + private final String descp; - public int getCode() { - return code; - } + public int getCode() { + return code; + } - public String getDescp() { - return descp; - } + public String getDescp() { + return descp; + } } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskRecordStatus.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskRecordStatus.java index 842fd75846..faa9d0ceab 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskRecordStatus.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskRecordStatus.java @@ -14,8 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dolphinscheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * task record status diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java index 36766a7f4d..a730fa84c3 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; /** diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskTimeoutStrategy.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskTimeoutStrategy.java index a203fd4d53..08ad60f17e 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskTimeoutStrategy.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskTimeoutStrategy.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskType.java index d5338cad4c..a6c539d72d 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskType.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UdfType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UdfType.java index 2351cca40b..211061681b 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UdfType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UdfType.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UserType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UserType.java index 75a5df6fb9..ebab5da742 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UserType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UserType.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; @@ -28,8 +29,7 @@ public enum UserType { ADMIN_USER(0, "admin user"), GENERAL_USER(1, "general user"); - - UserType(int code, String descp){ + UserType(int code, String descp) { this.code = code; this.descp = descp; } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WarningType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WarningType.java index 3a65760716..d3cbffd391 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WarningType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WarningType.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; @@ -22,32 +23,31 @@ import com.baomidou.mybatisplus.annotation.EnumValue; * types for whether to send warning when process ending; */ public enum WarningType { - /** - * 0 do not send warning; - * 1 send if process success; - * 2 send if process failed; - * 3 send if process ending; - */ - NONE(0, "none"), - SUCCESS(1, "success"), - FAILURE(2, "failure"), - ALL(3, "all"); - + /** + * 0 do not send warning; + * 1 send if process success; + * 2 send if process failed; + * 3 send if process ending; + */ + NONE(0, "none"), + SUCCESS(1, "success"), + FAILURE(2, "failure"), + ALL(3, "all"); - WarningType(int code, String descp){ - this.code = code; - this.descp = descp; - } + WarningType(int code, String descp) { + this.code = code; + this.descp = descp; + } - @EnumValue - private final int code; - private final String descp; + @EnumValue + private final int code; + private final String descp; - public int getCode() { - return code; - } + public int getCode() { + return code; + } - public String getDescp() { - return descp; - } + public String getDescp() { + return descp; + } } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/graph/DAG.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/graph/DAG.java index fe55934635..e57b3dd93e 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/graph/DAG.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/graph/DAG.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.graph; import org.apache.commons.collections4.CollectionUtils; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java index 2ff3922c18..81adcd763a 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java @@ -14,26 +14,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dolphinscheduler.common.model; -import com.fasterxml.jackson.annotation.JsonFormat; +package org.apache.dolphinscheduler.common.model; import java.util.Date; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonFormat; + /** * date interval class */ public class DateInterval { - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date startTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date endTime; - public DateInterval(Date beginTime, Date endTime){ + public DateInterval(Date beginTime, Date endTime) { this.startTime = beginTime; this.endTime = endTime; - } @Override @@ -44,8 +44,8 @@ public class DateInterval { return true; } else { DateInterval that = (DateInterval) obj; - return startTime.equals(that.startTime) && - endTime.equals(that.endTime); + return startTime.equals(that.startTime) + && endTime.equals(that.endTime); } } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DependentTaskModel.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DependentTaskModel.java index 93647bae04..eb56ee7dbe 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DependentTaskModel.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DependentTaskModel.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.model; import org.apache.dolphinscheduler.common.enums.DependentRelation; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/Server.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/Server.java index 69d718c286..d0d1394367 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/Server.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/Server.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.model; +import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import java.util.Date; - /** * server */ @@ -54,13 +54,13 @@ public class Server { /** * create time */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date createTime; /** * laster heart beat time */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date lastHeartbeatTime; public int getId() { diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNodeRelation.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNodeRelation.java index e4741574e4..7ee8322601 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNodeRelation.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNodeRelation.java @@ -14,66 +14,66 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.model; import java.util.Objects; public class TaskNodeRelation { - /** - * task start node name - */ - private String startNode; - - /** - * task end node name - */ - private String endNode; + /** + * task start node name + */ + private String startNode; - public TaskNodeRelation() { - } + /** + * task end node name + */ + private String endNode; - public TaskNodeRelation(String startNode, String endNode) { - this.startNode = startNode; - this.endNode = endNode; - } + public TaskNodeRelation() { + } - public String getStartNode() { - return startNode; - } + public TaskNodeRelation(String startNode, String endNode) { + this.startNode = startNode; + this.endNode = endNode; + } - public void setStartNode(String startNode) { - this.startNode = startNode; - } + public String getStartNode() { + return startNode; + } - public String getEndNode() { - return endNode; - } + public void setStartNode(String startNode) { + this.startNode = startNode; + } - public void setEndNode(String endNode) { - this.endNode = endNode; - } + public String getEndNode() { + return endNode; + } + public void setEndNode(String endNode) { + this.endNode = endNode; + } - @Override - public boolean equals(Object o){ - if (!(o instanceof TaskNodeRelation)) { - return false; + @Override + public boolean equals(Object o) { + if (!(o instanceof TaskNodeRelation)) { + return false; + } + TaskNodeRelation relation = (TaskNodeRelation)o; + return (relation.getStartNode().equals(this.startNode) && relation.getEndNode().equals(this.endNode)); } - TaskNodeRelation relation = (TaskNodeRelation)o; - return (relation.getStartNode().equals(this.startNode) && relation.getEndNode().equals(this.endNode)); - } - @Override - public String toString() { - return "TaskNodeRelation{" + - "startNode='" + startNode + '\'' + - ", endNode='" + endNode + '\'' + - '}'; - } + @Override + public String toString() { + return "TaskNodeRelation{" + + "startNode='" + startNode + '\'' + + ", endNode='" + endNode + '\'' + + '}'; + } - @Override - public int hashCode() { - return Objects.hash(startNode, endNode); - } + @Override + public int hashCode() { + return Objects.hash(startNode, endNode); + } } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/WorkerServerModel.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/WorkerServerModel.java index 984124b872..0c2ab2f72e 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/WorkerServerModel.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/WorkerServerModel.java @@ -14,8 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dolphinscheduler.common.model; +package org.apache.dolphinscheduler.common.model; import java.util.Date; import java.util.Set; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/HttpProperty.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/HttpProperty.java index 71a3fd9db8..ab259f4181 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/HttpProperty.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/HttpProperty.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.process; import org.apache.dolphinscheduler.common.enums.HttpParametersType; @@ -21,105 +22,102 @@ import org.apache.dolphinscheduler.common.enums.HttpParametersType; import java.util.Objects; public class HttpProperty { - /** - * key - */ - private String prop; - - /** - * httpParametersType - */ - private HttpParametersType httpParametersType; - - /** - * value - */ - private String value; - - public HttpProperty() { - } - - public HttpProperty(String prop, HttpParametersType httpParametersType, String value) { - this.prop = prop; - this.httpParametersType = httpParametersType; - this.value = value; - } - - /** - * getter method - * - * @return the prop - * @see HttpProperty#prop - */ - public String getProp() { - return prop; - } - - /** - * setter method - * - * @param prop the prop to set - * @see HttpProperty#prop - */ - public void setProp(String prop) { - this.prop = prop; - } - - /** - * getter method - * - * @return the value - * @see HttpProperty#value - */ - public String getValue() { - return value; - } - - /** - * setter method - * - * @param value the value to set - * @see HttpProperty#value - */ - public void setValue(String value) { - this.value = value; - } - - public HttpParametersType getHttpParametersType() { - return httpParametersType; - } - - public void setHttpParametersType(HttpParametersType httpParametersType) { - this.httpParametersType = httpParametersType; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; + /** + * key + */ + private String prop; + + /** + * httpParametersType + */ + private HttpParametersType httpParametersType; + + /** + * value + */ + private String value; + + public HttpProperty() { + } + + public HttpProperty(String prop, HttpParametersType httpParametersType, String value) { + this.prop = prop; + this.httpParametersType = httpParametersType; + this.value = value; } - if (o == null || getClass() != o.getClass()) { - return false; + + /** + * getter method + * + * @return the prop + * @see HttpProperty#prop + */ + public String getProp() { + return prop; } - HttpProperty property = (HttpProperty) o; - return Objects.equals(prop, property.prop) && - Objects.equals(value, property.value); - } + /** + * setter method + * + * @param prop the prop to set + * @see HttpProperty#prop + */ + public void setProp(String prop) { + this.prop = prop; + } - @Override - public int hashCode() { - return Objects.hash(prop, value); - } + /** + * getter method + * + * @return the value + * @see HttpProperty#value + */ + public String getValue() { + return value; + } - @Override - public String toString() { - return "HttpProperty{" + - "prop='" + prop + '\'' + - ", httpParametersType=" + httpParametersType + - ", value='" + value + '\'' + - '}'; - } + /** + * setter method + * + * @param value the value to set + * @see HttpProperty#value + */ + public void setValue(String value) { + this.value = value; + } + public HttpParametersType getHttpParametersType() { + return httpParametersType; + } + public void setHttpParametersType(HttpParametersType httpParametersType) { + this.httpParametersType = httpParametersType; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + HttpProperty property = (HttpProperty) o; + return Objects.equals(prop, property.prop) + && Objects.equals(value, property.value); + } + + @Override + public int hashCode() { + return Objects.hash(prop, value); + } + + @Override + public String toString() { + return "HttpProperty{" + + "prop='" + prop + '\'' + + ", httpParametersType=" + httpParametersType + + ", value='" + value + '\'' + + '}'; + } } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ProcessDag.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ProcessDag.java index 465fcbe2f6..357e4ca6b1 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ProcessDag.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ProcessDag.java @@ -14,9 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dolphinscheduler.common.process; - +package org.apache.dolphinscheduler.common.process; import org.apache.dolphinscheduler.common.model.TaskNode; import org.apache.dolphinscheduler.common.model.TaskNodeRelation; @@ -25,61 +24,61 @@ import java.util.List; public class ProcessDag { - /** - * DAG edge list - **/ - private List edges; + /** + * DAG edge list + **/ + private List edges; - /** - * DAG node list - */ - private List nodes; + /** + * DAG node list + */ + private List nodes; - /** - * getter method - * - * @return the edges - * @see ProcessDag#edges - */ - public List getEdges() { - return edges; - } + /** + * getter method + * + * @return the edges + * @see ProcessDag#edges + */ + public List getEdges() { + return edges; + } - /** - * setter method - * - * @param edges the edges to set - * @see ProcessDag#edges - */ - public void setEdges(List edges) { - this.edges = edges; - } + /** + * setter method + * + * @param edges the edges to set + * @see ProcessDag#edges + */ + public void setEdges(List edges) { + this.edges = edges; + } - /** - * getter method - * - * @return the nodes - * @see ProcessDag#nodes - */ - public List getNodes() { - return nodes; - } + /** + * getter method + * + * @return the nodes + * @see ProcessDag#nodes + */ + public List getNodes() { + return nodes; + } - /** - * setter method - * - * @param nodes the nodes to set - * @see ProcessDag#nodes - */ - public void setNodes(List nodes) { - this.nodes = nodes; - } + /** + * setter method + * + * @param nodes the nodes to set + * @see ProcessDag#nodes + */ + public void setNodes(List nodes) { + this.nodes = nodes; + } - @Override - public String toString() { - return "ProcessDag{" + - "edges=" + edges + - ", nodes=" + nodes + - '}'; - } + @Override + public String toString() { + return "ProcessDag{" + + "edges=" + edges + + ", nodes=" + nodes + + '}'; + } } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/Property.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/Property.java index 9ec9b1ae57..2f9556e578 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/Property.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/Property.java @@ -14,8 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dolphinscheduler.common.process; +package org.apache.dolphinscheduler.common.process; import org.apache.dolphinscheduler.common.enums.DataType; import org.apache.dolphinscheduler.common.enums.Direct; @@ -24,121 +24,117 @@ import java.io.Serializable; import java.util.Objects; public class Property implements Serializable { - /** - * key - */ - private String prop; - - /** - * input/output - */ - private Direct direct; - - /** - * data type - */ - private DataType type; - - /** - * value - */ - private String value; - - public Property() { - } - - public Property(String prop,Direct direct,DataType type,String value) { - this.prop = prop; - this.direct = direct; - this.type = type; - this.value = value; - } - - /** - * getter method - * - * @return the prop - * @see Property#prop - */ - public String getProp() { - return prop; - } - - /** - * setter method - * - * @param prop the prop to set - * @see Property#prop - */ - public void setProp(String prop) { - this.prop = prop; - } - - /** - * getter method - * - * @return the value - * @see Property#value - */ - public String getValue() { - return value; - } - - /** - * setter method - * - * @param value the value to set - * @see Property#value - */ - public void setValue(String value) { - this.value = value; - } - - - public Direct getDirect() { - return direct; - } - - public void setDirect(Direct direct) { - this.direct = direct; - } - - public DataType getType() { - return type; - } - - public void setType(DataType type) { - this.type = type; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; + /** + * key + */ + private String prop; + + /** + * input/output + */ + private Direct direct; + + /** + * data type + */ + private DataType type; + + /** + * value + */ + private String value; + + public Property() { + } + + public Property(String prop,Direct direct,DataType type,String value) { + this.prop = prop; + this.direct = direct; + this.type = type; + this.value = value; + } + + /** + * getter method + * + * @return the prop + * @see Property#prop + */ + public String getProp() { + return prop; + } + + /** + * setter method + * + * @param prop the prop to set + * @see Property#prop + */ + public void setProp(String prop) { + this.prop = prop; + } + + /** + * getter method + * + * @return the value + * @see Property#value + */ + public String getValue() { + return value; } - if (o == null || getClass() != o.getClass()) { - return false; + + /** + * setter method + * + * @param value the value to set + * @see Property#value + */ + public void setValue(String value) { + this.value = value; + } + + public Direct getDirect() { + return direct; + } + + public void setDirect(Direct direct) { + this.direct = direct; } - Property property = (Property) o; - return Objects.equals(prop, property.prop) && - Objects.equals(value, property.value); - } + public DataType getType() { + return type; + } - @Override - public int hashCode() { - return Objects.hash(prop, value); - } + public void setType(DataType type) { + this.type = type; + } - @Override - public String toString() { - return "Property{" + - "prop='" + prop + '\'' + - ", direct=" + direct + - ", type=" + type + - ", value='" + value + '\'' + - '}'; - } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Property property = (Property) o; + return Objects.equals(prop, property.prop) + && Objects.equals(value, property.value); + } + @Override + public int hashCode() { + return Objects.hash(prop, value); + } + @Override + public String toString() { + return "Property{" + + "prop='" + prop + '\'' + + ", direct=" + direct + + ", type=" + type + + ", value='" + value + '\'' + + '}'; + } } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ResourceInfo.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ResourceInfo.java index cacdbf5579..adc86b2f1c 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ResourceInfo.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ResourceInfo.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.process; /** diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/AbstractShell.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/AbstractShell.java index 9a24fdb407..63e43a9f78 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/AbstractShell.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/AbstractShell.java @@ -14,8 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.shell; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -27,11 +31,7 @@ import java.util.TimerTask; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -/** +/** * A base class for running a Unix command. * * AbstractShell can be used to run unix commands like du or @@ -40,318 +40,316 @@ import org.slf4j.LoggerFactory; */ public abstract class AbstractShell { - private static final Logger logger = LoggerFactory.getLogger(AbstractShell.class); + private static final Logger logger = LoggerFactory.getLogger(AbstractShell.class); - /** - * Time after which the executing script would be timedout - */ - protected long timeOutInterval = 0L; - /** - * If or not script timed out - */ - private AtomicBoolean timedOut; - - /** - * refresh interval in msec - */ - private long interval; - - /** - * last time the command was performed - */ - private long lastTime; - - /** - * env for the command execution - */ - private Map environment; - private File dir; - - /** - * sub process used to execute the command - */ - private Process process; - private int exitCode; - - /** - * If or not script finished executing - */ - private AtomicBoolean completed; - - public AbstractShell() { - this(0L); - } - - /** - * @param interval the minimum duration to wait before re-executing the - * command. - */ - public AbstractShell(long interval ) { - this.interval = interval; - this.lastTime = (interval<0) ? 0 : -interval; - } + /** + * Time after which the executing script would be timedout + */ + protected long timeOutInterval = 0L; + /** + * If or not script timed out + */ + private AtomicBoolean timedOut; + + /** + * refresh interval in msec + */ + private long interval; + + /** + * last time the command was performed + */ + private long lastTime; + /** + * env for the command execution + */ + private Map environment; + private File dir; + /** + * sub process used to execute the command + */ + private Process process; + private int exitCode; + + /** + * If or not script finished executing + */ + private AtomicBoolean completed; - /** - * set the environment for the command - * @param env Mapping of environment variables - */ - protected void setEnvironment(Map env) { - this.environment = env; - } - - /** - * set the working directory - * @param dir The directory where the command would be executed - */ - protected void setWorkingDirectory(File dir) { - this.dir = dir; - } - - /** - * check to see if a command needs to be executed and execute if needed - * @throws IOException errors - */ - protected void run() throws IOException { - if (lastTime + interval > System.currentTimeMillis()) { - return; + public AbstractShell() { + this(0L); } - // reset for next run - exitCode = 0; - runCommand(); - } - - /** - * Run a command actual work - */ - private void runCommand() throws IOException { - ProcessBuilder builder = new ProcessBuilder(getExecString()); - Timer timeOutTimer = null; - ShellTimeoutTimerTask timeoutTimerTask = null; - timedOut = new AtomicBoolean(false); - completed = new AtomicBoolean(false); - - if (environment != null) { - builder.environment().putAll(this.environment); + /** + * @param interval the minimum duration to wait before re-executing the + * command. + */ + public AbstractShell(long interval) { + this.interval = interval; + this.lastTime = (interval < 0) ? 0 : -interval; } - if (dir != null) { - builder.directory(this.dir); + + /** + * set the environment for the command + * @param env Mapping of environment variables + */ + protected void setEnvironment(Map env) { + this.environment = env; } - - process = builder.start(); - ProcessContainer.putProcess(process); - - if (timeOutInterval > 0) { - timeOutTimer = new Timer(); - timeoutTimerTask = new ShellTimeoutTimerTask( - this); - //One time scheduling. - timeOutTimer.schedule(timeoutTimerTask, timeOutInterval); + + /** + * set the working directory + * @param dir The directory where the command would be executed + */ + protected void setWorkingDirectory(File dir) { + this.dir = dir; + } + + /** + * check to see if a command needs to be executed and execute if needed + * @throws IOException errors + */ + protected void run() throws IOException { + if (lastTime + interval > System.currentTimeMillis()) { + return; + } + // reset for next run + exitCode = 0; + runCommand(); } - final BufferedReader errReader = - new BufferedReader( - new InputStreamReader(process.getErrorStream())); - BufferedReader inReader = - new BufferedReader( - new InputStreamReader(process.getInputStream())); - final StringBuilder errMsg = new StringBuilder(); - - // read error and input streams as this would free up the buffers - // free the error stream buffer - Thread errThread = new Thread() { - @Override - public void run() { + + /** + * Run a command actual work + */ + private void runCommand() throws IOException { + ProcessBuilder builder = new ProcessBuilder(getExecString()); + Timer timeOutTimer = null; + ShellTimeoutTimerTask timeoutTimerTask = null; + timedOut = new AtomicBoolean(false); + completed = new AtomicBoolean(false); + + if (environment != null) { + builder.environment().putAll(this.environment); + } + if (dir != null) { + builder.directory(this.dir); + } + + process = builder.start(); + ProcessContainer.putProcess(process); + + if (timeOutInterval > 0) { + timeOutTimer = new Timer(); + timeoutTimerTask = new ShellTimeoutTimerTask(this); + //One time scheduling. + timeOutTimer.schedule(timeoutTimerTask, timeOutInterval); + } + final BufferedReader errReader = + new BufferedReader( + new InputStreamReader(process.getErrorStream())); + BufferedReader inReader = + new BufferedReader( + new InputStreamReader(process.getInputStream())); + final StringBuilder errMsg = new StringBuilder(); + + // read error and input streams as this would free up the buffers + // free the error stream buffer + Thread errThread = new Thread() { + @Override + public void run() { + try { + String line = errReader.readLine(); + while ((line != null) && !isInterrupted()) { + errMsg.append(line); + errMsg.append(System.getProperty("line.separator")); + line = errReader.readLine(); + } + } catch (IOException ioe) { + logger.warn("Error reading the error stream", ioe); + } + } + }; + Thread inThread = new Thread() { + @Override + public void run() { + try { + parseExecResult(inReader); + } catch (IOException ioe) { + logger.warn("Error reading the in stream", ioe); + } + super.run(); + } + }; try { - String line = errReader.readLine(); - while((line != null) && !isInterrupted()) { - errMsg.append(line); - errMsg.append(System.getProperty("line.separator")); - line = errReader.readLine(); - } - } catch(IOException ioe) { - logger.warn("Error reading the error stream", ioe); + errThread.start(); + inThread.start(); + } catch (IllegalStateException ise) { + logger.warn("Illegal while starting the error and in thread", ise); } - } - }; - Thread inThread = new Thread() { - @Override - public void run() { try { - parseExecResult(inReader); - } catch (IOException ioe) { - logger.warn("Error reading the in stream", ioe); + // parse the output + exitCode = process.waitFor(); + try { + // make sure that the error and in thread exits + errThread.join(); + inThread.join(); + } catch (InterruptedException ie) { + logger.warn("Interrupted while reading the error and in stream", ie); + } + completed.compareAndSet(false,true); + //the timeout thread handling + //taken care in finally block + if (exitCode != 0 || errMsg.length() > 0) { + throw new ExitCodeException(exitCode, errMsg.toString()); + } + } catch (InterruptedException ie) { + throw new IOException(ie.toString()); + } finally { + if ((timeOutTimer != null) && !timedOut.get()) { + timeOutTimer.cancel(); + } + // close the input stream + try { + inReader.close(); + } catch (IOException ioe) { + logger.warn("Error while closing the input stream", ioe); + } + if (!completed.get()) { + errThread.interrupt(); + } + try { + errReader.close(); + } catch (IOException ioe) { + logger.warn("Error while closing the error stream", ioe); + } + ProcessContainer.removeProcess(process); + process.destroy(); + lastTime = System.currentTimeMillis(); } - super.run(); - } - }; - try { - errThread.start(); - inThread.start(); - } catch (IllegalStateException ise) { } - try { - // parse the output - exitCode = process.waitFor(); - try { - // make sure that the error and in thread exits - errThread.join(); - inThread.join(); - } catch (InterruptedException ie) { - logger.warn("Interrupted while reading the error and in stream", ie); - } - completed.compareAndSet(false,true); - //the timeout thread handling - //taken care in finally block - if (exitCode != 0 || errMsg.length() > 0) { - throw new ExitCodeException(exitCode, errMsg.toString()); - } - } catch (InterruptedException ie) { - throw new IOException(ie.toString()); - } finally { - if ((timeOutTimer!=null) && !timedOut.get()) { - timeOutTimer.cancel(); - } - // close the input stream - try { - inReader.close(); - } catch (IOException ioe) { - logger.warn("Error while closing the input stream", ioe); - } - if (!completed.get()) { - errThread.interrupt(); - } - try { - errReader.close(); - } catch (IOException ioe) { - logger.warn("Error while closing the error stream", ioe); - } - ProcessContainer.removeProcess(process); - process.destroy(); - lastTime = System.currentTimeMillis(); } - } - /** - * - * @return an array containing the command name and its parameters - */ - protected abstract String[] getExecString(); - - /** - * Parse the execution result - * @param lines lines - * @throws IOException errors - */ - protected abstract void parseExecResult(BufferedReader lines) - throws IOException; - - /** - * get the current sub-process executing the given command - * @return process executing the command - */ - public Process getProcess() { - return process; - } - - /** get the exit code - * @return the exit code of the process - */ - public int getExitCode() { - return exitCode; - } - - /** - * Set if the command has timed out. - * - */ - private void setTimedOut() { - this.timedOut.set(true); - } + /** + * + * @return an array containing the command name and its parameters + */ + protected abstract String[] getExecString(); + /** + * Parse the execution result + * @param lines lines + * @throws IOException errors + */ + protected abstract void parseExecResult(BufferedReader lines) throws IOException; + /** + * get the current sub-process executing the given command + * @return process executing the command + */ + public Process getProcess() { + return process; + } - /** - * Timer which is used to timeout scripts spawned off by shell. - */ - private static class ShellTimeoutTimerTask extends TimerTask { - - private AbstractShell shell; + /** get the exit code + * @return the exit code of the process + */ + public int getExitCode() { + return exitCode; + } - public ShellTimeoutTimerTask(AbstractShell shell) { - this.shell = shell; + /** + * Set if the command has timed out. + * + */ + private void setTimedOut() { + this.timedOut.set(true); } - @Override - public void run() { - Process p = shell.getProcess(); - try { - p.exitValue(); - } catch (Exception e) { - //Process has not terminated. - //So check if it has completed - //if not just destroy it. - if (p != null && !shell.completed.get()) { - shell.setTimedOut(); - p.destroy(); + /** + * Timer which is used to timeout scripts spawned off by shell. + */ + private static class ShellTimeoutTimerTask extends TimerTask { + + private AbstractShell shell; + + public ShellTimeoutTimerTask(AbstractShell shell) { + this.shell = shell; + } + + @Override + public void run() { + Process p = shell.getProcess(); + try { + p.exitValue(); + } catch (Exception e) { + //Process has not terminated. + //So check if it has completed + //if not just destroy it. + if (p != null && !shell.completed.get()) { + shell.setTimedOut(); + p.destroy(); + } + } } - } } - } - - /** - * This is an IOException with exit code added. - */ - public static class ExitCodeException extends IOException { - int exitCode; - - public ExitCodeException(int exitCode, String message) { - super(message); - this.exitCode = exitCode; + + /** + * This is an IOException with exit code added. + */ + public static class ExitCodeException extends IOException { + int exitCode; + + public ExitCodeException(int exitCode, String message) { + super(message); + this.exitCode = exitCode; + } + + public int getExitCode() { + return exitCode; + } } - - public int getExitCode() { - return exitCode; + + /** + * process manage container + * + */ + public static class ProcessContainer extends ConcurrentHashMap { + private static final ProcessContainer container = new ProcessContainer(); + + private ProcessContainer() { + super(); + } + + public static final ProcessContainer getInstance() { + return container; + } + + public static void putProcess(Process process) { + getInstance().put(process.hashCode(), process); + } + + public static int processSize() { + return getInstance().size(); + } + + public static void removeProcess(Process process) { + getInstance().remove(process.hashCode()); + } + + public static void destroyAllProcess() { + Set> set = getInstance().entrySet(); + for (Entry entry : set) { + try { + entry.getValue().destroy(); + } catch (Exception e) { + logger.error("Destroy All Processes error", e); + } + } + + logger.info("close " + set.size() + " executing process tasks"); + } } - } - - /** - * process manage container - * - */ - public static class ProcessContainer extends ConcurrentHashMap{ - private static final ProcessContainer container = new ProcessContainer(); - private ProcessContainer(){ - super(); - } - public static final ProcessContainer getInstance(){ - return container; - } - - public static void putProcess(Process process){ - getInstance().put(process.hashCode(), process); - } - public static int processSize(){ - return getInstance().size(); - } - - public static void removeProcess(Process process){ - getInstance().remove(process.hashCode()); - } - - public static void destroyAllProcess(){ - Set> set = getInstance().entrySet(); - for (Entry entry : set) { - try{ - entry.getValue().destroy(); - } catch (Exception e) { - logger.error("Destroy All Processes error", e); - } - } - - logger.info("close " + set.size() + " executing process tasks"); - } - } } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/ShellExecutor.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/ShellExecutor.java index 8d2b768084..ac1eae590a 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/ShellExecutor.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/ShellExecutor.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.shell; import java.io.BufferedReader; @@ -34,7 +35,6 @@ public class ShellExecutor extends AbstractShell { private String[] command; private StringBuffer output; - public ShellExecutor(String... execString) { this(execString, null); } @@ -45,7 +45,7 @@ public class ShellExecutor extends AbstractShell { public ShellExecutor(String[] execString, File dir, Map env) { - this(execString, dir, env , 0L); + this(execString, dir, env,0L); } /** @@ -74,7 +74,6 @@ public class ShellExecutor extends AbstractShell { timeOutInterval = timeout; } - /** * Static method to execute a shell command. * Covers most of the simple cases without requiring the user to implement @@ -114,7 +113,7 @@ public class ShellExecutor extends AbstractShell { * @return the output of the executed command. * @throws IOException errors */ - public static String execCommand(Map env, String ... cmd) + public static String execCommand(Map env, String... cmd) throws IOException { return execCommand(env, cmd, 0L); } @@ -138,7 +137,7 @@ public class ShellExecutor extends AbstractShell { char[] buf = new char[1024]; int nRead; String line = ""; - while ( (nRead = lines.read(buf, 0, buf.length)) > 0 ) { + while ((nRead = lines.read(buf, 0, buf.length)) > 0) { line = new String(buf,0,nRead); output.append(line); } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/AbstractParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/AbstractParameters.java index 5714c8a96b..4886e52c29 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/AbstractParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/AbstractParameters.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.task; import org.apache.dolphinscheduler.common.enums.Direct; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/IParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/IParameters.java index 63c2aa04cd..f64e7098a6 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/IParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/IParameters.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.task; import org.apache.dolphinscheduler.common.process.ResourceInfo; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/TaskTimeoutParameter.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/TaskTimeoutParameter.java index 245b1358a6..cc1bf4e202 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/TaskTimeoutParameter.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/TaskTimeoutParameter.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.task; import org.apache.dolphinscheduler.common.enums.TaskTimeoutStrategy; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/dependent/DependentParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/dependent/DependentParameters.java index 5f2e0e1853..b62cd4813e 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/dependent/DependentParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/dependent/DependentParameters.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.task.dependent; import org.apache.dolphinscheduler.common.enums.DependentRelation; @@ -29,8 +30,6 @@ public class DependentParameters extends AbstractParameters { private List dependTaskList; private DependentRelation relation; - - @Override public boolean checkParameters() { return true; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/http/HttpParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/http/HttpParameters.java index 04bc39128c..df2c26846b 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/http/HttpParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/http/HttpParameters.java @@ -62,13 +62,13 @@ public class HttpParameters extends AbstractParameters { * Connect Timeout * Unit: ms */ - private int connectTimeout ; + private int connectTimeout; /** * Socket Timeout * Unit: ms */ - private int socketTimeout ; + private int socketTimeout; @Override public boolean checkParameters() { diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/mr/MapReduceParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/mr/MapReduceParameters.java index 762ee4275a..e9b54a3bb1 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/mr/MapReduceParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/mr/MapReduceParameters.java @@ -70,7 +70,6 @@ public class MapReduceParameters extends AbstractParameters { */ private ProgramType programType; - public String getMainClass() { return mainClass; } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/python/PythonParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/python/PythonParameters.java index 35dbd8ed86..48c5e31dbb 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/python/PythonParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/python/PythonParameters.java @@ -14,8 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dolphinscheduler.common.task.python; +package org.apache.dolphinscheduler.common.task.python; import org.apache.dolphinscheduler.common.process.ResourceInfo; import org.apache.dolphinscheduler.common.task.AbstractParameters; @@ -23,39 +23,39 @@ import org.apache.dolphinscheduler.common.task.AbstractParameters; import java.util.List; public class PythonParameters extends AbstractParameters { - /** - * origin python script - */ - private String rawScript; - - /** - * resource list - */ - private List resourceList; - - public String getRawScript() { - return rawScript; - } - - public void setRawScript(String rawScript) { - this.rawScript = rawScript; - } - - public List getResourceList() { - return resourceList; - } - - public void setResourceList(List resourceList) { - this.resourceList = resourceList; - } - - @Override - public boolean checkParameters() { - return rawScript != null && !rawScript.isEmpty(); - } - - @Override - public List getResourceFilesList() { - return this.resourceList; - } + /** + * origin python script + */ + private String rawScript; + + /** + * resource list + */ + private List resourceList; + + public String getRawScript() { + return rawScript; + } + + public void setRawScript(String rawScript) { + this.rawScript = rawScript; + } + + public List getResourceList() { + return resourceList; + } + + public void setResourceList(List resourceList) { + this.resourceList = resourceList; + } + + @Override + public boolean checkParameters() { + return rawScript != null && !rawScript.isEmpty(); + } + + @Override + public List getResourceFilesList() { + return this.resourceList; + } } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlBinds.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlBinds.java index 1096185f45..2d68af891e 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlBinds.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlBinds.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.task.sql; import org.apache.dolphinscheduler.common.process.Property; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlType.java index 871900a742..c506ca3e88 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlType.java @@ -14,8 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dolphinscheduler.common.task.sql; +package org.apache.dolphinscheduler.common.task.sql; public enum SqlType { /** diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/SqoopParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/SqoopParameters.java index 40ec6c277b..feea0fb389 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/SqoopParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/SqoopParameters.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.task.sqoop; import org.apache.dolphinscheduler.common.enums.SqoopJobType; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceHdfsParameter.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceHdfsParameter.java index 07f1157be0..5346ca6073 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceHdfsParameter.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceHdfsParameter.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.task.sqoop.sources; /** diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceHiveParameter.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceHiveParameter.java index a37840f9ea..b7bc97ae2f 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceHiveParameter.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceHiveParameter.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.task.sqoop.sources; /** diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceMysqlParameter.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceMysqlParameter.java index f80d681b59..9e5e81b311 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceMysqlParameter.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceMysqlParameter.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.task.sqoop.sources; import org.apache.dolphinscheduler.common.process.Property; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetHdfsParameter.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetHdfsParameter.java index 524921dcee..e60a123f00 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetHdfsParameter.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetHdfsParameter.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.task.sqoop.targets; /** diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetHiveParameter.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetHiveParameter.java index f9bfde3374..eba17ee107 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetHiveParameter.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetHiveParameter.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.task.sqoop.targets; /** diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetMysqlParameter.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetMysqlParameter.java index 86931cbe46..b16c77cb1c 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetMysqlParameter.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetMysqlParameter.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.task.sqoop.targets; /** diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/subprocess/SubProcessParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/subprocess/SubProcessParameters.java index 21a4f3e52a..6a783c34c3 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/subprocess/SubProcessParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/subprocess/SubProcessParameters.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.task.subprocess; import org.apache.dolphinscheduler.common.process.ResourceInfo; @@ -22,7 +23,6 @@ import org.apache.dolphinscheduler.common.task.AbstractParameters; import java.util.ArrayList; import java.util.List; - public class SubProcessParameters extends AbstractParameters { /** diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/Stopper.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/Stopper.java index 57e8af4221..67abde7e7a 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/Stopper.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/Stopper.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.thread; import java.util.concurrent.atomic.AtomicBoolean; @@ -23,17 +24,17 @@ import java.util.concurrent.atomic.AtomicBoolean; */ public class Stopper { - private static AtomicBoolean signal = new AtomicBoolean(false); - - public static final boolean isStopped(){ - return signal.get(); - } - - public static final boolean isRunning(){ - return !signal.get(); - } - - public static final void stop(){ - signal.set(true); - } + private static AtomicBoolean signal = new AtomicBoolean(false); + + public static final boolean isStopped() { + return signal.get(); + } + + public static final boolean isRunning() { + return !signal.get(); + } + + public static final void stop() { + signal.set(true); + } } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java index 5a1d3f44d0..75f624d15d 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.thread; import java.util.concurrent.ExecutorService; @@ -32,7 +33,7 @@ public class ThreadUtils { * @param threadsNum threadsNum * @return ExecutorService */ - public static ExecutorService newDaemonFixedThreadExecutor(String threadName,int threadsNum){ + public static ExecutorService newDaemonFixedThreadExecutor(String threadName,int threadsNum) { ThreadFactory threadFactory = new ThreadFactoryBuilder() .setDaemon(true) .setNameFormat(threadName) diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DependentUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DependentUtils.java index b8b6c1d13e..d6cea28780 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DependentUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DependentUtils.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.utils; import org.apache.dolphinscheduler.common.enums.DependResult; @@ -60,7 +61,6 @@ public class DependentUtils { return dependResult; } - /** * get date interval list by business date and date value. * diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java index 4d8e3fcf5e..a7c880db1c 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java @@ -22,8 +22,8 @@ import static org.apache.dolphinscheduler.common.Constants.RESOURCE_UPLOAD_PATH; import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.enums.ExecutionStatus; import org.apache.dolphinscheduler.common.enums.ResUploadType; -import org.apache.dolphinscheduler.spi.enums.ResourceType; import org.apache.dolphinscheduler.common.exception.BaseException; +import org.apache.dolphinscheduler.spi.enums.ResourceType; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java index ae4c72ce07..e0b32ad54b 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java @@ -35,7 +35,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Optional; import java.util.StringTokenizer; import java.util.regex.Pattern; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ScriptRunner.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ScriptRunner.java index 31a362c993..33c632b8d6 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ScriptRunner.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ScriptRunner.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.utils; import java.io.IOException; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/TriFunction.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/TriFunction.java index fe873b3475..fae03af6b1 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/TriFunction.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/TriFunction.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.dolphinscheduler.common.utils; /**