From a76be79d65c9eb278688887a068cc5dacc857d28 Mon Sep 17 00:00:00 2001
From: Teryk Bellahsene <teryk.bellahsene@sonarsource.com>
Date: Wed, 17 Dec 2014 11:54:48 +0100
Subject: [PATCH] SONAR-5910 fix methods contracts and possible NPE

---
 .../org/sonar/server/computation/ComputeEngineContext.java | 4 +++-
 .../org/sonar/server/computation/db/AnalysisReportDao.java | 7 +++++--
 .../server/computation/step/ComputationStepRegistry.java   | 3 +--
 .../sonar/server/computation/step/DigestReportStep.java    | 2 +-
 .../step/ComputationStepRegistryMediumTest.java            | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputeEngineContext.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ComputeEngineContext.java
index 353f5625148..d0e473da8e0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputeEngineContext.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ComputeEngineContext.java
@@ -23,6 +23,8 @@ package org.sonar.server.computation;
 import org.sonar.core.component.ComponentDto;
 import org.sonar.core.computation.db.AnalysisReportDto;
 
+import javax.annotation.Nullable;
+
 import java.io.File;
 
 public class ComputeEngineContext {
@@ -48,7 +50,7 @@ public class ComputeEngineContext {
     return reportDirectory;
   }
 
-  public void setReportDirectory(File reportDirectory) {
+  public void setReportDirectory(@Nullable File reportDirectory) {
     this.reportDirectory = reportDirectory;
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/db/AnalysisReportDao.java b/server/sonar-server/src/main/java/org/sonar/server/computation/db/AnalysisReportDao.java
index 75c5e909b26..7954090cefe 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/db/AnalysisReportDao.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/db/AnalysisReportDao.java
@@ -164,6 +164,7 @@ public class AnalysisReportDao extends BaseDao<AnalysisReportMapper, AnalysisRep
     ps.setBinaryStream(parameterIndex, reportDataStream, streamSizeEstimate);
   }
 
+  @CheckForNull
   public File getDecompressedReport(DbSession session, long id) {
     Connection connection = session.getConnection();
     InputStream reportDataStream = null;
@@ -177,8 +178,10 @@ public class AnalysisReportDao extends BaseDao<AnalysisReportMapper, AnalysisRep
       ResultSet rs = ps.executeQuery();
       if (rs.next()) {
         reportDataStream = rs.getBinaryStream(1);
-        directory = tempFolder.newDir();
-        ZipUtils.unzip(reportDataStream, directory);
+        if (reportDataStream != null) {
+          directory = tempFolder.newDir();
+          ZipUtils.unzip(reportDataStream, directory);
+        }
       }
     } catch (SQLException e) {
       throw new IllegalStateException(String.format("Failed to read report '%d' in the database", id), e);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStepRegistry.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStepRegistry.java
index 280cd9bb04e..564b09b866d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStepRegistry.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStepRegistry.java
@@ -40,8 +40,7 @@ public class ComputationStepRegistry implements ServerComponent {
   public List<ComputationStep> steps() {
     List<ComputationStep> steps = Lists.newArrayList();
     // project & views
-    // FIXME this step must be fixed before being reactivated
-//    steps.add(pico.getComponentByType(DigestReportStep.class));
+    steps.add(pico.getComponentByType(DigestReportStep.class));
     // project only
     steps.add(pico.getComponentByType(SynchronizeProjectPermissionsStep.class));
     // project & views
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/DigestReportStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/DigestReportStep.java
index b48a6caaf5c..61b0fd07d34 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/DigestReportStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/DigestReportStep.java
@@ -38,6 +38,6 @@ public class DigestReportStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Uncompress analysis report";
+    return "Decompress analysis report";
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepRegistryMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepRegistryMediumTest.java
index 50496cc6253..a63e98f51bf 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepRegistryMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComputationStepRegistryMediumTest.java
@@ -59,7 +59,7 @@ public class ComputationStepRegistryMediumTest {
   @Test
   public void steps_returned_in_the_right_order() throws Exception {
     List<Class<? extends ComputationStep>> wishStepsClasses = Lists.newArrayList(
-//      DigestReportStep.class,
+      DigestReportStep.class,
       SynchronizeProjectPermissionsStep.class,
       SwitchSnapshotStep.class,
       InvalidatePreviewCacheStep.class,
-- 
2.39.5