Issue #331: fix rule template determination logic

Author: gaurabdg

pom.xml

@@ -714,7 +714,7 @@
                     <limit>
                       <counter>BRANCH</counter>
                       <value>COVEREDRATIO</value>
-                      <minimum>0.89</minimum>
+                      <minimum>0.92</minimum>
                     </limit>
                   </limits>
                 </rule>

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

@@ -21,7 +21,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -42,6 +41,7 @@
 import com.google.common.collect.ImmutableList;
 import com.puppycrawl.tools.checkstyle.meta.ModuleDetails;
 import com.puppycrawl.tools.checkstyle.meta.ModulePropertyDetails;
+import com.puppycrawl.tools.checkstyle.meta.ModuleType;
 import com.puppycrawl.tools.checkstyle.meta.XmlMetaReader;
 
 public class CheckstyleMetadata {
@@ -85,11 +85,12 @@ public void createRulesWithMetadata() {
                 new DefaultDebtRemediationFunction(DebtRemediationFunction.Type.CONSTANT_ISSUE,
                         null, "0d 0h 5min");
 
-        metadataRepo
-                .forEach((checkKey, metadata) -> {
-                    final ModuleDetails moduleDetails = metadataRepo.get(checkKey);
+        metadataRepo.entrySet().stream()
+                .filter(entry -> entry.getValue().getModuleType() == ModuleType.CHECK)
+                .forEach(check -> {
+                    final ModuleDetails moduleDetails = check.getValue();
                     final SonarRulePropertyLoader.AdditionalRuleProperties additionalDetails =
-                            additionalRuleData.get(checkKey);
+                            additionalRuleData.get(check.getKey());
                     final RulesDefinition.NewRule rule =
                             repository.createRule(moduleDetails.getFullQualifiedName());
                     rule.setHtmlDescription(moduleDetails.getDescription())
@@ -105,7 +106,7 @@ public void createRulesWithMetadata() {
                     if (tag != null) {
                         rule.setTags(tag);
                     }
-                    if (isTemplateRule(moduleDetails.getFullQualifiedName())) {
+                    if (isTemplateRule(moduleDetails)) {
                         rule.setTemplate(true);
                     }
 
@@ -135,14 +136,14 @@ private Class<?> getClass(String checkName) {
     }
 
     /**
-     * Determine whether the check is a template rule based on the method types of the check.
+     * Determine whether the check is a template rule based on the number of the properties of
+     * check.
      *
-     * @param checkName check name
+     * @param moduleDetails module
      * @return true if check is a template rule
      */
-    private boolean isTemplateRule(String checkName) {
-        return Arrays.stream(getClass(checkName).getMethods())
-                .anyMatch(CheckstyleMetadata::isSetter);
+    private static boolean isTemplateRule(ModuleDetails moduleDetails) {
+        return !moduleDetails.getProperties().isEmpty();
     }
 
     /**
@@ -303,17 +304,6 @@ private static String getRuleTag(String checkPackage,
         return additionalDetails;
     }
 
-    /**
-     * Check if the provided method is a setter.
-     *
-     * @param method class method
-     * @return true if the method is a setter
-     */
-    public static boolean isSetter(Method method) {
-        return method.getName().startsWith("set")
-                && method.getParameterTypes().length == 1;
-    }
-
     /**
      * It converts the name received from ModuleDetails to Sonar rule name format
      * e.g. RightCurlyCheck -> Right Curly Check

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(189);
+        assertThat(rules).hasSize(179);
 
         for (RulesDefinition.Rule rule : rules) {
             assertThat(rule.key()).isNotNull();

src/test/java/org/sonar/plugins/checkstyle/metadata/CheckstyleMetadataTest.java

@@ -46,12 +46,15 @@ public static void getPreparedRepository() {
         final RulesDefinition.Context context = new RulesDefinition.Context();
         definition.define(context);
         repository = context.repository(CheckstyleConstants.REPOSITORY_KEY);
-        checkSet = Arrays.asList("com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck",
+        checkSet = Arrays.asList(
+                "com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck",
                 "com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck",
                 "com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck",
                 "com.puppycrawl.tools.checkstyle.checks.coding.NestedForDepthCheck",
                 "com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck",
-                "com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck");
+                "com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck",
+                "com.puppycrawl.tools.checkstyle.checks.coding.AvoidInlineConditionalsCheck"
+        );
         metadataRepo = new HashMap<>();
         XmlMetaReader.readAllModulesIncludingThirdPartyIfAny()
                 .forEach(moduleDetails -> {