Fix quality flaws

6 files changed, 16 insertions, 14 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/activity/Activity.java b/server/sonar-server/src/main/java/org/sonar/server/activity/Activity.java
index f0a50a40c5e..ff9a5a2d145 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/activity/Activity.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/activity/Activity.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.server.activity;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 
 import java.util.LinkedHashMap;
@@ -51,6 +52,7 @@ public class Activity {
     this.action = action;
   }
 
+  @CheckForNull
   public String getMessage() {
     return message;
   }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityDoc.java b/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityDoc.java
index 46e122bae51..c0472856ada 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityDoc.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/activity/index/ActivityDoc.java
@@ -67,7 +67,7 @@ public class ActivityDoc extends BaseDoc {
   }
 
   public String getType() {
-    return ((String) getField(ActivityIndexDefinition.FIELD_TYPE));
+    return (String) getField(ActivityIndexDefinition.FIELD_TYPE);
   }
 
   public void setType(String s) {
@@ -83,9 +83,8 @@ public class ActivityDoc extends BaseDoc {
     setField(ActivityIndexDefinition.FIELD_ACTION, s);
   }
 
-  @CheckForNull
   public Map<String, String> getDetails() {
-    return this.getNullableField(ActivityIndexDefinition.FIELD_DETAILS);
+    return this.getField(ActivityIndexDefinition.FIELD_DETAILS);
   }
 
   public void setDetails(Map<String, String> details) {
@@ -101,6 +100,7 @@ public class ActivityDoc extends BaseDoc {
     setField(ActivityIndexDefinition.FIELD_MESSAGE, s);
   }
 
+  @Override
   public String toString() {
     return ReflectionToStringBuilder.toString(this);
   }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ParseReportStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ParseReportStep.java
index 08c92210404..c9a8c173b23 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ParseReportStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ParseReportStep.java
@@ -52,12 +52,10 @@ public class ParseReportStep implements ComputationStep {
   private void recursivelyProcessComponent(ComputationContext context, int componentRef) {
     BatchReportReader reportReader = context.getReportReader();
     BatchReport.Component component = reportReader.readComponent(componentRef);
-    if (component != null) {
-      List<BatchReport.Issue> issues = reportReader.readComponentIssues(componentRef);
-      issueComputation.processComponentIssues(context, component.getUuid(), issues);
-      for (Integer childRef : component.getChildRefsList()) {
-        recursivelyProcessComponent(context, childRef);
-      }
+    List<BatchReport.Issue> issues = reportReader.readComponentIssues(componentRef);
+    issueComputation.processComponentIssues(context, component.getUuid(), issues);
+    for (Integer childRef : component.getChildRefsList()) {
+      recursivelyProcessComponent(context, childRef);
     }
   }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActivityQuery.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActivityQuery.java
index 5cce6da31fe..fd41cdd86b4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActivityQuery.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActivityQuery.java
@@ -42,7 +42,9 @@ public class QProfileActivityQuery extends ActivityQuery {
   }
 
   public QProfileActivityQuery setQprofileKey(@Nullable String qprofileKey) {
-    addDataOrFilter("profileKey", qprofileKey);
+    if (qprofileKey != null) {
+      addDataOrFilter("profileKey", qprofileKey);
+    }
     return this;
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java
index 26682ddb642..adeecf0d06f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java
@@ -50,7 +50,7 @@ import org.sonar.api.utils.ZipUtils;
 import org.sonar.api.utils.internal.JUnitTempFolder;
 import org.sonar.api.utils.log.LogTester;
 import org.sonar.api.utils.log.LoggerLevel;
-import org.sonar.batch.protocol.output.BatchOutputWriter;
+import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.persistence.DbTester;
@@ -178,7 +178,7 @@ public class ComputationServiceTest {
 
   private File generateZip() throws IOException {
     File dir = tempFolder.newDir();
-    BatchOutputWriter writer = new BatchOutputWriter(dir);
+    BatchReportWriter writer = new BatchReportWriter(dir);
     writer.writeMetadata(BatchReport.Metadata.newBuilder()
       .setRootComponentRef(1)
       .setProjectKey("PROJECT_KEY")
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ParseReportStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ParseReportStepTest.java
index 1b0d625148a..12dee15de96 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ParseReportStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ParseReportStepTest.java
@@ -24,7 +24,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchOutputWriter;
+import org.sonar.batch.protocol.output.BatchReportWriter;
 import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.batch.protocol.output.BatchReportReader;
 import org.sonar.core.component.ComponentDto;
@@ -78,7 +78,7 @@ public class ParseReportStepTest extends BaseStepTest {
   private File generateReport() throws IOException {
     File dir = temp.newFolder();
     // project and 2 files
-    BatchOutputWriter writer = new BatchOutputWriter(dir);
+    BatchReportWriter writer = new BatchReportWriter(dir);
     writer.writeMetadata(BatchReport.Metadata.newBuilder()
       .setRootComponentRef(1)
       .setProjectKey("PROJECT_KEY")