SONAR-9160 All files are scanned in issues mode when analysing a branch

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultModuleFileSystem.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultModuleFileSystem.java
index eb18a1ff50192b74e8f4d2eff67fc6894de9e462..43a52aa4de24b3c2a5b485089e0d337f6cbb5ab3 100644 (file)
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultModuleFileSystem.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/DefaultModuleFileSystem.java
@@ -74,7 +74,7 @@ public class DefaultModuleFileSystem extends DefaultFileSystem {
 
     // filter the files sensors have access to
     if (!mode.scanAllFiles()) {
-      setDefaultPredicate(new SameInputFilePredicate(projectRepositories, moduleKey));
+      setDefaultPredicate(new SameInputFilePredicate(projectRepositories, module.definition().getKeyWithBranch()));
     }
   }
 

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/SameInputFilePredicate.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/SameInputFilePredicate.java
index 7e6e033b4aa39821c6d6d8202cb4f739f9506dab..bf5206be7ad4bc0f87188daad7e04ff539d828bf 100644 (file)
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/SameInputFilePredicate.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/SameInputFilePredicate.java
@@ -32,16 +32,16 @@ import org.sonar.scanner.repository.ProjectRepositories;
 public class SameInputFilePredicate implements Predicate<InputFile> {
   private static final Logger LOG = LoggerFactory.getLogger(SameInputFilePredicate.class);
   private final ProjectRepositories projectRepositories;
-  private final String moduleKey;
+  private final String moduleKeyWithBranch;
 
-  public SameInputFilePredicate(ProjectRepositories projectRepositories, String moduleKey) {
+  public SameInputFilePredicate(ProjectRepositories projectRepositories, String moduleKeyWithBranch) {
     this.projectRepositories = projectRepositories;
-    this.moduleKey = moduleKey;
+    this.moduleKeyWithBranch = moduleKeyWithBranch;
   }
 
   @Override
   public boolean test(InputFile inputFile) {
-    FileData fileDataPerPath = projectRepositories.fileData(moduleKey, inputFile.relativePath());
+    FileData fileDataPerPath = projectRepositories.fileData(moduleKeyWithBranch, inputFile.relativePath());
     if (fileDataPerPath == null) {
       // ADDED
       return true;