Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
769b0537
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 接近 2 年
通知
707
Star
9572
Fork
3514
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
769b0537
编写于
12月 04, 2019
作者:
L
lamber-ken
提交者:
qiaozhanwei
12月 04, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[checkstyle] optimize java code checkstyle for LeftCurly rule (#1375)
上级
e6395d0e
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
30 addition
and
21 deletion
+30
-21
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/ServiceModelToSwagger2MapperImpl.java
...r/api/configuration/ServiceModelToSwagger2MapperImpl.java
+1
-2
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java
.../dolphinscheduler/api/controller/ResourcesController.java
+1
-2
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FourLetterWordMain.java
...apache/dolphinscheduler/api/utils/FourLetterWordMain.java
+2
-4
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java
...apache/dolphinscheduler/common/enums/ExecutionStatus.java
+3
-1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/zk/AbstractZKClient.java
...g/apache/dolphinscheduler/common/zk/AbstractZKClient.java
+6
-2
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/queue/TaskQueueImplTest.java
...ache/dolphinscheduler/common/queue/TaskQueueImplTest.java
+1
-2
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/TaskRecordDao.java
...n/java/org/apache/dolphinscheduler/dao/TaskRecordDao.java
+1
-2
style/checkstyle.xml
style/checkstyle.xml
+15
-6
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/ServiceModelToSwagger2MapperImpl.java
浏览文件 @
769b0537
...
...
@@ -156,8 +156,7 @@ public class ServiceModelToSwagger2MapperImpl extends ServiceModelToSwagger2Mapp
List
<
String
>
list
=
new
ArrayList
<
String
>(
tagsSet
.
size
());
Iterator
<
String
>
it
=
from
.
getTags
().
iterator
();
while
(
it
.
hasNext
())
{
while
(
it
.
hasNext
()){
String
tag
=
it
.
next
();
list
.
add
(
StringUtils
.
isNotBlank
(
tag
)
?
messageSource
.
getMessage
(
tag
,
null
,
tag
,
locale
)
:
" "
);
}
...
...
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java
浏览文件 @
769b0537
...
...
@@ -451,8 +451,7 @@ public class ResourcesController extends BaseController{
@GetMapping
(
value
=
"/udf-func/update-ui"
)
@ResponseStatus
(
HttpStatus
.
OK
)
public
Result
viewUIUdfFunction
(
@ApiIgnore
@RequestAttribute
(
value
=
Constants
.
SESSION_USER
)
User
loginUser
,
@RequestParam
(
"id"
)
int
id
)
{
@RequestParam
(
"id"
)
int
id
)
{
logger
.
info
(
"login user {}, query udf{}"
,
loginUser
.
getUserName
(),
id
);
try
{
...
...
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FourLetterWordMain.java
浏览文件 @
769b0537
...
...
@@ -45,8 +45,7 @@ public class FourLetterWordMain {
* @throws java.io.IOException io exceptions
*/
public
static
String
send4LetterWord
(
String
host
,
int
port
,
String
cmd
)
throws
IOException
{
throws
IOException
{
return
send4LetterWord
(
host
,
port
,
cmd
,
DEFAULT_SOCKET_TIMEOUT
);
}
/**
...
...
@@ -59,8 +58,7 @@ public class FourLetterWordMain {
* @throws java.io.IOException io exceptions
*/
public
static
String
send4LetterWord
(
String
host
,
int
port
,
String
cmd
,
int
timeout
)
throws
IOException
{
throws
IOException
{
LOG
.
info
(
"connecting to "
+
host
+
" "
+
port
);
Socket
sock
=
new
Socket
();
InetSocketAddress
hostaddress
=
host
!=
null
?
new
InetSocketAddress
(
host
,
port
)
:
...
...
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java
浏览文件 @
769b0537
...
...
@@ -119,7 +119,9 @@ public enum ExecutionStatus {
* status is cancel
* @return status
*/
public
boolean
typeIsCancel
(){
return
this
==
KILL
||
this
==
STOP
;}
public
boolean
typeIsCancel
(){
return
this
==
KILL
||
this
==
STOP
;
}
}
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/zk/AbstractZKClient.java
浏览文件 @
769b0537
...
...
@@ -419,13 +419,17 @@ public abstract class AbstractZKClient {
*
* @return get worker node parent path
*/
protected
String
getWorkerZNodeParentPath
(){
return
conf
.
getString
(
Constants
.
ZOOKEEPER_DOLPHINSCHEDULER_WORKERS
);};
protected
String
getWorkerZNodeParentPath
(){
return
conf
.
getString
(
Constants
.
ZOOKEEPER_DOLPHINSCHEDULER_WORKERS
);
}
/**
*
* @return get master node parent path
*/
protected
String
getMasterZNodeParentPath
(){
return
conf
.
getString
(
Constants
.
ZOOKEEPER_DOLPHINSCHEDULER_MASTERS
);}
protected
String
getMasterZNodeParentPath
(){
return
conf
.
getString
(
Constants
.
ZOOKEEPER_DOLPHINSCHEDULER_MASTERS
);
}
/**
*
...
...
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/queue/TaskQueueImplTest.java
浏览文件 @
769b0537
...
...
@@ -94,8 +94,7 @@ public class TaskQueueImplTest extends StandaloneZKServerForTest {
public
void
extremeTest
(){
int
total
=
30
*
10000
;
for
(
int
i
=
0
;
i
<
total
;
i
++)
{
for
(
int
i
=
0
;
i
<
total
;
i
++)
{
for
(
int
j
=
0
;
j
<
total
;
j
++)
{
//${processInstancePriority}_${processInstanceId}_${taskInstancePriority}_${taskId}
//format ${processInstancePriority}_${processInstanceId}_${taskInstancePriority}_${taskId}
...
...
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/TaskRecordDao.java
浏览文件 @
769b0537
...
...
@@ -93,8 +93,7 @@ public class TaskRecordDao {
* @param filterMap filterMap
* @return sql string
*/
private
static
String
getWhereString
(
Map
<
String
,
String
>
filterMap
)
{
private
static
String
getWhereString
(
Map
<
String
,
String
>
filterMap
)
{
if
(
filterMap
.
size
()
==
0
){
return
""
;
}
...
...
style/checkstyle.xml
浏览文件 @
769b0537
...
...
@@ -37,16 +37,25 @@
</module>
<module
name=
"TreeWalker"
>
<module
name=
"OuterTypeFilename"
>
<property
name=
"severity"
value=
"error"
/>
</module>
<module
name=
"O
uterTypeFilename"
/
>
<
module
name=
"OneTopLevelClass"
/
>
<module
name=
"O
neTopLevelClass"
>
<property
name=
"severity"
value=
"error"
/>
<
/module
>
<module
name=
"NoLineWrap"
/>
<module
name=
"NoLineWrap"
>
<property
name=
"severity"
value=
"error"
/>
</module>
<module
name=
"NeedBraces"
/>
<module
name=
"NeedBraces"
>
<property
name=
"severity"
value=
"error"
/>
</module>
<module
name=
"LeftCurly"
/>
<module
name=
"LeftCurly"
>
<property
name=
"severity"
value=
"error"
/>
</module>
<module
name=
"AvoidNestedBlocks"
>
<property
name=
"allowInSwitchCase"
value=
"true"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录