SONAR-8835 file move detection does not need to compute source hash

4 files changed, 5 insertions, 19 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStep.java
index 1a53493123a..182e4232455 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStep.java
@@ -37,7 +37,6 @@ import javax.annotation.concurrent.Immutable;
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.core.hash.SourceHashComputer;
 import org.sonar.core.hash.SourceLinesHashesComputer;
 import org.sonar.core.util.CloseableIterator;
 import org.sonar.db.DbClient;
@@ -185,15 +184,13 @@ public class FileMoveDetectionStep implements ComputationStep {
       // SourceHashRepository
       Component component = reportFilesByKey.get(fileKey);
       SourceLinesHashesComputer linesHashesComputer = new SourceLinesHashesComputer();
-      SourceHashComputer sourceHashComputer = new SourceHashComputer();
       try (CloseableIterator<String> lineIterator = sourceLinesRepository.readLines(component)) {
         while (lineIterator.hasNext()) {
           String line = lineIterator.next();
           linesHashesComputer.addLine(line);
-          sourceHashComputer.addLine(line, lineIterator.hasNext());
         }
       }
-      builder.put(fileKey, new File(component.getReportAttributes().getPath(), sourceHashComputer.getHash(), linesHashesComputer.getLineHashes()));
+      builder.put(fileKey, new File(component.getReportAttributes().getPath(), linesHashesComputer.getLineHashes()));
     }
     return builder.build();
   }
@@ -236,7 +233,7 @@ public class FileMoveDetectionStep implements ComputationStep {
     if (fileSourceDto == null) {
       return null;
     }
-    return new File(dbComponent.getPath(), fileSourceDto.getSrcHash(), LINES_HASHES_SPLITTER.splitToList(fileSourceDto.getLineHashes()));
+    return new File(dbComponent.getPath(), LINES_HASHES_SPLITTER.splitToList(fileSourceDto.getLineHashes()));
   }
 
   private static void printIfDebug(ScoreMatrix scoreMatrix) {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarity.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarity.java
index d234f35292c..86743b06906 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarity.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/filemove/FileSimilarity.java
@@ -29,12 +29,10 @@ public interface FileSimilarity {
 
   final class File {
     private final String path;
-    private final String srcHash;
     private final List<String> lineHashes;
 
-    public File(String path, @Nullable String srcHash, @Nullable List<String> lineHashes) {
+    public File(String path, @Nullable List<String> lineHashes) {
       this.path = requireNonNull(path, "path can not be null");
-      this.srcHash = srcHash;
       this.lineHashes = lineHashes;
     }
 
@@ -43,11 +41,6 @@ public interface FileSimilarity {
     }
 
     @CheckForNull
-    public String getSrcHash() {
-      return srcHash;
-    }
-
-    @CheckForNull
     public List<String> getLineHashes() {
       return lineHashes;
     }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java
index f6fd10c8e01..6f67fd94847 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java
@@ -35,7 +35,6 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
-import org.sonar.core.hash.SourceHashComputer;
 import org.sonar.core.hash.SourceLinesHashesComputer;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
@@ -499,18 +498,15 @@ public class FileMoveDetectionStepTest {
 
   private void mockContentOfFileInDb(String key, String[] content) {
     SourceLinesHashesComputer linesHashesComputer = new SourceLinesHashesComputer();
-    SourceHashComputer sourceHashComputer = new SourceHashComputer();
     Iterator<String> lineIterator = Arrays.asList(content).iterator();
     while (lineIterator.hasNext()) {
       String line = lineIterator.next();
       linesHashesComputer.addLine(line);
-      sourceHashComputer.addLine(line, lineIterator.hasNext());
     }
 
     when(fileSourceDao.selectSourceByFileUuid(dbSession, componentUuidOf(key)))
       .thenReturn(new FileSourceDto()
-        .setLineHashes(on('\n').join(linesHashesComputer.getLineHashes()))
-        .setSrcHash(sourceHashComputer.getHash()));
+        .setLineHashes(on('\n').join(linesHashesComputer.getLineHashes())));
   }
 
   private void setFilesInReport(Component... files) {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScoreTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScoreTest.java
index 1f2644a69c3..cbd96aac878 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScoreTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MatchesByScoreTest.java
@@ -78,6 +78,6 @@ public class MatchesByScoreTest {
   }
 
   private static FileSimilarity.File fileOf(String key) {
-    return new FileSimilarity.File("path of " + key, null, null);
+    return new FileSimilarity.File("path of " + key, null);
   }
 }