Issue #180: upgrade to checkstyle 8.16

checkstyle · Dec 30, 2018 · 457ece9 · 457ece9
1 parent d247a71
commit 457ece9
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -18,6 +18,7 @@ This plugin provides coding rules from [Checkstyle](http://checkstyle.sourceforg
 
 Checkstyle Plugin|Sonar|Checkstyle|Jdk
 -----------------|-----|----------|---
+4.16|5.6.6|8.16|1.8
 4.15|5.6.6|8.15|1.8
 4.14|5.6.6|8.14|1.8
 4.13|5.6.6|8.13|1.8

diff --git a/checkstyle-sonar-plugin/src/main/resources/com/sonar/sqale/checkstyle-model.xml b/checkstyle-sonar-plugin/src/main/resources/com/sonar/sqale/checkstyle-model.xml
@@ -578,6 +578,19 @@
           <txt>min</txt>
         </prop>
       </chc>
+      <chc>
+        <rule-repo>checkstyle</rule-repo>
+        <rule-key>com.puppycrawl.tools.checkstyle.checks.modifier.ClassMemberImpliedModifierCheck</rule-key>
+        <prop>
+          <key>remediationFunction</key>
+          <txt>CONSTANT_ISSUE</txt>
+        </prop>
+        <prop>
+          <key>offset</key>
+          <val>2</val>
+          <txt>min</txt>
+        </prop>
+      </chc>
       <chc>
         <rule-repo>checkstyle</rule-repo>
         <rule-key>com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck</rule-key>

diff --git a/checkstyle-sonar-plugin/src/main/resources/org/sonar/l10n/checkstyle.properties b/checkstyle-sonar-plugin/src/main/resources/org/sonar/l10n/checkstyle.properties
@@ -164,6 +164,9 @@ rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.modifier.InterfaceMemberI
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.modifier.InterfaceMemberImpliedModifierCheck.param.violateImpliedAbstractMethod=Control whether to enforce that abstract is explicitly coded on interface methods.
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.modifier.InterfaceMemberImpliedModifierCheck.param.violateImpliedPublicNested=Control whether to enforce that public is explicitly coded on interface nested types.
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.modifier.InterfaceMemberImpliedModifierCheck.param.violateImpliedStaticNested=Control whether to enforce that static is explicitly coded on interface nested types.
+rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.modifier.ClassMemberImpliedModifierCheck.name=Class Member Implied Modifier
+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.
+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.
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForInitializerPadCheck.name=Empty For Initializer Pad
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForInitializerPadCheck.param.option=policy on how to pad an empty for iterator
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck.name=Javadoc Style

diff --git a/...tyle/com.puppycrawl.tools.checkstyle.checks.modifier.ClassMemberImpliedModifierCheck.html b/...tyle/com.puppycrawl.tools.checkstyle.checks.modifier.ClassMemberImpliedModifierCheck.html
@@ -0,0 +1,6 @@
+<div >
+<div class="section">
+Checks for implicit modifiers on nested types in classes.
+see full documentation at <a href="https://checkstyle.org/config_modifier.html#ClassMemberImpliedModifier">ClassMemberImpliedModifier</a>
+</div>
+</div>
diff --git a/checkstyle-sonar-plugin/src/main/resources/org/sonar/plugins/checkstyle/rules.xml b/checkstyle-sonar-plugin/src/main/resources/org/sonar/plugins/checkstyle/rules.xml
@@ -2114,4 +2114,17 @@
     </param>
   </rule>
 
+  <rule key="com.puppycrawl.tools.checkstyle.checks.modifier.ClassMemberImpliedModifierCheck">
+    <priority>MINOR</priority>
+    <name><![CDATA[Class Member Implied Modifier]]></name>
+    <configKey><![CDATA[Checker/TreeWalker/ClassMemberImpliedModifier]]></configKey>
+
+    <param key="violateImpliedStaticOnNestedEnum" type="BOOLEAN">
+        <defaultValue>true</defaultValue>
+    </param>
+    <param key="violateImpliedStaticOnNestedInterface" type="BOOLEAN">
+        <defaultValue>true</defaultValue>
+    </param>
+  </rule>
+
 </rules>
diff --git a/...onar-plugin/src/test/java/org/sonar/plugins/checkstyle/CheckstyleRulesDefinitionTest.java b/...onar-plugin/src/test/java/org/sonar/plugins/checkstyle/CheckstyleRulesDefinitionTest.java
@@ -56,7 +56,7 @@ public void test() {
         assertThat(repository.language()).isEqualTo("java");
 
         final List<RulesDefinition.Rule> rules = repository.rules();
-        assertThat(rules).hasSize(156);
+        assertThat(rules).hasSize(157);
 
         for (RulesDefinition.Rule rule : rules) {
             assertThat(rule.key()).isNotNull();

diff --git a/pom.xml b/pom.xml
@@ -85,7 +85,7 @@
   </ciManagement>
 
   <properties>
-    <checkstyle.version>8.15</checkstyle.version>
+    <checkstyle.version>8.16</checkstyle.version>
     <sonar.version>5.6.6</sonar.version>
     <sonar-java.version>3.7</sonar-java.version>
     <java.version>1.8</java.version>