diff options
author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2015-11-10 17:29:52 +0100 |
---|---|---|
committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2015-11-12 11:01:30 +0100 |
commit | c20343073c1c3ba5356db69a9c1a040cab339fa1 (patch) | |
tree | 6004d5f70eac2c329ace178a2197dec29f190a89 /sonar-batch | |
parent | dd16b88717a81272e50624bd60ece463fae8ec76 (diff) | |
download | sonarqube-c20343073c1c3ba5356db69a9c1a040cab339fa1.tar.gz sonarqube-c20343073c1c3ba5356db69a9c1a040cab339fa1.zip |
SONAR-6993 Replace hash of CpdTextBlock from a list of int to a string
Having a the hash represented as a list of int in the report brings too much complexity in the compute engine, as we need only a string.
Diffstat (limited to 'sonar-batch')
-rw-r--r-- | sonar-batch/src/main/java/org/sonar/batch/cpd/index/SonarDuplicationsIndex.java | 4 | ||||
-rw-r--r-- | sonar-batch/src/test/java/org/sonar/batch/mediumtest/cpd/CpdMediumTest.java | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cpd/index/SonarDuplicationsIndex.java b/sonar-batch/src/main/java/org/sonar/batch/cpd/index/SonarDuplicationsIndex.java index ca331ebeb2c..f5872efdd50 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/cpd/index/SonarDuplicationsIndex.java +++ b/sonar-batch/src/main/java/org/sonar/batch/cpd/index/SonarDuplicationsIndex.java @@ -60,9 +60,7 @@ public class SonarDuplicationsIndex extends AbstractCloneIndex { builder.setEndLine(input.getEndLine()); builder.setStartTokenIndex(input.getStartUnit()); builder.setEndTokenIndex(input.getEndUnit()); - for (int i : input.getBlockHash().toIntArray()) { - builder.addHash(i); - } + builder.setHash(input.getBlockHash().toHexString()); return builder.build(); } })); diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/cpd/CpdMediumTest.java b/sonar-batch/src/test/java/org/sonar/batch/mediumtest/cpd/CpdMediumTest.java index acc0f5255ac..bb41a88d7e6 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/cpd/CpdMediumTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/mediumtest/cpd/CpdMediumTest.java @@ -158,19 +158,19 @@ public class CpdMediumTest { assertThat(duplicationBlocks.get(0).getEndLine()).isEqualTo(5); assertThat(duplicationBlocks.get(0).getStartTokenIndex()).isEqualTo(1); assertThat(duplicationBlocks.get(0).getEndTokenIndex()).isEqualTo(6); - assertThat(duplicationBlocks.get(0).getHashList()).isNotEmpty(); + assertThat(duplicationBlocks.get(0).getHash()).isNotEmpty(); assertThat(duplicationBlocks.get(1).getStartLine()).isEqualTo(2); assertThat(duplicationBlocks.get(1).getEndLine()).isEqualTo(6); assertThat(duplicationBlocks.get(1).getStartTokenIndex()).isEqualTo(3); assertThat(duplicationBlocks.get(1).getEndTokenIndex()).isEqualTo(7); - assertThat(duplicationBlocks.get(0).getHashList()).isNotEmpty(); + assertThat(duplicationBlocks.get(0).getHash()).isNotEmpty(); assertThat(duplicationBlocks.get(2).getStartLine()).isEqualTo(3); assertThat(duplicationBlocks.get(2).getEndLine()).isEqualTo(7); assertThat(duplicationBlocks.get(2).getStartTokenIndex()).isEqualTo(4); assertThat(duplicationBlocks.get(2).getEndTokenIndex()).isEqualTo(8); - assertThat(duplicationBlocks.get(0).getHashList()).isNotEmpty(); + assertThat(duplicationBlocks.get(0).getHash()).isNotEmpty(); } // SONAR-6000 |