remove lombok dependence in dao module (#1735)

5 years ago · 343434b294
8 changed files with 169 additions and 16 deletions
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java
@ -20,11 +20,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;

 import java.util.Date;

-@Data
@TableName("t_ds_access_token")
 public class AccessToken {

@ -105,4 +103,45 @@ public class AccessToken {
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        AccessToken that = (AccessToken) o;
+
+        if (id != that.id) return false;
+        if (userId != that.userId) return false;
+        if (token != null ? !token.equals(that.token) : that.token != null) return false;
+        if (userName != null ? !userName.equals(that.userName) : that.userName != null) return false;
+        if (expireTime != null ? !expireTime.equals(that.expireTime) : that.expireTime != null) return false;
+        if (createTime != null ? !createTime.equals(that.createTime) : that.createTime != null) return false;
+        return updateTime != null ? updateTime.equals(that.updateTime) : that.updateTime == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id;
+        result = 31 * result + userId;
+        result = 31 * result + (token != null ? token.hashCode() : 0);
+        result = 31 * result + (userName != null ? userName.hashCode() : 0);
+        result = 31 * result + (expireTime != null ? expireTime.hashCode() : 0);
+        result = 31 * result + (createTime != null ? createTime.hashCode() : 0);
+        result = 31 * result + (updateTime != null ? updateTime.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "AccessToken{" +
+                "id=" + id +
+                ", userId=" + userId +
+                ", token='" + token + '\'' +
+                ", userName='" + userName + '\'' +
+                ", expireTime=" + expireTime +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
 }
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java
@ -20,7 +20,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import org.apache.dolphinscheduler.common.enums.AlertStatus;
 import org.apache.dolphinscheduler.common.enums.AlertType;
 import org.apache.dolphinscheduler.common.enums.ShowType;
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java
@ -20,11 +20,9 @@ import org.apache.dolphinscheduler.common.enums.AlertType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;

 import java.util.Date;

-@Data
@TableName("t_ds_alertgroup")
 public class AlertGroup {

@ -145,4 +143,16 @@ public class AlertGroup {
        result = 31 * result + (updateTime != null ? updateTime.hashCode() : 0);
        return result;
    }
+
+    @Override
+    public String toString() {
+        return "AlertGroup{" +
+                "id=" + id +
+                ", groupName='" + groupName + '\'' +
+                ", groupType=" + groupType +
+                ", description='" + description + '\'' +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
 }
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java
@ -20,7 +20,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import org.apache.dolphinscheduler.common.enums.*;

 import java.util.Date;
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DataSource.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DataSource.java
@ -16,18 +16,14 @@
 */
 package org.apache.dolphinscheduler.dao.entity;

-
-
 import org.apache.dolphinscheduler.common.enums.DbType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;

 import java.util.Date;

-@Data
@TableName("t_ds_datasource")
 public class DataSource {
  /**
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import lombok.Data;
 import org.apache.dolphinscheduler.common.enums.*;

 import java.util.Date;
@ -29,7 +28,6 @@ import java.util.Date;
 /**
 * process instance
 */
-@Data
@TableName("t_ds_process_instance")
 public class ProcessInstance {

@ -619,4 +617,98 @@ public class ProcessInstance {
                ", receiversCc='" + receiversCc + '\'' +
                '}';
    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        ProcessInstance that = (ProcessInstance) o;
+
+        if (id != that.id) return false;
+        if (processDefinitionId != that.processDefinitionId) return false;
+        if (runTimes != that.runTimes) return false;
+        if (maxTryTimes != that.maxTryTimes) return false;
+        if (executorId != that.executorId) return false;
+        if (workerGroupId != that.workerGroupId) return false;
+        if (timeout != that.timeout) return false;
+        if (tenantId != that.tenantId) return false;
+        if (state != that.state) return false;
+        if (recovery != that.recovery) return false;
+        if (startTime != null ? !startTime.equals(that.startTime) : that.startTime != null) return false;
+        if (endTime != null ? !endTime.equals(that.endTime) : that.endTime != null) return false;
+        if (name != null ? !name.equals(that.name) : that.name != null) return false;
+        if (host != null ? !host.equals(that.host) : that.host != null) return false;
+        if (processDefinition != null ? !processDefinition.equals(that.processDefinition) : that.processDefinition != null)
+            return false;
+        if (commandType != that.commandType) return false;
+        if (commandParam != null ? !commandParam.equals(that.commandParam) : that.commandParam != null) return false;
+        if (taskDependType != that.taskDependType) return false;
+        if (failureStrategy != that.failureStrategy) return false;
+        if (warningType != that.warningType) return false;
+        if (warningGroupId != null ? !warningGroupId.equals(that.warningGroupId) : that.warningGroupId != null)
+            return false;
+        if (scheduleTime != null ? !scheduleTime.equals(that.scheduleTime) : that.scheduleTime != null) return false;
+        if (commandStartTime != null ? !commandStartTime.equals(that.commandStartTime) : that.commandStartTime != null)
+            return false;
+        if (globalParams != null ? !globalParams.equals(that.globalParams) : that.globalParams != null) return false;
+        if (processInstanceJson != null ? !processInstanceJson.equals(that.processInstanceJson) : that.processInstanceJson != null)
+            return false;
+        if (tenantCode != null ? !tenantCode.equals(that.tenantCode) : that.tenantCode != null) return false;
+        if (queue != null ? !queue.equals(that.queue) : that.queue != null) return false;
+        if (isSubProcess != that.isSubProcess) return false;
+        if (locations != null ? !locations.equals(that.locations) : that.locations != null) return false;
+        if (connects != null ? !connects.equals(that.connects) : that.connects != null) return false;
+        if (historyCmd != null ? !historyCmd.equals(that.historyCmd) : that.historyCmd != null) return false;
+        if (dependenceScheduleTimes != null ? !dependenceScheduleTimes.equals(that.dependenceScheduleTimes) : that.dependenceScheduleTimes != null)
+            return false;
+        if (duration != null ? !duration.equals(that.duration) : that.duration != null) return false;
+        if (processInstancePriority != that.processInstancePriority) return false;
+        if (workerGroupName != null ? !workerGroupName.equals(that.workerGroupName) : that.workerGroupName != null)
+            return false;
+        if (receivers != null ? !receivers.equals(that.receivers) : that.receivers != null) return false;
+        return receiversCc != null ? receiversCc.equals(that.receiversCc) : that.receiversCc == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id;
+        result = 31 * result + processDefinitionId;
+        result = 31 * result + (state != null ? state.hashCode() : 0);
+        result = 31 * result + (recovery != null ? recovery.hashCode() : 0);
+        result = 31 * result + (startTime != null ? startTime.hashCode() : 0);
+        result = 31 * result + (endTime != null ? endTime.hashCode() : 0);
+        result = 31 * result + runTimes;
+        result = 31 * result + (name != null ? name.hashCode() : 0);
+        result = 31 * result + (host != null ? host.hashCode() : 0);
+        result = 31 * result + (processDefinition != null ? processDefinition.hashCode() : 0);
+        result = 31 * result + (commandType != null ? commandType.hashCode() : 0);
+        result = 31 * result + (commandParam != null ? commandParam.hashCode() : 0);
+        result = 31 * result + (taskDependType != null ? taskDependType.hashCode() : 0);
+        result = 31 * result + maxTryTimes;
+        result = 31 * result + (failureStrategy != null ? failureStrategy.hashCode() : 0);
+        result = 31 * result + (warningType != null ? warningType.hashCode() : 0);
+        result = 31 * result + (warningGroupId != null ? warningGroupId.hashCode() : 0);
+        result = 31 * result + (scheduleTime != null ? scheduleTime.hashCode() : 0);
+        result = 31 * result + (commandStartTime != null ? commandStartTime.hashCode() : 0);
+        result = 31 * result + (globalParams != null ? globalParams.hashCode() : 0);
+        result = 31 * result + (processInstanceJson != null ? processInstanceJson.hashCode() : 0);
+        result = 31 * result + executorId;
+        result = 31 * result + (tenantCode != null ? tenantCode.hashCode() : 0);
+        result = 31 * result + (queue != null ? queue.hashCode() : 0);
+        result = 31 * result + (isSubProcess != null ? isSubProcess.hashCode() : 0);
+        result = 31 * result + (locations != null ? locations.hashCode() : 0);
+        result = 31 * result + (connects != null ? connects.hashCode() : 0);
+        result = 31 * result + (historyCmd != null ? historyCmd.hashCode() : 0);
+        result = 31 * result + (dependenceScheduleTimes != null ? dependenceScheduleTimes.hashCode() : 0);
+        result = 31 * result + (duration != null ? duration.hashCode() : 0);
+        result = 31 * result + (processInstancePriority != null ? processInstancePriority.hashCode() : 0);
+        result = 31 * result + workerGroupId;
+        result = 31 * result + timeout;
+        result = 31 * result + tenantId;
+        result = 31 * result + (workerGroupName != null ? workerGroupName.hashCode() : 0);
+        result = 31 * result + (receivers != null ? receivers.hashCode() : 0);
+        result = 31 * result + (receiversCc != null ? receiversCc.hashCode() : 0);
+        return result;
+    }
 }
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java
@ -19,12 +19,10 @@ package org.apache.dolphinscheduler.dao.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;

 /**
 * process instance map
 */
-@Data
@TableName("t_ds_relation_process_instance")
 public class ProcessInstanceMap {

@ -90,4 +88,26 @@ public class ProcessInstanceMap {
                ", processInstanceId=" + processInstanceId +
                '}';
    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        ProcessInstanceMap that = (ProcessInstanceMap) o;
+
+        if (id != that.id) return false;
+        if (parentProcessInstanceId != that.parentProcessInstanceId) return false;
+        if (parentTaskInstanceId != that.parentTaskInstanceId) return false;
+        return processInstanceId == that.processInstanceId;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id;
+        result = 31 * result + parentProcessInstanceId;
+        result = 31 * result + parentTaskInstanceId;
+        result = 31 * result + processInstanceId;
+        return result;
+    }
 }
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java
@ -20,14 +20,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;

 import java.util.Date;

 /**
 * project
 */
-@Data
@TableName("t_ds_project")
 public class Project {