Fix some quality flaws

2 files changed, 6 insertions, 5 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 f6f273a9e68..ce6f8dc6f1b 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
@@ -137,8 +137,9 @@ public class ActiveRuleNormalizer extends BaseNormalizer<ActiveRuleDto, ActiveRu
 
       // TODO this should be generated by RegisterRule and modified in DTO.
       String parentKey = null;
-      if (activeRuleDto.getParentId() != null) {
-        ActiveRuleDto parentDto = db.activeRuleDao().getById(session, activeRuleDto.getParentId());
+      Integer parentId = activeRuleDto.getParentId();
+      if (parentId != null) {
+        ActiveRuleDto parentDto = db.activeRuleDao().getById(session, parentId);
         parentKey = parentDto.getKey().toString();
       }
       newRule.put(ActiveRuleField.PARENT_KEY.field(), parentKey);
diff --git a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
index e2141f765e1..df2756104bc 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
@@ -58,7 +58,7 @@ import org.sonar.server.search.QueryOptions;
 import org.sonar.server.search.Result;
 
 import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -366,8 +366,8 @@ public class RuleIndex extends BaseIndex<Rule, RuleDto, RuleKey> {
   }
 
   @Override
-  protected Rule toDoc(@Nullable Map<String, Object> fields) {
-    Preconditions.checkArgument(fields != null, "Cannot construct Rule with null response!!!");
+  protected Rule toDoc(Map<String, Object> fields) {
+    Preconditions.checkNotNull(fields, "Cannot construct Rule with null response");
     return new RuleDoc(fields);
   }