Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
pentaLiker
DolphinScheduler
提交
aa715e17
DolphinScheduler
项目概览
pentaLiker
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
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,发现更多精彩内容 >>
提交
aa715e17
编写于
1月 09, 2020
作者:
D
DK.Pino
提交者:
qiaozhanwei
1月 09, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove lombok dependency(last) (#1771)
上级
3cf21dca
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
65 addition
and
125 deletion
+65
-125
dolphinscheduler-dao/pom.xml
dolphinscheduler-dao/pom.xml
+1
-5
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java
...a/org/apache/dolphinscheduler/dao/entity/AccessToken.java
+3
-15
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
...g/apache/dolphinscheduler/dao/entity/ProcessInstance.java
+3
-81
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java
...a/org/apache/dolphinscheduler/dao/entity/ProjectUser.java
+0
-2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Queue.java
...in/java/org/apache/dolphinscheduler/dao/entity/Queue.java
+20
-2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java
...java/org/apache/dolphinscheduler/dao/entity/Resource.java
+0
-2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ResourcesUser.java
...org/apache/dolphinscheduler/dao/entity/ResourcesUser.java
+0
-2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Session.java
.../java/org/apache/dolphinscheduler/dao/entity/Session.java
+22
-2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java
...n/java/org/apache/dolphinscheduler/dao/entity/Tenant.java
+16
-2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UDFUser.java
.../java/org/apache/dolphinscheduler/dao/entity/UDFUser.java
+0
-2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java
.../java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java
+0
-2
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/SensitiveDataConverter.java
...inscheduler/server/worker/log/SensitiveDataConverter.java
+0
-2
pom.xml
pom.xml
+0
-6
未找到文件。
dolphinscheduler-dao/pom.xml
浏览文件 @
aa715e17
...
...
@@ -49,11 +49,7 @@
<groupId>
org.postgresql
</groupId>
<artifactId>
postgresql
</artifactId>
</dependency>
<dependency>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<version>
${lombok.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-test
</artifactId>
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java
浏览文件 @
aa715e17
...
...
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
java.util.Date
;
import
java.util.Objects
;
@TableName
(
"t_ds_access_token"
)
public
class
AccessToken
{
...
...
@@ -111,25 +112,12 @@ public class AccessToken {
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
;
return
id
==
that
.
id
;
}
@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
;
return
Objects
.
hash
(
id
);
}
@Override
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
浏览文件 @
aa715e17
...
...
@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import
org.apache.dolphinscheduler.common.enums.*
;
import
java.util.Date
;
import
java.util.Objects
;
/**
* process instance
...
...
@@ -625,90 +626,11 @@ public class ProcessInstance {
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
;
return
id
==
that
.
id
;
}
@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
;
return
Objects
.
hash
(
id
);
}
}
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java
浏览文件 @
aa715e17
...
...
@@ -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_relation_project_user"
)
public
class
ProjectUser
{
/**
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Queue.java
浏览文件 @
aa715e17
...
...
@@ -19,14 +19,12 @@ 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
;
import
java.util.Date
;
/**
* queue
*/
@Data
@TableName
(
"t_ds_queue"
)
public
class
Queue
{
...
...
@@ -103,4 +101,24 @@ public class Queue {
", updateTime="
+
updateTime
+
'}'
;
}
@Override
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
return
true
;
if
(
o
==
null
||
getClass
()
!=
o
.
getClass
())
return
false
;
Queue
queue1
=
(
Queue
)
o
;
if
(
id
!=
queue1
.
id
)
return
false
;
if
(!
queueName
.
equals
(
queue1
.
queueName
))
return
false
;
return
queue
.
equals
(
queue1
.
queue
);
}
@Override
public
int
hashCode
()
{
int
result
=
id
;
result
=
31
*
result
+
queueName
.
hashCode
();
result
=
31
*
result
+
queue
.
hashCode
();
return
result
;
}
}
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java
浏览文件 @
aa715e17
...
...
@@ -21,11 +21,9 @@ import org.apache.dolphinscheduler.common.enums.ResourceType;
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_resources"
)
public
class
Resource
{
/**
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ResourcesUser.java
浏览文件 @
aa715e17
...
...
@@ -19,14 +19,12 @@ 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
;
import
java.util.Date
;
/**
* resource user relation
*/
@Data
@TableName
(
"t_ds_relation_resources_user"
)
public
class
ResourcesUser
{
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Session.java
浏览文件 @
aa715e17
...
...
@@ -19,14 +19,12 @@ 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
;
import
java.util.Date
;
/**
* session
*/
@Data
@TableName
(
"t_ds_session"
)
public
class
Session
{
...
...
@@ -92,4 +90,26 @@ public class Session {
", lastLoginTime="
+
lastLoginTime
+
'}'
;
}
@Override
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
return
true
;
if
(
o
==
null
||
getClass
()
!=
o
.
getClass
())
return
false
;
Session
session
=
(
Session
)
o
;
if
(
userId
!=
session
.
userId
)
return
false
;
if
(!
id
.
equals
(
session
.
id
))
return
false
;
if
(!
lastLoginTime
.
equals
(
session
.
lastLoginTime
))
return
false
;
return
ip
.
equals
(
session
.
ip
);
}
@Override
public
int
hashCode
()
{
int
result
=
id
.
hashCode
();
result
=
31
*
result
+
userId
;
result
=
31
*
result
+
lastLoginTime
.
hashCode
();
result
=
31
*
result
+
ip
.
hashCode
();
return
result
;
}
}
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java
浏览文件 @
aa715e17
...
...
@@ -20,14 +20,13 @@ 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
;
import
java.util.Objects
;
/**
* tenant
*/
@Data
@TableName
(
"t_ds_tenant"
)
public
class
Tenant
{
...
...
@@ -164,4 +163,19 @@ public class Tenant {
public
void
setDescription
(
String
description
)
{
this
.
description
=
description
;
}
@Override
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
return
true
;
if
(
o
==
null
||
getClass
()
!=
o
.
getClass
())
return
false
;
Tenant
tenant
=
(
Tenant
)
o
;
return
id
==
tenant
.
id
;
}
@Override
public
int
hashCode
()
{
return
Objects
.
hash
(
id
);
}
}
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UDFUser.java
浏览文件 @
aa715e17
...
...
@@ -19,14 +19,12 @@ 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
;
import
java.util.Date
;
/**
* udf user relation
*/
@Data
@TableName
(
"t_ds_relation_udfs_user"
)
public
class
UDFUser
{
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java
浏览文件 @
aa715e17
...
...
@@ -21,14 +21,12 @@ import org.apache.dolphinscheduler.common.enums.UdfType;
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
;
/**
* udf function
*/
@Data
@TableName
(
"t_ds_udfs"
)
public
class
UdfFunc
{
/**
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/SensitiveDataConverter.java
浏览文件 @
aa715e17
...
...
@@ -19,7 +19,6 @@ package org.apache.dolphinscheduler.server.worker.log;
import
ch.qos.logback.classic.pattern.MessageConverter
;
import
ch.qos.logback.classic.spi.ILoggingEvent
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.dolphinscheduler.common.Constants
;
import
org.apache.dolphinscheduler.common.utils.StringUtils
;
import
org.apache.dolphinscheduler.server.utils.SensitiveLogUtil
;
...
...
@@ -30,7 +29,6 @@ import java.util.regex.Pattern;
/**
* sensitive data log converter
*/
@Slf4j
public
class
SensitiveDataConverter
extends
MessageConverter
{
/**
...
...
pom.xml
浏览文件 @
aa715e17
...
...
@@ -64,7 +64,6 @@
<quartz.version>
2.2.3
</quartz.version>
<jackson.version>
2.9.8
</jackson.version>
<mybatis-plus.version>
3.2.0
</mybatis-plus.version>
<lombok.version>
1.18.4
</lombok.version>
<mybatis.spring.version>
2.0.1
</mybatis.spring.version>
<cron.utils.version>
5.0.5
</cron.utils.version>
<fastjson.version>
1.2.61
</fastjson.version>
...
...
@@ -834,11 +833,6 @@
<format>
xml
</format>
<instrumentation>
<ignoreTrivial>
true
</ignoreTrivial>
<ignoreMethodAnnotations>
<ignoreMethodAnnotation>
lombok.Generated
</ignoreMethodAnnotation>
</ignoreMethodAnnotations>
<excludes>
</excludes>
</instrumentation>
</configuration>
</plugin>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录