SONAR-11139 Store changed lines information received in scanner report

1 files changed, 9 insertions, 6 deletions

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ChangedLinesPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ChangedLinesPublisher.java
index d15fa2d0961..1413a7a6bfa 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ChangedLinesPublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ChangedLinesPublisher.java
@@ -20,6 +20,7 @@
 package org.sonar.scanner.report;
 
 import java.nio.file.Path;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -78,17 +79,19 @@ public class ChangedLinesPublisher implements ReportPublisherStep {
     int count = 0;
 
     if (pathSetMap == null) {
+      // no information returned by the SCM, we write nothing in the report and
+      // the compute engine will use SCM dates to estimate which lines are new
       return count;
     }
 
     for (Map.Entry<Path, DefaultInputFile> e : allPublishedFiles.entrySet()) {
-      Set<Integer> changedLines = pathSetMap.get(e.getKey());
-      // if the file got no information returned by the SCM, we write nothing in the report and
-      // the compute engine will use SCM dates to estimate which lines are new
-      if (changedLines != null && !changedLines.isEmpty()) {
-        count++;
-        writeChangedLines(writer, e.getValue().batchId(), changedLines);
+      Set<Integer> changedLines = pathSetMap.getOrDefault(e.getKey(), Collections.emptySet());
+
+      if (changedLines.isEmpty()) {
+        LOG.warn("File '{}' was detected as changed but without having changed lines", e.getKey().toAbsolutePath());
       }
+      count++;
+      writeChangedLines(writer, e.getValue().batchId(), changedLines);
     }
     return count;
   }