Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yanghaoyuan.sh
DolphinScheduler
提交
896fef6c
DolphinScheduler
项目概览
yanghaoyuan.sh
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
0
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,发现更多精彩内容 >>
未验证
提交
896fef6c
编写于
8月 13, 2022
作者:
E
Eric Gao
提交者:
GitHub
8月 13, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Feature][Style] Enable spotless to manage imports (#11458)
上级
7ff34c39
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
62 addition
and
27 deletion
+62
-27
dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/task/zeppelin/ZeppelinTask.java
...e/dolphinscheduler/plugin/task/zeppelin/ZeppelinTask.java
+7
-4
pom.xml
pom.xml
+32
-23
style/eclipse.importorder
style/eclipse.importorder
+23
-0
未找到文件。
dolphinscheduler-task-plugin/dolphinscheduler-task-zeppelin/src/main/java/org/apache/dolphinscheduler/plugin/task/zeppelin/ZeppelinTask.java
浏览文件 @
896fef6c
...
...
@@ -17,23 +17,26 @@
package
org.apache.dolphinscheduler.plugin.task.zeppelin
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
kong.unirest.Unirest
;
import
org.apache.dolphinscheduler.plugin.task.api.AbstractTaskExecutor
;
import
org.apache.dolphinscheduler.plugin.task.api.TaskConstants
;
import
org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext
;
import
org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters
;
import
org.apache.dolphinscheduler.spi.utils.DateUtils
;
import
org.apache.dolphinscheduler.spi.utils.JSONUtils
;
import
org.apache.zeppelin.client.ClientConfig
;
import
org.apache.zeppelin.client.NoteResult
;
import
org.apache.zeppelin.client.ParagraphResult
;
import
org.apache.zeppelin.client.Status
;
import
org.apache.zeppelin.client.ZeppelinClient
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
kong.unirest.Unirest
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
public
class
ZeppelinTask
extends
AbstractTaskExecutor
{
...
...
@@ -52,7 +55,6 @@ public class ZeppelinTask extends AbstractTaskExecutor {
*/
private
ZeppelinClient
zClient
;
/**
* constructor
*
...
...
@@ -121,7 +123,8 @@ public class ZeppelinTask extends AbstractTaskExecutor {
resultContent
=
resultContentBuilder
.
toString
();
}
else
{
final
ParagraphResult
paragraphResult
=
this
.
zClient
.
executeParagraph
(
noteId
,
paragraphId
,
zeppelinParamsMap
);
final
ParagraphResult
paragraphResult
=
this
.
zClient
.
executeParagraph
(
noteId
,
paragraphId
,
zeppelinParamsMap
);
resultContent
=
paragraphResult
.
getResultInText
();
status
=
paragraphResult
.
getStatus
();
}
...
...
pom.xml
浏览文件 @
896fef6c
...
...
@@ -31,7 +31,7 @@
<description>
Dolphin Scheduler is a distributed and easy-to-expand visual DAG workflow scheduling system, dedicated
to solving the complex dependencies in data processing, making the scheduling system out of the box for data
processing.
</description>
<modules>
<module>
dolphinscheduler-bom
</module>
<module>
dolphinscheduler-alert
</module>
...
...
@@ -58,7 +58,7 @@
<module>
dolphinscheduler-ui
</module>
<module>
dolphinscheduler-scheduler-plugin
</module>
</modules>
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<project.reporting.outputEncoding>
UTF-8
</project.reporting.outputEncoding>
...
...
@@ -91,11 +91,11 @@
<docker.tag>
${project.version}
</docker.tag>
<docker.build.skip>
true
</docker.build.skip>
<docker.push.skip>
true
</docker.push.skip>
<python.sign.skip>
true
</python.sign.skip>
<skipDepCheck>
true
</skipDepCheck>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
...
...
@@ -173,13 +173,13 @@
<artifactId>
dolphinscheduler-spi
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
org.apache.dolphinscheduler
</groupId>
<artifactId>
dolphinscheduler-data-quality
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
org.apache.dolphinscheduler
</groupId>
<artifactId>
dolphinscheduler-python
</artifactId>
...
...
@@ -260,7 +260,7 @@
<artifactId>
dolphinscheduler-registry-mysql
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
org.apache.dolphinscheduler
</groupId>
<artifactId>
dolphinscheduler-scheduler-api
</artifactId>
...
...
@@ -271,7 +271,7 @@
<artifactId>
dolphinscheduler-scheduler-quartz
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
org.apache.dolphinscheduler
</groupId>
<artifactId>
dolphinscheduler-datasource-all
</artifactId>
...
...
@@ -282,7 +282,7 @@
<artifactId>
dolphinscheduler-datasource-api
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
org.apache.dolphinscheduler
</groupId>
<artifactId>
dolphinscheduler-task-api
</artifactId>
...
...
@@ -298,7 +298,7 @@
<artifactId>
dolphinscheduler-task-all
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
org.apache.dolphinscheduler
</groupId>
<artifactId>
dolphinscheduler-ui
</artifactId>
...
...
@@ -310,9 +310,9 @@
<version>
${project.version}
</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!--
NOTE: only development / test phase dependencies (scope = test / provided)
...
...
@@ -370,7 +370,7 @@
<scope>
test
</scope>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
...
...
@@ -380,7 +380,7 @@
<version>
${rpm-maven-plugion.version}
</version>
<inherited>
false
</inherited>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-compiler-plugin
</artifactId>
...
...
@@ -392,7 +392,7 @@
<testTarget>
${java.version}
</testTarget>
</configuration>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-release-plugin
</artifactId>
...
...
@@ -401,13 +401,13 @@
<tagNameFormat>
@{project.version}
</tagNameFormat>
</configuration>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-assembly-plugin
</artifactId>
<version>
${maven-assembly-plugin.version}
</version>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-javadoc-plugin
</artifactId>
...
...
@@ -417,7 +417,7 @@
<failOnError>
false
</failOnError>
</configuration>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-dependency-plugin
</artifactId>
...
...
@@ -512,7 +512,7 @@
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>
org.owasp
</groupId>
...
...
@@ -554,7 +554,7 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-compiler-plugin
</artifactId>
...
...
@@ -584,7 +584,7 @@
</dependency>
</dependencies>
</plugin>
<!-- jenkins plugin jacoco report-->
<plugin>
<groupId>
org.jacoco
</groupId>
...
...
@@ -648,13 +648,22 @@
<eclipse>
<file>
style/spotless_dolphinscheduler_formatter.xml
</file>
</eclipse>
<removeUnusedImports
/>
<importOrder>
<file>
style/eclipse.importorder
</file>
</importOrder>
<replaceRegex>
<name>
Remove wildcard imports
</name>
<searchRegex>
import\s+[^\*\s]+\*;(\r\n|\r|\n)
</searchRegex>
<replacement>
$1
</replacement>
</replaceRegex>
</java>
<pom>
<sortPom>
<encoding>
UTF-8
</encoding>
<nrOfIndentSpace>
4
</nrOfIndentSpace>
<keepBlankLines>
true
</keepBlankLines>
<indentBlankLines>
tru
e
</indentBlankLines>
<indentBlankLines>
fals
e
</indentBlankLines>
<indentSchemaLocation>
true
</indentSchemaLocation>
<spaceBeforeCloseEmptyElement>
true
</spaceBeforeCloseEmptyElement>
<sortModules>
false
</sortModules>
...
...
@@ -747,7 +756,7 @@
<url>
https://github.com/apache/dolphinscheduler
</url>
<tag>
HEAD
</tag>
</scm>
<profiles>
<profile>
<id>
docker
</id>
...
...
style/eclipse.importorder
0 → 100644
浏览文件 @
896fef6c
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#Organize Import Order
0=org.apache.dolphinscheduler
1=org.apache
2=java
3=javax
4=org
5=com
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录