diff options
| author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2015-01-23 14:59:40 +0100 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2015-01-23 15:32:05 +0100 |
| commit | 34e46e58156289bcdf868971b1d650d88e2477a9 (patch) | |
| tree | 88f027251dafec3f163302a8babc10fda39cd722 /sonar-batch-protocol | |
| parent | be5f0bda807df4d735b55c89cd30a5dfc2601b74 (diff) | |
| download | sonarqube-34e46e58156289bcdf868971b1d650d88e2477a9.tar.gz sonarqube-34e46e58156289bcdf868971b1d650d88e2477a9.zip | |
SONAR-6013 Return severity, manualSeverity and creationDate
Diffstat (limited to 'sonar-batch-protocol')
2 files changed, 33 insertions, 11 deletions
diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/issues/PreviousIssue.java b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/issues/PreviousIssue.java index 10f44f1e390..8239717deb0 100644 --- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/issues/PreviousIssue.java +++ b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/issues/PreviousIssue.java @@ -22,6 +22,7 @@ package org.sonar.batch.protocol.input.issues; import javax.annotation.Nullable; import java.io.Serializable; +import java.util.Date; public class PreviousIssue implements Serializable { @@ -31,12 +32,13 @@ public class PreviousIssue implements Serializable { private String ruleRepo; private Integer line; private String message; - // For manual issues and when user has overriden severity - private String overriddenSeverity; + private String severity; + private Boolean manualSeverity; private String resolution; private String status; private String checksum; private String assigneeLogin; + private Date creationDate; public PreviousIssue setKey(String key) { this.key = key; @@ -92,13 +94,22 @@ public class PreviousIssue implements Serializable { return status; } - public PreviousIssue setOverriddenSeverity(@Nullable String overriddenSeverity) { - this.overriddenSeverity = overriddenSeverity; + public PreviousIssue setSeverity(@Nullable String severity) { + this.severity = severity; return this; } - public String overriddenSeverity() { - return overriddenSeverity; + public String severity() { + return severity; + } + + public boolean isManualSeverity() { + return manualSeverity; + } + + public PreviousIssue setManualSeverity(boolean manualSeverity) { + this.manualSeverity = manualSeverity; + return this; } public PreviousIssue setChecksum(String checksum) { @@ -133,4 +144,12 @@ public class PreviousIssue implements Serializable { return ruleKey; } + public Date getCreationDate() { + return creationDate; + } + + public PreviousIssue setCreationDate(Date creationDate) { + this.creationDate = creationDate; + return this; + } } diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/issues/PreviousIssueHelperTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/issues/PreviousIssueHelperTest.java index c36431c7e14..750b35f8280 100644 --- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/issues/PreviousIssueHelperTest.java +++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/issues/PreviousIssueHelperTest.java @@ -42,7 +42,8 @@ public class PreviousIssueHelperTest { issue1.setRuleKey("repokey", "rulekey"); issue1.setLine(2); issue1.setMessage("message"); - issue1.setOverriddenSeverity("severity"); + issue1.setSeverity("severity"); + issue1.setManualSeverity(true); issue1.setResolution("resolution"); issue1.setStatus("status"); issue1.setChecksum("checksum"); @@ -57,11 +58,11 @@ public class PreviousIssueHelperTest { JSONAssert .assertEquals( - "[{\"key\": \"key1\", \"componentKey\": \"key\", \"ruleKey\": \"rulekey\", \"ruleRepo\": \"repokey\", \"line\": 2,\"message\": \"message\", \"overriddenSeverity\": \"severity\", \"resolution\": \"resolution\", \"status\": \"status\", \"checksum\": \"checksum\",\"assigneeLogin\": \"login\"}," + "[{\"key\": \"key1\", \"componentKey\": \"key\", \"ruleKey\": \"rulekey\", \"ruleRepo\": \"repokey\", \"line\": 2,\"message\": \"message\", " + + "\"severity\": \"severity\", \"manualSeverity\": true, \"resolution\": \"resolution\", \"status\": \"status\", \"checksum\": \"checksum\",\"assigneeLogin\": \"login\"}," + "{\"key\": \"key2\"}]", out.getBuffer().toString(), true); - } private static class PreviousIssueFunction implements PreviousIssueHelper.Function<PreviousIssue, PreviousIssue> { @@ -76,7 +77,8 @@ public class PreviousIssueHelperTest { StringWriter out = new StringWriter(); PreviousIssueHelper helper = PreviousIssueHelper.create(out); StringReader reader = new StringReader( - "[{\"key\": \"key1\", \"componentKey\": \"key\", \"ruleKey\": \"rulekey\", \"ruleRepo\": \"repokey\", \"line\": 2,\"message\": \"message\", \"overriddenSeverity\": \"severity\", \"resolution\": \"resolution\", \"status\": \"status\", \"checksum\": \"checksum\",\"assigneeLogin\": \"login\"}," + "[{\"key\": \"key1\", \"componentKey\": \"key\", \"ruleKey\": \"rulekey\", \"ruleRepo\": \"repokey\", \"line\": 2,\"message\": \"message\", " + + "\"severity\": \"severity\", \"manualSeverity\": true, \"resolution\": \"resolution\", \"status\": \"status\", \"checksum\": \"checksum\",\"assigneeLogin\": \"login\"}," + "{\"key\": \"key2\"}]"); @@ -92,7 +94,8 @@ public class PreviousIssueHelperTest { assertThat(issue1.ruleKey()).isEqualTo("rulekey"); assertThat(issue1.line()).isEqualTo(2); assertThat(issue1.message()).isEqualTo("message"); - assertThat(issue1.overriddenSeverity()).isEqualTo("severity"); + assertThat(issue1.severity()).isEqualTo("severity"); + assertThat(issue1.isManualSeverity()).isTrue(); assertThat(issue1.resolution()).isEqualTo("resolution"); assertThat(issue1.status()).isEqualTo("status"); assertThat(issue1.checksum()).isEqualTo("checksum"); |