Issue #294: update to CS 8.33

Author: Daniel Muehlbachler

README.md

@@ -21,6 +21,7 @@ Compatibility matrix from checkstyle team:
 
 Checkstyle Plugin|Sonar min|Sonar max|Checkstyle|Jdk
 -----------------|---------|---------|----------|---
+4.33|7.9  |7.9+|8.33|1.8
 4.32|7.9  |7.9+|8.32|1.8
 4.31|7.9  |7.9+|8.31|1.8
 4.30|7.9  |7.9+|8.30|1.8

pom.xml

@@ -93,7 +93,7 @@
   </ciManagement>
 
   <properties>
-    <checkstyle.version>8.32</checkstyle.version>
+    <checkstyle.version>8.33</checkstyle.version>
     <sonar.version>7.9</sonar.version>
     <sonar-java.version>6.0.0.20538</sonar-java.version>
     <maven.checkstyle.plugin.version>3.1.0</maven.checkstyle.plugin.version>

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

@@ -46,6 +46,19 @@
           <txt>min</txt>
         </prop>
       </chc>
+      <chc>
+        <rule-repo>checkstyle</rule-repo>
+        <rule-key>com.puppycrawl.tools.checkstyle.checks.NoCodeInFileCheck</rule-key>
+        <prop>
+          <key>remediationFunction</key>
+          <txt>CONSTANT_ISSUE</txt>
+        </prop>
+        <prop>
+          <key>offset</key>
+          <val>2</val>
+          <txt>min</txt>
+        </prop>
+      </chc>
     </chc>
     <chc>
       <key>TIME_ZONE_RELATED_PORTABILITY</key>

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

@@ -376,6 +376,7 @@ rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineCh
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.sizes.FileLengthCheck.name=File Length
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.sizes.FileLengthCheck.param.max=maximum allowable number of lines. Default is 2000.
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.sizes.FileLengthCheck.param.fileExtensions=file type extension of files to process
+rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.NoCodeInFileCheck.name=No Code In File
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck.name=Newline At End Of File
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck.param.fileExtensions=file type extension of the files to check.
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck.param.lineSeparator=type of line separator. One of "system" (system default), "crlf" (Windows-style), "cr" (Mac-style), "lf" (Unix-style) and "lf_cr_crlf" (lf, cr or crlf).
@@ -451,6 +452,7 @@ rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck.pa
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck.param.applyToProtected=Controls whether to apply the check to protected member
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck.param.format=Regular expression
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.ArrayTrailingCommaCheck.name=Array Trailing Comma
+rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.ArrayTrailingCommaCheck.param.alwaysDemandTrailingComma=Control whether to always check for a trailing comma, even when an array is inline.
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck.name=Generic Whitespace
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.NoCloneCheck.name=No Clone
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.NoEnumTrailingCommaCheck.name=No Enum Trailing Comma

src/main/resources/org/sonar/l10n/checkstyle/rules/checkstyle/com.puppycrawl.tools.checkstyle.checks.NoCodeInFileCheck.html

@@ -0,0 +1,6 @@
+    Checks whether file contains code. Files which are considered to have no code:
+<ul>
+    <li>File with no text</li>
+    <li>File with single line comment(s)</li>
+    <li>File with a multi line comment(s).</li>
+</ul>

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

@@ -309,6 +309,9 @@
     <priority>MAJOR</priority>
     <name><![CDATA[Array Trailing Comma]]></name>
     <configKey><![CDATA[Checker/TreeWalker/ArrayTrailingComma]]></configKey>
+    <param key="alwaysDemandTrailingComma" type="BOOLEAN">
+      <defaultValue>false</defaultValue>
+    </param>
   </rule>
 
   <rule key="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck">
@@ -1326,6 +1329,13 @@
     <status>READY</status>
   </rule>
 
+  <rule key="com.puppycrawl.tools.checkstyle.checks.NoCodeInFileCheck">
+    <priority>MINOR</priority>
+    <name><![CDATA[No Code In File]]></name>
+    <configKey><![CDATA[Checker/TreeWalker/NoCodeInFile]]></configKey>
+    <status>READY</status>
+  </rule>
+
   <rule key="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck">
     <priority>MINOR</priority>
     <name><![CDATA[No Whitespace After]]></name>

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

@@ -61,7 +61,7 @@ public void test() {
         assertThat(repository.language()).isEqualTo("java");
 
         final List<RulesDefinition.Rule> rules = repository.rules();
-        assertThat(rules).hasSize(173);
+        assertThat(rules).hasSize(174);
 
         for (RulesDefinition.Rule rule : rules) {
             assertThat(rule.key()).isNotNull();