Issue #302: update to CS 8.35

Author: Daniel Muehlbachler

README.md

@@ -21,6 +21,7 @@ Compatibility matrix from checkstyle team:
 
 Checkstyle Plugin|Sonar min|Sonar max|Checkstyle|Jdk
 -----------------|---------|---------|----------|---
+8.35|7.9  |7.9+|8.35|1.8
 4.34|7.9  |7.9+|8.34|1.8
 4.33|7.9  |7.9+|8.33|1.8
 4.32|7.9  |7.9+|8.32|1.8

pom.xml

@@ -93,7 +93,7 @@
   </ciManagement>
 
   <properties>
-    <checkstyle.version>8.34</checkstyle.version>
+    <checkstyle.version>8.35</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/java/org/sonar/plugins/checkstyle/metadata/CheckstyleMetadata.java

@@ -195,7 +195,7 @@ private void constructParams(String checkName, RulesDefinition.NewParam param,
                                         ModulePropertyDetails modulePropertyDetails) {
         param.setDescription(modulePropertyDetails.getDescription())
                 .setDefaultValue(modulePropertyDetails.getDefaultValue());
-        String paramType = modulePropertyDetails.getType();
+        final String paramType = modulePropertyDetails.getType();
         if (modulePropertyDetails.getValidationType() != null
             && "tokenSet".equals(modulePropertyDetails.getValidationType())) {
             final Object[] valuesArray = CheckUtil.getAcceptableTokens(checkName)
@@ -220,11 +220,6 @@ private void constructParams(String checkName, RulesDefinition.NewParam param,
             }
         }
         else if (paramType.endsWith(OPTION_STRING)) {
-            // the enum class names have been updated in later releases.
-            // this condition should be removed when upgraded to 8.35
-            if (paramType.contains("AnnotationUseStyleCheck")) {
-                paramType = paramType.substring(0, paramType.length() - OPTION_STRING.length());
-            }
             final Object[] valuesArray = getEnumValues(paramType).toArray();
             param.setType(RuleParamType.singleListOfValues(Arrays.copyOf(
                     valuesArray, valuesArray.length, String[].class)));

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

@@ -628,8 +628,8 @@
     <name><![CDATA[Hidden Field]]></name>
     <configKey><![CDATA[Checker/TreeWalker/HiddenField]]></configKey>
     <cardinality>MULTIPLE</cardinality>
-    <param key="tokens" type="s[VARIABLE_DEF,PARAMETER_DEF,LAMBDA]">
-      <defaultValue>VARIABLE_DEF,PARAMETER_DEF,LAMBDA</defaultValue>
+    <param key="tokens" type="s[VARIABLE_DEF,PARAMETER_DEF,PATTERN_VARIABLE_DEF,LAMBDA]">
+      <defaultValue>VARIABLE_DEF,PARAMETER_DEF,PATTERN_VARIABLE_DEF,LAMBDA</defaultValue>
     </param>
     <param key="ignoreFormat" type="REGULAR_EXPRESSION">
     </param>
@@ -738,8 +738,8 @@
     <param key="validateAbstractClassNames" type="BOOLEAN">
       <defaultValue>false</defaultValue>
     </param>
-    <param key="tokens" type="s[ANNOTATION_FIELD_DEF,CLASS_DEF,INTERFACE_DEF,METHOD_CALL,METHOD_DEF,METHOD_REF,PARAMETER_DEF,VARIABLE_DEF]">
-      <defaultValue>ANNOTATION_FIELD_DEF,CLASS_DEF,INTERFACE_DEF,METHOD_CALL,METHOD_DEF,METHOD_REF,PARAMETER_DEF,VARIABLE_DEF</defaultValue>
+    <param key="tokens" type="s[ANNOTATION_FIELD_DEF,CLASS_DEF,INTERFACE_DEF,METHOD_CALL,METHOD_DEF,METHOD_REF,PARAMETER_DEF,VARIABLE_DEF,PATTERN_VARIABLE_DEF]">
+      <defaultValue>ANNOTATION_FIELD_DEF,CLASS_DEF,INTERFACE_DEF,METHOD_CALL,METHOD_DEF,METHOD_REF,PARAMETER_DEF,VARIABLE_DEF,PATTERN_VARIABLE_DEF</defaultValue>
     </param>
     <param key="illegalClassNames" type="s{}">
       <defaultValue>"java.util.HashSet,java.util.HashMap,java.util.LinkedHashMap,java.util.LinkedHashSet,java.util.TreeSet,java.util.TreeMap"</defaultValue>
@@ -1934,8 +1934,8 @@
     <param key="ignoreOverriddenMethods" type="BOOLEAN">
       <defaultValue>true</defaultValue>
     </param>
-    <param key="tokens" type="s[CLASS_DEF,INTERFACE_DEF,ENUM_DEF,ANNOTATION_DEF,ANNOTATION_FIELD_DEF,PARAMETER_DEF,VARIABLE_DEF,METHOD_DEF,ENUM_CONSTANT_DEF]">
-      <defaultValue>CLASS_DEF,INTERFACE_DEF,ENUM_DEF,ANNOTATION_DEF,ANNOTATION_FIELD_DEF,PARAMETER_DEF,VARIABLE_DEF,METHOD_DEF</defaultValue>
+    <param key="tokens" type="s[CLASS_DEF,INTERFACE_DEF,ENUM_DEF,ANNOTATION_DEF,ANNOTATION_FIELD_DEF,PARAMETER_DEF,VARIABLE_DEF,METHOD_DEF,ENUM_CONSTANT_DEF,PATTERN_VARIABLE_DEF]">
+      <defaultValue>CLASS_DEF,INTERFACE_DEF,ENUM_DEF,ANNOTATION_DEF,ANNOTATION_FIELD_DEF,PARAMETER_DEF,VARIABLE_DEF,METHOD_DEF,PATTERN_VARIABLE_DEF</defaultValue>
     </param>
   </rule>