This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new db39f1f [Improvement][style] Improve checkstyle import order and code
style importer (#3368)
db39f1f is described below
commit db39f1f38574a2da542ac44e522aeb0a8de1de51
Author: Yichao Yang <1048262...@qq.com>
AuthorDate: Mon Aug 10 15:03:27 2020 +0800
[Improvement][style] Improve checkstyle import order and code style
importer (#3368)
* [Improvement][style] Add code import style automatic formatter
* Update checkstyle.xml
* Update checkstyle.xml
* [Improvement][api] Improve the code style and checkstyle of ds
* Update checkstyle.xml
---
style/checkstyle.xml | 63 ++++++++++++++++++++++++--------------
style/intellij-java-code-style.xml | 16 ++++++++++
2 files changed, 56 insertions(+), 23 deletions(-)
diff --git a/style/checkstyle.xml b/style/checkstyle.xml
index 54188c6..2a74b99 100644
--- a/style/checkstyle.xml
+++ b/style/checkstyle.xml
@@ -186,19 +186,51 @@
</module>
<module name="Indentation">
- <property name="basicOffset" value="2"/>
+ <property name="basicOffset" value="4"/>
<property name="braceAdjustment" value="0"/>
- <property name="caseIndent" value="2"/>
- <property name="throwsIndent" value="4"/>
+ <property name="caseIndent" value="4"/>
+ <property name="throwsIndent" value="2"/>
<property name="lineWrappingIndentation" value="4"/>
- <property name="arrayInitIndent" value="2"/>
+ <property name="arrayInitIndent" value="4"/>
</module>
- <module name="UnusedImports"/>
-
+ <module name="IllegalImport">
+ <property name="regexp" value="true"/>
+ <property name="illegalPkgs"
+ value="^com\.google\.api\.client\.repackaged,
+ ^avro\.shaded, ^org\.apache\.hadoop\.hbase\.shaded,
+ ^org\.apache\.hadoop\.shaded,
+ ^javax\.ws\.rs\.ext,
+ ^cc\.concurrent\.mango\.util\.concurrent,
+ ^org\.apache\.curator-test\.shaded,
+ ^com\.sun\.istack,
+ ^org\.apache\.commons\.lang,
+ ^org\.jetbrains\.annotations,
+ ^jline\.internal,
+ ^com\.cronutils\.utils,
+ ^javax\.ws\.rs\.ext,
+ ^org\.jboss\.netty\.util\.internal,
+ ^com\.sun\.javafx,
+ ^io\.reactivex\.annotations,
+ ^org\.codehaus\.jackson"/>
+ <property name="illegalClasses"
+ value="^java\.util\.logging\.Logging,
+ ^sun\.misc\.BASE64Encoder,
+ ^sun\.misc\.BASE64Decoder,
+ ^jdk\.internal\.jline\.internal\.Nullable"/>
+ </module>
+
<module name="RedundantImport"/>
-
- <module name="MethodParamPad"/>
+
+ <module name="UnusedImports"/>
+
+ <module name="ImportOrder">
+ <property name="groups"
value="org.apache.dolphinscheduler,org.apache,java,javax,org,com"/>
+ <property name="ordered" value="true"/>
+ <property name="separated" value="true"/>
+ <property name="option" value="top"/>
+ <property name="sortStaticImportsAlphabetically" value="true"/>
+ </module>
<module name="NoWhitespaceBefore">
<property name="tokens" value="COMMA, SEMI, POST_INC, POST_DEC,
DOT, ELLIPSIS, METHOD_REF"/>
@@ -233,11 +265,6 @@
<module name="CommentsIndentation"/>
- <module name="IllegalImport">
- <property name="illegalPkgs" value="org.apache.commons"/>
- <property name="illegalClasses" value="java.util.Optional,
com.google.common.base.Optional"/>
- </module>
-
<module name="EmptyStatement">
<property name="severity" value="error"/>
</module>
@@ -249,16 +276,6 @@
<property name="allowMissingParamTags" value="true"/>
</module>
- <module name="ImportOrder">
- <property name="groups" value="org.apache.dolphinscheduler, *,
javax, java, scala"/>
- <property name="separated" value="true"/>
- <property name="sortStaticImportsAlphabetically" value="true"/>
- <property name="option" value="bottom"/>
- <property name="tokens" value="STATIC_IMPORT, IMPORT"/>
- <message key="import.ordering"
- value="Import {0} appears after other imports that it
should precede"/>
- </module>
-
<module name="AvoidStarImport"/>
</module>
diff --git a/style/intellij-java-code-style.xml
b/style/intellij-java-code-style.xml
index ae333b1..8e0cd2f 100644
--- a/style/intellij-java-code-style.xml
+++ b/style/intellij-java-code-style.xml
@@ -37,8 +37,24 @@
</option>
<option name="IMPORT_LAYOUT_TABLE">
<value>
+ <package name="org.apache.dolphinscheduler" withSubpackages="true"
static="true" />
+ <emptyLine />
+ <package name="org.apache" withSubpackages="true" static="true" />
+ <emptyLine />
+ <package name="java" withSubpackages="true" static="true" />
+ <emptyLine />
+ <package name="javax" withSubpackages="true" static="true" />
+ <emptyLine />
+ <package name="org" withSubpackages="true" static="true" />
+ <emptyLine />
+ <package name="com" withSubpackages="true" static="true" />
+ <emptyLine />
<package name="" withSubpackages="true" static="true" />
<emptyLine />
+ <package name="org.apache.dolphinscheduler" withSubpackages="true"
static="false" />
+ <emptyLine />
+ <package name="org.apache" withSubpackages="true" static="false" />
+ <emptyLine />
<package name="java" withSubpackages="true" static="false" />
<emptyLine />
<package name="javax" withSubpackages="true" static="false" />
