SONAR-6012 Checksum can be null

3 files changed, 8 insertions, 4 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java
index c08b203edd5..147d7d899f2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java
@@ -100,7 +100,10 @@ public class IssuesAction implements RequestHandler {
     }
     issueBuilder.setRuleRepository(issue.ruleKey().repository());
     issueBuilder.setRuleKey(issue.ruleKey().rule());
-    issueBuilder.setChecksum(issue.checksum());
+    String checksum = issue.checksum();
+    if (checksum != null) {
+      issueBuilder.setChecksum(checksum);
+    }
     String assigneeLogin = issue.assignee();
     if (assigneeLogin != null) {
       issueBuilder.setAssigneeLogin(assigneeLogin);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueDoc.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueDoc.java
index f8f6e2d40b6..fdfedca9850 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueDoc.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueDoc.java
@@ -97,8 +97,9 @@ public class IssueDoc extends BaseDoc implements Issue {
     return BooleanUtils.isTrue((Boolean) getField(IssueIndexDefinition.FIELD_ISSUE_MANUAL_SEVERITY));
   }
 
+  @Nullable
   public String checksum() {
-    return getField(IssueIndexDefinition.FIELD_ISSUE_CHECKSUM);
+    return getNullableField(IssueIndexDefinition.FIELD_ISSUE_CHECKSUM);
   }
 
   @Override
diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java
index 9d1fb293013..ed1efae697c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java
@@ -123,7 +123,7 @@ public class IssuesActionTest {
       .setManualSeverity(false)
       .setMessage(null)
       .setLine(null)
-      .setChecksum("123456")
+      .setChecksum(null)
       .setAssignee(null));
 
     MockUserSession.set().setLogin("henry").setGlobalPermissions(GlobalPermissions.PREVIEW_EXECUTION);
@@ -142,7 +142,7 @@ public class IssuesActionTest {
     assertThat(serverIssue.getStatus()).isEqualTo("RESOLVED");
     assertThat(serverIssue.getSeverity()).isEqualTo(Severity.BLOCKER);
     assertThat(serverIssue.getManualSeverity()).isFalse();
-    assertThat(serverIssue.getChecksum()).isEqualTo("123456");
+    assertThat(serverIssue.hasChecksum()).isFalse();
     assertThat(serverIssue.hasAssigneeLogin()).isFalse();
   }