From 32e911370bfa8a7f797e5ac8d2cd2d6c1ef9e457 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 14 May 2013 22:46:35 +0200 Subject: [PATCH] SONAR-3755 rename ISSUES.USER_LOGIN to REPORTER * and drop ISSUES.MANUAL_ISSUE --- .../org/sonar/core/issue/DefaultIssue.java | 20 +++------- .../sonar/core/issue/DefaultIssueBuilder.java | 1 - .../org/sonar/core/issue/db/IssueDto.java | 26 ++++-------- .../sonar/core/issue/workflow/IsManual.java | 2 +- .../org/sonar/core/issue/db/IssueMapper.xml | 40 +++++++++---------- .../org/sonar/core/persistence/schema-h2.ddl | 5 +-- .../org/sonar/core/issue/db/IssueDaoTest.java | 5 +-- .../org/sonar/core/issue/db/IssueDtoTest.java | 6 +-- .../sonar/core/issue/db/IssueMapperTest.java | 4 +- .../sonar/core/issue/db/IssueStorageTest.java | 4 +- .../core/issue/workflow/IsManualTest.java | 8 ++-- .../should_find_by_project.xml | 15 +++---- .../db/IssueDaoTest/should_select_all.xml | 15 +++---- .../should_select_by_action_plans.xml | 15 +++---- .../should_select_by_assigned.xml | 15 +++---- .../should_select_by_component_root.xml | 10 ++--- .../should_select_by_date_creation.xml | 10 ++--- .../db/IssueDaoTest/should_select_by_ids.xml | 15 +++---- .../db/IssueDaoTest/should_select_by_key.xml | 5 +-- .../IssueDaoTest/should_select_by_planned.xml | 15 +++---- .../IssueDaoTest/should_select_by_query.xml | 5 +-- .../should_select_by_resolved.xml | 15 +++---- .../IssueDaoTest/should_select_by_rules.xml | 15 +++---- .../should_select_issue_and_component_ids.xml | 15 +++---- .../should_select_open_issues.xml | 15 +++---- .../should_select_returned_sorted_result.xml | 15 +++---- .../db/IssueMapperTest/testInsert-result.xml | 5 +-- .../db/IssueMapperTest/testUpdate-result.xml | 5 +-- .../issue/db/IssueMapperTest/testUpdate.xml | 5 +-- .../should_insert_new_issues-result.xml | 5 +-- .../should_update_issues-result.xml | 5 +-- .../IssueStorageTest/should_update_issues.xml | 5 +-- .../should_create_database_with_issues.xml | 10 ++--- .../shouldDeleteResource.xml | 3 +- .../PurgeDaoTest/shouldDeleteProject.xml | 6 ++- .../main/java/org/sonar/api/issue/Issue.java | 4 +- .../java/org/sonar/api/issue/IssueQuery.java | 33 ++++++++------- .../org/sonar/api/issue/IssueQueryTest.java | 39 ++++++++++++------ .../server/issue/DefaultIssueFinder.java | 4 +- .../org/sonar/server/issue/IssueService.java | 3 +- .../server/issue/PublicRubyIssueService.java | 2 +- .../main/webapp/WEB-INF/app/models/issue.rb | 3 +- .../WEB-INF/db/migrate/395_create_issues.rb | 5 +-- .../issue/PublicRubyIssueServiceTest.java | 4 +- .../java/org/sonar/wsclient/issue/Issue.java | 8 +++- .../org/sonar/wsclient/issue/IssueQuery.java | 9 ++++- .../sonar/wsclient/issue/IssueQueryTest.java | 4 +- .../issue/IssueParserTest/search.json | 2 +- 48 files changed, 215 insertions(+), 270 deletions(-) diff --git a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java index dbb8da8afa7..a3e659e8672 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java @@ -54,9 +54,8 @@ public class DefaultIssue implements Issue { private Double effortToFix; private String status; private String resolution; - private String userLogin; + private String reporter; private String assignee; - private boolean manual = false; private String checksum; private boolean isNew = true; private boolean isAlive = true; @@ -174,12 +173,12 @@ public class DefaultIssue implements Issue { } @CheckForNull - public String userLogin() { - return userLogin; + public String reporter() { + return reporter; } - public DefaultIssue setUserLogin(@Nullable String userLogin) { - this.userLogin = userLogin; + public DefaultIssue setReporter(@Nullable String s) { + this.reporter = s; return this; } @@ -250,15 +249,6 @@ public class DefaultIssue implements Issue { return technicalUpdateDate; } - public boolean manual() { - return manual; - } - - public DefaultIssue setManual(boolean b) { - this.manual = b; - return this; - } - @CheckForNull public String getChecksum() { return checksum; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java index e4184397938..c851d61b0b5 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java @@ -126,7 +126,6 @@ public class DefaultIssueBuilder implements Issuable.IssueBuilder { issue.setSeverity(Objects.firstNonNull(severity, Severity.MAJOR)); issue.setEffortToFix(effortToFix); issue.setLine(line); - issue.setManual(manual); issue.setManualSeverity(manual); issue.setAttributes(attributes); issue.setNew(true); diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java index 54ea3ef4795..2d918a8a80a 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java @@ -42,14 +42,13 @@ public final class IssueDto { private Integer ruleId; private String severity; private boolean manualSeverity; - private boolean manualIssue; private String description; private Integer line; private Double effortToFix; private String status; private String resolution; private String checksum; - private String userLogin; + private String reporter; private String assignee; private String authorLogin; private String actionPlanKey; @@ -134,15 +133,6 @@ public final class IssueDto { return this; } - public boolean isManualIssue() { - return manualIssue; - } - - public IssueDto setManualIssue(boolean manualIssue) { - this.manualIssue = manualIssue; - return this; - } - @CheckForNull public String getDescription() { return description; @@ -203,12 +193,12 @@ public final class IssueDto { } @CheckForNull - public String getUserLogin() { - return userLogin; + public String getReporter() { + return reporter; } - public IssueDto setUserLogin(@Nullable String userLogin) { - this.userLogin = userLogin; + public IssueDto setReporter(@Nullable String s) { + this.reporter = s; return this; } @@ -330,9 +320,8 @@ public final class IssueDto { .setStatus(issue.status()) .setSeverity(issue.severity()) .setChecksum(issue.getChecksum()) - .setManualIssue(issue.manual()) .setManualSeverity(issue.manualSeverity()) - .setUserLogin(issue.userLogin()) + .setReporter(issue.reporter()) .setAssignee(issue.assignee()) .setRuleId(ruleId) .setResourceId(componentId) @@ -355,11 +344,10 @@ public final class IssueDto { issue.setEffortToFix(effortToFix); issue.setLine(line); issue.setSeverity(severity); - issue.setUserLogin(userLogin); + issue.setReporter(reporter); issue.setAssignee(assignee); issue.setAttributes(KeyValueFormat.parse(Objects.firstNonNull(attributes, ""))); issue.setComponentKey(componentKey); - issue.setManual(manualIssue); issue.setManualSeverity(manualSeverity); issue.setRuleKey(RuleKey.of(ruleRepo, ruleKey)); issue.setActionPlanKey(actionPlanKey); diff --git a/sonar-core/src/main/java/org/sonar/core/issue/workflow/IsManual.java b/sonar-core/src/main/java/org/sonar/core/issue/workflow/IsManual.java index d13f6e9d5e3..e38e2c75d2e 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/workflow/IsManual.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/workflow/IsManual.java @@ -31,6 +31,6 @@ class IsManual implements Condition { @Override public boolean matches(Issue issue) { - return issue.manual()==manual; + return manual==(issue.reporter()!=null); } } diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml index ca23e1495c1..5027df2b91c 100644 --- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml @@ -12,15 +12,14 @@ i.action_plan_key as actionPlanKey, i.severity as severity, i.manual_severity as manualSeverity, - i.manual_issue as manualIssue, i.description as description, i.line as line, i.effort_to_fix as effortToFix, i.status as status, i.resolution as resolution, i.checksum as checksum, - i.user_login as userLogin, - i.assignee_login as assignee, + i.reporter as reporter, + i.assignee as assignee, i.author_login as authorLogin, i.attributes as attributes, i.issue_creation_date as issueCreationDate, @@ -34,13 +33,13 @@ - INSERT INTO issues (kee, resource_id, rule_id, action_plan_key, severity, manual_severity, manual_issue, + INSERT INTO issues (kee, resource_id, rule_id, action_plan_key, severity, manual_severity, description, line, effort_to_fix, status, - resolution, checksum, user_login, assignee_login, author_login, attributes, issue_creation_date, issue_update_date, + resolution, checksum, reporter, assignee, author_login, attributes, issue_creation_date, issue_update_date, issue_close_date, created_at, updated_at) - VALUES (#{kee}, #{resourceId}, #{ruleId}, #{actionPlanKey}, #{severity}, #{manualSeverity}, #{manualIssue}, + VALUES (#{kee}, #{resourceId}, #{ruleId}, #{actionPlanKey}, #{severity}, #{manualSeverity}, #{description}, #{line}, #{effortToFix}, #{status}, - #{resolution}, #{checksum}, #{userLogin}, #{assignee}, #{authorLogin}, #{attributes}, #{issueCreationDate}, + #{resolution}, #{checksum}, #{reporter}, #{assignee}, #{authorLogin}, #{attributes}, #{issueCreationDate}, #{issueUpdateDate}, #{issueCloseDate}, #{createdAt}, #{updatedAt}) @@ -50,13 +49,13 @@ select issues_seq.NEXTVAL from DUAL - INSERT INTO issues (id, kee, resource_id, rule_id, action_plan_key, severity, manual_severity, manual_issue, + INSERT INTO issues (id, kee, resource_id, rule_id, action_plan_key, severity, manual_severity, description, line, effort_to_fix, status, - resolution, checksum, user_login, assignee_login, author_login, attributes, issue_creation_date, issue_update_date, + resolution, checksum, reporter, assignee, author_login, attributes, issue_creation_date, issue_update_date, issue_close_date, created_at, updated_at) - VALUES (#{id}, #{kee}, #{resourceId}, #{ruleId}, #{actionPlanKey}, #{severity}, #{manualSeverity}, #{manualIssue}, + VALUES (#{id}, #{kee}, #{resourceId}, #{ruleId}, #{actionPlanKey}, #{severity}, #{manualSeverity}, #{description}, #{line}, #{effortToFix}, #{status}, - #{resolution}, #{checksum}, #{userLogin}, #{assignee}, #{authorLogin}, #{attributes}, #{issueCreationDate}, + #{resolution}, #{checksum}, #{reporter}, #{assignee}, #{authorLogin}, #{attributes}, #{issueCreationDate}, #{issueUpdateDate}, #{issueCloseDate}, #{createdAt}, #{updatedAt}) @@ -67,15 +66,14 @@ action_plan_key=#{actionPlanKey}, severity=#{severity}, manual_severity=#{manualSeverity}, - manual_issue=#{manualIssue}, description=#{description}, line=#{line}, effort_to_fix=#{effortToFix}, status=#{status}, resolution=#{resolution}, checksum=#{checksum}, - user_login=#{userLogin}, - assignee_login=#{assignee}, + reporter=#{reporter}, + assignee=#{assignee}, author_login=#{authorLogin}, attributes=#{attributes}, issue_creation_date=#{issueCreationDate}, @@ -200,22 +198,22 @@ and i.resolution is null - - and i.user_login in - #{userLogin} + + and i.reporter in + #{reporter} - and i.assignee_login in + and i.assignee in #{assignee} - and i.assignee_login is not null + and i.assignee is not null - and i.assignee_login is null + and i.assignee is null @@ -259,7 +257,7 @@ i.issue_close_date - i.assignee_login + i.assignee diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl index 199feb7cdd9..d78553ed60f 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl +++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl @@ -523,15 +523,14 @@ CREATE TABLE "ISSUES" ( "RULE_ID" INTEGER, "SEVERITY" VARCHAR(10), "MANUAL_SEVERITY" BOOLEAN NOT NULL, - "MANUAL_ISSUE" BOOLEAN NOT NULL, "DESCRIPTION" VARCHAR(4000), "LINE" INTEGER, "EFFORT_TO_FIX" DOUBLE, "STATUS" VARCHAR(20), "RESOLUTION" VARCHAR(20), "CHECKSUM" VARCHAR(1000), - "USER_LOGIN" VARCHAR(40), - "ASSIGNEE_LOGIN" VARCHAR(40), + "REPORTER" VARCHAR(40), + "ASSIGNEE" VARCHAR(40), "AUTHOR_LOGIN" VARCHAR(100), "ACTION_PLAN_KEY" VARCHAR(50) NULL, "ATTRIBUTES" VARCHAR(4000), diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java index b3745c615f6..d07c7a04a7e 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java @@ -54,7 +54,6 @@ public class IssueDaoTest extends AbstractDaoTestCase { assertThat(issue.getRuleId()).isEqualTo(500); assertThat(issue.getSeverity()).isEqualTo("BLOCKER"); assertThat(issue.isManualSeverity()).isFalse(); - assertThat(issue.isManualIssue()).isFalse(); assertThat(issue.getDescription()).isNull(); assertThat(issue.getLine()).isEqualTo(200); assertThat(issue.getEffortToFix()).isEqualTo(4.2); @@ -62,7 +61,7 @@ public class IssueDaoTest extends AbstractDaoTestCase { assertThat(issue.getResolution()).isEqualTo("FIXED"); assertThat(issue.getChecksum()).isEqualTo("XXX"); assertThat(issue.getAuthorLogin()).isEqualTo("karadoc"); - assertThat(issue.getUserLogin()).isEqualTo("arthur"); + assertThat(issue.getReporter()).isEqualTo("arthur"); assertThat(issue.getAssignee()).isEqualTo("perceval"); assertThat(issue.getAttributes()).isEqualTo("JIRA=FOO-1234"); assertThat(issue.getIssueCreationDate()).isNotNull(); @@ -81,7 +80,7 @@ public class IssueDaoTest extends AbstractDaoTestCase { IssueQuery query = IssueQuery.builder() .issueKeys(newArrayList("ABCDE")) - .userLogins(newArrayList("arthur", "otherguy")) + .reporters(newArrayList("arthur", "otherguy")) .assignees(newArrayList("perceval", "otherguy")) .components(newArrayList("Action.java")) .resolutions(newArrayList("FIXED")) diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java index 54be128bc42..a40e0f97dec 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDtoTest.java @@ -66,8 +66,7 @@ public class IssueDtoTest { .setSeverity("BLOCKER") .setDescription("message") .setManualSeverity(true) - .setManualIssue(true) - .setUserLogin("arthur") + .setReporter("arthur") .setAssignee("perceval") .setAttributes("key=value") .setAuthorLogin("pierre") @@ -86,8 +85,7 @@ public class IssueDtoTest { assertThat(issue.severity()).isEqualTo("BLOCKER"); assertThat(issue.description()).isEqualTo("message"); assertThat(issue.manualSeverity()).isTrue(); - assertThat(issue.manual()).isTrue(); - assertThat(issue.userLogin()).isEqualTo("arthur"); + 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-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java index b7e1513678c..1137a60af33 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java @@ -47,7 +47,7 @@ public class IssueMapperTest extends AbstractDaoTestCase { dto.setResolution("FIXED"); dto.setStatus("RESOLVED"); dto.setSeverity("BLOCKER"); - dto.setUserLogin("emmerik"); + dto.setReporter("emmerik"); dto.setAuthorLogin("morgan"); dto.setAssignee("karadoc"); dto.setActionPlanKey("current_sprint"); @@ -80,7 +80,7 @@ public class IssueMapperTest extends AbstractDaoTestCase { dto.setResolution("FIXED"); dto.setStatus("RESOLVED"); dto.setSeverity("BLOCKER"); - dto.setUserLogin("emmerik"); + dto.setReporter("emmerik"); dto.setAuthorLogin("morgan"); dto.setAssignee("karadoc"); dto.setActionPlanKey("current_sprint"); diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStorageTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStorageTest.java index 1668bcfcde6..193c259d0d2 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStorageTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStorageTest.java @@ -52,7 +52,7 @@ public class IssueStorageTest extends AbstractDaoTestCase { issue.setRuleKey(RuleKey.of("squid", "AvoidCycle")); issue.setLine(5000); issue.setNew(true); - issue.setUserLogin("emmerik"); + issue.setReporter("emmerik"); issue.setResolution("OPEN").setStatus("OPEN").setSeverity("BLOCKER"); issue.setAttribute("foo", "bar"); issue.addComment(comment); @@ -85,7 +85,7 @@ public class IssueStorageTest extends AbstractDaoTestCase { issue.setAuthorLogin("simon"); issue.setAssignee("loic"); issue.setFieldDiff(context, "severity", "INFO", "BLOCKER"); - issue.setUserLogin("emmerik"); + issue.setReporter("emmerik"); issue.setResolution("FIXED").setStatus("RESOLVED").setSeverity("BLOCKER"); issue.setAttribute("foo", "bar"); issue.addComment(comment); diff --git a/sonar-core/src/test/java/org/sonar/core/issue/workflow/IsManualTest.java b/sonar-core/src/test/java/org/sonar/core/issue/workflow/IsManualTest.java index 15ffee45752..4c56042ad4e 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/workflow/IsManualTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/workflow/IsManualTest.java @@ -30,14 +30,14 @@ public class IsManualTest { @Test public void should_match() throws Exception { IsManual condition = new IsManual(true); - assertThat(condition.matches(issue.setManual(true))).isTrue(); - assertThat(condition.matches(issue.setManual(false))).isFalse(); + assertThat(condition.matches(issue.setReporter("you"))).isTrue(); + assertThat(condition.matches(issue.setReporter(null))).isFalse(); } @Test public void should_match_dead() throws Exception { IsManual condition = new IsManual(false); - assertThat(condition.matches(issue.setManual(true))).isFalse(); - assertThat(condition.matches(issue.setManual(false))).isTrue(); + assertThat(condition.matches(issue.setReporter("you"))).isFalse(); + assertThat(condition.matches(issue.setReporter(null))).isTrue(); } } diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml index 6596479511f..d5ce9ef3842 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/ActionPlanStatsDaoTest/should_find_by_project.xml @@ -10,14 +10,13 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" status="OPEN" resolution="[null]" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" action_plan_key="ABC" @@ -35,14 +34,13 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" status="CLOSED" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" action_plan_key="ABC" @@ -60,14 +58,13 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" status="CLOSED" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" action_plan_key="ABC" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml index 0472f446673..24ff8a4b5e6 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml @@ -8,15 +8,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -33,15 +32,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -60,15 +58,14 @@ rule_id="501" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml index 6d0dcd710cf..b0414484987 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml @@ -8,15 +8,14 @@ action_plan_key="ABC" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -34,15 +33,14 @@ action_plan_key="ABC" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -61,15 +59,14 @@ action_plan_key="DEF" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml index 619c809b1f6..fc0e605e452 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml @@ -8,15 +8,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -33,15 +32,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -60,15 +58,14 @@ rule_id="501" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="[null]" + reporter="arthur" + assignee="[null]" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml index 18cbee8d9f3..a43a90b0d47 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml @@ -7,15 +7,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="[null]" status="OPEN" resolution="[null]" checksum="[null]" - user_login="user" - assignee_login="user" + reporter="user" + assignee="user" author_login="[null]" attributes="[null]" issue_creation_date="2013-04-16" @@ -32,15 +31,14 @@ rule_id="501" severity="MAJOR" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="120" effort_to_fix="[null]" status="CLOSED" resolution="FIXED" checksum="[null]" - user_login="[null]" - assignee_login="user" + reporter="[null]" + assignee="user" author_login="[null]" attributes="[null]" issue_creation_date="2013-04-16" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml index aadb69260a3..1a297848923 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml @@ -7,15 +7,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -32,15 +31,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-13" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml index 4b011292686..4482d66dfe5 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml @@ -8,15 +8,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -33,15 +32,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -60,15 +58,14 @@ rule_id="501" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml index b1b095f894d..eab42be2c70 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml @@ -7,15 +7,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="karadoc" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml index 8ea59a28bcb..5efa836cf16 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml @@ -8,15 +8,14 @@ action_plan_key="ABC" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -34,15 +33,14 @@ action_plan_key="ABC" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -61,15 +59,14 @@ action_plan_key="[null]" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="[null]" + reporter="arthur" + assignee="[null]" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml index 14c5331fe64..1c876c79d76 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml @@ -7,15 +7,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml index 4719a57f140..3eeccd3a251 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml @@ -7,15 +7,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="[null]" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -32,15 +31,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="RESOLVED" resolution="FALSE-POSITIVE" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -57,15 +55,14 @@ rule_id="501" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="CLOSED" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="[null]" + reporter="arthur" + assignee="[null]" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml index b5efd1e4c80..805b5d703c4 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml @@ -8,15 +8,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -33,15 +32,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -60,15 +58,14 @@ rule_id="501" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml index 0472f446673..24ff8a4b5e6 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml @@ -8,15 +8,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -33,15 +32,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -60,15 +58,14 @@ rule_id="501" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml index 2ffade23dfb..f08fa7766c6 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml @@ -7,15 +7,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="[null]" status="OPEN" resolution="[null]" checksum="[null]" - user_login="user" - assignee_login="user" + reporter="user" + assignee="user" author_login="[null]" attributes="[null]" issue_creation_date="2013-04-16" @@ -32,15 +31,14 @@ rule_id="501" severity="MAJOR" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="120" effort_to_fix="[null]" status="OPEN" resolution="FIXED" checksum="[null]" - user_login="[null]" - assignee_login="user" + reporter="[null]" + assignee="user" author_login="[null]" attributes="[null]" issue_creation_date="2013-04-16" @@ -57,15 +55,14 @@ rule_id="501" severity="MAJOR" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="120" effort_to_fix="[null]" status="CLOSED" resolution="FIXED" checksum="[null]" - user_login="[null]" - assignee_login="user" + reporter="[null]" + assignee="user" author_login="[null]" attributes="[null]" issue_creation_date="2013-04-16" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result.xml index 7deccb78596..87bf002da47 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result.xml @@ -8,15 +8,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="arthur" + reporter="arthur" + assignee="arthur" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -33,15 +32,14 @@ rule_id="500" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="perceval" + reporter="arthur" + assignee="perceval" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" @@ -60,15 +58,14 @@ rule_id="501" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="[null]" line="200" effort_to_fix="4.2" status="OPEN" resolution="FIXED" checksum="XXX" - user_login="arthur" - assignee_login="henry" + reporter="arthur" + assignee="henry" author_login="[null]" attributes="JIRA=FOO-1234" issue_creation_date="2013-04-16" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml index 87f0a290699..4f7105aca6e 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml @@ -6,16 +6,15 @@ rule_id="200" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="the description" line="500" effort_to_fix="3.14" status="RESOLVED" resolution="FIXED" checksum="123456789" - user_login="emmerik" + reporter="emmerik" author_login="morgan" - assignee_login="karadoc" + assignee="karadoc" attributes="JIRA=FOO-1234" issue_creation_date="2013-05-18" issue_update_date="2013-05-19" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml index 9385a08792c..792d428ee5e 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml @@ -25,16 +25,15 @@ rule_id="200" severity="BLOCKER" manual_severity="[false]" - manual_issue="[false]" description="the description" line="500" effort_to_fix="3.14" status="RESOLVED" resolution="FIXED" checksum="123456789" - user_login="emmerik" + reporter="emmerik" author_login="morgan" - assignee_login="karadoc" + assignee="karadoc" attributes="JIRA=FOO-1234" issue_creation_date="2013-05-18" issue_update_date="2013-05-19" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml index 38b64d7f53d..fbae0e482a6 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml @@ -25,16 +25,15 @@ rule_id="200" severity="INFO" manual_severity="[false]" - manual_issue="[false]" description="old" line="[null]" effort_to_fix="[null]" status="OPEN" resolution="[null]" checksum="[null]" - user_login="[null]" + reporter="[null]" author_login="[null]" - assignee_login="[null]" + assignee="[null]" attributes="[null]" issue_creation_date="[null]" issue_update_date="[null]" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml index 4cc8ecf642a..34b9088daae 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml @@ -1,17 +1,16 @@ componentRoots; private final Collection rules; private final Collection actionPlans; - private final Collection userLogins; + private final Collection reporters; private final Collection assignees; private final Boolean assigned; private final Boolean planned; @@ -72,7 +76,7 @@ public class IssueQuery { this.componentRoots = builder.componentRoots; this.rules = builder.rules; this.actionPlans = builder.actionPlans; - this.userLogins = builder.userLogins; + this.reporters = builder.reporters; this.assignees = builder.assignees; this.assigned = builder.assigned; this.planned = builder.planned; @@ -118,8 +122,8 @@ public class IssueQuery { return actionPlans; } - public Collection userLogins() { - return userLogins; + public Collection reporters() { + return reporters; } public Collection assignees() { @@ -177,12 +181,6 @@ public class IssueQuery { } public static class Builder { - - private static final int DEFAULT_PAGE_SIZE = 100; - private static final int MAX_PAGE_SIZE = 1000; - private static final int DEFAULT_PAGE_INDEX = 1; - private static final int MAX_ISSUE_KEYS = 1000; - private Collection issueKeys; private Collection severities; private Collection statuses; @@ -191,7 +189,7 @@ public class IssueQuery { private Collection componentRoots; private Collection rules; private Collection actionPlans; - private Collection userLogins; + private Collection reporters; private Collection assignees; private Boolean assigned = null; private Boolean planned = null; @@ -247,8 +245,8 @@ public class IssueQuery { return this; } - public Builder userLogins(Collection l) { - this.userLogins = l; + public Builder reporters(Collection l) { + this.reporters = l; return this; } @@ -332,16 +330,17 @@ public class IssueQuery { if (components != null && components.size() == 1 && pageSize == null) { pageSize = 999999; } else { - if (pageSize==null) { + if (pageSize == null) { pageSize = DEFAULT_PAGE_SIZE; + } else if (pageSize > MAX_PAGE_SIZE) { + pageSize = MAX_PAGE_SIZE; } Preconditions.checkArgument(pageSize > 0, "Page size must be greater than 0 (got " + pageSize + ")"); - Preconditions.checkArgument(pageSize < MAX_PAGE_SIZE, "Page size must be less than " + MAX_PAGE_SIZE + " (got " + pageSize + ")"); } } private void initPageIndex() { - if (pageIndex==null) { + if (pageIndex == null) { pageIndex = DEFAULT_PAGE_INDEX; } Preconditions.checkArgument(pageIndex > 0, "Page index must be greater than 0 (got " + pageIndex + ")"); diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/issue/IssueQueryTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/issue/IssueQueryTest.java index 5b3a2d78823..2ec08dabf13 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/issue/IssueQueryTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/issue/IssueQueryTest.java @@ -23,7 +23,9 @@ import com.google.common.collect.Lists; import org.junit.Test; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; +import org.sonar.api.web.UserRole; +import java.util.Arrays; import java.util.Date; import static org.fest.assertions.Assertions.assertThat; @@ -42,7 +44,7 @@ public class IssueQueryTest { .componentRoots(Lists.newArrayList("org.struts:core")) .rules(Lists.newArrayList(RuleKey.of("squid", "AvoidCycle"))) .actionPlans(Lists.newArrayList("AP1", "AP2")) - .userLogins(Lists.newArrayList("crunky")) + .reporters(Lists.newArrayList("crunky")) .assignees(Lists.newArrayList("gargantua")) .assigned(true) .createdAfter(new Date()) @@ -50,6 +52,7 @@ public class IssueQueryTest { .sort(IssueQuery.Sort.ASSIGNEE) .pageSize(10) .pageIndex(2) + .requiredRole(UserRole.CODEVIEWER) .build(); assertThat(query.issueKeys()).containsOnly("ABCDE"); assertThat(query.severities()).containsOnly(Severity.BLOCKER); @@ -57,7 +60,7 @@ public class IssueQueryTest { assertThat(query.resolutions()).containsOnly(Issue.RESOLUTION_FALSE_POSITIVE); assertThat(query.components()).containsOnly("org/struts/Action.java"); assertThat(query.componentRoots()).containsOnly("org.struts:core"); - assertThat(query.userLogins()).containsOnly("crunky"); + assertThat(query.reporters()).containsOnly("crunky"); assertThat(query.assignees()).containsOnly("gargantua"); assertThat(query.assigned()).isTrue(); assertThat(query.rules()).containsOnly(RuleKey.of("squid", "AvoidCycle")); @@ -67,10 +70,11 @@ public class IssueQueryTest { assertThat(query.sort()).isEqualTo(IssueQuery.Sort.ASSIGNEE); assertThat(query.pageSize()).isEqualTo(10); assertThat(query.pageIndex()).isEqualTo(2); + assertThat(query.requiredRole()).isEqualTo(UserRole.CODEVIEWER); } @Test - public void should_validate_page_size() throws Exception { + public void page_size_should_be_positive() throws Exception { try { IssueQuery.builder() .pageSize(0) @@ -82,19 +86,28 @@ public class IssueQueryTest { } @Test - public void should_validate_page_size_too_high() throws Exception { - try { - IssueQuery.builder() - .pageSize(10000) - .build(); - fail(); - } catch (Exception e) { - assertThat(e).hasMessage("Page size must be less than 1000 (got 10000)").isInstanceOf(IllegalArgumentException.class); - } + public void test_default_page_index_and_size() throws Exception { + IssueQuery query = IssueQuery.builder().build(); + assertThat(query.pageSize()).isEqualTo(IssueQuery.DEFAULT_PAGE_SIZE); + assertThat(query.pageIndex()).isEqualTo(IssueQuery.DEFAULT_PAGE_INDEX); + } + + @Test + public void automatically_resize_page_size() throws Exception { + IssueQuery query = IssueQuery.builder() + .pageSize(IssueQuery.MAX_PAGE_SIZE + 100) + .build(); + assertThat(query.pageSize()).isEqualTo(IssueQuery.MAX_PAGE_SIZE); + } + + @Test + public void could_disable_paging_on_single_component() throws Exception { + IssueQuery query = IssueQuery.builder().components(Arrays.asList("Action.java")).build(); + assertThat(query.pageSize()).isGreaterThan(IssueQuery.MAX_PAGE_SIZE); } @Test - public void should_validate_page_index() throws Exception { + public void page_index_should_be_positive() throws Exception { try { IssueQuery.builder() .pageIndex(0) diff --git a/sonar-server/src/main/java/org/sonar/server/issue/DefaultIssueFinder.java b/sonar-server/src/main/java/org/sonar/server/issue/DefaultIssueFinder.java index c477d9af3c8..515b240daab 100644 --- a/sonar-server/src/main/java/org/sonar/server/issue/DefaultIssueFinder.java +++ b/sonar-server/src/main/java/org/sonar/server/issue/DefaultIssueFinder.java @@ -131,8 +131,8 @@ public class DefaultIssueFinder implements IssueFinder { ruleIds.add(dto.getRuleId()); componentIds.add(dto.getResourceId()); actionPlanKeys.add(dto.getActionPlanKey()); - if (dto.getUserLogin() != null) { - users.add(dto.getUserLogin()); + if (dto.getReporter() != null) { + users.add(dto.getReporter()); } if (dto.getAssignee() != null) { users.add(dto.getAssignee()); diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java index 382908acb77..fcf93b139b7 100644 --- a/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java +++ b/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java @@ -121,8 +121,7 @@ public class IssueService implements ServerComponent { public Issue create(DefaultIssue issue, UserSession userSession) { // TODO merge with InternalRubyIssueService - issue.setManual(true); - issue.setUserLogin(userSession.login()); + issue.setReporter(userSession.login()); issueStorage.save(issue); diff --git a/sonar-server/src/main/java/org/sonar/server/issue/PublicRubyIssueService.java b/sonar-server/src/main/java/org/sonar/server/issue/PublicRubyIssueService.java index 072972b58e5..eac63549e25 100644 --- a/sonar-server/src/main/java/org/sonar/server/issue/PublicRubyIssueService.java +++ b/sonar-server/src/main/java/org/sonar/server/issue/PublicRubyIssueService.java @@ -74,7 +74,7 @@ public class PublicRubyIssueService implements RubyIssueService { builder.componentRoots(RubyUtils.toStrings(props.get("componentRoots"))); builder.rules(toRules(props.get("rules"))); builder.actionPlans(RubyUtils.toStrings(props.get("actionPlans"))); - builder.userLogins(RubyUtils.toStrings(props.get("userLogins"))); + builder.reporters(RubyUtils.toStrings(props.get("reporters"))); builder.assignees(RubyUtils.toStrings(props.get("assignees"))); builder.assigned(RubyUtils.toBoolean(props.get("assigned"))); builder.planned(RubyUtils.toBoolean(props.get("planned"))); diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/issue.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/issue.rb index 4dcf1ebba1b..c5264c589e8 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/models/issue.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/models/issue.rb @@ -32,13 +32,12 @@ class Issue hash[:desc] = issue.description if issue.description hash[:line] = issue.line.to_i if issue.line hash[:effortToFix] = issue.effortToFix.to_f if issue.effortToFix - hash[:userLogin] = issue.userLogin if issue.userLogin + hash[:reporter] = issue.reporter if issue.reporter hash[:assignee] = issue.assignee if issue.assignee hash[:creationDate] = Api::Utils.format_datetime(issue.creationDate) if issue.creationDate hash[:updateDate] = Api::Utils.format_datetime(issue.updateDate) if issue.updateDate hash[:closeDate] = Api::Utils.format_datetime(issue.closeDate) if issue.closeDate hash[:attr] = issue.attributes.to_hash unless issue.attributes.isEmpty() - hash[:manual] = issue.manual if issue.manual if issue.comments.size>0 hash[:comments] = issue.comments.map { |c| comment_to_hash(c) } end diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/395_create_issues.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/395_create_issues.rb index 3c9373c44a7..10d2fddfd39 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/395_create_issues.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/395_create_issues.rb @@ -30,15 +30,14 @@ class CreateIssues < ActiveRecord::Migration t.column :rule_id, :integer, :null => true t.column :severity, :string, :null => true, :limit => 10 t.column :manual_severity, :boolean, :null => false - t.column :manual_issue, :boolean, :null => false t.column :description, :string, :null => true, :limit => 4000 t.column :line, :integer, :null => true t.column :effort_to_fix, :decimal, :null => true, :precision => 30, :scale => 20 t.column :status, :string , :null => true, :limit => 20 t.column :resolution, :string , :null => true, :limit => 20 t.column :checksum, :string , :null => true, :limit => 1000 - t.column :user_login, :string, :null => true, :limit => 40 - t.column :assignee_login, :string, :null => true, :limit => 40 + t.column :reporter, :string, :null => true, :limit => 40 + t.column :assignee, :string, :null => true, :limit => 40 t.column :author_login, :string, :null => true, :limit => 100 t.column :action_plan_key, :string, :null => true, :limit => 50 t.column :attributes, :string, :null => true, :limit => 4000 diff --git a/sonar-server/src/test/java/org/sonar/server/issue/PublicRubyIssueServiceTest.java b/sonar-server/src/test/java/org/sonar/server/issue/PublicRubyIssueServiceTest.java index efcbfc5a70e..1267beb69ae 100644 --- a/sonar-server/src/test/java/org/sonar/server/issue/PublicRubyIssueServiceTest.java +++ b/sonar-server/src/test/java/org/sonar/server/issue/PublicRubyIssueServiceTest.java @@ -65,7 +65,7 @@ public class PublicRubyIssueServiceTest { map.put("resolved", true); map.put("components", newArrayList("org.apache")); map.put("componentRoots", newArrayList("org.sonar")); - map.put("userLogins", newArrayList("marilyn")); + map.put("reporters", newArrayList("marilyn")); map.put("assignees", newArrayList("joanna")); map.put("assigned", true); map.put("planned", true); @@ -83,7 +83,7 @@ public class PublicRubyIssueServiceTest { assertThat(query.resolved()).isTrue(); assertThat(query.components()).containsOnly("org.apache"); assertThat(query.componentRoots()).containsOnly("org.sonar"); - assertThat(query.userLogins()).containsOnly("marilyn"); + assertThat(query.reporters()).containsOnly("marilyn"); assertThat(query.assignees()).containsOnly("joanna"); assertThat(query.assigned()).isTrue(); assertThat(query.planned()).isTrue(); diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issue.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issue.java index ad922698f50..525eeee3635 100644 --- a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issue.java +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issue.java @@ -83,10 +83,16 @@ public class Issue { /** * Login of the user who created the manual issue, else null. + * TODO to be removed */ @CheckForNull public String userLogin() { - return JsonUtils.getString(json, "userLogin"); + return JsonUtils.getString(json, "reporter"); + } + + @CheckForNull + public String reporter() { + return JsonUtils.getString(json, "reporter"); } /** diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/IssueQuery.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/IssueQuery.java index ff30b1dbb2e..204e90c6f54 100644 --- a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/IssueQuery.java +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/IssueQuery.java @@ -76,8 +76,15 @@ public class IssueQuery { return addParam("actionPlans", s); } + /** + * TODO To be removed + */ public IssueQuery userLogins(String... s) { - return addParam("userLogins", s); + return addParam("reporters", s); + } + + public IssueQuery reporters(String... s) { + return addParam("reporters", s); } public IssueQuery assignees(String... s) { diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/IssueQueryTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/IssueQueryTest.java index 8d0e0b949b2..bd1ddc18e01 100644 --- a/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/IssueQueryTest.java +++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/IssueQueryTest.java @@ -46,7 +46,7 @@ public class IssueQueryTest { .actionPlans("ABC") .statuses("OPEN", "CLOSED") .severities("BLOCKER", "INFO") - .userLogins("login1", "login2") + .reporters("login1", "login2") .sort("ASSIGNEE") .asc(false) .pageSize(5) @@ -65,7 +65,7 @@ public class IssueQueryTest { assertThat(query.urlParams()).includes(entry("resolved", true)); assertThat(query.urlParams()).includes(entry("statuses", "OPEN,CLOSED")); assertThat(query.urlParams()).includes(entry("severities", "BLOCKER,INFO")); - assertThat(query.urlParams()).includes(entry("userLogins", "login1,login2")); + assertThat(query.urlParams()).includes(entry("reporters", "login1,login2")); assertThat(query.urlParams()).includes(entry("sort", "ASSIGNEE")); assertThat(query.urlParams()).includes(entry("asc", false)); assertThat(query.urlParams()).includes(entry("pageSize", 5)); diff --git a/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/search.json b/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/search.json index c59e1bad4b6..5eda187d3db 100644 --- a/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/search.json +++ b/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/search.json @@ -12,7 +12,7 @@ "effortToFix": 4.2, "desc": "the desc", "title": "the title", - "userLogin": "perceval", + "reporter": "perceval", "creationDate": "2013-05-18T12:45:34+0200", "updateDate": "2013-05-18T13:45:34+0200", "closeDate": "2013-05-18T14:45:34+0200", -- 2.39.5