SONAR-6931 Speed up issues mode by scanning only changed files

3 files changed, 10 insertions, 10 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/analysis/DefaultAnalysisMode.java b/sonar-batch/src/main/java/org/sonar/batch/analysis/DefaultAnalysisMode.java
index 2e0d79cf9d1..31784aa1e80 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/analysis/DefaultAnalysisMode.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/analysis/DefaultAnalysisMode.java
@@ -36,11 +36,11 @@ import java.util.Map;
 public class DefaultAnalysisMode extends AbstractAnalysisMode implements AnalysisMode {
 
   private static final Logger LOG = LoggerFactory.getLogger(DefaultAnalysisMode.class);
-  private static final String KEY_ONLY_ANALYZE_CHANGED = "sonar.scanChangedFilesOnly";
+  private static final String KEY_SCAN_ALL = "sonar.scanAllFiles";
 
   private boolean mediumTestMode;
   private boolean notAssociated;
-  private boolean onlyChanged;
+  private boolean scanAllFiles;
 
   public DefaultAnalysisMode(GlobalProperties globalProps, AnalysisProperties props) {
     init(globalProps.properties(), props.properties());
@@ -54,8 +54,8 @@ public class DefaultAnalysisMode extends AbstractAnalysisMode implements Analysi
     return notAssociated;
   }
 
-  public boolean onlyAnalyzeChanged() {
-    return onlyChanged;
+  public boolean scanAllFiles() {
+    return scanAllFiles;
   }
 
   private void init(Map<String, String> globalProps, Map<String, String> analysisProps) {
@@ -76,8 +76,8 @@ public class DefaultAnalysisMode extends AbstractAnalysisMode implements Analysi
     issues = CoreProperties.ANALYSIS_MODE_ISSUES.equals(mode) || CoreProperties.ANALYSIS_MODE_PREVIEW.equals(mode);
     mediumTestMode = "true".equals(getPropertyWithFallback(analysisProps, globalProps, FakePluginInstaller.MEDIUM_TEST_ENABLED));
     notAssociated = issues && rootProjectKeyMissing(analysisProps);
-    String onlyChangedStr = getPropertyWithFallback(analysisProps, globalProps, KEY_ONLY_ANALYZE_CHANGED);
-    onlyChanged = issues && "true".equals(onlyChangedStr);
+    String scanAllStr = getPropertyWithFallback(analysisProps, globalProps, KEY_SCAN_ALL);
+    scanAllFiles = !issues || "true".equals(scanAllStr);
   }
 
   public void printMode() {
@@ -94,7 +94,7 @@ public class DefaultAnalysisMode extends AbstractAnalysisMode implements Analysi
     if (notAssociated) {
       LOG.info("Local analysis");
     }
-    if (onlyChanged) {
+    if (!scanAllFiles) {
       LOG.info("Scanning only changed files");
     }
   }
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/LocalIssueTracking.java b/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/LocalIssueTracking.java
index eaaf466228e..8c77079f5f6 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/LocalIssueTracking.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/LocalIssueTracking.java
@@ -115,7 +115,7 @@ public class LocalIssueTracking {
   }
 
   private boolean shouldCopyServerIssues(BatchComponent component) {
-    if (mode.onlyAnalyzeChanged() && component.isFile()) {
+    if (!mode.scanAllFiles() && component.isFile()) {
       DefaultInputFile inputFile = (DefaultInputFile) component.inputComponent();
       if (inputFile.status() == Status.SAME) {
         return true;
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystem.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystem.java
index 17d6f8d4271..ad73100f467 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystem.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/DefaultModuleFileSystem.java
@@ -78,7 +78,7 @@ public class DefaultModuleFileSystem extends DefaultFileSystem implements Module
     this.binaryDirs = initializer.binaryDirs();
 
     // filter the files that sensors have access to (SONAR-6931)
-    if (mode.onlyAnalyzeChanged()) {
+    if (!mode.scanAllFiles()) {
       setDefaultPredicate(predicates.not(predicates.hasStatus(Status.SAME)));
     }
   }
@@ -98,7 +98,7 @@ public class DefaultModuleFileSystem extends DefaultFileSystem implements Module
     this.binaryDirs = initializer.binaryDirs();
     
     // filter the files sensors have access to
-    if (mode.onlyAnalyzeChanged()) {
+    if (!mode.scanAllFiles()) {
       setDefaultPredicate(predicates.not(predicates.hasStatus(Status.SAME)));
     }
   }