SONAR-11394 Calculate estimated overall duplication in SLB

1 files changed, 4 insertions, 12 deletions

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/CpdExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/CpdExecutor.java
index f0b923791a0..89e2cd0569c 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/CpdExecutor.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/cpd/CpdExecutor.java
@@ -34,7 +34,6 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import org.sonar.api.batch.fs.InputComponent;
-import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.DefaultInputComponent;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.utils.log.Logger;
@@ -49,7 +48,6 @@ import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReport.Duplicate;
 import org.sonar.scanner.protocol.output.ScannerReport.Duplication;
 import org.sonar.scanner.report.ReportPublisher;
-import org.sonar.scanner.scan.branch.BranchConfiguration;
 import org.sonar.scanner.scan.filesystem.InputComponentStore;
 import org.sonar.scanner.util.ProgressReport;
 
@@ -68,24 +66,22 @@ public class CpdExecutor {
   private final SonarCpdBlockIndex index;
   private final ReportPublisher publisher;
   private final InputComponentStore componentStore;
-  private final BranchConfiguration branchConfiguration;
   private final ProgressReport progressReport;
   private final CpdSettings settings;
   private final ExecutorService executorService;
   private int count = 0;
   private int total;
 
-  public CpdExecutor(CpdSettings settings, SonarCpdBlockIndex index, ReportPublisher publisher, InputComponentStore inputComponentCache, BranchConfiguration branchConfiguration) {
-    this(settings, index, publisher, inputComponentCache, branchConfiguration, Executors.newSingleThreadExecutor());
+  public CpdExecutor(CpdSettings settings, SonarCpdBlockIndex index, ReportPublisher publisher, InputComponentStore inputComponentCache) {
+    this(settings, index, publisher, inputComponentCache, Executors.newSingleThreadExecutor());
   }
 
   public CpdExecutor(CpdSettings settings, SonarCpdBlockIndex index, ReportPublisher publisher, InputComponentStore inputComponentCache,
-    BranchConfiguration branchConfiguration, ExecutorService executorService) {
+    ExecutorService executorService) {
     this.settings = settings;
     this.index = index;
     this.publisher = publisher;
     this.componentStore = inputComponentCache;
-    this.branchConfiguration = branchConfiguration;
     this.progressReport = new ProgressReport("CPD computation", TimeUnit.SECONDS.toMillis(10));
     this.executorService = executorService;
   }
@@ -102,7 +98,7 @@ public class CpdExecutor {
     while (it.hasNext()) {
       ResourceBlocks resourceBlocks = it.next();
       Optional<FileBlocks> fileBlocks = toFileBlocks(resourceBlocks.resourceId(), resourceBlocks.blocks());
-      if (!fileBlocks.isPresent() || shouldSkip(fileBlocks.get().getInputFile())) {
+      if (!fileBlocks.isPresent()) {
         continue;
       }
       components.add(fileBlocks.get());
@@ -129,10 +125,6 @@ public class CpdExecutor {
     }
   }
 
-  private boolean shouldSkip(DefaultInputFile inputFile) {
-    return branchConfiguration.isShortOrPullRequest() && inputFile.status() == InputFile.Status.SAME;
-  }
-
   private static String pluralize(int files) {
     return files == 1 ? "file" : "files";
   }