Issue #373: upgrade to checkstyle 8.45.1

Author: muhlba91

README.md

@@ -21,6 +21,7 @@ Compatibility matrix from checkstyle team:
 
 Checkstyle Plugin|Sonar min|Sonar max|Checkstyle|Jdk
 -----------------|---------|---------|----------|---
+8.45.1|7.9  |7.9+|8.45.1|1.8
 8.42|7.9  |7.9+|8.42|1.8
 8.41.1|7.9  |7.9+|8.41.1|1.8
 8.40|7.9  |7.9+|8.40|1.8

pom.xml

@@ -93,7 +93,7 @@
   </ciManagement>
 
   <properties>
-    <checkstyle.version>8.42</checkstyle.version>
+    <checkstyle.version>8.45.1</checkstyle.version>
     <sonar.version>7.9</sonar.version>
     <sonar-java.version>6.0.0.20538</sonar-java.version>
     <maven.checkstyle.plugin.version>3.1.2</maven.checkstyle.plugin.version>

src/main/java/org/sonar/plugins/checkstyle/metadata/CheckstyleMetadata.java

@@ -97,25 +97,33 @@ public void createRulesWithMetadata() {
                 .filter(entry -> entry.getValue().getModuleType() == ModuleType.CHECK)
                 .forEach(check -> {
                     final ModuleDetails moduleDetails = check.getValue();
-                    final SonarRulePropertyLoader.AdditionalRuleProperties additionalDetails =
-                            additionalRuleData.get(check.getKey());
-                    final RulesDefinition.NewRule rule =
-                            repository.createRule(moduleDetails.getFullQualifiedName()
-                                    + "template");
+                    final boolean isTemplate = isTemplateRule(moduleDetails);
+                    final String fullCheckName = getFullCheckName(moduleDetails.getName());
+                    final String fullQualifiedName = moduleDetails.getFullQualifiedName();
+                    final RulesDefinition.NewRule rule;
+                    if (isTemplate) {
+                        rule = repository
+                                .createRule(fullQualifiedName + "template")
+                                .setName(fullCheckName + " Template");
+                    }
+                    else {
+                        rule = repository
+                                .createRule(fullQualifiedName)
+                                .setName(fullCheckName);
+                    }
                     rule.setHtmlDescription(moduleDetails.getDescription())
-                            .setName(getFullCheckName(moduleDetails.getName()) + " Template")
                             .setInternalKey(getInternalKey(moduleDetails))
                             .setSeverity("MINOR")
                             .setStatus(RuleStatus.READY);
                     if (!NO_SQALE.contains(rule.key())) {
                         rule.setDebtRemediationFunction(debtRemediationFunction);
                     }
                     final String tag = getRuleTag(moduleDetails.getFullQualifiedName(),
-                            additionalDetails);
+                            additionalRuleData.get(check.getKey()));
                     if (tag != null) {
                         rule.setTags(tag);
                     }
-                    if (isTemplateRule(moduleDetails)) {
+                    if (isTemplate) {
                         rule.setTemplate(true);
                     }
 

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

@@ -80,7 +80,7 @@ public void test() {
         // such number should not change during checkstyle version upgrade
         assertThat(duplicatedRuleWithTemplate).hasSize(0);
         // all new Rules should fall in this group
-        assertThat(rulesWithDuplicateTemplate).hasSize(183);
+        assertThat(rulesWithDuplicateTemplate).hasSize(184);
 
         for (RulesDefinition.Rule rule : rules) {
             assertThat(rule.key()).isNotNull();