SONAR-5007 - Small Normalizer Update

diff --git a/sonar-server/src/main/java/org/sonar/server/log/index/LogNormalizer.java b/sonar-server/src/main/java/org/sonar/server/log/index/LogNormalizer.java
index 9d81d622bd6875d44907bb8dfb28e98d42ac44fc..75661f013b5ed67595867f138ced419de80912c3 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/log/index/LogNormalizer.java
+++ b/sonar-server/src/main/java/org/sonar/server/log/index/LogNormalizer.java
@@ -74,7 +74,7 @@ public class LogNormalizer extends BaseNormalizer<LogDto, LogKey> {
   }
 
   @Override
-  public List<UpdateRequest> normalize(Object object, Object key) {
+  public List<UpdateRequest> normalize(Object object, LogKey key) {
     throw new IllegalStateException("Normalizer is not yet implemented");
   }
 

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 b160eb817dc8ca91e62dfafa509b0207bf0b9851..48023b5d9af5a992bd7579fe2ec9f0694ab1aace 100644 (file)
--- 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
@@ -160,11 +160,13 @@ public class ActiveRuleNormalizer extends BaseNormalizer<ActiveRuleDto, ActiveRu
   }
 
   @Override
-  public List<UpdateRequest> normalize(Object object, Object key) {
-    Preconditions.checkArgument(object.getClass().isAssignableFrom(ActiveRuleParamDto.class), "Cannot Normalize class");
-    Preconditions.checkArgument(key.getClass().isAssignableFrom(ActiveRuleKey.class), "key is not an ActiveRuleKey");
-
-    return normalize((ActiveRuleParamDto)object, (ActiveRuleKey)key);
+  public List<UpdateRequest> normalize(Object object, ActiveRuleKey key) {
+    Preconditions.checkArgument(key != null, "key cannot be null");
+    if (object.getClass().isAssignableFrom(ActiveRuleParamDto.class)) {
+      return normalize((ActiveRuleParamDto) object, key);
+    } else {
+      throw new IllegalStateException("Cannot normalize object of type '" + object.getClass() + "' in current context");
+    }
   }
 
   public List<UpdateRequest> normalize(ActiveRuleParamDto param, ActiveRuleKey key) {

diff --git a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleDoc.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleDoc.java
index e95b4e3031391b74a54988d7f5284456560e091e..4fe5af67582f8d08c34b4aa401521b2b33b11657 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleDoc.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleDoc.java
@@ -31,7 +31,6 @@ import org.sonar.server.search.IndexUtils;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -99,11 +98,7 @@ public class RuleDoc extends BaseDoc implements Rule {
 
   @Override
   public List<String> tags() {
-    if(List.class.isAssignableFrom(RuleNormalizer.RuleField.TAGS.field().getClass())) {
-      return (List<String>) getField(RuleNormalizer.RuleField.TAGS.field());
-    } else {
-      return Collections.emptyList();
-    }
+    return (List<String>) getField(RuleNormalizer.RuleField.TAGS.field());
   }
 
   @Override

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 5766113b0d06a72bf30fba6d5e6f600dfa3538c5..8e97154176306e181f6d881c557736c6029d4904 100644 (file)
--- 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
@@ -238,11 +238,13 @@ public class RuleNormalizer extends BaseNormalizer<RuleDto, RuleKey> {
   }
 
   @Override
-  public List<UpdateRequest> normalize(Object object, Object key) {
-    Preconditions.checkArgument(object.getClass().isAssignableFrom(RuleParamDto.class), "Cannot Normalize class");
-    Preconditions.checkArgument(key.getClass().isAssignableFrom(RuleKey.class), "key is not an ActiveRuleKey");
-
-    return normalize((RuleParamDto)object, (RuleKey)key);
+  public List<UpdateRequest> normalize(Object object, RuleKey key) {
+    Preconditions.checkArgument(key != null, "key of Rule must be set");
+    if (object.getClass().isAssignableFrom(RuleParamDto.class)) {
+      return normalize((RuleParamDto) object, key);
+    } else {
+      throw new IllegalStateException("Cannot normalize object of type '" + object.getClass() + "' in current context");
+    }
   }
 
   private List<UpdateRequest> normalize(RuleParamDto param, RuleKey key) {

diff --git a/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java b/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java
index 1b110239c694ef14d52f6aa0a63c258676f7259d..c4cd7173b7782e7340bf37b01ebc73d87ba863c1 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/BaseNormalizer.java
@@ -35,7 +35,7 @@ public abstract class BaseNormalizer<DTO extends Dto<KEY>, KEY extends Serializa
     this.definition = definition;
   }
 
-  public abstract java.util.List<UpdateRequest> normalize(Object object, Object key);
+  public abstract java.util.List<UpdateRequest> normalize(Object object, KEY key);
 
   public abstract java.util.List<UpdateRequest> normalize(KEY key);