From f53ede13454805fdc31be35c7c46e88c9f4e5b73 Mon Sep 17 00:00:00 2001 From: Stephane Gamard Date: Thu, 5 Jun 2014 12:21:02 +0200 Subject: [PATCH] SONAR-5007 - Checking type of static field for Indexables in normalizer classes --- .../qualityprofile/index/ActiveRuleNormalizer.java | 2 -- .../org/sonar/server/rule/index/RuleNormalizer.java | 13 ++++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleNormalizer.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleNormalizer.java index b7c6dec9463..7e7af5a378b 100644 --- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleNormalizer.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleNormalizer.java @@ -60,7 +60,6 @@ public class ActiveRuleNormalizer extends BaseNormalizer fields = new HashSet(); for (Field classField : ActiveRuleField.class.getDeclaredFields()) { if (classField.getType().isAssignableFrom(IndexField.class)) { - //Modifier.isStatic(classField.getModifiers()) try { fields.add(IndexField.class.cast(classField.get(null))); } catch (IllegalAccessException e) { @@ -83,7 +82,6 @@ public class ActiveRuleNormalizer extends BaseNormalizer fields = new HashSet(); for (Field classField : ActiveRuleParamField.class.getDeclaredFields()) { if (classField.getType().isAssignableFrom(IndexField.class)) { - //Modifier.isStatic(classField.getModifiers()) try { fields.add(IndexField.class.cast(classField.get(null))); } catch (IllegalAccessException e) { diff --git a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java index eb8caef08bf..85a9d313fc1 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java @@ -37,7 +37,6 @@ import org.sonar.server.search.Indexable; import org.sonar.server.search.es.ListUpdate; import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -48,18 +47,19 @@ import java.util.Set; public class RuleNormalizer extends BaseNormalizer { public static final class RuleParamField extends Indexable { - public static IndexField NAME = add(IndexField.Type.STRING, "name"); - public static IndexField TYPE = add(IndexField.Type.STRING, "type"); - public static IndexField DESCRIPTION = addSearchable(IndexField.Type.TEXT, "description"); - public static IndexField DEFAULT_VALUE = add(IndexField.Type.STRING, "defaultValue"); + public static final IndexField NAME = add(IndexField.Type.STRING, "name"); + + public static final IndexField TYPE = add(IndexField.Type.STRING, "type"); + public static final IndexField DESCRIPTION = addSearchable(IndexField.Type.TEXT, "description"); + public static final IndexField DEFAULT_VALUE = add(IndexField.Type.STRING, "defaultValue"); public static Set ALL_FIELDS = getAllFields(); private static Set getAllFields() { Set fields = new HashSet(); for (Field classField : RuleParamField.class.getDeclaredFields()) { - if (Modifier.isStatic(classField.getModifiers())) { + if (classField.getType().isAssignableFrom(IndexField.class)) { try { fields.add(IndexField.class.cast(classField.get(null))); } catch (IllegalAccessException e) { @@ -107,7 +107,6 @@ public class RuleNormalizer extends BaseNormalizer { Set fields = new HashSet(); for (Field classField : RuleField.class.getDeclaredFields()) { if (classField.getType().isAssignableFrom(IndexField.class)) { - //Modifier.isStatic(classField.getModifiers()) try { fields.add(IndexField.class.cast(classField.get(null))); } catch (IllegalAccessException e) { -- 2.39.5