Fix some quality flaws

9 files changed, 29 insertions, 76 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/IssueTracking.java b/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/IssueTracking.java
index a330543c881..b641bd88779 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/IssueTracking.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/IssueTracking.java
@@ -175,21 +175,15 @@ public class IssueTracking {
           findLastIssueWithSameChecksumAndMessage(rawIssue, result.unmatchedByKeyForRule(ruleKey(rawIssue)).values()),
           result);
       }
-    }
-
-    // Try then to match issues on same rule with same line and with same message
-    for (BatchReport.Issue rawIssue : rawIssues) {
+      // Try then to match issues on same rule with same line and with same message
       if (isNotAlreadyMapped(rawIssue, result)) {
         mapIssue(
           rawIssue,
           findLastIssueWithSameLineAndMessage(rawIssue, result.unmatchedByKeyForRule(ruleKey(rawIssue)).values()),
           result);
       }
-    }
-
-    // Last check: match issue if same rule and same checksum but different line and different message
-    // See SONAR-2812
-    for (BatchReport.Issue rawIssue : rawIssues) {
+      // Last check: match issue if same rule and same checksum but different line and different message
+      // See SONAR-2812
       if (isNotAlreadyMapped(rawIssue, result)) {
         mapIssue(
           rawIssue,
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java
index 89c5e8bcc17..baa19bd268a 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java
@@ -54,7 +54,6 @@ import org.sonar.batch.phases.ProjectInitializer;
 import org.sonar.batch.phases.SensorsExecutor;
 import org.sonar.batch.postjob.DefaultPostJobContext;
 import org.sonar.batch.postjob.PostJobOptimizer;
-import org.sonar.batch.rule.ModuleQProfiles;
 import org.sonar.batch.rule.QProfileSensor;
 import org.sonar.batch.rule.QProfileVerifier;
 import org.sonar.batch.rule.RuleFinderCompatibility;
@@ -117,7 +116,7 @@ public class ModuleScanContainer extends ComponentContainer {
       ProjectInitializer.class,
       moduleDefinition.getContainerExtensions(),
 
-    // file system
+      // file system
       ModuleInputFileCache.class,
       FileExclusions.class,
       ExclusionFilters.class,
@@ -136,10 +135,10 @@ public class ModuleScanContainer extends ComponentContainer {
       ProjectClasspath.class,
       QProfileVerifier.class,
 
-    SensorOptimizer.class,
+      SensorOptimizer.class,
       PostJobOptimizer.class,
 
-    DefaultSensorContext.class,
+      DefaultSensorContext.class,
       DefaultPostJobContext.class,
       DefaultSensorStorage.class,
       DeprecatedSensorContext.class,
@@ -147,20 +146,20 @@ public class ModuleScanContainer extends ComponentContainer {
       IssueFilters.class,
       CoverageExclusions.class,
 
-    // rules
+      // rules
       new RulesProfileProvider(),
       QProfileSensor.class,
       CheckFactory.class,
 
-    // report
+      // report
       IssuesReports.class,
 
-    // issues
+      // issues
       IssuableFactory.class,
       ModuleIssues.class,
       org.sonar.api.issue.NoSonarFilter.class,
 
-    // issue exclusions
+      // issue exclusions
       IssueInclusionPatternInitializer.class,
       IssueExclusionPatternInitializer.class,
       IssueExclusionsRegexpScanner.class,
@@ -169,7 +168,7 @@ public class ModuleScanContainer extends ComponentContainer {
       IgnoreIssuesFilter.class,
       NoSonarFilter.class,
 
-    // Perspectives
+      // Perspectives
       BatchPerspectives.class,
       HighlightableBuilder.class,
       SymbolizableBuilder.class);
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorBuilder.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorBuilder.java
index 81b54609351..d25a5d0e33e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorBuilder.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorBuilder.java
@@ -19,16 +19,10 @@
  */
 package org.sonar.batch.scan;
 
-import org.sonar.api.batch.AnalysisMode;
-
-import org.apache.commons.lang.ArrayUtils;
-import org.sonar.batch.analysis.AnalysisProperties;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
-
 import java.io.File;
 import java.io.FileFilter;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -38,23 +32,23 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Properties;
-
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-
 import org.apache.commons.io.filefilter.AndFileFilter;
 import org.apache.commons.io.filefilter.FileFileFilter;
 import org.apache.commons.io.filefilter.IOFileFilter;
 import org.apache.commons.io.filefilter.WildcardFileFilter;
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.CoreProperties;
+import org.sonar.api.batch.AnalysisMode;
 import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.api.utils.log.Profiler;
+import org.sonar.batch.analysis.AnalysisProperties;
 import org.sonar.batch.util.BatchUtils;
 
 /**
@@ -109,7 +103,7 @@ public class ProjectReactorBuilder {
    */
   private static final List<String> NON_HERITED_PROPERTIES_FOR_CHILD = Lists.newArrayList(PROPERTY_PROJECT_BASEDIR, CoreProperties.WORKING_DIRECTORY, PROPERTY_MODULES,
     CoreProperties.PROJECT_DESCRIPTION_PROPERTY);
-  
+
   private static final String NON_ASSOCIATED_PROJECT_KEY = "project";
 
   private final AnalysisProperties taskProps;
@@ -165,16 +159,16 @@ public class ProjectReactorBuilder {
       extractPropertiesByModule(propertiesByModuleId, moduleId, currentModuleProperties);
     }
   }
-  
+
   private static void prepareNonAssociatedProject(Map<String, String> props, AnalysisMode mode) {
-    if(mode.isIssues() && !props.containsKey(CoreProperties.PROJECT_KEY_PROPERTY)) {
+    if (mode.isIssues() && !props.containsKey(CoreProperties.PROJECT_KEY_PROPERTY)) {
       props.put(CoreProperties.PROJECT_KEY_PROPERTY, NON_ASSOCIATED_PROJECT_KEY);
     }
   }
-  
+
   protected ProjectDefinition defineRootProject(Map<String, String> rootProperties, @Nullable ProjectDefinition parent) {
     prepareNonAssociatedProject(rootProperties, analysisMode);
-    
+
     if (rootProperties.containsKey(PROPERTY_MODULES)) {
       checkMandatoryProperties(rootProperties, MANDATORY_PROPERTIES_FOR_MULTIMODULE_PROJECT);
     } else {
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReport.java b/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReport.java
index 1f2b551ef2f..63abaace82e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReport.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReport.java
@@ -19,17 +19,15 @@
  */
 package org.sonar.batch.scan.report;
 
-import org.sonar.api.batch.rule.Rule;
-
 import com.google.common.collect.Maps;
-import org.sonar.api.issue.Issue;
-import org.sonar.api.rules.RulePriority;
-import org.sonar.batch.index.BatchComponent;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import org.sonar.api.batch.rule.Rule;
+import org.sonar.api.issue.Issue;
+import org.sonar.api.rules.RulePriority;
+import org.sonar.batch.index.BatchComponent;
 
 public class IssuesReport {
 
@@ -40,9 +38,6 @@ public class IssuesReport {
   private final ReportSummary summary = new ReportSummary();
   private final Map<BatchComponent, ResourceReport> resourceReportsByResource = Maps.newLinkedHashMap();
 
-  public IssuesReport() {
-  }
-
   public ReportSummary getSummary() {
     return summary;
   }
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/ReportSummary.java b/sonar-batch/src/main/java/org/sonar/batch/scan/report/ReportSummary.java
index 680b4f086ec..2ebb4a2f9a9 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/report/ReportSummary.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/report/ReportSummary.java
@@ -19,16 +19,14 @@
  */
 package org.sonar.batch.scan.report;
 
-import org.sonar.api.batch.rule.Rule;
-
 import com.google.common.collect.Maps;
-import org.sonar.api.issue.Issue;
-import org.sonar.api.rules.RulePriority;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import org.sonar.api.batch.rule.Rule;
+import org.sonar.api.issue.Issue;
+import org.sonar.api.rules.RulePriority;
 
 public class ReportSummary {
 
@@ -38,9 +36,6 @@ public class ReportSummary {
   private final Map<String, IssueVariation> totalByRuleKey = Maps.newHashMap();
   private final Map<String, IssueVariation> totalBySeverity = Maps.newHashMap();
 
-  public ReportSummary() {
-  }
-
   public IssueVariation getTotal() {
     return total;
   }
diff --git a/sonar-batch/src/main/java/org/sonar/batch/sensor/SensorOptimizer.java b/sonar-batch/src/main/java/org/sonar/batch/sensor/SensorOptimizer.java
index 4ecec6fd5a2..8682da2bca2 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/sensor/SensorOptimizer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/sensor/SensorOptimizer.java
@@ -21,8 +21,8 @@ package org.sonar.batch.sensor;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonar.api.batch.BatchSide;
 import org.sonar.api.batch.AnalysisMode;
+import org.sonar.api.batch.BatchSide;
 import org.sonar.api.batch.fs.FilePredicate;
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.rule.ActiveRules;
@@ -62,10 +62,6 @@ public class SensorOptimizer {
       LOG.debug("'{}' skipped because one of the required properties is missing", descriptor.name());
       return false;
     }
-    if (descriptor.isDisabledInPreview() && analysisMode.isPreview()) {
-      LOG.debug("'{}' skipped in preview mode", descriptor.name());
-      return false;
-    }
     if (descriptor.isDisabledInIssues() && analysisMode.isIssues()) {
       LOG.debug("'{}' skipped in issues mode", descriptor.name());
       return false;
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/highlighting/HighlightingMediumTest.java b/sonar-batch/src/test/java/org/sonar/batch/mediumtest/highlighting/HighlightingMediumTest.java
index e2787402209..5dcc1d57af9 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/highlighting/HighlightingMediumTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/mediumtest/highlighting/HighlightingMediumTest.java
@@ -20,6 +20,8 @@
 package org.sonar.batch.mediumtest.highlighting;
 
 import com.google.common.collect.ImmutableMap;
+import java.io.File;
+import java.io.IOException;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.junit.After;
@@ -27,16 +29,12 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestName;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.sensor.highlighting.TypeOfText;
 import org.sonar.batch.mediumtest.BatchMediumTester;
 import org.sonar.batch.mediumtest.TaskResult;
 import org.sonar.xoo.XooPlugin;
 
-import java.io.File;
-import java.io.IOException;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class HighlightingMediumTest {
@@ -44,9 +42,6 @@ public class HighlightingMediumTest {
   @Rule
   public TemporaryFolder temp = new TemporaryFolder();
 
-  @Rule
-  public TestName testName = new TestName();
-
   public BatchMediumTester tester = BatchMediumTester.builder()
     .registerPlugin("xoo", new XooPlugin())
     .addDefaultQProfile("xoo", "Sonar Way")
diff --git a/sonar-batch/src/test/java/org/sonar/batch/postjob/PostJobOptimizerTest.java b/sonar-batch/src/test/java/org/sonar/batch/postjob/PostJobOptimizerTest.java
index 3fe56c92312..2b55fc3c144 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/postjob/PostJobOptimizerTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/postjob/PostJobOptimizerTest.java
@@ -23,7 +23,6 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.junit.rules.TemporaryFolder;
 import org.sonar.api.batch.AnalysisMode;
 import org.sonar.api.batch.postjob.internal.DefaultPostJobDescriptor;
 import org.sonar.api.config.Settings;
@@ -35,9 +34,6 @@ import static org.mockito.Mockito.when;
 public class PostJobOptimizerTest {
 
   @Rule
-  public TemporaryFolder temp = new TemporaryFolder();
-
-  @Rule
   public ExpectedException thrown = ExpectedException.none();
 
   private PostJobOptimizer optimizer;
diff --git a/sonar-batch/src/test/java/org/sonar/batch/sensor/SensorOptimizerTest.java b/sonar-batch/src/test/java/org/sonar/batch/sensor/SensorOptimizerTest.java
index 15f334dadee..e064473f714 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/sensor/SensorOptimizerTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/sensor/SensorOptimizerTest.java
@@ -139,17 +139,6 @@ public class SensorOptimizerTest {
   }
 
   @Test
-  public void should_disabled_in_preview_mode() {
-    DefaultSensorDescriptor descriptor = new DefaultSensorDescriptor()
-      .disabledInPreview();
-    assertThat(optimizer.shouldExecute(descriptor)).isTrue();
-
-    when(analysisMode.isPreview()).thenReturn(true);
-
-    assertThat(optimizer.shouldExecute(descriptor)).isFalse();
-  }
-
-  @Test
   public void should_disabled_in_issues_mode() {
     DefaultSensorDescriptor descriptor = new DefaultSensorDescriptor()
       .disabledInIssues();