Skip to content

Commit 457ece9

Browse files
committed
Issue #180: upgrade to checkstyle 8.16
1 parent d247a71 commit 457ece9

File tree

7 files changed

+38
-2
lines changed

7 files changed

+38
-2
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ This plugin provides coding rules from [Checkstyle](http://checkstyle.sourceforg
1818

1919
Checkstyle Plugin|Sonar|Checkstyle|Jdk
2020
-----------------|-----|----------|---
21+
4.16|5.6.6|8.16|1.8
2122
4.15|5.6.6|8.15|1.8
2223
4.14|5.6.6|8.14|1.8
2324
4.13|5.6.6|8.13|1.8

checkstyle-sonar-plugin/src/main/resources/com/sonar/sqale/checkstyle-model.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,19 @@
578578
<txt>min</txt>
579579
</prop>
580580
</chc>
581+
<chc>
582+
<rule-repo>checkstyle</rule-repo>
583+
<rule-key>com.puppycrawl.tools.checkstyle.checks.modifier.ClassMemberImpliedModifierCheck</rule-key>
584+
<prop>
585+
<key>remediationFunction</key>
586+
<txt>CONSTANT_ISSUE</txt>
587+
</prop>
588+
<prop>
589+
<key>offset</key>
590+
<val>2</val>
591+
<txt>min</txt>
592+
</prop>
593+
</chc>
581594
<chc>
582595
<rule-repo>checkstyle</rule-repo>
583596
<rule-key>com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck</rule-key>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,9 @@ rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.modifier.InterfaceMemberI
164164
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.modifier.InterfaceMemberImpliedModifierCheck.param.violateImpliedAbstractMethod=Control whether to enforce that abstract is explicitly coded on interface methods.
165165
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.modifier.InterfaceMemberImpliedModifierCheck.param.violateImpliedPublicNested=Control whether to enforce that public is explicitly coded on interface nested types.
166166
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.modifier.InterfaceMemberImpliedModifierCheck.param.violateImpliedStaticNested=Control whether to enforce that static is explicitly coded on interface nested types.
167+
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.modifier.ClassMemberImpliedModifierCheck.name=Class Member Implied Modifier
168+
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.modifier.ClassMemberImpliedModifierCheck.param.violateImpliedStaticOnNestedEnum=Control whether to enforce that static is explicitly coded on nested enums in classes.
169+
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.modifier.ClassMemberImpliedModifierCheck.param.violateImpliedStaticOnNestedInterface=Control whether to enforce that static is explicitly coded on nested interfaces in classes.
167170
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForInitializerPadCheck.name=Empty For Initializer Pad
168171
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForInitializerPadCheck.param.option=policy on how to pad an empty for iterator
169172
rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.name=Javadoc Style
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<div >
2+
<div class="section">
3+
Checks for implicit modifiers on nested types in classes.
4+
see full documentation at <a href="https://checkstyle.org/config_modifier.html#ClassMemberImpliedModifier">ClassMemberImpliedModifier</a>
5+
</div>
6+
</div>

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2114,4 +2114,17 @@
21142114
</param>
21152115
</rule>
21162116

2117+
<rule key="com.puppycrawl.tools.checkstyle.checks.modifier.ClassMemberImpliedModifierCheck">
2118+
<priority>MINOR</priority>
2119+
<name><![CDATA[Class Member Implied Modifier]]></name>
2120+
<configKey><![CDATA[Checker/TreeWalker/ClassMemberImpliedModifier]]></configKey>
2121+
2122+
<param key="violateImpliedStaticOnNestedEnum" type="BOOLEAN">
2123+
<defaultValue>true</defaultValue>
2124+
</param>
2125+
<param key="violateImpliedStaticOnNestedInterface" type="BOOLEAN">
2126+
<defaultValue>true</defaultValue>
2127+
</param>
2128+
</rule>
2129+
21172130
</rules>

checkstyle-sonar-plugin/src/test/java/org/sonar/plugins/checkstyle/CheckstyleRulesDefinitionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void test() {
5656
assertThat(repository.language()).isEqualTo("java");
5757

5858
final List<RulesDefinition.Rule> rules = repository.rules();
59-
assertThat(rules).hasSize(156);
59+
assertThat(rules).hasSize(157);
6060

6161
for (RulesDefinition.Rule rule : rules) {
6262
assertThat(rule.key()).isNotNull();

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>8.15</checkstyle.version>
88+
<checkstyle.version>8.16</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)