Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DolphinScheduler社区
DolphinScheduler
提交
343434b2
DolphinScheduler
项目概览
DolphinScheduler社区
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
67
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
343434b2
编写于
1月 07, 2020
作者:
D
DK.Pino
提交者:
qiaozhanwei
1月 07, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove lombok dependence in dao module (#1735)
上级
4cc058c9
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
169 addition
and
16 deletion
+169
-16
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java
...a/org/apache/dolphinscheduler/dao/entity/AccessToken.java
+41
-2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java
...in/java/org/apache/dolphinscheduler/dao/entity/Alert.java
+0
-1
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java
...va/org/apache/dolphinscheduler/dao/entity/AlertGroup.java
+12
-2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java
.../java/org/apache/dolphinscheduler/dao/entity/Command.java
+0
-1
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DataSource.java
...va/org/apache/dolphinscheduler/dao/entity/DataSource.java
+0
-4
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
...g/apache/dolphinscheduler/dao/entity/ProcessInstance.java
+94
-2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java
...pache/dolphinscheduler/dao/entity/ProcessInstanceMap.java
+22
-2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java
.../java/org/apache/dolphinscheduler/dao/entity/Project.java
+0
-2
未找到文件。
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java
浏览文件 @
343434b2
...
...
@@ -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
+
'}'
;
}
}
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java
浏览文件 @
343434b2
...
...
@@ -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
;
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java
浏览文件 @
343434b2
...
...
@@ -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
+
'}'
;
}
}
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java
浏览文件 @
343434b2
...
...
@@ -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
;
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DataSource.java
浏览文件 @
343434b2
...
...
@@ -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
{
/**
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
浏览文件 @
343434b2
...
...
@@ -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
;
}
}
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java
浏览文件 @
343434b2
...
...
@@ -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
;
}
}
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java
浏览文件 @
343434b2
...
...
@@ -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
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录