Add default measure duplications to container

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java
index c6fcc5d22d9c06651e72abf10261d271ed8cde41..d9bf5132eccd698ca4dca6099479816d13343127 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java
@@ -38,6 +38,7 @@ import org.sonar.server.computation.task.projectanalysis.component.DisabledCompo
 import org.sonar.server.computation.task.projectanalysis.component.ConfigurationRepositoryImpl;
 import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderImpl;
 import org.sonar.server.computation.task.projectanalysis.duplication.CrossProjectDuplicationStatusHolderImpl;
+import org.sonar.server.computation.task.projectanalysis.duplication.DuplicationMeasures;
 import org.sonar.server.computation.task.projectanalysis.duplication.DuplicationRepositoryImpl;
 import org.sonar.server.computation.task.projectanalysis.duplication.IntegrateCrossProjectDuplications;
 import org.sonar.server.computation.task.projectanalysis.event.EventRepositoryImpl;
@@ -235,6 +236,7 @@ public final class ProjectAnalysisTaskContainerPopulator implements ContainerPop
 
       // duplication
       IntegrateCrossProjectDuplications.class,
+      DuplicationMeasures.class,
 
       // views
       ViewIndex.class,

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStep.java
index 4f317f007eeb706a57cfc75c18278bad8cc36793..5a66cd4a66a25ae604e1a5391d116e256e3e6af9 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/DuplicationMeasuresStep.java
@@ -19,6 +19,8 @@
  */
 package org.sonar.server.computation.task.projectanalysis.step;
 
+import javax.annotation.Nullable;
+
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolder;
 import org.sonar.server.computation.task.projectanalysis.duplication.DuplicationMeasures;
@@ -36,7 +38,7 @@ public class DuplicationMeasuresStep implements ComputationStep {
   private final IncrementalDuplicationMeasures incrementalDuplicationsMeasures;
 
   public DuplicationMeasuresStep(AnalysisMetadataHolder analysisMetadataHolder, DuplicationMeasures defaultDuplicationMeasures,
-    IncrementalDuplicationMeasures incrementalDuplicationMeasures) {
+    @Nullable IncrementalDuplicationMeasures incrementalDuplicationMeasures) {
     this.analysisMetadataHolder = analysisMetadataHolder;
     this.defaultDuplicationMeasures = defaultDuplicationMeasures;
     this.incrementalDuplicationsMeasures = incrementalDuplicationMeasures;