APEX-16 #renamed dt_checks to apex_checks
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/29bc8347 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/29bc8347 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/29bc8347 Branch: refs/heads/feature-module Commit: 29bc834733616b20f5804ea1f6ee0316a22dff9f Parents: 3f2581e Author: Chandni Singh <[email protected]> Authored: Thu Sep 24 09:55:20 2015 -0700 Committer: Chandni Singh <[email protected]> Committed: Thu Sep 24 09:55:20 2015 -0700 ---------------------------------------------------------------------- apex_checks.xml | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++ dt_checks.xml | 128 --------------------------------------------------- pom.xml | 4 +- 3 files changed, 131 insertions(+), 129 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/29bc8347/apex_checks.xml ---------------------------------------------------------------------- diff --git a/apex_checks.xml b/apex_checks.xml new file mode 100644 index 0000000..f7967e6 --- /dev/null +++ b/apex_checks.xml @@ -0,0 +1,128 @@ +<?xml version="1.0"?> +<!DOCTYPE module PUBLIC + "-//Puppy Crawl//DTD Check Configuration 1.3//EN" + "http://www.puppycrawl.com/dtds/configuration_1_3.dtd";> + +<module name="Checker"> + <property name="charset" value="UTF-8"/> + + <module name="FileTabCharacter"> + <property name="eachLine" value="true"/> + </module> + + <module name="NewlineAtEndOfFile"> + <property name="lineSeparator" value="lf"/> + </module> + + <module name="RegexpMultiline"> + <property name="format" value="System\.(out)|(err)\.print(ln)?\("/> + </module> + + <module name="TreeWalker"> + <module name="OneTopLevelClass"/> + <!-- checks package and import stmts are not line wrapped --> + <module name="NoLineWrap"/> + + <module name="EmptyBlock"> + <property name="option" value="TEXT"/> + <property name="tokens" + value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/> + </module> + <!-- checks for braces around code blocks --> + <module name="NeedBraces"/> + + <module name="LeftCurly"> + <property name="option" value="eol"/> + <property name="tokens" + value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE"/> + </module> + + <module name="LeftCurly"> + <property name="option" value="nl"/> + <property name="tokens" + value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_DEF, ENUM_CONSTANT_DEF, INTERFACE_DEF, METHOD_DEF, STATIC_INIT "/> + </module> + + <module name="RightCurly"> + <property name="option" value="same"/> + <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE"/> + </module> + + <module name="RightCurly"> + <property name="option" value="alone"/> + <property name="tokens" + value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/> + </module> + + <module name="NoWhitespaceAfter"> + <property name="tokens" + value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, TYPECAST, ARRAY_DECLARATOR"/> + </module> + + <module name="NoWhitespaceBefore"> + <property name="tokens" value="SEMI, DOT, POST_DEC, POST_INC"/> + </module> + + <module name="WhitespaceAround"> + <property name="allowEmptyConstructors" value="true"/> + <property name="allowEmptyMethods" value="true"/> + <property name="allowEmptyTypes" value="true"/> + <property name="allowEmptyLoops" value="true"/> + <message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace."/> + <message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/> + </module> + + <module name="OneStatementPerLine"/> + <module name="MultipleVariableDeclarations"/> + <module name="ArrayTypeStyle"/> + <module name="MissingSwitchDefault"/> + + <!-- If the logic requires fallthrough then the text "fallthru", "fall through", "fallthrough", + "falls through" and "fallsthrough" can be placed as a comment after the last line of the case --> + <module name="FallThrough"/> + + <module name="UpperEll"/> + <module name="ModifierOrder"/> + <module name="EmptyLineSeparator"> + <property name="tokens" + value="IMPORT, CLASS_DEF, ENUM_DEF, INTERFACE_DEF, CTOR_DEF, METHOD_DEF, STATIC_INIT, INSTANCE_INIT"/> + </module> + <module name="SeparatorWrap"> + <property name="tokens" value="DOT"/> + <property name="option" value="nl"/> + </module> + + <module name="SeparatorWrap"> + <property name="tokens" value="COMMA"/> + <property name="option" value="EOL"/> + </module> + + <module name="NoFinalizer"/> + <module name="GenericWhitespace"> + <message key="ws.followed" + value="GenericWhitespace ''{0}'' is followed by whitespace."/> + <message key="ws.preceded" + value="GenericWhitespace ''{0}'' is preceded with whitespace."/> + <message key="ws.illegalFollow" + value="GenericWhitespace ''{0}'' should be followed by whitespace."/> + <message key="ws.notPreceded" + value="GenericWhitespace ''{0}'' is not preceded with whitespace."/> + </module> + + <module name="Indentation"> + <property name="basicOffset" value="2"/> + <property name="braceAdjustment" value="0"/> + <property name="caseIndent" value="2"/> + </module> + + <module name="CustomImportOrder"> + <property name="thirdPartyPackageRegExp" value=".*"/> + <property name="specialImportsRegExp" value="com.datatorrent"/> + <property name="sortImportsInGroupAlphabetically" value="true"/> + <property name="customImportOrderRules" + value="STATIC###STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS"/> + </module> + <module name="MethodParamPad"/> + </module> + +</module> http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/29bc8347/dt_checks.xml ---------------------------------------------------------------------- diff --git a/dt_checks.xml b/dt_checks.xml deleted file mode 100644 index f7967e6..0000000 --- a/dt_checks.xml +++ /dev/null @@ -1,128 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module PUBLIC - "-//Puppy Crawl//DTD Check Configuration 1.3//EN" - "http://www.puppycrawl.com/dtds/configuration_1_3.dtd";> - -<module name="Checker"> - <property name="charset" value="UTF-8"/> - - <module name="FileTabCharacter"> - <property name="eachLine" value="true"/> - </module> - - <module name="NewlineAtEndOfFile"> - <property name="lineSeparator" value="lf"/> - </module> - - <module name="RegexpMultiline"> - <property name="format" value="System\.(out)|(err)\.print(ln)?\("/> - </module> - - <module name="TreeWalker"> - <module name="OneTopLevelClass"/> - <!-- checks package and import stmts are not line wrapped --> - <module name="NoLineWrap"/> - - <module name="EmptyBlock"> - <property name="option" value="TEXT"/> - <property name="tokens" - value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/> - </module> - <!-- checks for braces around code blocks --> - <module name="NeedBraces"/> - - <module name="LeftCurly"> - <property name="option" value="eol"/> - <property name="tokens" - value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE"/> - </module> - - <module name="LeftCurly"> - <property name="option" value="nl"/> - <property name="tokens" - value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_DEF, ENUM_CONSTANT_DEF, INTERFACE_DEF, METHOD_DEF, STATIC_INIT "/> - </module> - - <module name="RightCurly"> - <property name="option" value="same"/> - <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE"/> - </module> - - <module name="RightCurly"> - <property name="option" value="alone"/> - <property name="tokens" - value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/> - </module> - - <module name="NoWhitespaceAfter"> - <property name="tokens" - value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, TYPECAST, ARRAY_DECLARATOR"/> - </module> - - <module name="NoWhitespaceBefore"> - <property name="tokens" value="SEMI, DOT, POST_DEC, POST_INC"/> - </module> - - <module name="WhitespaceAround"> - <property name="allowEmptyConstructors" value="true"/> - <property name="allowEmptyMethods" value="true"/> - <property name="allowEmptyTypes" value="true"/> - <property name="allowEmptyLoops" value="true"/> - <message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace."/> - <message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/> - </module> - - <module name="OneStatementPerLine"/> - <module name="MultipleVariableDeclarations"/> - <module name="ArrayTypeStyle"/> - <module name="MissingSwitchDefault"/> - - <!-- If the logic requires fallthrough then the text "fallthru", "fall through", "fallthrough", - "falls through" and "fallsthrough" can be placed as a comment after the last line of the case --> - <module name="FallThrough"/> - - <module name="UpperEll"/> - <module name="ModifierOrder"/> - <module name="EmptyLineSeparator"> - <property name="tokens" - value="IMPORT, CLASS_DEF, ENUM_DEF, INTERFACE_DEF, CTOR_DEF, METHOD_DEF, STATIC_INIT, INSTANCE_INIT"/> - </module> - <module name="SeparatorWrap"> - <property name="tokens" value="DOT"/> - <property name="option" value="nl"/> - </module> - - <module name="SeparatorWrap"> - <property name="tokens" value="COMMA"/> - <property name="option" value="EOL"/> - </module> - - <module name="NoFinalizer"/> - <module name="GenericWhitespace"> - <message key="ws.followed" - value="GenericWhitespace ''{0}'' is followed by whitespace."/> - <message key="ws.preceded" - value="GenericWhitespace ''{0}'' is preceded with whitespace."/> - <message key="ws.illegalFollow" - value="GenericWhitespace ''{0}'' should be followed by whitespace."/> - <message key="ws.notPreceded" - value="GenericWhitespace ''{0}'' is not preceded with whitespace."/> - </module> - - <module name="Indentation"> - <property name="basicOffset" value="2"/> - <property name="braceAdjustment" value="0"/> - <property name="caseIndent" value="2"/> - </module> - - <module name="CustomImportOrder"> - <property name="thirdPartyPackageRegExp" value=".*"/> - <property name="specialImportsRegExp" value="com.datatorrent"/> - <property name="sortImportsInGroupAlphabetically" value="true"/> - <property name="customImportOrderRules" - value="STATIC###STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS"/> - </module> - <module name="MethodParamPad"/> - </module> - -</module> http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/29bc8347/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ba64390..eafd558 100644 --- a/pom.xml +++ b/pom.xml @@ -260,11 +260,13 @@ </goals> <configuration> <failOnViolation>true</failOnViolation> - <configLocation>dt_checks.xml</configLocation> <logViolationsToConsole>${checkstyle.console}</logViolationsToConsole> </configuration> </execution> </executions> + <configuration> + <configLocation>apex_checks.xml</configLocation> + </configuration> </plugin> </plugins> </pluginManagement>
