SONAR-6736 refactor step names and descriptions

43 files changed, 126 insertions, 153 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java
index 2a3f826035c..908b491dd35 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java
@@ -89,7 +89,7 @@ public class ApplyPermissionsStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Apply project permissions";
+    return "Apply permissions";
   }
 
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/BuildComponentTreeStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/BuildComponentTreeStep.java
index 185c3310b6b..42b9a52a799 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/BuildComponentTreeStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/BuildComponentTreeStep.java
@@ -72,6 +72,6 @@ public class BuildComponentTreeStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Builds the Component tree";
+    return "Build tree of components";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CommentMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/CommentMeasuresStep.java
index f097f8d5d0f..883960d4aa9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CommentMeasuresStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/CommentMeasuresStep.java
@@ -26,10 +26,10 @@ import org.sonar.server.computation.component.CrawlerDepthLimit;
 import org.sonar.server.computation.component.PathAwareCrawler;
 import org.sonar.server.computation.component.TreeRootHolder;
 import org.sonar.server.computation.formula.Counter;
+import org.sonar.server.computation.formula.CounterInitializationContext;
 import org.sonar.server.computation.formula.CreateMeasureContext;
 import org.sonar.server.computation.formula.Formula;
 import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor;
-import org.sonar.server.computation.formula.CounterInitializationContext;
 import org.sonar.server.computation.formula.counter.IntSumCounter;
 import org.sonar.server.computation.formula.counter.SumCounter;
 import org.sonar.server.computation.measure.Measure;
@@ -200,6 +200,6 @@ public class CommentMeasuresStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Aggregation of comment measures";
+    return "Compute comment measures";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComplexityMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComplexityMeasuresStep.java
index bd42ec28534..78dc338c26b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComplexityMeasuresStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComplexityMeasuresStep.java
@@ -90,6 +90,6 @@ public class ComplexityMeasuresStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Aggregation of complexity measures";
+    return "Compute complexity measures";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputeMeasureVariationsStep.java
index ff51847f7bd..c7bd26fcd45 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputeMeasureVariationsStep.java
@@ -58,7 +58,7 @@ import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_
  * <p/>
  * Note that measures on developer are not handle yet.
  */
-public class FillMeasuresWithVariationsStep implements ComputationStep {
+public class ComputeMeasureVariationsStep implements ComputationStep {
 
   private final DbClient dbClient;
   private final TreeRootHolder treeRootHolder;
@@ -75,7 +75,7 @@ public class FillMeasuresWithVariationsStep implements ComputationStep {
     }
   };
 
-  public FillMeasuresWithVariationsStep(DbClient dbClient, TreeRootHolder treeRootHolder, PeriodsHolder periodsHolder, MetricRepository metricRepository,
+  public ComputeMeasureVariationsStep(DbClient dbClient, TreeRootHolder treeRootHolder, PeriodsHolder periodsHolder, MetricRepository metricRepository,
     MeasureRepository measureRepository) {
     this.dbClient = dbClient;
     this.treeRootHolder = treeRootHolder;
@@ -252,6 +252,6 @@ public class FillMeasuresWithVariationsStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Compute differential measures";
+    return "Compute measure variations";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputeQProfileMeasureStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputeQProfileMeasureStep.java
index 12806b26c39..c974dcd3911 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputeQProfileMeasureStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputeQProfileMeasureStep.java
@@ -122,6 +122,6 @@ public class ComputeQProfileMeasureStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Computes Quality Profile measures";
+    return "Compute Quality Profile measures";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CoverageMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/CoverageMeasuresStep.java
index 9f5501d3442..31952e95461 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CoverageMeasuresStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/CoverageMeasuresStep.java
@@ -184,6 +184,6 @@ public class CoverageMeasuresStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Aggregation of coverage measures";
+    return "Compute coverage measures";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/DuplicationMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/DuplicationMeasuresStep.java
index ae7020cb558..b9e12564d26 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/DuplicationMeasuresStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/DuplicationMeasuresStep.java
@@ -27,11 +27,11 @@ import org.sonar.server.computation.component.CrawlerDepthLimit;
 import org.sonar.server.computation.component.PathAwareCrawler;
 import org.sonar.server.computation.component.TreeRootHolder;
 import org.sonar.server.computation.formula.Counter;
+import org.sonar.server.computation.formula.CounterInitializationContext;
 import org.sonar.server.computation.formula.CreateMeasureContext;
 import org.sonar.server.computation.formula.Formula;
 import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor;
 import org.sonar.server.computation.formula.counter.IntSumCounter;
-import org.sonar.server.computation.formula.CounterInitializationContext;
 import org.sonar.server.computation.measure.Measure;
 import org.sonar.server.computation.measure.MeasureRepository;
 import org.sonar.server.computation.metric.Metric;
@@ -197,6 +197,6 @@ public class DuplicationMeasuresStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Aggregation of duplication measures";
+    return "Compute duplication measures";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ExecuteVisitorsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ExecuteVisitorsStep.java
index 0e87f65419c..cf29c473e3c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ExecuteVisitorsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ExecuteVisitorsStep.java
@@ -41,6 +41,6 @@ public class ExecuteVisitorsStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Execute Visitors";
+    return "Execute visitors";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ReportExtractionStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ExtractReportStep.java
index 77a597116e8..d7065e4cac7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ReportExtractionStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ExtractReportStep.java
@@ -34,15 +34,15 @@ import org.sonar.server.computation.batch.MutableBatchReportDirectoryHolder;
  * Extracts the content zip file of the {@link org.sonar.server.computation.CeTask} to a temp directory and adds a {@link File}
  * representing that temp directory to the {@link MutableBatchReportDirectoryHolder}.
  */
-public class ReportExtractionStep implements ComputationStep {
-  private static final Logger LOG = Loggers.get(ReportExtractionStep.class);
+public class ExtractReportStep implements ComputationStep {
+  private static final Logger LOG = Loggers.get(ExtractReportStep.class);
 
   private final ReportFiles reportFiles;
   private final CeTask task;
   private final TempFolder tempFolder;
   private final MutableBatchReportDirectoryHolder reportDirectoryHolder;
 
-  public ReportExtractionStep(ReportFiles reportFiles, CeTask task, TempFolder tempFolder,
+  public ExtractReportStep(ReportFiles reportFiles, CeTask task, TempFolder tempFolder,
     MutableBatchReportDirectoryHolder reportDirectoryHolder) {
     this.reportFiles = reportFiles;
     this.task = task;
@@ -66,7 +66,7 @@ public class ReportExtractionStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Uncompress report";
+    return "Extract report";
   }
 
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LanguageDistributionMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LanguageDistributionMeasuresStep.java
index afdb75a1b7a..698d1b41671 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LanguageDistributionMeasuresStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LanguageDistributionMeasuresStep.java
@@ -147,6 +147,6 @@ public class LanguageDistributionMeasuresStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Compute language distribution measures";
+    return "Compute language distribution";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedDebtModelStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadDebtModelStep.java
index 88358dd9c82..2c1ea541579 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedDebtModelStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadDebtModelStep.java
@@ -40,12 +40,12 @@ import static com.google.common.collect.FluentIterable.from;
 /**
  * Populates the {@link org.sonar.server.computation.debt.DebtModelHolder}
  */
-public class FeedDebtModelStep implements ComputationStep {
+public class LoadDebtModelStep implements ComputationStep {
 
   private final DbClient dbClient;
   private final MutableDebtModelHolder mutableDebtModelHolder;
 
-  public FeedDebtModelStep(DbClient dbClient, MutableDebtModelHolder mutableDebtModelHolder) {
+  public LoadDebtModelStep(DbClient dbClient, MutableDebtModelHolder mutableDebtModelHolder) {
     this.dbClient = dbClient;
     this.mutableDebtModelHolder = mutableDebtModelHolder;
   }
@@ -123,6 +123,6 @@ public class FeedDebtModelStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Feed technical debt model";
+    return "Load debt model";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedMeasureComputers.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadMeasureComputersStep.java
index a9901ac5ca5..dc176f65aa8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedMeasureComputers.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadMeasureComputersStep.java
@@ -46,7 +46,7 @@ import static com.google.common.collect.FluentIterable.from;
 import static org.sonar.api.ce.measure.MeasureComputer.MeasureComputerDefinition;
 import static org.sonar.api.ce.measure.MeasureComputer.MeasureComputerDefinitionContext;
 
-public class FeedMeasureComputers implements ComputationStep {
+public class LoadMeasureComputersStep implements ComputationStep {
 
   private static final Set<String> CORE_METRIC_KEYS = from(CoreMetrics.getMetrics()).transform(MetricToKey.INSTANCE).toSet();
   private Set<String> pluginMetricKeys;
@@ -54,7 +54,7 @@ public class FeedMeasureComputers implements ComputationStep {
   private final MutableMeasureComputersHolder measureComputersHolder;
   private final MeasureComputer[] measureComputers;
 
-  public FeedMeasureComputers(MutableMeasureComputersHolder measureComputersHolder, Metrics[] metricsRepositories, MeasureComputer[] measureComputers) {
+  public LoadMeasureComputersStep(MutableMeasureComputersHolder measureComputersHolder, Metrics[] metricsRepositories, MeasureComputer[] measureComputers) {
     this.measureComputersHolder = measureComputersHolder;
     this.measureComputers = measureComputers;
     this.pluginMetricKeys = from(Arrays.asList(metricsRepositories))
@@ -66,21 +66,21 @@ public class FeedMeasureComputers implements ComputationStep {
   /**
    * Constructor override used by Pico to instantiate the class when no plugin is defining metrics
    */
-  public FeedMeasureComputers(MutableMeasureComputersHolder measureComputersHolder, MeasureComputer[] measureComputers) {
+  public LoadMeasureComputersStep(MutableMeasureComputersHolder measureComputersHolder, MeasureComputer[] measureComputers) {
     this(measureComputersHolder, new Metrics[] {}, measureComputers);
   }
 
   /**
    * Constructor override used by Pico to instantiate the class when no plugin is defining measure computers
    */
-  public FeedMeasureComputers(MutableMeasureComputersHolder measureComputersHolder, Metrics[] metricsRepositories) {
+  public LoadMeasureComputersStep(MutableMeasureComputersHolder measureComputersHolder, Metrics[] metricsRepositories) {
     this(measureComputersHolder, metricsRepositories, new MeasureComputer[] {});
   }
 
   /**
    * Constructor override used by Pico to instantiate the class when no plugin is defining metrics neither measure computers
    */
-  public FeedMeasureComputers(MutableMeasureComputersHolder measureComputersHolder) {
+  public LoadMeasureComputersStep(MutableMeasureComputersHolder measureComputersHolder) {
     this(measureComputersHolder, new Metrics[] {}, new MeasureComputer[] {});
   }
 
@@ -254,6 +254,6 @@ public class FeedMeasureComputers implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Feed measure computers";
+    return "Load measure computers";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedPeriodsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadPeriodsStep.java
index 1da2605ff8d..cd2fe44638b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedPeriodsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadPeriodsStep.java
@@ -66,9 +66,9 @@ import static org.sonar.server.computation.component.CrawlerDepthLimit.reportMax
  * - Try to find the matching snapshots from the properties
  * - If a snapshot is found, a new period is added to the repository
  */
-public class FeedPeriodsStep implements ComputationStep {
+public class LoadPeriodsStep implements ComputationStep {
 
-  private static final Logger LOG = Loggers.get(FeedPeriodsStep.class);
+  private static final Logger LOG = Loggers.get(LoadPeriodsStep.class);
 
   private static final int NUMBER_OF_PERIODS = 5;
 
@@ -78,7 +78,7 @@ public class FeedPeriodsStep implements ComputationStep {
   private final AnalysisMetadataHolder analysisMetadataHolder;
   private final PeriodsHolderImpl periodsHolder;
 
-  public FeedPeriodsStep(DbClient dbClient, SettingsRepository settingsRepository, TreeRootHolder treeRootHolder, AnalysisMetadataHolder analysisMetadataHolder,
+  public LoadPeriodsStep(DbClient dbClient, SettingsRepository settingsRepository, TreeRootHolder treeRootHolder, AnalysisMetadataHolder analysisMetadataHolder,
     PeriodsHolderImpl periodsHolder) {
     this.dbClient = dbClient;
     this.settingsRepository = settingsRepository;
@@ -172,7 +172,7 @@ public class FeedPeriodsStep implements ComputationStep {
       if (days != null) {
         return findByDays(index, days);
       }
-      Date date = tryToResolveByDate(property);
+      Date date = DateUtils.parseDateQuietly(property);
       if (date != null) {
         return findByDate(index, date);
       }
@@ -261,16 +261,6 @@ public class FeedPeriodsStep implements ComputationStep {
   }
 
   @CheckForNull
-  private static Date tryToResolveByDate(String property) {
-    try {
-      return DateUtils.parseDate(property);
-    } catch (Exception e) {
-      // Nothing to, it means that the property is not a date
-      return null;
-    }
-  }
-
-  @CheckForNull
   private static SnapshotDto findNearestSnapshotToTargetDate(List<SnapshotDto> snapshots, Long targetDate) {
     long bestDistance = Long.MAX_VALUE;
     SnapshotDto nearest = null;
@@ -303,6 +293,6 @@ public class FeedPeriodsStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Feed differential periods";
+    return "Load differential periods";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateLoadingStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadQualityGateStep.java
index 49a06363f60..265e805cd9e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateLoadingStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadQualityGateStep.java
@@ -40,8 +40,8 @@ import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_
  * This step retrieves the QualityGate and stores it in
  * {@link MutableQualityGateHolder}.
  */
-public class QualityGateLoadingStep implements ComputationStep {
-  private static final Logger LOGGER = Loggers.get(QualityGateLoadingStep.class);
+public class LoadQualityGateStep implements ComputationStep {
+  private static final Logger LOGGER = Loggers.get(LoadQualityGateStep.class);
 
   private static final String PROPERTY_QUALITY_GATE = "sonar.qualitygate";
 
@@ -50,8 +50,8 @@ public class QualityGateLoadingStep implements ComputationStep {
   private final QualityGateService qualityGateService;
   private final MutableQualityGateHolder qualityGateHolder;
 
-  public QualityGateLoadingStep(TreeRootHolder treeRootHolder, SettingsRepository settingsRepository,
-    QualityGateService qualityGateService, MutableQualityGateHolder qualityGateHolder) {
+  public LoadQualityGateStep(TreeRootHolder treeRootHolder, SettingsRepository settingsRepository,
+                             QualityGateService qualityGateService, MutableQualityGateHolder qualityGateHolder) {
     this.treeRootHolder = treeRootHolder;
     this.settingsRepository = settingsRepository;
     this.qualityGateService = qualityGateService;
@@ -97,6 +97,6 @@ public class QualityGateLoadingStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Retrieve Quality Gate";
+    return "Load Quality gate";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedActiveRulesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadQualityProfilesStep.java
index 18fb9e5001b..bf19a622dda 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedActiveRulesStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LoadQualityProfilesStep.java
@@ -37,13 +37,13 @@ import org.sonar.server.computation.qualityprofile.ActiveRulesHolderImpl;
 
 import static com.google.common.collect.FluentIterable.from;
 
-public class FeedActiveRulesStep implements ComputationStep {
+public class LoadQualityProfilesStep implements ComputationStep {
 
   private final BatchReportReader batchReportReader;
   private final ActiveRulesHolderImpl activeRulesHolder;
   private final RuleRepository ruleRepository;
 
-  public FeedActiveRulesStep(BatchReportReader batchReportReader, ActiveRulesHolderImpl activeRulesHolder, RuleRepository ruleRepository) {
+  public LoadQualityProfilesStep(BatchReportReader batchReportReader, ActiveRulesHolderImpl activeRulesHolder, RuleRepository ruleRepository) {
     this.batchReportReader = batchReportReader;
     this.activeRulesHolder = activeRulesHolder;
     this.ruleRepository = ruleRepository;
@@ -76,10 +76,10 @@ public class FeedActiveRulesStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return getClass().getSimpleName();
+    return "Load quality profiles";
   }
 
-  private ActiveRule convert(BatchReport.ActiveRule input) {
+  private static ActiveRule convert(BatchReport.ActiveRule input) {
     RuleKey key = RuleKey.of(input.getRuleRepository(), input.getRuleKey());
     Map<String, String> params = new HashMap<>();
     for (BatchReport.ActiveRule.ActiveRuleParam inputParam : input.getParamList()) {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/NewCoverageMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/NewCoverageMeasuresStep.java
index eee963c6af0..d3da00d000c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/NewCoverageMeasuresStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/NewCoverageMeasuresStep.java
@@ -123,7 +123,7 @@ public class NewCoverageMeasuresStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Computation of New Coverage measures";
+    return "Compute new coverage";
   }
 
   private static class NewLinesAndConditionsCoverageFormula extends NewLinesAndConditionsFormula {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java
index ed09fb80b12..4dd6a24f7d7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java
@@ -133,7 +133,7 @@ public class PersistEventsStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Persist component links";
+    return "Persist events";
   }
 
   private class PersistEventComponentVisitor extends TypeAwareVisitorAdapter {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java
index 9625d2ea8bd..305a1969068 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java
@@ -205,6 +205,6 @@ public class PersistFileSourcesStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Persist file sources";
+    return "Persist sources";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java
index 0583017085d..b9bc585dc82 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java
@@ -158,6 +158,6 @@ public class PersistProjectLinksStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Persist component links";
+    return "Persist project links";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java
index 99f259c1c6e..9cd2a478cde 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java
@@ -81,6 +81,6 @@ public class PurgeDatastoresStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Purge datastores";
+    return "Purge db";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateEventsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateEventsStep.java
index b1f1851ff57..eae85fb71c9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateEventsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateEventsStep.java
@@ -137,6 +137,6 @@ public class QualityGateEventsStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Generate Quality Gate Events";
+    return "Generate Quality gate events";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateMeasuresStep.java
index 28cc46d63dc..730a8ebd7ab 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateMeasuresStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateMeasuresStep.java
@@ -56,7 +56,7 @@ import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_
  * {@link CoreMetrics#ALERT_STATUS_KEY}</li>
  * </ul>
  *
- * It must be executed after the computation of differential measures {@link FillMeasuresWithVariationsStep}
+ * It must be executed after the computation of differential measures {@link ComputeMeasureVariationsStep}
  */
 public class QualityGateMeasuresStep implements ComputationStep {
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java
index 452d418b521..6a8bd53a219 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java
@@ -166,6 +166,6 @@ public class QualityProfileEventsStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Compute Quality Profile events";
+    return "Generate Quality profile events";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ReportComputationSteps.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ReportComputationSteps.java
index 57eaba6ac64..ea8e690ec1b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ReportComputationSteps.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ReportComputationSteps.java
@@ -23,6 +23,7 @@ import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import java.util.Arrays;
 import java.util.List;
+import javax.annotation.Nonnull;
 import org.sonar.server.computation.container.ComputeEngineContainer;
 
 /**
@@ -38,19 +39,19 @@ public class ReportComputationSteps implements ComputationSteps {
   public List<Class<? extends ComputationStep>> orderedStepClasses() {
     return Arrays.asList(
       // extract report to a temp directory
-      ReportExtractionStep.class,
+      ExtractReportStep.class,
 
       // Builds Component tree
       BuildComponentTreeStep.class,
       FillComponentsStep.class,
       ValidateProjectStep.class,
 
-      FeedDebtModelStep.class,
-      FeedActiveRulesStep.class,
+      LoadDebtModelStep.class,
+      LoadQualityProfilesStep.class,
 
       // load project related stuffs
-      QualityGateLoadingStep.class,
-      FeedPeriodsStep.class,
+      LoadQualityGateStep.class,
+      LoadPeriodsStep.class,
 
       // data computation
       SizeMeasuresStep.class,
@@ -63,11 +64,11 @@ public class ReportComputationSteps implements ComputationSteps {
       UnitTestMeasuresStep.class,
       ComplexityMeasuresStep.class,
 
-      FeedMeasureComputers.class,
+      LoadMeasureComputersStep.class,
       ExecuteVisitorsStep.class,
 
       // Must be executed after computation of all measures
-      FillMeasuresWithVariationsStep.class,
+      ComputeMeasureVariationsStep.class,
 
       // Must be executed after computation of differential measures
       QualityGateMeasuresStep.class,
@@ -113,7 +114,7 @@ public class ReportComputationSteps implements ComputationSteps {
   public Iterable<ComputationStep> instances() {
     return Iterables.transform(orderedStepClasses(), new Function<Class<? extends ComputationStep>, ComputationStep>() {
       @Override
-      public ComputationStep apply(Class<? extends ComputationStep> input) {
+      public ComputationStep apply(@Nonnull Class<? extends ComputationStep> input) {
         ComputationStep computationStepType = computeEngineContainer.getComponentByType(input);
         if (computationStepType == null) {
           throw new IllegalStateException(String.format("Component not found: %s", input));
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SizeMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SizeMeasuresStep.java
index ebdf6b09058..d153893f306 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SizeMeasuresStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SizeMeasuresStep.java
@@ -86,7 +86,7 @@ public class SizeMeasuresStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "File and Directory measures";
+    return "Compute size measures";
   }
 
   private class FileAndDirectoryMeasureVisitor extends PathAwareVisitorAdapter<Counter> {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java
index 8a566bcee38..067ae344bd2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java
@@ -21,14 +21,14 @@
 package org.sonar.server.computation.step;
 
 import java.util.List;
-import org.sonar.db.component.SnapshotDto;
+import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.MyBatis;
 import org.sonar.db.component.SnapshotDao;
+import org.sonar.db.component.SnapshotDto;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DbIdsRepository;
 import org.sonar.server.computation.component.TreeRootHolder;
-import org.sonar.db.DbClient;
 
 import static org.sonar.db.component.SnapshotDao.isLast;
 
@@ -59,7 +59,7 @@ public class SwitchSnapshotStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Switch last snapshot flag";
+    return "Enable snapshot";
   }
 
   private void disablePreviousSnapshot(DbSession session, long reportSnapshotId) {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/UnitTestMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/UnitTestMeasuresStep.java
index f49d6429782..61a87ac1283 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/UnitTestMeasuresStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/UnitTestMeasuresStep.java
@@ -27,10 +27,10 @@ import org.sonar.server.computation.component.CrawlerDepthLimit;
 import org.sonar.server.computation.component.PathAwareCrawler;
 import org.sonar.server.computation.component.TreeRootHolder;
 import org.sonar.server.computation.formula.Counter;
+import org.sonar.server.computation.formula.CounterInitializationContext;
 import org.sonar.server.computation.formula.CreateMeasureContext;
 import org.sonar.server.computation.formula.Formula;
 import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor;
-import org.sonar.server.computation.formula.CounterInitializationContext;
 import org.sonar.server.computation.formula.counter.IntSumCounter;
 import org.sonar.server.computation.measure.Measure;
 import org.sonar.server.computation.measure.MeasureRepository;
@@ -151,6 +151,6 @@ public class UnitTestMeasuresStep implements ComputationStep {
 
   @Override
   public String getDescription() {
-    return "Aggregation of comment measures";
+    return "Compute test measures";
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ValidateProjectStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ValidateProjectStep.java
index 5e06c59522e..7177a62e46e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ValidateProjectStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ValidateProjectStep.java
@@ -28,7 +28,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.CheckForNull;
-import org.sonar.api.config.Settings;
 import org.sonar.api.utils.MessageException;
 import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.core.component.ComponentKeys;
@@ -63,13 +62,11 @@ public class ValidateProjectStep implements ComputationStep {
   private static final Joiner MESSAGES_JOINER = Joiner.on("\n  o ");
 
   private final DbClient dbClient;
-  private final Settings settings;
   private final BatchReportReader reportReader;
   private final TreeRootHolder treeRootHolder;
 
-  public ValidateProjectStep(DbClient dbClient, Settings settings, BatchReportReader reportReader, TreeRootHolder treeRootHolder) {
+  public ValidateProjectStep(DbClient dbClient, BatchReportReader reportReader, TreeRootHolder treeRootHolder) {
     this.dbClient = dbClient;
-    this.settings = settings;
     this.reportReader = reportReader;
     this.treeRootHolder = treeRootHolder;
   }
@@ -88,13 +85,13 @@ public class ValidateProjectStep implements ComputationStep {
         throw MessageException.of("Validation of project failed:\n  o " + MESSAGES_JOINER.join(visitor.validationMessages));
       }
     } finally {
-      session.close();
+      dbClient.closeSession(session);
     }
   }
 
   @Override
   public String getDescription() {
-    return "Validate project and modules keys";
+    return "Validate project";
   }
 
   private class ValidateProjectsVisitor extends TypeAwareVisitorAdapter {
@@ -130,7 +127,7 @@ public class ValidateProjectStep implements ComputationStep {
         // Project key is already used as a module of another project
         ComponentDto anotherBaseProject = componentDao.selectOrFailByUuid(session, baseProject.get().projectUuid());
         validationMessages.add(String.format("The project \"%s\" is already defined in SonarQube but as a module of project \"%s\". "
-            + "If you really want to stop directly analysing project \"%s\", please first delete it from SonarQube and then relaunch the analysis of project \"%s\".",
+          + "If you really want to stop directly analysing project \"%s\", please first delete it from SonarQube and then relaunch the analysis of project \"%s\".",
           rawProjectKey, anotherBaseProject.key(), anotherBaseProject.key(), rawProjectKey));
       }
     }
@@ -142,7 +139,7 @@ public class ValidateProjectStep implements ComputationStep {
         Long lastAnalysisDate = snapshotDto != null ? snapshotDto.getCreatedAt() : null;
         if (lastAnalysisDate != null && currentAnalysisDate <= snapshotDto.getCreatedAt()) {
           validationMessages.add(String.format("Date of analysis cannot be older than the date of the last known analysis on this project. Value: \"%s\". " +
-              "Latest analysis: \"%s\". It's only possible to rebuild the past in a chronological order.",
+            "Latest analysis: \"%s\". It's only possible to rebuild the past in a chronological order.",
             formatDateTime(new Date(currentAnalysisDate)), formatDateTime(new Date(lastAnalysisDate))));
         }
       }
@@ -166,7 +163,7 @@ public class ValidateProjectStep implements ComputationStep {
       if (baseModule.projectUuid().equals(baseModule.uuid())) {
         // module is actually a project
         validationMessages.add(String.format("The project \"%s\" is already defined in SonarQube but not as a module of project \"%s\". "
-            + "If you really want to stop directly analysing project \"%s\", please first delete it from SonarQube and then relaunch the analysis of project \"%s\".",
+          + "If you really want to stop directly analysing project \"%s\", please first delete it from SonarQube and then relaunch the analysis of project \"%s\".",
           rawModuleKey, rawProjectKey, rawModuleKey, rawProjectKey));
       }
     }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java
index d45bc634ad5..97cffa83c23 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java
@@ -24,7 +24,6 @@ import javax.annotation.Nullable;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.internal.TempFolderCleaner;
 import org.sonar.core.config.CorePropertyDefinitions;
-import org.sonar.core.config.Logback;
 import org.sonar.core.util.UuidFactoryImpl;
 import org.sonar.db.DaoModule;
 import org.sonar.db.DatabaseChecker;
@@ -74,7 +73,6 @@ public class PlatformLevel1 extends PlatformLevel {
     add(
       ServerSettings.class,
       ServerImpl.class,
-      Logback.class,
       UuidFactoryImpl.INSTANCE,
       EmbeddedDatabaseFactory.class,
       DefaultDatabase.class,
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedDebtModelStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedDebtModelStepTest.java
index b6b09740edf..605337f911b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedDebtModelStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedDebtModelStepTest.java
@@ -48,14 +48,14 @@ public class FeedDebtModelStepTest extends BaseStepTest {
 
   MutableDebtModelHolder debtModelHolder = new DebtModelHolderImpl();
 
-  FeedDebtModelStep underTest;
+  LoadDebtModelStep underTest;
 
   @Before
   public void setUp() {
     dbTester.truncateTables();
     dbSession = dbClient.openSession(false);
 
-    underTest = new FeedDebtModelStep(dbClient, debtModelHolder);
+    underTest = new LoadDebtModelStep(dbClient, debtModelHolder);
   }
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedMeasureComputersTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedMeasureComputersTest.java
index b8eac165d79..b5824d978bb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedMeasureComputersTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedMeasureComputersTest.java
@@ -59,7 +59,7 @@ public class FeedMeasureComputersTest {
   @Test
   public void support_core_metrics_as_input_metrics() throws Exception {
     MeasureComputer[] computers = new MeasureComputer[] {newMeasureComputer(array(NCLOC_KEY), array(NEW_METRIC_1))};
-    ComputationStep underTest = new FeedMeasureComputers(holder, array(new TestMetrics()), computers);
+    ComputationStep underTest = new LoadMeasureComputersStep(holder, array(new TestMetrics()), computers);
     underTest.execute();
 
     assertThat(holder.getMeasureComputers()).hasSize(1);
@@ -68,7 +68,7 @@ public class FeedMeasureComputersTest {
   @Test
   public void support_plugin_metrics_as_input_metrics() throws Exception {
     MeasureComputer[] computers = new MeasureComputer[] {newMeasureComputer(array(NEW_METRIC_1), array(NEW_METRIC_2))};
-    ComputationStep underTest = new FeedMeasureComputers(holder, array(new TestMetrics()), computers);
+    ComputationStep underTest = new LoadMeasureComputersStep(holder, array(new TestMetrics()), computers);
     underTest.execute();
 
     assertThat(holder.getMeasureComputers()).hasSize(1);
@@ -84,7 +84,7 @@ public class FeedMeasureComputersTest {
     MeasureComputer measureComputer3 = newMeasureComputer(array(NEW_METRIC_2), array(NEW_METRIC_3));
     MeasureComputer[] computers = new MeasureComputer[] {measureComputer1, measureComputer2, measureComputer3};
 
-    ComputationStep underTest = new FeedMeasureComputers(holder, array(new TestMetrics()), computers);
+    ComputationStep underTest = new LoadMeasureComputersStep(holder, array(new TestMetrics()), computers);
     underTest.execute();
 
     List<MeasureComputerWrapper> result = newArrayList(holder.getMeasureComputers());
@@ -104,7 +104,7 @@ public class FeedMeasureComputersTest {
     MeasureComputer measureComputer3 = newMeasureComputer(array(NEW_METRIC_2), array(NEW_METRIC_3));
     MeasureComputer[] computers = new MeasureComputer[] {measureComputer1, measureComputer2, measureComputer3};
 
-    ComputationStep underTest = new FeedMeasureComputers(holder, array(new TestMetrics()), computers);
+    ComputationStep underTest = new LoadMeasureComputersStep(holder, array(new TestMetrics()), computers);
     underTest.execute();
 
     List<MeasureComputerWrapper> result = newArrayList(holder.getMeasureComputers());
@@ -120,7 +120,7 @@ public class FeedMeasureComputersTest {
     thrown.expectMessage("Metric 'unknown' cannot be used as an input metric as it's not a core metric and no plugin declare this metric");
 
     MeasureComputer[] computers = new MeasureComputer[] {newMeasureComputer(array("unknown"), array(NEW_METRIC_4))};
-    ComputationStep underTest = new FeedMeasureComputers(holder, array(new TestMetrics()), computers);
+    ComputationStep underTest = new LoadMeasureComputersStep(holder, array(new TestMetrics()), computers);
     underTest.execute();
   }
 
@@ -130,7 +130,7 @@ public class FeedMeasureComputersTest {
     thrown.expectMessage("Metric 'unknown' cannot be used as an output metric as no plugin declare this metric");
 
     MeasureComputer[] computers = new MeasureComputer[] {newMeasureComputer(array(NEW_METRIC_4), array("unknown"))};
-    ComputationStep underTest = new FeedMeasureComputers(holder, array(new TestMetrics()), computers);
+    ComputationStep underTest = new LoadMeasureComputersStep(holder, array(new TestMetrics()), computers);
     underTest.execute();
   }
 
@@ -140,14 +140,14 @@ public class FeedMeasureComputersTest {
     thrown.expectMessage("Metric 'ncloc' cannot be used as an output metric as it's a core metric");
 
     MeasureComputer[] computers = new MeasureComputer[] {newMeasureComputer(array(NEW_METRIC_4), array(NCLOC_KEY))};
-    ComputationStep underTest = new FeedMeasureComputers(holder, array(new TestMetrics()), computers);
+    ComputationStep underTest = new LoadMeasureComputersStep(holder, array(new TestMetrics()), computers);
     underTest.execute();
   }
 
   @Test
   public void not_fail_if_input_metrics_are_same_as_output_metrics() throws Exception {
     MeasureComputer[] computers = new MeasureComputer[] {newMeasureComputer(array(NEW_METRIC_1), array(NEW_METRIC_1))};
-    ComputationStep underTest = new FeedMeasureComputers(holder, array(new TestMetrics()), computers);
+    ComputationStep underTest = new LoadMeasureComputersStep(holder, array(new TestMetrics()), computers);
     underTest.execute();
 
     assertThat(holder.getMeasureComputers()).hasSize(1);
@@ -155,7 +155,7 @@ public class FeedMeasureComputersTest {
 
   @Test
   public void return_empty_list_when_no_measure_computers() throws Exception {
-    ComputationStep underTest = new FeedMeasureComputers(holder, array(new TestMetrics()));
+    ComputationStep underTest = new LoadMeasureComputersStep(holder, array(new TestMetrics()));
     underTest.execute();
 
     assertThat(holder.getMeasureComputers()).isEmpty();
@@ -163,7 +163,7 @@ public class FeedMeasureComputersTest {
 
   @Test
   public void return_empty_list_when_no_metrics_neither_measure_computers() throws Exception {
-    ComputationStep underTest = new FeedMeasureComputers(holder);
+    ComputationStep underTest = new LoadMeasureComputersStep(holder);
     underTest.execute();
 
     assertThat(holder.getMeasureComputers()).isEmpty();
@@ -175,7 +175,7 @@ public class FeedMeasureComputersTest {
     thrown.expectMessage("Metric 'metric1' cannot be used as an output metric as no plugin declare this metric");
 
     MeasureComputer[] computers = new MeasureComputer[] {newMeasureComputer(array(NCLOC_KEY), array(NEW_METRIC_1))};
-    ComputationStep underTest = new FeedMeasureComputers(holder, computers);
+    ComputationStep underTest = new LoadMeasureComputersStep(holder, computers);
     underTest.execute();
   }
 
@@ -185,7 +185,7 @@ public class FeedMeasureComputersTest {
     thrown.expectMessage("Output metric 'metric1' is already defined by another measure computer 'TestMeasureComputer'");
 
     MeasureComputer[] computers = new MeasureComputer[] {newMeasureComputer(array(NCLOC_KEY), array(NEW_METRIC_1)), newMeasureComputer(array(CLASSES_KEY), array(NEW_METRIC_1))};
-    ComputationStep underTest = new FeedMeasureComputers(holder, array(new TestMetrics()), computers);
+    ComputationStep underTest = new LoadMeasureComputersStep(holder, array(new TestMetrics()), computers);
     underTest.execute();
   }
 
@@ -219,7 +219,7 @@ public class FeedMeasureComputersTest {
     };
 
     MeasureComputer[] computers = new MeasureComputer[] {measureComputer};
-    ComputationStep underTest = new FeedMeasureComputers(holder, array(new TestMetrics()), computers);
+    ComputationStep underTest = new LoadMeasureComputersStep(holder, array(new TestMetrics()), computers);
     underTest.execute();
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedPeriodsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedPeriodsStepTest.java
index 83a23649c7b..49438cab704 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedPeriodsStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedPeriodsStepTest.java
@@ -73,7 +73,7 @@ public class FeedPeriodsStepTest extends BaseStepTest {
   Settings settings = new Settings();
   SettingsRepository settingsRepository = mock(SettingsRepository.class);
 
-  FeedPeriodsStep underTest;
+  LoadPeriodsStep underTest;
 
   @Override
   protected ComputationStep step() {
@@ -84,7 +84,7 @@ public class FeedPeriodsStepTest extends BaseStepTest {
   public void setUp() throws Exception {
     analysisMetadataHolder.setAnalysisDate(DATE_FORMAT.parse("2008-11-30"));
 
-    underTest = new FeedPeriodsStep(dbClient, settingsRepository, treeRootHolder, analysisMetadataHolder, periodsHolder);
+    underTest = new LoadPeriodsStep(dbClient, settingsRepository, treeRootHolder, analysisMetadataHolder, periodsHolder);
   }
 
   private void setupRoot(Component root) {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedActiveRulesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadQualityProfilesStepTest.java
index 4003d77a4f0..42ae22228bd 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FeedActiveRulesStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/LoadQualityProfilesStepTest.java
@@ -23,7 +23,6 @@ import com.google.common.base.Optional;
 import org.assertj.core.data.MapEntry;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
 import org.sonar.api.rule.RuleStatus;
 import org.sonar.api.rule.Severity;
 import org.sonar.batch.protocol.Constants;
@@ -39,10 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.db.rule.RuleTesting.XOO_X1;
 import static org.sonar.db.rule.RuleTesting.XOO_X2;
 
-public class FeedActiveRulesStepTest {
-
-  @Rule
-  public TemporaryFolder temp = new TemporaryFolder();
+public class LoadQualityProfilesStepTest {
 
   @Rule
   public BatchReportReaderRule batchReportReader = new BatchReportReaderRule();
@@ -51,7 +47,7 @@ public class FeedActiveRulesStepTest {
   public RuleRepositoryRule ruleRepository = new RuleRepositoryRule();
 
   ActiveRulesHolderImpl activeRulesHolder = new ActiveRulesHolderImpl();
-  FeedActiveRulesStep underTest = new FeedActiveRulesStep(batchReportReader, activeRulesHolder, ruleRepository);
+  LoadQualityProfilesStep underTest = new LoadQualityProfilesStep(batchReportReader, activeRulesHolder, ruleRepository);
 
   @Test
   public void feed_active_rules() throws Exception {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityGateLoadingStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityGateLoadingStepTest.java
index ba15c22f7ec..b50e8c69f6d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityGateLoadingStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityGateLoadingStepTest.java
@@ -55,7 +55,7 @@ public class QualityGateLoadingStepTest {
   private SettingsRepository settingsRepository = mock(SettingsRepository.class);
   private QualityGateService qualityGateService = mock(QualityGateService.class);
 
-  private QualityGateLoadingStep underTest = new QualityGateLoadingStep(treeRootHolder, settingsRepository, qualityGateService, mutableQualityGateHolder);
+  private LoadQualityGateStep underTest = new LoadQualityGateStep(treeRootHolder, settingsRepository, qualityGateService, mutableQualityGateHolder);
 
   @Test
   public void execute_sets_default_QualityGate_when_project_has_no_settings() {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportComputationStepsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportComputationStepsTest.java
index e8e5f7057f5..3c8bc5db711 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportComputationStepsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportComputationStepsTest.java
@@ -37,7 +37,7 @@ public class ReportComputationStepsTest {
   @Test
   public void instances_throws_ISE_if_container_does_not_have_any_step() throws Exception {
     expectedException.expect(IllegalStateException.class);
-    expectedException.expectMessage("Component not found: class org.sonar.server.computation.step.ReportExtractionStep");
+    expectedException.expectMessage("Component not found: " + ExtractReportStep.class);
 
     ComputeEngineContainerImpl computeEngineContainer = new ComputeEngineContainerImpl(new ComponentContainer(), new ContainerPopulator<ComputeEngineContainer>() {
       @Override
@@ -54,7 +54,7 @@ public class ReportComputationStepsTest {
     expectedException.expect(IllegalStateException.class);
     expectedException.expectMessage("Component not found: class org.sonar.server.computation.step.BuildComponentTreeStep");
 
-    final ReportExtractionStep reportExtractionStep = mock(ReportExtractionStep.class);
+    final ExtractReportStep reportExtractionStep = mock(ExtractReportStep.class);
     ComponentContainer componentContainer = new ComponentContainer() {
       {
         addSingleton(reportExtractionStep);
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportFillMeasuresWithVariationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportComputeMeasureVariationsStepTest.java
index 6b28ebfe291..a072dfd9a89 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportFillMeasuresWithVariationsStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportComputeMeasureVariationsStepTest.java
@@ -29,9 +29,9 @@ import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.DbTester;
 import org.sonar.db.component.ComponentDto;
+import org.sonar.db.component.ComponentTesting;
 import org.sonar.db.component.SnapshotDto;
 import org.sonar.db.measure.MeasureDto;
-import org.sonar.db.component.ComponentTesting;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.batch.TreeRootHolderRule;
 import org.sonar.server.computation.component.Component;
@@ -50,7 +50,7 @@ import static org.sonar.server.component.SnapshotTesting.createForComponent;
 import static org.sonar.server.component.SnapshotTesting.createForProject;
 
 @Category(DbTests.class)
-public class ReportFillMeasuresWithVariationsStepTest {
+public class ReportComputeMeasureVariationsStepTest {
 
   static final Metric ISSUES_METRIC = new MetricImpl(1, "violations", "violations", Metric.MetricType.INT);
   static final Metric DEBT_METRIC = new MetricImpl(2, "sqale_index", "sqale_index", Metric.MetricType.WORK_DUR);
@@ -87,7 +87,7 @@ public class ReportFillMeasuresWithVariationsStepTest {
 
   DbClient dbClient = dbTester.getDbClient();
 
-  FillMeasuresWithVariationsStep underTest;
+  ComputeMeasureVariationsStep underTest;
 
   @Before
   public void setUp() {
@@ -95,7 +95,7 @@ public class ReportFillMeasuresWithVariationsStepTest {
     dbClient.componentDao().insert(session, PROJECT_DTO);
     session.commit();
 
-    underTest = new FillMeasuresWithVariationsStep(dbClient, treeRootHolder, periodsHolder, metricRepository, measureRepository);
+    underTest = new ComputeMeasureVariationsStep(dbClient, treeRootHolder, periodsHolder, metricRepository, measureRepository);
   }
 
   @Test
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java
index 512e5a9819b..7a32cee3485 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java
@@ -25,7 +25,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.rules.ExpectedException;
-import org.sonar.api.config.Settings;
 import org.sonar.api.utils.MessageException;
 import org.sonar.api.utils.System2;
 import org.sonar.batch.protocol.Constants;
@@ -62,16 +61,11 @@ public class ValidateProjectStepTest {
 
   DbClient dbClient = dbTester.getDbClient();
 
-  Settings settings;
-
-  ValidateProjectStep underTest;
+  ValidateProjectStep underTest = new ValidateProjectStep(dbClient, reportReader, treeRootHolder);
 
   @Before
   public void setUp() {
     dbTester.truncateTables();
-    settings = new Settings();
-
-    underTest = new ValidateProjectStep(dbClient, settings, reportReader, treeRootHolder);
   }
 
   @Test
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsFillMeasuresWithVariationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsComputeMeasureVariationsStepTest.java
index 5b5bbc8028f..90408c55709 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsFillMeasuresWithVariationsStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsComputeMeasureVariationsStepTest.java
@@ -51,7 +51,7 @@ import static org.sonar.server.component.SnapshotTesting.createForProject;
 import static org.sonar.server.component.SnapshotTesting.createForView;
 
 @Category(DbTests.class)
-public class ViewsFillMeasuresWithVariationsStepTest {
+public class ViewsComputeMeasureVariationsStepTest {
 
   static final Metric ISSUES_METRIC = new MetricImpl(1, "violations", "violations", Metric.MetricType.INT);
   static final Metric DEBT_METRIC = new MetricImpl(2, "sqale_index", "sqale_index", Metric.MetricType.WORK_DUR);
@@ -88,7 +88,7 @@ public class ViewsFillMeasuresWithVariationsStepTest {
 
   DbClient dbClient = dbTester.getDbClient();
 
-  FillMeasuresWithVariationsStep underTest;
+  ComputeMeasureVariationsStep underTest;
 
   @Before
   public void setUp() {
@@ -96,7 +96,7 @@ public class ViewsFillMeasuresWithVariationsStepTest {
     dbClient.componentDao().insert(session, VIEW_DTO);
     session.commit();
 
-    underTest = new FillMeasuresWithVariationsStep(dbClient, treeRootHolder, periodsHolder, metricRepository, measureRepository);
+    underTest = new ComputeMeasureVariationsStep(dbClient, treeRootHolder, periodsHolder, metricRepository, measureRepository);
   }
 
   @Test
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalContainer.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalContainer.java
index c4f09fcbac8..2a802f6be1b 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalContainer.java
@@ -19,32 +19,28 @@
  */
 package org.sonar.batch.bootstrap;
 
-import javax.annotation.CheckForNull;
-
-import org.sonar.batch.analysis.DefaultAnalysisMode;
-import org.sonar.batch.cache.PersistentCacheProvider;
-import org.sonar.batch.cache.WSLoader.LoadStrategy;
-import org.sonar.batch.analysis.AnalysisProperties;
-import org.sonar.batch.cache.StrategyWSLoaderProvider;
-import org.sonar.batch.cache.ProjectSyncContainer;
-import org.sonar.batch.rule.RulesLoader;
-import org.sonar.batch.rule.DefaultRulesLoader;
-import org.sonar.batch.rule.RulesProvider;
-
 import java.util.List;
 import java.util.Map;
-
+import javax.annotation.CheckForNull;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.SonarPlugin;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.UriReader;
+import org.sonar.batch.analysis.AnalysisProperties;
+import org.sonar.batch.analysis.DefaultAnalysisMode;
+import org.sonar.batch.cache.PersistentCacheProvider;
+import org.sonar.batch.cache.ProjectSyncContainer;
+import org.sonar.batch.cache.StrategyWSLoaderProvider;
+import org.sonar.batch.cache.WSLoader.LoadStrategy;
 import org.sonar.batch.index.CachesManager;
 import org.sonar.batch.platform.DefaultServer;
 import org.sonar.batch.repository.DefaultGlobalRepositoriesLoader;
 import org.sonar.batch.repository.GlobalRepositoriesLoader;
 import org.sonar.batch.repository.GlobalRepositoriesProvider;
+import org.sonar.batch.rule.DefaultRulesLoader;
+import org.sonar.batch.rule.RulesLoader;
+import org.sonar.batch.rule.RulesProvider;
 import org.sonar.batch.scan.ProjectScanContainer;
-import org.sonar.core.config.Logback;
 import org.sonar.core.platform.ComponentContainer;
 import org.sonar.core.platform.PluginClassloaderFactory;
 import org.sonar.core.platform.PluginInfo;
@@ -94,7 +90,6 @@ public class GlobalContainer extends ComponentContainer {
       GlobalSettings.class,
       new RulesProvider(),
       ServerClient.class,
-      Logback.class,
       DefaultServer.class,
       new GlobalTempFolderProvider(),
       DefaultHttpDownloader.class,
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalContainerTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalContainerTest.java
index 0ac0c6e4398..c65e624aac5 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalContainerTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalContainerTest.java
@@ -19,20 +19,18 @@
  */
 package org.sonar.batch.bootstrap;
 
-import org.sonar.api.batch.BatchSide;
-
-import org.junit.Rule;
-import org.junit.rules.TemporaryFolder;
-import org.sonar.api.CoreProperties;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
-import org.junit.Test;
-import org.sonar.api.utils.TempFolder;
-import org.sonar.core.config.Logback;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.sonar.api.CoreProperties;
+import org.sonar.api.batch.BatchSide;
+import org.sonar.api.utils.TempFolder;
+import org.sonar.core.util.UuidFactory;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -53,7 +51,7 @@ public class GlobalContainerTest {
   public void should_add_components() {
     GlobalContainer container = createContainer(Collections.emptyList());
 
-    assertThat(container.getComponentByType(Logback.class)).isNotNull();
+    assertThat(container.getComponentByType(UuidFactory.class)).isNotNull();
     assertThat(container.getComponentByType(TempFolder.class)).isNotNull();
   }
 
diff --git a/sonar-core/src/main/java/org/sonar/core/config/Logback.java b/sonar-core/src/main/java/org/sonar/core/config/Logback.java
index efe9aede004..9c8f25ebc62 100644
--- a/sonar-core/src/main/java/org/sonar/core/config/Logback.java
+++ b/sonar-core/src/main/java/org/sonar/core/config/Logback.java
@@ -32,7 +32,6 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.batch.BatchSide;
-import org.sonar.api.server.ServerSide;
 
 /**
  * Configure Logback
@@ -40,9 +39,12 @@ import org.sonar.api.server.ServerSide;
  * @since 2.12
  */
 @BatchSide
-@ServerSide
 public class Logback {
 
+  private Logback() {
+    // only statics
+  }
+
   public static void configure(String classloaderPath, Map<String, String> substitutionVariables) {
     InputStream input = Logback.class.getResourceAsStream(classloaderPath);
     if (input == null) {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/DateUtils.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/DateUtils.java
index dcb95c2fd62..9abeb23dca3 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/DateUtils.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/DateUtils.java
@@ -87,9 +87,10 @@ public final class DateUtils {
    * Parse format {@link #DATE_FORMAT}. This method never throws exception.
    *
    * @param s any string
-   * @return the date, null if parsing error or null string
+   * @return the date, {@code null} if parsing error or if parameter is {@code null}
    * @since 3.0
    */
+  @CheckForNull
   public static Date parseDateQuietly(@Nullable String s) {
     Date date = null;
     if (s != null) {
@@ -121,8 +122,9 @@ public final class DateUtils {
    * Parse format {@link #DATETIME_FORMAT}. This method never throws exception.
    *
    * @param s any string
-   * @return the datetime, null if parsing error or null string
+   * @return the datetime, {@code null} if parsing error or if parameter is {@code null}
    */
+  @CheckForNull
   public static Date parseDateTimeQuietly(@Nullable String s) {
     Date datetime = null;
     if (s != null) {