aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-db
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2016-03-24 17:44:13 +0100
committerTeryk Bellahsene <teryk.bellahsene@sonarsource.com>2016-03-29 19:10:50 +0200
commitcbc00be035405cade14eef1366a89b65583242b8 (patch)
treefea94cd11f94b0f1ad8dbe2109235227333b0e1c /sonar-db
parentf661a14e2a03a44a9adfe18bb55f76754c9eabda (diff)
downloadsonarqube-cbc00be035405cade14eef1366a89b65583242b8.tar.gz
sonarqube-cbc00be035405cade14eef1366a89b65583242b8.zip
SONAR-7473 Drop 'reporter' field from backend
Diffstat (limited to 'sonar-db')
-rw-r--r--sonar-db/src/main/java/org/sonar/db/issue/IssueDto.java19
-rw-r--r--sonar-db/src/main/resources/org/sonar/db/issue/IssueMapper.xml8
-rw-r--r--sonar-db/src/test/java/org/sonar/db/issue/IssueDaoTest.java3
-rw-r--r--sonar-db/src/test/java/org/sonar/db/issue/IssueDtoTest.java6
-rw-r--r--sonar-db/src/test/java/org/sonar/db/issue/IssueMapperTest.java4
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml4
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_severities_by_component.xml6
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml6
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml2
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml2
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/update-result.xml2
-rw-r--r--sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml6
12 files changed, 20 insertions, 48 deletions
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/IssueDto.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueDto.java
index 56d267a6b6b..0c996463aa6 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/IssueDto.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueDto.java
@@ -69,7 +69,6 @@ public final class IssueDto implements Serializable {
private String status;
private String resolution;
private String checksum;
- private String reporter;
private String assignee;
private String authorLogin;
private String issueAttributes;
@@ -115,7 +114,6 @@ public final class IssueDto implements Serializable {
.setSeverity(issue.severity())
.setManualSeverity(issue.manualSeverity())
.setChecksum(issue.checksum())
- .setReporter(issue.reporter())
.setAssignee(issue.assignee())
.setRuleId(ruleId)
.setRuleKey(issue.ruleKey().repository(), issue.ruleKey().rule())
@@ -134,7 +132,7 @@ public final class IssueDto implements Serializable {
.setIssueUpdateDate(issue.updateDate())
.setSelectedAt(issue.selectedAt())
- // technical dates
+ // technical dates
.setCreatedAt(now)
.setUpdatedAt(now);
}
@@ -163,7 +161,6 @@ public final class IssueDto implements Serializable {
.setSeverity(issue.severity())
.setChecksum(issue.checksum())
.setManualSeverity(issue.manualSeverity())
- .setReporter(issue.reporter())
.setAssignee(issue.assignee())
.setIssueAttributes(KeyValueFormat.format(issue.attributes()))
.setAuthorLogin(issue.authorLogin())
@@ -180,7 +177,7 @@ public final class IssueDto implements Serializable {
.setIssueUpdateDate(issue.updateDate())
.setSelectedAt(issue.selectedAt())
- // technical date
+ // technical date
.setUpdatedAt(now);
}
@@ -342,17 +339,6 @@ public final class IssueDto implements Serializable {
}
@CheckForNull
- public String getReporter() {
- return reporter;
- }
-
- public IssueDto setReporter(@Nullable String s) {
- checkArgument(s == null || s.length() <= 255, "Value is too long for issue reporter: %s", s);
- this.reporter = s;
- return this;
- }
-
- @CheckForNull
public String getAssignee() {
return assignee;
}
@@ -722,7 +708,6 @@ public final class IssueDto implements Serializable {
issue.setLine(line);
issue.setChecksum(checksum);
issue.setSeverity(severity);
- issue.setReporter(reporter);
issue.setAssignee(assignee);
issue.setAttributes(KeyValueFormat.parse(Objects.firstNonNull(issueAttributes, "")));
issue.setComponentKey(componentKey);
diff --git a/sonar-db/src/main/resources/org/sonar/db/issue/IssueMapper.xml b/sonar-db/src/main/resources/org/sonar/db/issue/IssueMapper.xml
index 8c13afdc31c..cc440f77446 100644
--- a/sonar-db/src/main/resources/org/sonar/db/issue/IssueMapper.xml
+++ b/sonar-db/src/main/resources/org/sonar/db/issue/IssueMapper.xml
@@ -18,7 +18,6 @@
i.status as status,
i.resolution as resolution,
i.checksum as checksum,
- i.reporter as reporter,
i.assignee as assignee,
i.author_login as authorLogin,
i.tags as tagsString,
@@ -69,7 +68,7 @@
<insert id="insert" parameterType="Issue" useGeneratedKeys="false" keyProperty="id">
INSERT INTO issues (kee, rule_id, severity, manual_severity,
message, line, locations, gap, effort, status, tags,
- resolution, checksum, reporter, assignee, author_login, issue_attributes, issue_creation_date, issue_update_date,
+ resolution, checksum, assignee, author_login, issue_attributes, issue_creation_date, issue_update_date,
issue_close_date, created_at, updated_at, component_uuid, project_uuid, issue_type)
VALUES (#{kee,jdbcType=VARCHAR}, #{ruleId,jdbcType=INTEGER},
#{severity,jdbcType=VARCHAR},
@@ -77,7 +76,7 @@
#{locations,jdbcType=BINARY},
#{gap,jdbcType=DOUBLE}, #{effort,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR},
#{tagsString,jdbcType=VARCHAR}, #{resolution,jdbcType=VARCHAR}, #{checksum,jdbcType=VARCHAR},
- #{reporter,jdbcType=VARCHAR}, #{assignee,jdbcType=VARCHAR}, #{authorLogin,jdbcType=VARCHAR},
+ #{assignee,jdbcType=VARCHAR}, #{authorLogin,jdbcType=VARCHAR},
#{issueAttributes,jdbcType=VARCHAR},
#{issueCreationTime,jdbcType=BIGINT},#{issueUpdateTime,jdbcType=BIGINT}, #{issueCloseTime,jdbcType=BIGINT},
#{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT},
@@ -99,7 +98,6 @@
status=#{status,jdbcType=VARCHAR},
resolution=#{resolution,jdbcType=VARCHAR},
checksum=#{checksum,jdbcType=VARCHAR},
- reporter=#{reporter,jdbcType=VARCHAR},
assignee=#{assignee,jdbcType=VARCHAR},
author_login=#{authorLogin,jdbcType=VARCHAR},
tags=#{tagsString,jdbcType=VARCHAR},
@@ -128,7 +126,6 @@
status=#{status,jdbcType=VARCHAR},
resolution=#{resolution,jdbcType=VARCHAR},
checksum=#{checksum,jdbcType=VARCHAR},
- reporter=#{reporter,jdbcType=VARCHAR},
assignee=#{assignee,jdbcType=VARCHAR},
author_login=#{authorLogin,jdbcType=VARCHAR},
tags=#{tagsString,jdbcType=VARCHAR},
@@ -181,7 +178,6 @@
i.status as status,
i.resolution as resolution,
i.checksum as checksum,
- i.reporter as reporter,
i.assignee as assignee,
i.author_login as authorLogin,
i.tags as tagsString,
diff --git a/sonar-db/src/test/java/org/sonar/db/issue/IssueDaoTest.java b/sonar-db/src/test/java/org/sonar/db/issue/IssueDaoTest.java
index 9f2290ad1e9..4b48ebbce04 100644
--- a/sonar-db/src/test/java/org/sonar/db/issue/IssueDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/issue/IssueDaoTest.java
@@ -36,7 +36,6 @@ import org.sonar.db.rule.RuleTesting;
import static java.util.Arrays.asList;
import static org.assertj.core.api.Assertions.assertThat;
-
public class IssueDaoTest {
public static final RuleDto RULE = RuleTesting.newXooX1();
@@ -120,7 +119,6 @@ public class IssueDaoTest {
assertThat(issue.getResolution()).isEqualTo("FIXED");
assertThat(issue.getChecksum()).isEqualTo("123456789");
assertThat(issue.getAuthorLogin()).isEqualTo("morgan");
- assertThat(issue.getReporter()).isEqualTo("emmerik");
assertThat(issue.getAssignee()).isEqualTo("karadoc");
assertThat(issue.getIssueAttributes()).isEqualTo("JIRA=FOO-1234");
assertThat(issue.getIssueCreationDate()).isNotNull();
@@ -181,7 +179,6 @@ public class IssueDaoTest {
dto.setResolution("FIXED");
dto.setStatus("RESOLVED");
dto.setSeverity("BLOCKER");
- dto.setReporter("emmerik");
dto.setAuthorLogin("morgan");
dto.setAssignee("karadoc");
dto.setIssueAttributes("JIRA=FOO-1234");
diff --git a/sonar-db/src/test/java/org/sonar/db/issue/IssueDtoTest.java b/sonar-db/src/test/java/org/sonar/db/issue/IssueDtoTest.java
index 865f476f867..f4c4b5a98eb 100644
--- a/sonar-db/src/test/java/org/sonar/db/issue/IssueDtoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/issue/IssueDtoTest.java
@@ -77,7 +77,6 @@ public class IssueDtoTest {
.setSeverity("BLOCKER")
.setMessage("message")
.setManualSeverity(true)
- .setReporter("arthur")
.setAssignee("perceval")
.setIssueAttributes("key=value")
.setAuthorLogin("pierre")
@@ -98,13 +97,12 @@ public class IssueDtoTest {
assertThat(issue.projectKey()).isEqualTo("org.sonar.sample");
assertThat(issue.status()).isEqualTo(Issue.STATUS_CLOSED);
assertThat(issue.resolution()).isEqualTo(Issue.RESOLUTION_FALSE_POSITIVE);
- assertThat(issue.effortToFix()).isEqualTo(15.0);
- assertThat(issue.debt()).isEqualTo(Duration.create(10L));
+ assertThat(issue.gap()).isEqualTo(15.0);
+ assertThat(issue.effort()).isEqualTo(Duration.create(10L));
assertThat(issue.line()).isEqualTo(6);
assertThat(issue.severity()).isEqualTo("BLOCKER");
assertThat(issue.message()).isEqualTo("message");
assertThat(issue.manualSeverity()).isTrue();
- assertThat(issue.reporter()).isEqualTo("arthur");
assertThat(issue.assignee()).isEqualTo("perceval");
assertThat(issue.attribute("key")).isEqualTo("value");
assertThat(issue.authorLogin()).isEqualTo("pierre");
diff --git a/sonar-db/src/test/java/org/sonar/db/issue/IssueMapperTest.java b/sonar-db/src/test/java/org/sonar/db/issue/IssueMapperTest.java
index 0091675d756..8c3da1c63ff 100644
--- a/sonar-db/src/test/java/org/sonar/db/issue/IssueMapperTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/issue/IssueMapperTest.java
@@ -74,7 +74,6 @@ public class IssueMapperTest {
assertThat(result.getResolution()).isEqualTo("FIXED");
assertThat(result.getStatus()).isEqualTo("RESOLVED");
assertThat(result.getSeverity()).isEqualTo("BLOCKER");
- assertThat(result.getReporter()).isEqualTo("emmerik");
assertThat(result.getAuthorLogin()).isEqualTo("morgan");
assertThat(result.getAssignee()).isEqualTo("karadoc");
assertThat(result.getIssueAttributes()).isEqualTo("JIRA=FOO-1234");
@@ -105,7 +104,6 @@ public class IssueMapperTest {
update.setResolution("FIXED");
update.setStatus("RESOLVED");
update.setSeverity("BLOCKER");
- update.setReporter("emmerik");
update.setAuthorLogin("morgan");
update.setAssignee("karadoc");
update.setIssueAttributes("JIRA=FOO-1234");
@@ -136,7 +134,6 @@ public class IssueMapperTest {
assertThat(result.getResolution()).isEqualTo("FIXED");
assertThat(result.getStatus()).isEqualTo("RESOLVED");
assertThat(result.getSeverity()).isEqualTo("BLOCKER");
- assertThat(result.getReporter()).isEqualTo("emmerik");
assertThat(result.getAuthorLogin()).isEqualTo("morgan");
assertThat(result.getAssignee()).isEqualTo("karadoc");
assertThat(result.getIssueAttributes()).isEqualTo("JIRA=FOO-1234");
@@ -221,7 +218,6 @@ public class IssueMapperTest {
.setResolution("FIXED")
.setStatus("RESOLVED")
.setSeverity("BLOCKER")
- .setReporter("emmerik")
.setAuthorLogin("morgan")
.setAssignee("karadoc")
.setIssueAttributes("JIRA=FOO-1234")
diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml
index 5119dd45c57..efb08c7ae4f 100644
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueChangeDaoTest/selectChangelogOfNonClosedIssuesByComponent.xml
@@ -15,7 +15,7 @@
line="200"
gap="[null]"
checksum="[null]"
- reporter="user"
+ reporter="[null]"
assignee="user"
author_login="[null]"
issue_attributes="[null]"
@@ -146,7 +146,7 @@
line="200"
gap="[null]"
checksum="[null]"
- reporter="user"
+ reporter="[null]"
assignee="user"
author_login="[null]"
issue_attributes="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_severities_by_component.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_severities_by_component.xml
index 35486efd650..3a272a88b28 100644
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_severities_by_component.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/find_severities_by_component.xml
@@ -15,7 +15,7 @@
status="OPEN"
resolution="[null]"
checksum="XXX"
- reporter="arthur"
+ reporter="[null]"
assignee="perceval"
author_login="[null]"
issue_attributes="JIRA=FOO-1234"
@@ -41,7 +41,7 @@
status="OPEN"
resolution="[null]"
checksum="XXX"
- reporter="arthur"
+ reporter="[null]"
assignee="perceval"
author_login="[null]"
issue_attributes="JIRA=FOO-1234"
@@ -69,7 +69,7 @@
status="OPEN"
resolution="[null]"
checksum="XXX"
- reporter="arthur"
+ reporter="[null]"
assignee="perceval"
author_login="[null]"
issue_attributes="JIRA=FOO-1234"
diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml
index 1aa94275af2..a86bf7a776a 100644
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_issue_and_component_ids.xml
@@ -15,7 +15,7 @@
status="OPEN"
resolution="FIXED"
checksum="XXX"
- reporter="arthur"
+ reporter="[null]"
assignee="perceval"
author_login="[null]"
issue_attributes="JIRA=FOO-1234"
@@ -41,7 +41,7 @@
status="OPEN"
resolution="FIXED"
checksum="XXX"
- reporter="arthur"
+ reporter="[null]"
assignee="perceval"
author_login="[null]"
issue_attributes="JIRA=FOO-1234"
@@ -69,7 +69,7 @@
status="OPEN"
resolution="FIXED"
checksum="XXX"
- reporter="arthur"
+ reporter="[null]"
assignee="perceval"
author_login="[null]"
issue_attributes="JIRA=FOO-1234"
diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml
index 82aeab40ca1..946a67dd5be 100644
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module.xml
@@ -15,7 +15,7 @@
status="OPEN"
resolution="[null]"
checksum="[null]"
- reporter="user"
+ reporter="[null]"
assignee="user"
author_login="[null]"
issue_attributes="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml
index e48cccd9e4a..06cf3a4e64d 100644
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/should_select_non_closed_issues_by_module_on_removed_project.xml
@@ -35,7 +35,7 @@
status="OPEN"
resolution="[null]"
checksum="[null]"
- reporter="user"
+ reporter="[null]"
assignee="user"
author_login="[null]"
issue_attributes="[null]"
diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/update-result.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/update-result.xml
index 3c03568a481..483763302b6 100644
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/update-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/update-result.xml
@@ -14,7 +14,7 @@
status="RESOLVED"
resolution="FIXED"
checksum="123456789"
- reporter="emmerik"
+ reporter="[null]"
author_login="morgan"
assignee="karadoc"
issue_attributes="JIRA=FOO-1234"
diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml
index 53ebfd57a66..58cad579bdc 100644
--- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml
@@ -17,7 +17,7 @@
status="OPEN"
resolution="FIXED"
checksum="XXX"
- reporter="arthur"
+ reporter="[null]"
assignee="perceval"
author_login="[null]"
issue_attributes="JIRA=FOO-1234"
@@ -43,7 +43,7 @@
status="OPEN"
resolution="FIXED"
checksum="XXX"
- reporter="arthur"
+ reporter="[null]"
assignee="[null]"
author_login="[null]"
issue_attributes="JIRA=FOO-1234"
@@ -69,7 +69,7 @@
status="OPEN"
resolution="FIXED"
checksum="XXX"
- reporter="arthur"
+ reporter="[null]"
assignee="perceval"
author_login="[null]"
issue_attributes="JIRA=FOO-1234"