This is an automated email from the ASF dual-hosted git repository.
zhangzc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/carbondata.git
The following commit(s) were added to refs/heads/master by this push:
new 2a2dcea [CARBONDATA-3528] refactor java checkstyle rules
2a2dcea is described below
commit 2a2dcea6c151461a2533e94b4414df156431fc95
Author: lamber-ken <[email protected]>
AuthorDate: Fri Sep 27 15:39:25 2019 +0800
[CARBONDATA-3528] refactor java checkstyle rules
AIMS
Goog products require good coding checkstyle. This issue aims to refactor
the java checkstyle.
Docs and tools
https://checkstyle.sourceforge.io/checks.html
mvn org.apache.maven.plugins:maven-checkstyle-plugin:2.17:check
New rules
RedundantImport
AvoidStarImport
LeftCurly
SimplifyBooleanExpression
EmptyStatement
EmptyLineSeparator
WhitespaceAfter
NoWhitespaceAfter
NoWhitespaceBefore
OperatorWrap
Tasks
Current, the severity property of these new rules is info level, so it will
not affect the build.
After we finish these rules, the level will change to error level.
This closes #3401
---
dev/javastyle-config.xml | 83 ++++++++++++++++++++++++++++++++++++++++++++--
integration/presto/pom.xml | 2 +-
2 files changed, 81 insertions(+), 4 deletions(-)
diff --git a/dev/javastyle-config.xml b/dev/javastyle-config.xml
index 6c42182..9ccba9e 100644
--- a/dev/javastyle-config.xml
+++ b/dev/javastyle-config.xml
@@ -139,15 +139,15 @@
<property name="lineWrappingIndentation" value="4"/>
<property name="arrayInitIndent" value="4"/>
</module>
-
+
<!-- TODO: 11/09/15 disabled - order is currently wrong in many places
-->
-
+
<module name="ImportOrder">
<property name="separated" value="true"/>
<!--<property name="ordered" value="true"/>-->
<property name="groups"
value="/^javax?\./,org.apache.carbondata,*"/>
</module>
-
+
<module name="MethodParamPad"/>
<module name="AnnotationLocation">
<property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
METHOD_DEF, CTOR_DEF"/>
@@ -169,5 +169,82 @@
<module name="ParenPad"/>
<module name="WhitespaceAround"/>
+
+ <!-- Checks for @Overrider in one line -->
+ <module name="RegexpSinglelineJava">
+ <property name="severity" value="info"/>
+ <property name="format" value="^\s*@Override\s+.+$"/>
+ <property name="ignoreComments" value="true"/>
+ <property name="message" value="@Override should at one line"/>
+ </module>
+
+ <!-- Checks for redundant imports. -->
+ <module name="RedundantImport">
+ <property name="severity" value="info"/>
+ <message key="import.redundancy" value="Redundant import {0}."/>
+ </module>
+
+ <!-- Checks for star import. -->
+ <module name="AvoidStarImport">
+ <property name="severity" value="info"/>
+ </module>
+
+ <!-- Checks for placement of the left curly brace ('{'). -->
+ <module name="LeftCurly">
+ <property name="severity" value="info"/>
+ </module>
+
+ <!-- Checks for complicated boolean expressions. -->
+ <module name="SimplifyBooleanExpression">
+ <property name="severity" value="info"/>
+ </module>
+
+ <!-- Checks for empty statements. -->
+ <module name="EmptyStatement">
+ <property name="severity" value="info"/>
+ </module>
+
+ <!-- Checks for consecutive semicolons. -->
+ <module name="RegexpSinglelineJava">
+ <property name="severity" value="info"/>
+ <property name="format" value=";{2,}"/>
+ <property name="message" value="Please use one semicolon"/>
+ <property name="ignoreComments" value="true"/>
+ </module>
+
+ <!-- Checks for empty line separator between tokens. -->
+ <module name="EmptyLineSeparator">
+ <property name="severity" value="info"/>
+ <property name="allowMultipleEmptyLines" value="false"/>
+ <property name="tokens" value="PACKAGE_DEF, IMPORT, CLASS_DEF,
INTERFACE_DEF, ENUM_DEF,
+ STATIC_INIT, INSTANCE_INIT,
METHOD_DEF,CTOR_DEF"/>
+ </module>
+
+ <!-- Checks for commas, semicolons and typecasts are followed by
whitespace. -->
+ <module name="WhitespaceAfter">
+ <property name="severity" value="info"/>
+ <property name="tokens" value="COMMA, SEMI, TYPECAST"/>
+ </module>
+
+ <!-- Checks for there is no whitespace after unary operators. -->
+ <module name="NoWhitespaceAfter">
+ <property name="severity" value="info"/>
+ <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT,
UNARY_MINUS, UNARY_PLUS"/>
+ <property name="allowLineBreaks" value="true"/>
+ </module>
+
+ <!-- Checks for there is no whitespace before unary operators. -->
+ <module name="NoWhitespaceBefore">
+ <property name="severity" value="info"/>
+ <property name="tokens" value="SEMI, DOT, POST_DEC, POST_INC"/>
+ <property name="allowLineBreaks" value="true"/>
+ </module>
+
+ <!-- Checks for assign operators are at the end of the line. -->
+ <module name="OperatorWrap">
+ <property name="severity" value="info"/>
+ <property name="option" value="eol"/>
+ <property name="tokens" value="ASSIGN"/>
+ </module>
</module>
</module>
diff --git a/integration/presto/pom.xml b/integration/presto/pom.xml
index 83b192d..0424039 100644
--- a/integration/presto/pom.xml
+++ b/integration/presto/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>carbondata-presto</artifactId>
- <name>Apache CarbonData :: presto</name>
+ <name>Apache CarbonData :: Presto</name>
<packaging>presto-plugin</packaging>
<properties>
