SONAR-6335 Fix file source migration to generate correct checksum on blank lines

diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FileSourceDto.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FileSourceDto.java
index 3a4e6a7d53ed62fa783c02e34a173fa6a876132d..ea3aa3ca172f676bf4d1e4d7adc6e496ee6197ac 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FileSourceDto.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v50/FileSourceDto.java
@@ -37,11 +37,7 @@ import javax.xml.stream.XMLStreamException;
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStreamWriter;
 import java.io.StringReader;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static com.google.common.base.Charsets.UTF_8;
 
@@ -110,7 +106,7 @@ class FileSourceDto {
 
   public static String lineChecksum(String line) {
     String reducedLine = StringUtils.replaceChars(line, SPACE_CHARS, "");
-    if (line.isEmpty()) {
+    if (reducedLine.isEmpty()) {
       return "";
     }
     return DigestUtils.md5Hex(reducedLine);

diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FileSourceDtoTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FileSourceDtoTest.java
new file mode 100644 (file)
index 0000000..fc4090f
--- /dev/null
+++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v50/FileSourceDtoTest.java
@@ -0,0 +1,34 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.server.db.migrations.v50;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FileSourceDtoTest {
+
+  @Test
+  public void checksumOfBlankLine() {
+    assertThat(FileSourceDto.lineChecksum("")).isEmpty();
+    assertThat(FileSourceDto.lineChecksum("          \r\n")).isEmpty();
+  }
+
+}