diff options
Diffstat (limited to 'config/checkstyle')
| -rw-r--r-- | config/checkstyle/checkstyle-best-practice.xml | 5 | ||||
| -rw-r--r-- | config/checkstyle/checkstyle.xml | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/config/checkstyle/checkstyle-best-practice.xml b/config/checkstyle/checkstyle-best-practice.xml index 47586a2bc..3abe4b5e5 100644 --- a/config/checkstyle/checkstyle-best-practice.xml +++ b/config/checkstyle/checkstyle-best-practice.xml @@ -187,11 +187,6 @@ </module> <module name="OverloadMethodsDeclarationOrder"/> <module name="VariableDeclarationUsageDistance"/> - <module name="CustomImportOrder"> - <property name="sortImportsInGroupAlphabetically" value="true"/> - <property name="separateLineBetweenGroups" value="true"/> - <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/> - </module> <module name="MethodParamPad"/> <module name="WhitespaceAfter"/> <module name="NoWhitespaceBefore"> diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 0a5b47eb8..4f916ec3f 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -11,6 +11,13 @@ <module name="TreeWalker"> <module name="OuterTypeFilename"/> + <module name="IllegalTokenText"> + <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/> + <property name="format" + value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/> + <property name="message" + value="Consider using special escape sequence instead of octal value or Unicode escaped value."/> + </module> <module name="AvoidEscapedUnicodeCharacters"> <property name="allowEscapesForControlCharacters" value="true"/> <property name="allowByTailComment" value="true"/> @@ -25,6 +32,7 @@ value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/> </module> <module name="OneStatementPerLine"/> + <module name="MultipleVariableDeclarations"/> <module name="FallThrough"/> <module name="UpperEll"/> <module name="ModifierOrder"/> @@ -68,6 +76,11 @@ <message key="ws.notPreceded" value="GenericWhitespace ''{0}'' is not preceded with whitespace."/> </module> + <module name="NoWhitespaceBefore"> + <property name="tokens" + value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/> + <property name="allowLineBreaks" value="true"/> + </module> <module name="AnnotationLocation"> <property name="id" value="AnnotationLocationMostCases"/> <property name="tokens" |