未验证 提交 1a88b186 编写于 作者: L lvshaokang 提交者: GitHub

[Improvement-5785][common] Fix code format (#6864)

* [DS-5785][style] Fix common module code format

* [DS-5785][style] Fix common module code format
上级 1c6ef500
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
...@@ -29,8 +30,7 @@ public enum AlertStatus { ...@@ -29,8 +30,7 @@ public enum AlertStatus {
EXECUTION_SUCCESS(1, "execute successfully"), EXECUTION_SUCCESS(1, "execute successfully"),
EXECUTION_FAILURE(2, "execute failed"); EXECUTION_FAILURE(2, "execute failed");
AlertStatus(int code, String descp) {
AlertStatus(int code, String descp){
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
...@@ -28,8 +29,7 @@ public enum AlertType { ...@@ -28,8 +29,7 @@ public enum AlertType {
EMAIL(0, "email"), EMAIL(0, "email"),
SMS(1, "SMS"); SMS(1, "SMS");
AlertType(int code, String descp) {
AlertType(int code, String descp){
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
...@@ -35,7 +36,7 @@ public enum AuthorizationType { ...@@ -35,7 +36,7 @@ public enum AuthorizationType {
DATASOURCE(3, "data source"), DATASOURCE(3, "data source"),
UDF(4, "udf function"); UDF(4, "udf function");
AuthorizationType(int code, String descp){ AuthorizationType(int code, String descp) {
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }
......
...@@ -14,13 +14,14 @@ ...@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.HashMap;
import java.util.Map; import java.util.Map;
import com.baomidou.mybatisplus.annotation.EnumValue;
/** /**
* command types * command types
*/ */
...@@ -54,7 +55,7 @@ public enum CommandType { ...@@ -54,7 +55,7 @@ public enum CommandType {
RECOVER_SERIAL_WAIT(11, "recover serial wait"), RECOVER_SERIAL_WAIT(11, "recover serial wait"),
; ;
CommandType(int code, String descp){ CommandType(int code, String descp) {
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }
...@@ -79,7 +80,6 @@ public enum CommandType { ...@@ -79,7 +80,6 @@ public enum CommandType {
} }
} }
public static CommandType of(Integer status) { public static CommandType of(Integer status) {
if (COMMAND_TYPE_MAP.containsKey(status)) { if (COMMAND_TYPE_MAP.containsKey(status)) {
return COMMAND_TYPE_MAP.get(status); return COMMAND_TYPE_MAP.get(status);
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
...@@ -30,7 +31,7 @@ public enum FailureStrategy { ...@@ -30,7 +31,7 @@ public enum FailureStrategy {
END(0, "end"), END(0, "end"),
CONTINUE(1, "continue"); CONTINUE(1, "continue");
FailureStrategy(int code, String descp){ FailureStrategy(int code, String descp) {
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
public enum NodeType { public enum NodeType {
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums;
package org.apache.dolphinscheduler.common.enums;
/** /**
* support program types * support program types
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
...@@ -30,7 +31,7 @@ public enum ReleaseState { ...@@ -30,7 +31,7 @@ public enum ReleaseState {
OFFLINE(0, "offline"), OFFLINE(0, "offline"),
ONLINE(1, "online"); ONLINE(1, "online");
ReleaseState(int code, String descp){ ReleaseState(int code, String descp) {
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }
...@@ -39,9 +40,9 @@ public enum ReleaseState { ...@@ -39,9 +40,9 @@ public enum ReleaseState {
private final int code; private final int code;
private final String descp; private final String descp;
public static ReleaseState getEnum(int value){ public static ReleaseState getEnum(int value) {
for (ReleaseState e:ReleaseState.values()) { for (ReleaseState e:ReleaseState.values()) {
if(e.ordinal() == value) { if (e.ordinal() == value) {
return e; return e;
} }
} }
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
...@@ -29,7 +30,7 @@ public enum RunMode { ...@@ -29,7 +30,7 @@ public enum RunMode {
RUN_MODE_SERIAL(0, "serial run"), RUN_MODE_SERIAL(0, "serial run"),
RUN_MODE_PARALLEL(1, "parallel run"); RUN_MODE_PARALLEL(1, "parallel run");
RunMode(int code, String descp){ RunMode(int code, String descp) {
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
...@@ -27,7 +28,7 @@ public enum SparkVersion { ...@@ -27,7 +28,7 @@ public enum SparkVersion {
SPARK1(0, "SPARK1"), SPARK1(0, "SPARK1"),
SPARK2(1, "SPARK2"); SPARK2(1, "SPARK2");
SparkVersion(int code, String descp){ SparkVersion(int code, String descp) {
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
...@@ -22,7 +23,7 @@ public enum SqoopJobType { ...@@ -22,7 +23,7 @@ public enum SqoopJobType {
CUSTOM(0, "CUSTOM"), CUSTOM(0, "CUSTOM"),
TEMPLATE(1, "TEMPLATE"); TEMPLATE(1, "TEMPLATE");
SqoopJobType(int code, String descp){ SqoopJobType(int code, String descp) {
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
...@@ -31,7 +32,7 @@ public enum TaskDependType { ...@@ -31,7 +32,7 @@ public enum TaskDependType {
TASK_PRE(1, "task pre"), TASK_PRE(1, "task pre"),
TASK_POST(2, "task post"); TASK_POST(2, "task post");
TaskDependType(int code, String descp){ TaskDependType(int code, String descp) {
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums;
package org.apache.dolphinscheduler.common.enums;
/** /**
* task record status * task record status
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
...@@ -28,8 +29,7 @@ public enum UserType { ...@@ -28,8 +29,7 @@ public enum UserType {
ADMIN_USER(0, "admin user"), ADMIN_USER(0, "admin user"),
GENERAL_USER(1, "general user"); GENERAL_USER(1, "general user");
UserType(int code, String descp) {
UserType(int code, String descp){
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.enums; package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue; import com.baomidou.mybatisplus.annotation.EnumValue;
...@@ -33,8 +34,7 @@ public enum WarningType { ...@@ -33,8 +34,7 @@ public enum WarningType {
FAILURE(2, "failure"), FAILURE(2, "failure"),
ALL(3, "all"); ALL(3, "all");
WarningType(int code, String descp) {
WarningType(int code, String descp){
this.code = code; this.code = code;
this.descp = descp; this.descp = descp;
} }
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.graph; package org.apache.dolphinscheduler.common.graph;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
......
...@@ -14,26 +14,26 @@ ...@@ -14,26 +14,26 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.Date;
import java.util.Objects; import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonFormat;
/** /**
* date interval class * date interval class
*/ */
public class DateInterval { 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; 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; private Date endTime;
public DateInterval(Date beginTime, Date endTime){ public DateInterval(Date beginTime, Date endTime) {
this.startTime = beginTime; this.startTime = beginTime;
this.endTime = endTime; this.endTime = endTime;
} }
@Override @Override
...@@ -44,8 +44,8 @@ public class DateInterval { ...@@ -44,8 +44,8 @@ public class DateInterval {
return true; return true;
} else { } else {
DateInterval that = (DateInterval) obj; DateInterval that = (DateInterval) obj;
return startTime.equals(that.startTime) && return startTime.equals(that.startTime)
endTime.equals(that.endTime); && endTime.equals(that.endTime);
} }
} }
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.model; package org.apache.dolphinscheduler.common.model;
import org.apache.dolphinscheduler.common.enums.DependentRelation; import org.apache.dolphinscheduler.common.enums.DependentRelation;
......
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.model; package org.apache.dolphinscheduler.common.model;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/** /**
* server * server
*/ */
...@@ -54,13 +54,13 @@ public class Server { ...@@ -54,13 +54,13 @@ public class Server {
/** /**
* create time * 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; private Date createTime;
/** /**
* laster heart beat time * 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; private Date lastHeartbeatTime;
public int getId() { public int getId() {
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.model; package org.apache.dolphinscheduler.common.model;
import java.util.Objects; import java.util.Objects;
...@@ -54,9 +55,8 @@ public class TaskNodeRelation { ...@@ -54,9 +55,8 @@ public class TaskNodeRelation {
this.endNode = endNode; this.endNode = endNode;
} }
@Override @Override
public boolean equals(Object o){ public boolean equals(Object o) {
if (!(o instanceof TaskNodeRelation)) { if (!(o instanceof TaskNodeRelation)) {
return false; return false;
} }
...@@ -66,10 +66,10 @@ public class TaskNodeRelation { ...@@ -66,10 +66,10 @@ public class TaskNodeRelation {
@Override @Override
public String toString() { public String toString() {
return "TaskNodeRelation{" + return "TaskNodeRelation{"
"startNode='" + startNode + '\'' + + "startNode='" + startNode + '\''
", endNode='" + endNode + '\'' + + ", endNode='" + endNode + '\''
'}'; + '}';
} }
@Override @Override
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.model;
package org.apache.dolphinscheduler.common.model;
import java.util.Date; import java.util.Date;
import java.util.Set; import java.util.Set;
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.process; package org.apache.dolphinscheduler.common.process;
import org.apache.dolphinscheduler.common.enums.HttpParametersType; import org.apache.dolphinscheduler.common.enums.HttpParametersType;
...@@ -102,11 +103,10 @@ public class HttpProperty { ...@@ -102,11 +103,10 @@ public class HttpProperty {
return false; return false;
} }
HttpProperty property = (HttpProperty) o; HttpProperty property = (HttpProperty) o;
return Objects.equals(prop, property.prop) && return Objects.equals(prop, property.prop)
Objects.equals(value, property.value); && Objects.equals(value, property.value);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(prop, value); return Objects.hash(prop, value);
...@@ -114,12 +114,10 @@ public class HttpProperty { ...@@ -114,12 +114,10 @@ public class HttpProperty {
@Override @Override
public String toString() { public String toString() {
return "HttpProperty{" + return "HttpProperty{"
"prop='" + prop + '\'' + + "prop='" + prop + '\''
", httpParametersType=" + httpParametersType + + ", httpParametersType=" + httpParametersType
", value='" + value + '\'' + + ", value='" + value + '\''
'}'; + '}';
} }
} }
...@@ -14,9 +14,8 @@ ...@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.TaskNode;
import org.apache.dolphinscheduler.common.model.TaskNodeRelation; import org.apache.dolphinscheduler.common.model.TaskNodeRelation;
...@@ -77,9 +76,9 @@ public class ProcessDag { ...@@ -77,9 +76,9 @@ public class ProcessDag {
@Override @Override
public String toString() { public String toString() {
return "ProcessDag{" + return "ProcessDag{"
"edges=" + edges + + "edges=" + edges
", nodes=" + nodes + + ", nodes=" + nodes
'}'; + '}';
} }
} }
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.DataType;
import org.apache.dolphinscheduler.common.enums.Direct; import org.apache.dolphinscheduler.common.enums.Direct;
...@@ -94,7 +94,6 @@ public class Property implements Serializable { ...@@ -94,7 +94,6 @@ public class Property implements Serializable {
this.value = value; this.value = value;
} }
public Direct getDirect() { public Direct getDirect() {
return direct; return direct;
} }
...@@ -120,11 +119,10 @@ public class Property implements Serializable { ...@@ -120,11 +119,10 @@ public class Property implements Serializable {
return false; return false;
} }
Property property = (Property) o; Property property = (Property) o;
return Objects.equals(prop, property.prop) && return Objects.equals(prop, property.prop)
Objects.equals(value, property.value); && Objects.equals(value, property.value);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(prop, value); return Objects.hash(prop, value);
...@@ -132,13 +130,11 @@ public class Property implements Serializable { ...@@ -132,13 +130,11 @@ public class Property implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "Property{" + return "Property{"
"prop='" + prop + '\'' + + "prop='" + prop + '\''
", direct=" + direct + + ", direct=" + direct
", type=" + type + + ", type=" + type
", value='" + value + '\'' + + ", value='" + value + '\''
'}'; + '}';
} }
} }
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.process; package org.apache.dolphinscheduler.common.process;
/** /**
......
...@@ -14,8 +14,12 @@ ...@@ -14,8 +14,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.shell; package org.apache.dolphinscheduler.common.shell;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
...@@ -27,10 +31,6 @@ import java.util.TimerTask; ...@@ -27,10 +31,6 @@ import java.util.TimerTask;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* A base class for running a Unix command. * A base class for running a Unix command.
* *
...@@ -88,13 +88,11 @@ public abstract class AbstractShell { ...@@ -88,13 +88,11 @@ public abstract class AbstractShell {
* @param interval the minimum duration to wait before re-executing the * @param interval the minimum duration to wait before re-executing the
* command. * command.
*/ */
public AbstractShell(long interval ) { public AbstractShell(long interval) {
this.interval = interval; this.interval = interval;
this.lastTime = (interval<0) ? 0 : -interval; this.lastTime = (interval < 0) ? 0 : -interval;
} }
/** /**
* set the environment for the command * set the environment for the command
* @param env Mapping of environment variables * @param env Mapping of environment variables
...@@ -124,7 +122,6 @@ public abstract class AbstractShell { ...@@ -124,7 +122,6 @@ public abstract class AbstractShell {
runCommand(); runCommand();
} }
/** /**
* Run a command actual work * Run a command actual work
*/ */
...@@ -147,8 +144,7 @@ public abstract class AbstractShell { ...@@ -147,8 +144,7 @@ public abstract class AbstractShell {
if (timeOutInterval > 0) { if (timeOutInterval > 0) {
timeOutTimer = new Timer(); timeOutTimer = new Timer();
timeoutTimerTask = new ShellTimeoutTimerTask( timeoutTimerTask = new ShellTimeoutTimerTask(this);
this);
//One time scheduling. //One time scheduling.
timeOutTimer.schedule(timeoutTimerTask, timeOutInterval); timeOutTimer.schedule(timeoutTimerTask, timeOutInterval);
} }
...@@ -167,12 +163,12 @@ public abstract class AbstractShell { ...@@ -167,12 +163,12 @@ public abstract class AbstractShell {
public void run() { public void run() {
try { try {
String line = errReader.readLine(); String line = errReader.readLine();
while((line != null) && !isInterrupted()) { while ((line != null) && !isInterrupted()) {
errMsg.append(line); errMsg.append(line);
errMsg.append(System.getProperty("line.separator")); errMsg.append(System.getProperty("line.separator"));
line = errReader.readLine(); line = errReader.readLine();
} }
} catch(IOException ioe) { } catch (IOException ioe) {
logger.warn("Error reading the error stream", ioe); logger.warn("Error reading the error stream", ioe);
} }
} }
...@@ -191,7 +187,9 @@ public abstract class AbstractShell { ...@@ -191,7 +187,9 @@ public abstract class AbstractShell {
try { try {
errThread.start(); errThread.start();
inThread.start(); inThread.start();
} catch (IllegalStateException ise) { } } catch (IllegalStateException ise) {
logger.warn("Illegal while starting the error and in thread", ise);
}
try { try {
// parse the output // parse the output
exitCode = process.waitFor(); exitCode = process.waitFor();
...@@ -211,7 +209,7 @@ public abstract class AbstractShell { ...@@ -211,7 +209,7 @@ public abstract class AbstractShell {
} catch (InterruptedException ie) { } catch (InterruptedException ie) {
throw new IOException(ie.toString()); throw new IOException(ie.toString());
} finally { } finally {
if ((timeOutTimer!=null) && !timedOut.get()) { if ((timeOutTimer != null) && !timedOut.get()) {
timeOutTimer.cancel(); timeOutTimer.cancel();
} }
// close the input stream // close the input stream
...@@ -245,8 +243,7 @@ public abstract class AbstractShell { ...@@ -245,8 +243,7 @@ public abstract class AbstractShell {
* @param lines lines * @param lines lines
* @throws IOException errors * @throws IOException errors
*/ */
protected abstract void parseExecResult(BufferedReader lines) protected abstract void parseExecResult(BufferedReader lines) throws IOException;
throws IOException;
/** /**
* get the current sub-process executing the given command * get the current sub-process executing the given command
...@@ -271,8 +268,6 @@ public abstract class AbstractShell { ...@@ -271,8 +268,6 @@ public abstract class AbstractShell {
this.timedOut.set(true); this.timedOut.set(true);
} }
/** /**
* Timer which is used to timeout scripts spawned off by shell. * Timer which is used to timeout scripts spawned off by shell.
*/ */
...@@ -321,30 +316,33 @@ public abstract class AbstractShell { ...@@ -321,30 +316,33 @@ public abstract class AbstractShell {
* process manage container * process manage container
* *
*/ */
public static class ProcessContainer extends ConcurrentHashMap<Integer, Process>{ public static class ProcessContainer extends ConcurrentHashMap<Integer, Process> {
private static final ProcessContainer container = new ProcessContainer(); private static final ProcessContainer container = new ProcessContainer();
private ProcessContainer(){
private ProcessContainer() {
super(); super();
} }
public static final ProcessContainer getInstance(){
public static final ProcessContainer getInstance() {
return container; return container;
} }
public static void putProcess(Process process){ public static void putProcess(Process process) {
getInstance().put(process.hashCode(), process); getInstance().put(process.hashCode(), process);
} }
public static int processSize(){
public static int processSize() {
return getInstance().size(); return getInstance().size();
} }
public static void removeProcess(Process process){ public static void removeProcess(Process process) {
getInstance().remove(process.hashCode()); getInstance().remove(process.hashCode());
} }
public static void destroyAllProcess(){ public static void destroyAllProcess() {
Set<Entry<Integer, Process>> set = getInstance().entrySet(); Set<Entry<Integer, Process>> set = getInstance().entrySet();
for (Entry<Integer, Process> entry : set) { for (Entry<Integer, Process> entry : set) {
try{ try {
entry.getValue().destroy(); entry.getValue().destroy();
} catch (Exception e) { } catch (Exception e) {
logger.error("Destroy All Processes error", e); logger.error("Destroy All Processes error", e);
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.shell; package org.apache.dolphinscheduler.common.shell;
import java.io.BufferedReader; import java.io.BufferedReader;
...@@ -34,7 +35,6 @@ public class ShellExecutor extends AbstractShell { ...@@ -34,7 +35,6 @@ public class ShellExecutor extends AbstractShell {
private String[] command; private String[] command;
private StringBuffer output; private StringBuffer output;
public ShellExecutor(String... execString) { public ShellExecutor(String... execString) {
this(execString, null); this(execString, null);
} }
...@@ -45,7 +45,7 @@ public class ShellExecutor extends AbstractShell { ...@@ -45,7 +45,7 @@ public class ShellExecutor extends AbstractShell {
public ShellExecutor(String[] execString, File dir, public ShellExecutor(String[] execString, File dir,
Map<String, String> env) { Map<String, String> env) {
this(execString, dir, env , 0L); this(execString, dir, env,0L);
} }
/** /**
...@@ -74,7 +74,6 @@ public class ShellExecutor extends AbstractShell { ...@@ -74,7 +74,6 @@ public class ShellExecutor extends AbstractShell {
timeOutInterval = timeout; timeOutInterval = timeout;
} }
/** /**
* Static method to execute a shell command. * Static method to execute a shell command.
* Covers most of the simple cases without requiring the user to implement * Covers most of the simple cases without requiring the user to implement
...@@ -114,7 +113,7 @@ public class ShellExecutor extends AbstractShell { ...@@ -114,7 +113,7 @@ public class ShellExecutor extends AbstractShell {
* @return the output of the executed command. * @return the output of the executed command.
* @throws IOException errors * @throws IOException errors
*/ */
public static String execCommand(Map<String,String> env, String ... cmd) public static String execCommand(Map<String,String> env, String... cmd)
throws IOException { throws IOException {
return execCommand(env, cmd, 0L); return execCommand(env, cmd, 0L);
} }
...@@ -138,7 +137,7 @@ public class ShellExecutor extends AbstractShell { ...@@ -138,7 +137,7 @@ public class ShellExecutor extends AbstractShell {
char[] buf = new char[1024]; char[] buf = new char[1024];
int nRead; int nRead;
String line = ""; 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); line = new String(buf,0,nRead);
output.append(line); output.append(line);
} }
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task; package org.apache.dolphinscheduler.common.task;
import org.apache.dolphinscheduler.common.enums.Direct; import org.apache.dolphinscheduler.common.enums.Direct;
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task; package org.apache.dolphinscheduler.common.task;
import org.apache.dolphinscheduler.common.process.ResourceInfo; import org.apache.dolphinscheduler.common.process.ResourceInfo;
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task; package org.apache.dolphinscheduler.common.task;
import org.apache.dolphinscheduler.common.enums.TaskTimeoutStrategy; import org.apache.dolphinscheduler.common.enums.TaskTimeoutStrategy;
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.dependent; package org.apache.dolphinscheduler.common.task.dependent;
import org.apache.dolphinscheduler.common.enums.DependentRelation; import org.apache.dolphinscheduler.common.enums.DependentRelation;
...@@ -29,8 +30,6 @@ public class DependentParameters extends AbstractParameters { ...@@ -29,8 +30,6 @@ public class DependentParameters extends AbstractParameters {
private List<DependentTaskModel> dependTaskList; private List<DependentTaskModel> dependTaskList;
private DependentRelation relation; private DependentRelation relation;
@Override @Override
public boolean checkParameters() { public boolean checkParameters() {
return true; return true;
......
...@@ -62,13 +62,13 @@ public class HttpParameters extends AbstractParameters { ...@@ -62,13 +62,13 @@ public class HttpParameters extends AbstractParameters {
* Connect Timeout * Connect Timeout
* Unit: ms * Unit: ms
*/ */
private int connectTimeout ; private int connectTimeout;
/** /**
* Socket Timeout * Socket Timeout
* Unit: ms * Unit: ms
*/ */
private int socketTimeout ; private int socketTimeout;
@Override @Override
public boolean checkParameters() { public boolean checkParameters() {
......
...@@ -70,7 +70,6 @@ public class MapReduceParameters extends AbstractParameters { ...@@ -70,7 +70,6 @@ public class MapReduceParameters extends AbstractParameters {
*/ */
private ProgramType programType; private ProgramType programType;
public String getMainClass() { public String getMainClass() {
return mainClass; return mainClass;
} }
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.process.ResourceInfo;
import org.apache.dolphinscheduler.common.task.AbstractParameters; import org.apache.dolphinscheduler.common.task.AbstractParameters;
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sql; package org.apache.dolphinscheduler.common.task.sql;
import org.apache.dolphinscheduler.common.process.Property; import org.apache.dolphinscheduler.common.process.Property;
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sql;
package org.apache.dolphinscheduler.common.task.sql;
public enum SqlType { public enum SqlType {
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sqoop; package org.apache.dolphinscheduler.common.task.sqoop;
import org.apache.dolphinscheduler.common.enums.SqoopJobType; import org.apache.dolphinscheduler.common.enums.SqoopJobType;
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sqoop.sources; package org.apache.dolphinscheduler.common.task.sqoop.sources;
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sqoop.sources; package org.apache.dolphinscheduler.common.task.sqoop.sources;
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sqoop.sources; package org.apache.dolphinscheduler.common.task.sqoop.sources;
import org.apache.dolphinscheduler.common.process.Property; import org.apache.dolphinscheduler.common.process.Property;
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sqoop.targets; package org.apache.dolphinscheduler.common.task.sqoop.targets;
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sqoop.targets; package org.apache.dolphinscheduler.common.task.sqoop.targets;
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.sqoop.targets; package org.apache.dolphinscheduler.common.task.sqoop.targets;
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.task.subprocess; package org.apache.dolphinscheduler.common.task.subprocess;
import org.apache.dolphinscheduler.common.process.ResourceInfo; import org.apache.dolphinscheduler.common.process.ResourceInfo;
...@@ -22,7 +23,6 @@ import org.apache.dolphinscheduler.common.task.AbstractParameters; ...@@ -22,7 +23,6 @@ import org.apache.dolphinscheduler.common.task.AbstractParameters;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class SubProcessParameters extends AbstractParameters { public class SubProcessParameters extends AbstractParameters {
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.thread; package org.apache.dolphinscheduler.common.thread;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
...@@ -25,15 +26,15 @@ public class Stopper { ...@@ -25,15 +26,15 @@ public class Stopper {
private static AtomicBoolean signal = new AtomicBoolean(false); private static AtomicBoolean signal = new AtomicBoolean(false);
public static final boolean isStopped(){ public static final boolean isStopped() {
return signal.get(); return signal.get();
} }
public static final boolean isRunning(){ public static final boolean isRunning() {
return !signal.get(); return !signal.get();
} }
public static final void stop(){ public static final void stop() {
signal.set(true); signal.set(true);
} }
} }
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.thread; package org.apache.dolphinscheduler.common.thread;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
...@@ -32,7 +33,7 @@ public class ThreadUtils { ...@@ -32,7 +33,7 @@ public class ThreadUtils {
* @param threadsNum threadsNum * @param threadsNum threadsNum
* @return ExecutorService * @return ExecutorService
*/ */
public static ExecutorService newDaemonFixedThreadExecutor(String threadName,int threadsNum){ public static ExecutorService newDaemonFixedThreadExecutor(String threadName,int threadsNum) {
ThreadFactory threadFactory = new ThreadFactoryBuilder() ThreadFactory threadFactory = new ThreadFactoryBuilder()
.setDaemon(true) .setDaemon(true)
.setNameFormat(threadName) .setNameFormat(threadName)
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.utils; package org.apache.dolphinscheduler.common.utils;
import org.apache.dolphinscheduler.common.enums.DependResult; import org.apache.dolphinscheduler.common.enums.DependResult;
...@@ -60,7 +61,6 @@ public class DependentUtils { ...@@ -60,7 +61,6 @@ public class DependentUtils {
return dependResult; return dependResult;
} }
/** /**
* get date interval list by business date and date value. * get date interval list by business date and date value.
* *
......
...@@ -22,8 +22,8 @@ import static org.apache.dolphinscheduler.common.Constants.RESOURCE_UPLOAD_PATH; ...@@ -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.Constants;
import org.apache.dolphinscheduler.common.enums.ExecutionStatus; import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
import org.apache.dolphinscheduler.common.enums.ResUploadType; 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.common.exception.BaseException;
import org.apache.dolphinscheduler.spi.enums.ResourceType;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
......
...@@ -35,7 +35,6 @@ import java.util.ArrayList; ...@@ -35,7 +35,6 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Optional;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.regex.Pattern; import java.util.regex.Pattern;
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.utils; package org.apache.dolphinscheduler.common.utils;
import java.io.IOException; import java.io.IOException;
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.utils; package org.apache.dolphinscheduler.common.utils;
/** /**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册