SONAR-7473 Drop 'reporter' field from backend

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueAssignerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueAssignerTest.java
index 839437da0fb894b5a93c26ba5ad4d1a2719d6fa4..1d3a3403f980a8cd5b45bdaf74b82563adb22cac 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueAssignerTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueAssignerTest.java
@@ -181,7 +181,12 @@ public class IssueAssignerTest {
     underTest.onIssue(FILE, issue);
 
     assertThat(logTester.logs(LoggerLevel.WARN)).containsOnly(
-      "No SCM info has been found for issue DefaultIssue[key=<null>,type=VULNERABILITY,componentUuid=<null>,componentKey=<null>,moduleUuid=<null>,moduleUuidPath=<null>,projectUuid=<null>,projectKey=<null>,ruleKey=<null>,language=<null>,severity=<null>,manualSeverity=false,message=<null>,line=2,gap=<null>,effort=<null>,status=<null>,resolution=<null>,reporter=<null>,assignee=<null>,checksum=<null>,attributes=<null>,authorLogin=<null>,comments=<null>,tags=<null>,locations=<null>,creationDate=<null>,updateDate=<null>,closeDate=<null>,currentChange=<null>,changes=<null>,isNew=true,beingClosed=false,onDisabledRule=false,isChanged=false,sendNotifications=false,selectedAt=<null>]");
+      "No SCM info has been found for issue DefaultIssue[key=<null>,type=VULNERABILITY,componentUuid=<null>,componentKey=<null>," +
+        "moduleUuid=<null>,moduleUuidPath=<null>,projectUuid=<null>,projectKey=<null>,ruleKey=<null>,language=<null>,severity=<null>," +
+        "manualSeverity=false,message=<null>,line=2,gap=<null>,effort=<null>,status=<null>,resolution=<null>," +
+        "assignee=<null>,checksum=<null>,attributes=<null>,authorLogin=<null>,comments=<null>,tags=<null>," +
+        "locations=<null>,creationDate=<null>,updateDate=<null>,closeDate=<null>,currentChange=<null>,changes=<null>,isNew=true," +
+        "beingClosed=false,onDisabledRule=false,isChanged=false,sendNotifications=false,selectedAt=<null>]");
   }
 
   private void setSingleChangeset(String author, Long date, String revision) {

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueStorageTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueStorageTest.java
index 0ae426537a1bd7a266e85d38baac717a4d2f7926..946f39bd2beec390b8b5474790e25ebbbecf5b68 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueStorageTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueStorageTest.java
@@ -67,7 +67,6 @@ public class IssueStorageTest {
       .setRuleKey(RuleKey.of("squid", "AvoidCycle"))
       .setLine(5000)
       .setEffort(Duration.create(10L))
-      .setReporter("emmerik")
       .setResolution("OPEN")
       .setStatus("OPEN")
       .setSeverity("BLOCKER")
@@ -104,7 +103,6 @@ public class IssueStorageTest {
       .setRuleKey(RuleKey.of("squid", "AvoidCycle"))
       .setLine(5000)
       .setEffort(Duration.create(10L))
-      .setReporter("emmerik")
       .setResolution("OPEN")
       .setStatus("OPEN")
       .setSeverity("BLOCKER")
@@ -144,7 +142,6 @@ public class IssueStorageTest {
       .setRuleKey(RuleKey.of("squid", "AvoidCycle"))
       .setLine(5000)
       .setEffort(Duration.create(10L))
-      .setReporter("emmerik")
       .setResolution("OPEN")
       .setStatus("OPEN")
       .setSeverity("BLOCKER")
@@ -189,7 +186,6 @@ public class IssueStorageTest {
       .setAuthorLogin("simon")
       .setAssignee("loic")
       .setFieldChange(context, "severity", "INFO", "BLOCKER")
-      .setReporter("emmerik")
       .setResolution("FIXED")
       .setStatus("RESOLVED")
       .setSeverity("BLOCKER")
@@ -236,7 +232,6 @@ public class IssueStorageTest {
       .setAuthorLogin("simon")
       .setAssignee("loic")
       .setFieldChange(context, "severity", "INFO", "BLOCKER")
-      .setReporter("emmerik")
       .setResolution("FIXED")
       .setStatus("RESOLVED")
       .setSeverity("BLOCKER")

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java
index 064588828e78672c3a5988f1269a6cf0e7bdc462..1feb8adf25e30b8923159b72063b7f9aba37add8 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java
@@ -95,7 +95,6 @@ public class ServerIssueStorageTest {
       .setProjectKey("struts")
       .setLine(5000)
       .setEffort(Duration.create(10L))
-      .setReporter("emmerik")
       .setResolution("OPEN")
       .setStatus("OPEN")
       .setSeverity("BLOCKER")
@@ -138,7 +137,6 @@ public class ServerIssueStorageTest {
       .setAuthorLogin("simon")
       .setAssignee("loic")
       .setFieldChange(context, "severity", "INFO", "BLOCKER")
-      .setReporter("emmerik")
       .setResolution("FIXED")
       .setStatus("RESOLVED")
       .setSeverity("BLOCKER")

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java
index abc253ed0797e566e4b5a310a52c0de8ef9305e4..6b1e4549c5f60965b179ecb1a8181b39d2deff2a 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/IssueWorkflowTest.java
@@ -125,8 +125,7 @@ public class IssueWorkflowTest {
     DefaultIssue issue = new DefaultIssue()
       .setKey("ABCDE")
       .setStatus(STATUS_CLOSED)
-      .setRuleKey(RuleKey.of("manual", "Performance"))
-      .setReporter("simon");
+      .setRuleKey(RuleKey.of("manual", "Performance"));
 
     List<Transition> transitions = workflow.outTransitions(issue);
     assertThat(keys(transitions)).containsOnly("reopen");
@@ -333,11 +332,11 @@ public class IssueWorkflowTest {
       .setKey("ABCDE")
       .setRuleKey(RuleKey.of(MANUAL_REPOSITORY_KEY, "Performance"))
 
-    // resolved by user
+      // resolved by user
       .setResolution(RESOLUTION_FIXED)
       .setStatus(STATUS_RESOLVED)
 
-    // but unmatched by tracking engine
+      // but unmatched by tracking engine
       .setBeingClosed(true);
 
     workflow.start();
@@ -353,8 +352,7 @@ public class IssueWorkflowTest {
     DefaultIssue issue = new DefaultIssue()
       .setKey("ABCDE")
       .setStatus(STATUS_OPEN)
-      .setRuleKey(RuleKey.of("manual", "Performance"))
-      .setReporter("simon");
+      .setRuleKey(RuleKey.of("manual", "Performance"));
 
     workflow.start();
 
@@ -392,7 +390,6 @@ public class IssueWorkflowTest {
       .setKey("ABCDE")
       .setStatus(STATUS_OPEN)
       .setRuleKey(RuleKey.of("manual", "Performance"))
-      .setReporter("simon")
       .setBeingClosed(true)
       .setOnDisabledRule(true);
 
@@ -410,7 +407,6 @@ public class IssueWorkflowTest {
       .setKey("ABCDE")
       .setStatus(STATUS_OPEN)
       .setRuleKey(RuleKey.of("manual", "Performance"))
-      .setReporter("simon")
       .setBeingClosed(true)
       .setOnDisabledRule(false);
 

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml
index 4cc182d5a66811e60d96f95837e858ae61749af2..8c8a93cbd13a57641eb9d7e4f70e9a16dcad3231 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_insert_new_issues-result.xml
@@ -12,7 +12,7 @@
           rule_id="200"
           created_at="[null]"
           updated_at="[null]"
-          reporter="emmerik"
+          reporter="[null]"
           issue_attributes="foo=bar"
           tags="[null]"
           action_plan_key="[null]"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml
index 27e6a2aa6c2e469fe18ee99e38f1777fb76a49a9..1a8a5607b7f32c94692a26d76a1be6d484aef477 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues-result.xml
@@ -17,7 +17,7 @@
           rule_id="200"
           created_at="2013-05-18"
           updated_at="2013-05-18"
-          reporter="emmerik"
+          reporter="[null]"
           issue_attributes="foo=bar"
           tags="[null]"
           action_plan_key="[null]"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml
index 6983f83239312df264f46522cddd9234e9d2589a..478c01ec27d0f7f369d09027caf793c50e24928b 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/IssueStorageTest/should_update_issues.xml
@@ -17,7 +17,7 @@
           rule_id="200"
           created_at="1400000000000"
           updated_at="1400000000000"
-          reporter="emmerik"
+          reporter="[null]"
           issue_attributes="foo=bar"
           tags="[null]"
           action_plan_key="[null]"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml
index 0e12196051ff8f823f9f6ab1d9e80f83f6d876e8..71d96ca788d9ff5ff51010e0783431ccc17810f8 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml
@@ -12,7 +12,7 @@
           rule_id="200"
           created_at="1000000000"
           updated_at="1000000000"
-          reporter="emmerik"
+          reporter="[null]"
           issue_attributes="foo=bar"
           tags="[null]"
           action_plan_key="[null]"

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 aa56371cb115baf93b7589e953f898e56bfcd32c..e8885be59bac82991303eb2f40dc9642fd361fb2 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java
@@ -75,7 +75,6 @@ public class DefaultIssue implements Issue, Trackable, org.sonar.api.ce.measure.
   private Duration effort;
   private String status;
   private String resolution;
-  private String reporter;
   private String assignee;
   private String checksum;
   private Map<String, String> attributes = null;
@@ -340,15 +339,14 @@ public class DefaultIssue implements Issue, Trackable, org.sonar.api.ce.measure.
     return this;
   }
 
+  /**
+   * @deprecated since 5.5, manual issue feature has been dropped.
+   */
+  @Deprecated
   @Override
   @CheckForNull
   public String reporter() {
-    return reporter;
-  }
-
-  public DefaultIssue setReporter(@Nullable String s) {
-    this.reporter = s;
-    return this;
+    return null;
   }
 
   @Override

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 a97a4c089bd36c1b7f3e57d3d70d1bde32ce289f..4f44a40bba1ab6c6cf88c96fa528de95071dabdf 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java
@@ -41,7 +41,6 @@ public class DefaultIssueBuilder implements Issuable.IssueBuilder {
   private String message;
   private String severity;
   private Double effortToFix;
-  private String reporter;
   private String assignee;
   private RuleType type;
   private Map<String, String> attributes;
@@ -114,9 +113,12 @@ public class DefaultIssueBuilder implements Issuable.IssueBuilder {
     return this;
   }
 
+  /**
+   * @deprecated since 5.5, manual issue feature has been dropped.
+   */
+  @Deprecated
   @Override
   public DefaultIssueBuilder reporter(@Nullable String s) {
-    this.reporter = s;
     return this;
   }
 
@@ -157,7 +159,6 @@ public class DefaultIssueBuilder implements Issuable.IssueBuilder {
     issue.setManualSeverity(false);
     issue.setGap(effortToFix);
     issue.setLine(line);
-    issue.setReporter(reporter);
     issue.setAssignee(assignee);
     issue.setAttributes(attributes);
     issue.setResolution(null);

diff --git a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java
index a98373af68cf939a22df8323318fffe808f2528d..190c413f7b84903cc46ad64b08d93fa83e6c28e4 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java
@@ -53,7 +53,6 @@ public class DefaultIssueTest {
       .setEffort(Duration.create(28800L))
       .setStatus(Issue.STATUS_CLOSED)
       .setResolution(Issue.RESOLUTION_FIXED)
-      .setReporter("simon")
       .setAssignee("julien")
       .setAuthorLogin("steph")
       .setChecksum("c7b5db46591806455cf082bb348631e8")
@@ -76,11 +75,10 @@ public class DefaultIssueTest {
     assertThat(issue.manualSeverity()).isTrue();
     assertThat(issue.message()).isEqualTo("a message");
     assertThat(issue.line()).isEqualTo(7);
-    assertThat(issue.effortToFix()).isEqualTo(1.2d);
-    assertThat(issue.debt()).isEqualTo(Duration.create(28800L));
+    assertThat(issue.gap()).isEqualTo(1.2d);
+    assertThat(issue.effort()).isEqualTo(Duration.create(28800L));
     assertThat(issue.status()).isEqualTo(Issue.STATUS_CLOSED);
     assertThat(issue.resolution()).isEqualTo(Issue.RESOLUTION_FIXED);
-    assertThat(issue.reporter()).isEqualTo("simon");
     assertThat(issue.assignee()).isEqualTo("julien");
     assertThat(issue.authorLogin()).isEqualTo("steph");
     assertThat(issue.checksum()).isEqualTo("c7b5db46591806455cf082bb348631e8");
@@ -173,7 +171,7 @@ public class DefaultIssueTest {
   @Test
   public void test_nullable_fields() throws Exception {
     issue.setGap(null).setSeverity(null).setLine(null);
-    assertThat(issue.effortToFix()).isNull();
+    assertThat(issue.gap()).isNull();
     assertThat(issue.severity()).isNull();
     assertThat(issue.line()).isNull();
   }

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 56d267a6b6b3d06201ef18806ee7cb066d015878..0c996463aa61e4901ad1064f7ebef3af4d26283a 100644 (file)
--- 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);
   }
 
@@ -341,17 +338,6 @@ public final class IssueDto implements Serializable {
     return this;
   }
 
-  @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 8c13afdc31c4c3500de93c3cfce23491e0b0bf4a..cc440f77446fd65f7c0b298c5f78485a31d6753c 100644 (file)
--- 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 9f2290ad1e9076cea4ac50db5db815b7165056d1..4b48ebbce04fd239b13c4fd210252a0211ac0a56 100644 (file)
--- 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 865f476f867bf3410faa73e0ad2a7b2a3d46fbdd..f4c4b5a98eb6d288cb5d2a7122aaab02def9ac82 100644 (file)
--- 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 0091675d75662dba182b14290ee76e2111fd49a8..8c3da1c63ff73fdbd5a021b5664364aa6aac3f77 100644 (file)
--- 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 5119dd45c573457fe05c1f31cc625d003f49f2ce..efb08c7ae4f57a8097c900d8efc941a34f7c2f7f 100644 (file)
--- 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 35486efd650a468905bec25a866657fc510a2350..3a272a88b28af0c33f9efc1af0506d567528d380 100644 (file)
--- 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 1aa94275af27fa8210bc6efcbb8cb6827fc386c6..a86bf7a776af815048fe22dd524709cb6bac1d1d 100644 (file)
--- 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 82aeab40ca13055f04e687848de218dce7cff57c..946a67dd5bec4ca8e26e66a94a21f9523f2ba0fd 100644 (file)
--- 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 e48cccd9e4a8457bc86336ae2ef1de238ac43497..06cf3a4e64d71d7d27d53d9c7f6a0ff141b6879e 100644 (file)
--- 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 3c03568a481069ceded56c9534a812809fec2160..483763302b6cea55f96a95dbad9d9159294454f8 100644 (file)
--- 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 53ebfd57a66798da199c9f73fc10989bf68312a3..58cad579bdcb44609f3782cc28befc11b4d0261e 100644 (file)
--- 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"

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issuable.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issuable.java
index a723fb4b6211baf110796d9de0af9f3fab0531a8..a9dee84046786c165ea1b8d907f560320001afa0 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issuable.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issuable.java
@@ -20,6 +20,7 @@
 package org.sonar.api.issue;
 
 import java.util.List;
+import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 import org.sonar.api.batch.sensor.issue.NewIssue;
 import org.sonar.api.batch.sensor.issue.NewIssueLocation;
@@ -112,8 +113,10 @@ public interface Issuable extends Perspective {
     IssueBuilder severity(@Nullable String severity);
 
     /**
-     * Login of the user who reported the issue. Optional.
+     * @deprecated since 5.5, manual issue feature has been dropped.
      */
+    @Deprecated
+    @CheckForNull
     IssueBuilder reporter(@Nullable String reporter);
 
     IssueBuilder effortToFix(@Nullable Double d);

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issue.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issue.java
index ce99e1d3c2543fe635654d2b350c1eb5415ad32e..96ee3c2405b5fb0581653a1d1aa9521a8ba869bd 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issue.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/Issue.java
@@ -139,8 +139,9 @@ public interface Issue extends Serializable {
   String resolution();
 
   /**
-   * Login of the user who reported this issue. Null if the issue is reported by a rule engine.
+   * @deprecated since 5.5, manual issue feature has been dropped.
    */
+  @Deprecated
   @CheckForNull
   String reporter();