Skip to content

Commit d108b23

Browse files
rnveachromani
authored andcommitted
Issue #100: upgraded checkstyle to 7.7
1 parent 3a7fda1 commit d108b23

File tree

3 files changed

+22
-6
lines changed

3 files changed

+22
-6
lines changed

checkstyle-sonar-plugin/src/main/resources/org/sonar/l10n/checkstyle.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTokenTextCh
2323
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.ClassFanOutComplexityCheck.name=Class Fan Out Complexity
2424
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.ClassFanOutComplexityCheck.param.max=the maximum threshold allowed. Default is 20.
2525
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.ClassFanOutComplexityCheck.param.excludedClasses=User-configured class names to ignore
26+
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.ClassFanOutComplexityCheck.param.excludeClassesRegexps=User-configured regular expressions to ignore classes
27+
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.ClassFanOutComplexityCheck.param.excludedPackages=User-configured packages to ignore
2628
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.annotation.MissingDeprecatedCheck.name=Missing Deprecated
2729
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.annotation.MissingDeprecatedCheck.param.skipNoJavadoc=When this property is set to true check ignore cases when JavaDoc is missing, but still warns when JavaDoc is present but either @deprecated is missing from JavaDoc or @deprecated is missing from the element.
2830
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.sizes.OuterTypeNumberCheck.name=Outer Type Number
@@ -265,6 +267,7 @@ rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.header.RegexpHeaderCheck.
265267
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.header.RegexpHeaderCheck.param.charset=character encoding to use when reading the headerFile
266268
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.header.RegexpHeaderCheck.param.fileExtensions=file type extension of files to process
267269
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.DefaultComesLastCheck.name=Default Comes Last
270+
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.DefaultComesLastCheck.param.skipIfLastAndSharedWithCase=whether to allow default along with case if they are not last
268271
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck.name=No Whitespace After
269272
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck.param.allowLineBreaks=whether whitespace is allowed if the token is at a linebreak. Default is true.
270273
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck.param.tokens=tokens to check
@@ -354,6 +357,8 @@ rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.StringLiteralEqual
354357
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.ClassDataAbstractionCouplingCheck.name=Class Data Abstraction Coupling
355358
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.ClassDataAbstractionCouplingCheck.param.max=the maximum threshold allowed. Default is 7.
356359
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.ClassDataAbstractionCouplingCheck.param.excludedClasses=User-configured class names to ignore.
360+
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.ClassDataAbstractionCouplingCheck.param.excludeClassesRegexps=User-configured regular expressions to ignore classes
361+
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.ClassDataAbstractionCouplingCheck.param.excludedPackages=User-configured packages to ignore
357362
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.FallThroughCheck.name=Fall Through
358363
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.FallThroughCheck.param.checkLastCaseGroup=Whether we need to check last case group or not. Default is false.
359364
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.FallThroughCheck.param.reliefPattern=Regular expression to match the relief comment that suppresses the warning about a fall through.

checkstyle-sonar-plugin/src/main/resources/org/sonar/plugins/checkstyle/rules.xml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,10 @@
362362
</param>
363363
<param key="excludedClasses" type="STRING">
364364
</param>
365+
<param key="excludeClassesRegexps" type="s{}">
366+
</param>
367+
<param key="excludedPackages" type="STRING">
368+
</param>
365369
</rule>
366370

367371
<rule key="com.puppycrawl.tools.checkstyle.checks.metrics.ClassFanOutComplexityCheck">
@@ -372,6 +376,10 @@
372376
</param>
373377
<param key="excludedClasses" type="s{}">
374378
</param>
379+
<param key="excludeClassesRegexps" type="s{}">
380+
</param>
381+
<param key="excludedPackages" type="STRING">
382+
</param>
375383
<status>READY</status>
376384
</rule>
377385

@@ -440,6 +448,9 @@
440448
<priority>MAJOR</priority>
441449
<name><![CDATA[Default Comes Last]]></name>
442450
<configKey><![CDATA[Checker/TreeWalker/DefaultComesLast]]></configKey>
451+
<param key="skipIfLastAndSharedWithCase" type="BOOLEAN">
452+
<defaultValue>false</defaultValue>
453+
</param>
443454
<status>READY</status>
444455
</rule>
445456

@@ -1227,7 +1238,7 @@
12271238
<param key="allowLineBreaks" type="BOOLEAN">
12281239
<defaultValue>false</defaultValue>
12291240
</param>
1230-
<param key="tokens" type="s[COMMA,SEMI,POST_INC,POST_DEC,DOT,GENERIC_START,GENERIC_END,ELLIPSIS]">
1241+
<param key="tokens" type="s[COMMA,SEMI,POST_INC,POST_DEC,DOT,GENERIC_START,GENERIC_END,ELLIPSIS,METHOD_REF]">
12311242
<defaultValue>COMMA,SEMI,POST_INC,POST_DEC,ELLIPSIS</defaultValue>
12321243
</param>
12331244
</rule>
@@ -1315,8 +1326,8 @@
13151326
<param key="option" type="s[nospace,space]">
13161327
<defaultValue>nospace</defaultValue>
13171328
</param>
1318-
<param key="tokens" type="s[ANNOTATION,ANNOTATION_FIELD_DEF,CTOR_CALL,CTOR_DEF,ENUM_CONSTANT_DEF,EXPR,LITERAL_CATCH,LITERAL_DO,LITERAL_FOR,LITERAL_IF,LITERAL_NEW,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_WHILE,METHOD_CALL,METHOD_DEF,QUESTION,RESOURCE_SPECIFICATION,SUPER_CTOR_CALL,LAMBDA]">
1319-
<defaultValue>ANNOTATION,ANNOTATION_FIELD_DEF,CTOR_CALL,CTOR_DEF,ENUM_CONSTANT_DEF,EXPR,LITERAL_CATCH,LITERAL_DO,LITERAL_FOR,LITERAL_IF,LITERAL_NEW,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_WHILE,METHOD_CALL,METHOD_DEF,QUESTION,RESOURCE_SPECIFICATION,SUPER_CTOR_CALL,LAMBDA</defaultValue>
1329+
<param key="tokens" type="s[ANNOTATION,ANNOTATION_FIELD_DEF,CTOR_CALL,CTOR_DEF,DOT,ENUM_CONSTANT_DEF,EXPR,LITERAL_CATCH,LITERAL_DO,LITERAL_FOR,LITERAL_IF,LITERAL_NEW,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_WHILE,METHOD_CALL,METHOD_DEF,QUESTION,RESOURCE_SPECIFICATION,SUPER_CTOR_CALL,LAMBDA]">
1330+
<defaultValue>ANNOTATION,ANNOTATION_FIELD_DEF,CTOR_CALL,CTOR_DEF,DOT,ENUM_CONSTANT_DEF,EXPR,LITERAL_CATCH,LITERAL_DO,LITERAL_FOR,LITERAL_IF,LITERAL_NEW,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_WHILE,METHOD_CALL,METHOD_DEF,QUESTION,RESOURCE_SPECIFICATION,SUPER_CTOR_CALL,LAMBDA</defaultValue>
13201331
</param>
13211332
</rule>
13221333

@@ -1391,7 +1402,7 @@
13911402
<param key="shouldStartLine" type="BOOLEAN">
13921403
<defaultValue>true</defaultValue>
13931404
</param>
1394-
<param key="tokens" type="s[LITERAL_TRY,LITERAL_CATCH,LITERAL_FINALLY,LITERAL_IF,LITERAL_ELSE,CLASS_DEF,METHOD_DEF,CTOR_DEF,LITERAL_FOR,LITERAL_WHILE,LITERAL_DO,STATIC_INIT,INSTANCE_INIT]">
1405+
<param key="tokens" type="s[LITERAL_TRY,LITERAL_CATCH,LITERAL_FINALLY,LITERAL_IF,LITERAL_ELSE,CLASS_DEF,METHOD_DEF,CTOR_DEF,LITERAL_FOR,LITERAL_WHILE,LITERAL_DO,STATIC_INIT,INSTANCE_INIT,LAMBDA]">
13951406
<defaultValue>LITERAL_TRY,LITERAL_CATCH,LITERAL_FINALLY,LITERAL_IF,LITERAL_ELSE</defaultValue>
13961407
</param>
13971408
<status>READY</status>
@@ -2014,7 +2025,7 @@
20142025
<param key="option" type="s[eol,nl]">
20152026
<defaultValue>eol</defaultValue>
20162027
</param>
2017-
<param key="tokens" type="s[DOT,COMMA,SEMI,ELLIPSIS,AT,LPAREN,RPAREN,ARRAY_DECLARATOR,RBRACK]">
2028+
<param key="tokens" type="s[DOT,COMMA,SEMI,ELLIPSIS,AT,LPAREN,RPAREN,ARRAY_DECLARATOR,RBRACK,METHOD_REF]">
20182029
<defaultValue>DOT,COMMA</defaultValue>
20192030
</param>
20202031
</rule>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
</ciManagement>
8686

8787
<properties>
88-
<checkstyle.version>7.6.1</checkstyle.version>
88+
<checkstyle.version>7.7</checkstyle.version>
8989
<sonar.version>5.6.6</sonar.version>
9090
<sonar-java.version>3.7</sonar-java.version>
9191
<java.version>1.8</java.version>

0 commit comments

Comments
 (0)