SONAR-3755 rename ISSUES.DESCRIPTION to MESSAGE

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueHandlers.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueHandlers.java
index ef60b59c944a081eb8b30a46fae8b58fc77439ee..3a752f8d4d9ee8f0b692f4ee69f8763fbd6d4d2e 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueHandlers.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueHandlers.java
@@ -84,8 +84,8 @@ public class IssueHandlers implements BatchExtension {
     }
 
     @Override
-    public IssueHandler.Context setDescription(@Nullable String description) {
-      updater.setDescription(issue, description);
+    public IssueHandler.Context setMessage(@Nullable String s) {
+      updater.setMessage(issue, s);
       return this;
     }
 

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTracking.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTracking.java
index e0538e3f713b7756e5b8207c302c7f09971fa158..c4ab555d068da171c7c4c16466ca0a22284cd2f3 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTracking.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTracking.java
@@ -337,7 +337,7 @@ public class IssueTracking implements BatchExtension {
   }
 
   private boolean isSameMessage(DefaultIssue newIssue, IssueDto pastIssue) {
-    return Objects.equal(newIssue.description(), pastIssue.getDescription());
+    return Objects.equal(newIssue.message(), pastIssue.getMessage());
   }
 
   private boolean isSameKey(DefaultIssue newIssue, IssueDto pastIssue) {

diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/IssueTrackingTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/IssueTrackingTest.java
index 61f105a4e5e169d29322a41e2b96fb2849d1ff80..9a81055c54a12bf2a0c86dd87a71aa901da0887d 100644 (file)
--- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/IssueTrackingTest.java
+++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/IssueTrackingTest.java
@@ -380,7 +380,7 @@ public class IssueTrackingTest {
   }
 
   private DefaultIssue newDefaultIssue(String message, Integer line, RuleKey ruleKey, String checksum) {
-    return new DefaultIssue().setDescription(message).setLine(line).setRuleKey(ruleKey).setChecksum(checksum).setStatus(Issue.STATUS_OPEN);
+    return new DefaultIssue().setMessage(message).setLine(line).setRuleKey(ruleKey).setChecksum(checksum).setStatus(Issue.STATUS_OPEN);
   }
 
   private IssueDto newReferenceIssue(String message, Integer lineId, int ruleId, String lineChecksum) {
@@ -389,7 +389,7 @@ public class IssueTrackingTest {
     referenceIssue.setId(id);
     referenceIssue.setKee(Long.toString(id));
     referenceIssue.setLine(lineId);
-    referenceIssue.setDescription(message);
+    referenceIssue.setMessage(message);
     referenceIssue.setRuleId(ruleId);
     referenceIssue.setChecksum(lineChecksum);
     referenceIssue.setResolution(null);

diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedViolations.java b/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedViolations.java
index d0db555891abe99fdb1e343277262ded4fd87303..adb81f8967b1a5fdb9cdd894031ac5e70ad53370 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedViolations.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedViolations.java
@@ -54,7 +54,7 @@ public class DeprecatedViolations implements BatchComponent {
       .ruleKey(RuleKey.of(violation.getRule().getRepositoryKey(), violation.getRule().getKey()))
       .effortToFix(violation.getCost())
       .line(violation.getLineId())
-      .description(violation.getMessage())
+      .message(violation.getMessage())
       .severity(violation.getSeverity() != null ? violation.getSeverity().name() : Severity.MAJOR)
       .build();
   }

diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/SonarReport.java b/sonar-batch/src/main/java/org/sonar/batch/report/SonarReport.java
index dc706c580362eea91e32bf6e8d2d4ec6e9b9f473..f02a8c466bec7704d81058c60c47b4744a942852 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/report/SonarReport.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/report/SonarReport.java
@@ -110,13 +110,15 @@ public class SonarReport implements BatchComponent {
       put(jsonIssue, "key", issue.key());
       put(jsonIssue, "component", issue.componentKey());
       put(jsonIssue, "line", issue.line());
-      put(jsonIssue, "description", issue.description());
+      put(jsonIssue, "message", issue.message());
       put(jsonIssue, "severity", issue.severity());
       put(jsonIssue, "rule", issue.ruleKey());
       put(jsonIssue, "status", issue.status());
       put(jsonIssue, "resolution", issue.resolution());
       put(jsonIssue, "isNew", issue.isNew());
+      put(jsonIssue, "reporter", issue.reporter());
       put(jsonIssue, "assignee", issue.assignee());
+      put(jsonIssue, "effortToFix", issue.effortToFix());
       put(jsonIssue, "creationDate", issue.creationDate());
       put(jsonIssue, "updateDate", issue.updateDate());
       put(jsonIssue, "closeDate", issue.closeDate());

diff --git a/sonar-batch/src/test/java/org/sonar/batch/report/SonarReportTest.java b/sonar-batch/src/test/java/org/sonar/batch/report/SonarReportTest.java
index 97f2ea774493ac33c938a40b06d1f02d288913c9..55253b35fb673f4757b2e37b154fccdf272f5bc7 100644 (file)
--- a/sonar-batch/src/test/java/org/sonar/batch/report/SonarReportTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/report/SonarReportTest.java
@@ -126,11 +126,13 @@ public class SonarReportTest {
     DefaultIssue issue = new DefaultIssue()
       .setKey("200")
       .setComponentKey("Action.java")
-      .setDescription("SystemPrintln")
+      .setMessage("SystemPrintln")
       .setSeverity("MINOR")
       .setStatus(Issue.STATUS_CLOSED)
       .setResolution(Issue.RESOLUTION_FALSE_POSITIVE)
       .setLine(1)
+      .setEffortToFix(3.14)
+      .setReporter("julien")
       .setAssignee("simon")
       .setRuleKey(RuleKey.of("squid", "AvoidCycle"))
       .setCreationDate(DateUtils.parseDate("2013-04-24"))
@@ -145,17 +147,19 @@ public class SonarReportTest {
     JSONArray issues = (JSONArray) json.get("issues");
     assertThat(issues).hasSize(1);
     JSONObject jsonIssue = (JSONObject) issues.get(0);
-    assertThat(jsonIssue.values()).hasSize(13);
+    assertThat(jsonIssue.values()).hasSize(15);
 
     assertThat(jsonIssue.get("key")).isEqualTo("200");
     assertThat(jsonIssue.get("component")).isEqualTo("Action.java");
     assertThat(jsonIssue.get("line")).isEqualTo(1);
-    assertThat(jsonIssue.get("description")).isEqualTo("SystemPrintln");
+    assertThat(jsonIssue.get("message")).isEqualTo("SystemPrintln");
     assertThat(jsonIssue.get("severity")).isEqualTo("MINOR");
     assertThat(jsonIssue.get("rule")).isEqualTo("squid:AvoidCycle");
     assertThat(jsonIssue.get("status")).isEqualTo("CLOSED");
     assertThat(jsonIssue.get("resolution")).isEqualTo("FALSE-POSITIVE");
     assertThat(jsonIssue.get("assignee")).isEqualTo("simon");
+    assertThat(jsonIssue.get("effortToFix")).isEqualTo(3.14);
+    assertThat(jsonIssue.get("reporter")).isEqualTo("julien");
     assertThat(jsonIssue.get("isNew")).isEqualTo(false);
     assertThat((String) jsonIssue.get("creationDate")).contains("2013-04-24T00:00");
     assertThat((String) jsonIssue.get("updateDate")).contains("2013-04-25T00:00");

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 a3e659e86724f2dfef6194fbb61503eefaf0caae..a2f64c12efb72ac3c80e92bbd9e62b405712880f 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
@@ -49,7 +49,7 @@ public class DefaultIssue implements Issue {
   private RuleKey ruleKey;
   private String severity;
   private boolean manualSeverity = false;
-  private String description;
+  private String message;
   private Integer line;
   private Double effortToFix;
   private String status;
@@ -121,12 +121,12 @@ public class DefaultIssue implements Issue {
   }
 
   @CheckForNull
-  public String description() {
-    return description;
+  public String message() {
+    return message;
   }
 
-  public DefaultIssue setDescription(@Nullable String s) {
-    this.description = StringUtils.abbreviate(StringUtils.trim(s), DESCRIPTION_MAX_SIZE);
+  public DefaultIssue setMessage(@Nullable String s) {
+    this.message = StringUtils.abbreviate(StringUtils.trim(s), MESSAGE_MAX_SIZE);
     return this;
   }
 

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 c851d61b0b5dfce812d26e5c968438f368e0346e..95d62e0d048dfbf048c626174ca72c54e3c084c0 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
@@ -38,11 +38,11 @@ public class DefaultIssueBuilder implements Issuable.IssueBuilder {
   private String componentKey;
   private RuleKey ruleKey;
   private Integer line;
-  private String description;
+  private String message;
   private String severity;
   private Double effortToFix;
-  private boolean manual = false;
   private Date createdDate;
+  private String reporter;
   private Map<String, String> attributes;
 
   public DefaultIssueBuilder() {
@@ -72,8 +72,8 @@ public class DefaultIssueBuilder implements Issuable.IssueBuilder {
   }
 
   @Override
-  public Issuable.IssueBuilder description(String s) {
-    this.description = s;
+  public Issuable.IssueBuilder message(@Nullable String s) {
+    this.message = s;
     return this;
   }
 
@@ -90,8 +90,8 @@ public class DefaultIssueBuilder implements Issuable.IssueBuilder {
   }
 
   @Override
-  public Issuable.IssueBuilder manual(boolean b) {
-    this.manual = b;
+  public Issuable.IssueBuilder reporter(@Nullable String s) {
+    this.reporter = s;
     return this;
   }
 
@@ -122,11 +122,12 @@ public class DefaultIssueBuilder implements Issuable.IssueBuilder {
     issue.setUpdateDate(date);
     issue.setComponentKey(componentKey);
     issue.setRuleKey(ruleKey);
-    issue.setDescription(description);
+    issue.setMessage(message);
     issue.setSeverity(Objects.firstNonNull(severity, Severity.MAJOR));
     issue.setEffortToFix(effortToFix);
     issue.setLine(line);
-    issue.setManualSeverity(manual);
+    issue.setManualSeverity(false);
+    issue.setReporter(reporter);
     issue.setAttributes(attributes);
     issue.setNew(true);
     issue.setAlive(true);

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/IssueUpdater.java b/sonar-core/src/main/java/org/sonar/core/issue/IssueUpdater.java
index 90da11f607613853822acf659765043b0ecebb4c..6d2444cb7df1e1e3151626ff6adbcd31a324b910 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/issue/IssueUpdater.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/IssueUpdater.java
@@ -95,8 +95,8 @@ public class IssueUpdater implements BatchComponent, ServerComponent {
     issue.setAuthorLogin(authorLogin);
   }
 
-  public void setDescription(DefaultIssue issue, @Nullable String description) {
-    issue.setDescription(description);
+  public void setMessage(DefaultIssue issue, @Nullable String s) {
+    issue.setMessage(s);
   }
 
   public void addComment(DefaultIssue issue, String text, IssueChangeContext context) {

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 2d918a8a80ad28800f5fc28f32c679a458a63745..f31e977f6aabb8e1063406ddf44b6c36fd811411 100644 (file)
--- 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,7 +42,7 @@ public final class IssueDto {
   private Integer ruleId;
   private String severity;
   private boolean manualSeverity;
-  private String description;
+  private String message;
   private Integer line;
   private Double effortToFix;
   private String status;
@@ -134,12 +134,12 @@ public final class IssueDto {
   }
 
   @CheckForNull
-  public String getDescription() {
-    return description;
+  public String getMessage() {
+    return message;
   }
 
-  public IssueDto setDescription(@Nullable String s) {
-    this.description = s;
+  public IssueDto setMessage(@Nullable String s) {
+    this.message = s;
     return this;
   }
 
@@ -314,7 +314,7 @@ public final class IssueDto {
     return new IssueDto()
       .setKee(issue.key())
       .setLine(issue.line())
-      .setDescription(issue.description())
+      .setMessage(issue.message())
       .setEffortToFix(issue.effortToFix())
       .setResolution(issue.resolution())
       .setStatus(issue.status())
@@ -340,7 +340,7 @@ public final class IssueDto {
     issue.setKey(kee);
     issue.setStatus(status);
     issue.setResolution(resolution);
-    issue.setDescription(description);
+    issue.setMessage(message);
     issue.setEffortToFix(effortToFix);
     issue.setLine(line);
     issue.setSeverity(severity);

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 5027df2b91c94744a4bf51f2e656f6a770f963ef..e0e2c0f64af2e6952df4c3926f9281def14e8528 100644 (file)
--- 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,7 +12,7 @@
     i.action_plan_key as actionPlanKey,
     i.severity as severity,
     i.manual_severity as manualSeverity,
-    i.description as description,
+    i.message as message,
     i.line as line,
     i.effort_to_fix as effortToFix,
     i.status as status,
@@ -34,11 +34,11 @@
 
   <insert id="insert" parameterType="Issue" useGeneratedKeys="false" keyProperty="id">
     INSERT INTO issues (kee, resource_id, rule_id, action_plan_key, severity, manual_severity,
-    description, line, effort_to_fix, status,
+    message, line, effort_to_fix, status,
     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},
-    #{description}, #{line}, #{effortToFix}, #{status},
+    #{message}, #{line}, #{effortToFix}, #{status},
     #{resolution}, #{checksum}, #{reporter}, #{assignee}, #{authorLogin}, #{attributes}, #{issueCreationDate},
     #{issueUpdateDate}, #{issueCloseDate}, #{createdAt}, #{updatedAt})
   </insert>
@@ -50,11 +50,11 @@
       select issues_seq.NEXTVAL from DUAL
     </selectKey>
     INSERT INTO issues (id, kee, resource_id, rule_id, action_plan_key, severity, manual_severity,
-    description, line, effort_to_fix, status,
+    message, line, effort_to_fix, status,
     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},
-    #{description}, #{line}, #{effortToFix}, #{status},
+    #{message}, #{line}, #{effortToFix}, #{status},
     #{resolution}, #{checksum}, #{reporter}, #{assignee}, #{authorLogin}, #{attributes}, #{issueCreationDate},
     #{issueUpdateDate}, #{issueCloseDate}, #{createdAt}, #{updatedAt})
   </insert>
@@ -66,7 +66,7 @@
     action_plan_key=#{actionPlanKey},
     severity=#{severity},
     manual_severity=#{manualSeverity},
-    description=#{description},
+    message=#{message},
     line=#{line},
     effort_to_fix=#{effortToFix},
     status=#{status},

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 d78553ed60fd78819d08efa3aeb00188a318d3a9..7f7a5f2d8e24422d5f560d760b9a9506c0d816bf 100644 (file)
--- 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,7 +523,7 @@ CREATE TABLE "ISSUES" (
   "RULE_ID" INTEGER,
   "SEVERITY" VARCHAR(10),
   "MANUAL_SEVERITY" BOOLEAN NOT NULL,
-  "DESCRIPTION" VARCHAR(4000),
+  "MESSAGE" VARCHAR(4000),
   "LINE" INTEGER,
   "EFFORT_TO_FIX" DOUBLE,
   "STATUS" VARCHAR(20),

diff --git a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueBuilderTest.java b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueBuilderTest.java
index e3bced3d3614e234dae791c16fc415a5d94d360c..5bdfdf1bee57c8f09ba98f9fb3a4821b0e0965c8 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueBuilderTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueBuilderTest.java
@@ -33,7 +33,7 @@ public class DefaultIssueBuilderTest {
     String componentKey = "org.apache.struts:struts-core:Action.java";
     DefaultIssue issue = (DefaultIssue) new DefaultIssueBuilder()
       .componentKey(componentKey)
-      .description("the desc")
+      .message("the message")
       .line(123)
       .effortToFix(10000.0)
       .ruleKey(RuleKey.of("squid", "NullDereference"))
@@ -46,7 +46,7 @@ public class DefaultIssueBuilderTest {
     assertThat(issue.key()).isNotNull();
     assertThat(issue.effortToFix()).isEqualTo(10000.0);
     assertThat(issue.componentKey()).isEqualTo(componentKey);
-    assertThat(issue.description()).isEqualTo("the desc");
+    assertThat(issue.message()).isEqualTo("the message");
     assertThat(issue.line()).isEqualTo(123);
     assertThat(issue.ruleKey().repository()).isEqualTo("squid");
     assertThat(issue.ruleKey().rule()).isEqualTo("NullDereference");

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 23bf9b5a6a8c8bc94009d964a6529f6db00d5b71..3801d70d743e22ead804cfd857b7aca8568c7dd6 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
@@ -77,20 +77,20 @@ public class DefaultIssueTest {
   }
 
   @Test
-  public void description_should_be_abbreviated_if_too_long() {
-    issue.setDescription(StringUtils.repeat("a", 5000));
-    assertThat(issue.description()).hasSize(4000);
+  public void message_should_be_abbreviated_if_too_long() {
+    issue.setMessage(StringUtils.repeat("a", 5000));
+    assertThat(issue.message()).hasSize(4000);
   }
 
   @Test
-  public void description_should_be_trimmed() {
-    issue.setDescription("    foo     ");
-    assertThat(issue.description()).isEqualTo("foo");
+  public void message_should_be_trimmed() {
+    issue.setMessage("    foo     ");
+    assertThat(issue.message()).isEqualTo("foo");
   }
 
   @Test
-  public void description_could_be_null() {
-    issue.setDescription(null);
-    assertThat(issue.description()).isNull();
+  public void message_could_be_null() {
+    issue.setMessage(null);
+    assertThat(issue.message()).isNull();
   }
 }

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 d07c7a04a7ea2158a952664a822563741dcfb735..1ac718d52cb9f2ce4c6674db41c9f420b2c01ae3 100644 (file)
--- 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,7 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     assertThat(issue.getRuleId()).isEqualTo(500);
     assertThat(issue.getSeverity()).isEqualTo("BLOCKER");
     assertThat(issue.isManualSeverity()).isFalse();
-    assertThat(issue.getDescription()).isNull();
+    assertThat(issue.getMessage()).isNull();
     assertThat(issue.getLine()).isEqualTo(200);
     assertThat(issue.getEffortToFix()).isEqualTo(4.2);
     assertThat(issue.getStatus()).isEqualTo("OPEN");

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 a40e0f97decaa7d59dca7679eedd93fd14cbdcd5..9598b8c796dc4f48997bf63191908522c1baea7e 100644 (file)
--- 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
@@ -64,7 +64,7 @@ public class IssueDtoTest {
         .setEffortToFix(15.0)
         .setLine(6)
         .setSeverity("BLOCKER")
-        .setDescription("message")
+        .setMessage("message")
         .setManualSeverity(true)
         .setReporter("arthur")
         .setAssignee("perceval")
@@ -83,7 +83,7 @@ public class IssueDtoTest {
     assertThat(issue.effortToFix()).isEqualTo(15.0);
     assertThat(issue.line()).isEqualTo(6);
     assertThat(issue.severity()).isEqualTo("BLOCKER");
-    assertThat(issue.description()).isEqualTo("message");
+    assertThat(issue.message()).isEqualTo("message");
     assertThat(issue.manualSeverity()).isTrue();
     assertThat(issue.reporter()).isEqualTo("arthur");
     assertThat(issue.assignee()).isEqualTo("perceval");

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 1137a60af33b8779739558f30b63cf095e15b26c..d606a87080d1fbad9e9aba8aaddc2635d2a3cd6e 100644 (file)
--- 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
@@ -53,7 +53,7 @@ public class IssueMapperTest extends AbstractDaoTestCase {
     dto.setActionPlanKey("current_sprint");
     dto.setAttributes("JIRA=FOO-1234");
     dto.setChecksum("123456789");
-    dto.setDescription("the description");
+    dto.setMessage("the message");
 
     dto.setIssueCreationDate(DateUtils.parseDate("2013-05-18"));
     dto.setIssueUpdateDate(DateUtils.parseDate("2013-05-19"));
@@ -86,7 +86,7 @@ public class IssueMapperTest extends AbstractDaoTestCase {
     dto.setActionPlanKey("current_sprint");
     dto.setAttributes("JIRA=FOO-1234");
     dto.setChecksum("123456789");
-    dto.setDescription("the description");
+    dto.setMessage("the message");
 
     dto.setIssueCreationDate(DateUtils.parseDate("2013-05-18"));
     dto.setIssueUpdateDate(DateUtils.parseDate("2013-05-19"));

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 d5ce9ef38421bbf0890e9c0ebd83c8e34655f72a..f960ecd1b62d88ec7e6599f601438062a58279f7 100644 (file)
--- 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,7 +10,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       status="OPEN"
       resolution="[null]"
@@ -34,7 +34,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       status="CLOSED"
       resolution="FIXED"
@@ -58,7 +58,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       status="CLOSED"
       resolution="FIXED"

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 24ff8a4b5e63d2fdd97331156862fc90c313c5e3..3d7bd96af2126c6adb78f0a22ea32d4875e5168e 100644 (file)
--- 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,7 +8,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -32,7 +32,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -58,7 +58,7 @@
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"

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 b0414484987b26aaecdbe59bf60a223ea3ddca02..5655372b58e3d0e895c558d6176e3a62947fa8b5 100644 (file)
--- 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,7 +8,7 @@
       action_plan_key="ABC"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -33,7 +33,7 @@
       action_plan_key="ABC"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -59,7 +59,7 @@
       action_plan_key="DEF"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"

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 fc0e605e452e933033a7dc715bfc44857bdbc591..f25c1c9e8ea5d1b0af0a0524b1bc8063e5c193b7 100644 (file)
--- 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,7 +8,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -32,7 +32,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -58,7 +58,7 @@
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"

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 a43a90b0d471ea7e3655b0074503102e836b007a..34f07c20209acd50515bb2e7de9df21aac765a37 100644 (file)
--- 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,7 +7,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="[null]"
       status="OPEN"
@@ -31,7 +31,7 @@
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="120"
       effort_to_fix="[null]"
       status="CLOSED"

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 1a297848923f7a710bbef2e1ea52b0e7a4974d42..9b6f20c96ca8aee11be82f76da302db2cc6f3fe2 100644 (file)
--- 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,7 +7,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -31,7 +31,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"

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 4482d66dfe50258acbcfed492eda0c41740c1210..d2804c856d3af2ef89625c0c4a61f41ef67e585f 100644 (file)
--- 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,7 +8,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -32,7 +32,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -58,7 +58,7 @@
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"

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 eab42be2c70cd7b6cbda02845eed8dab2f3754c4..d01f5342d8780aa620dacb210e8c6c35b582c454 100644 (file)
--- 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,7 +7,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"

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 5efa836cf162c53acf4d8df29a69448f6ac4bad5..ded6b072043db4a42483ba8b61dc857feae94511 100644 (file)
--- 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,7 +8,7 @@
       action_plan_key="ABC"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -33,7 +33,7 @@
       action_plan_key="ABC"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -59,7 +59,7 @@
       action_plan_key="[null]"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"

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 1c876c79d76a8b615e1e3e264bc5210bb8584ade..816742b954b30158e92d625dd54237a607886d79 100644 (file)
--- 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,7 +7,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"

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 3eeccd3a251234f738b9d2db6fa139c46c247841..371d3da3f4f22174fa51c90655ca9d8dd3baffa6 100644 (file)
--- 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,7 +7,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -31,7 +31,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="RESOLVED"
@@ -55,7 +55,7 @@
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="CLOSED"

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 805b5d703c464dfb7bc92b998dcd5c96cfa32484..d2af6661a9eb7f25faa21faece12c4cbf5d92fd3 100644 (file)
--- 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,7 +8,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -32,7 +32,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -58,7 +58,7 @@
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"

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 24ff8a4b5e63d2fdd97331156862fc90c313c5e3..3d7bd96af2126c6adb78f0a22ea32d4875e5168e 100644 (file)
--- 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,7 +8,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -32,7 +32,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -58,7 +58,7 @@
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"

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 f08fa7766c66e1a025c3df624b690cfd7d76930e..12f7036120e18dde09e90cc2991f787a1089eb57 100644 (file)
--- 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,7 +7,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="[null]"
       status="OPEN"
@@ -31,7 +31,7 @@
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="120"
       effort_to_fix="[null]"
       status="OPEN"
@@ -55,7 +55,7 @@
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="120"
       effort_to_fix="[null]"
       status="CLOSED"

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 87bf002da47dfc01106a3104b63625f406a1ce6d..41a97ef98b80e809108e87d5eb075f0c7d698851 100644 (file)
--- 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,7 +8,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -32,7 +32,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"
@@ -58,7 +58,7 @@
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="4.2"
       status="OPEN"

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 4f7105aca6e31477f0dc0e3b0d8191b722305c50..69e5160f9622b9cceee9f498c2dc1664ab2831bf 100644 (file)
--- 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,7 +6,7 @@
       rule_id="200"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="the description"
+      message="the message"
       line="500"
       effort_to_fix="3.14"
       status="RESOLVED"

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 792d428ee5e27c25b54ce115ba570841748e479f..67d9024f5c7ea611847c65ed675461728404ed50 100644 (file)
--- 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,7 +25,7 @@
       rule_id="200"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="the description"
+      message="the message"
       line="500"
       effort_to_fix="3.14"
       status="RESOLVED"

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 fbae0e482a6fabe9fbead2fe76ee451adfca8510..06ee1af1b5061a27444999dbc1c7938c5492dedd 100644 (file)
--- 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,7 +25,7 @@
       rule_id="200"
       severity="INFO"
       manual_severity="[false]"
-      description="old"
+      message="old"
       line="[null]"
       effort_to_fix="[null]"
       status="OPEN"

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 34b9088daae4ac93a96fe73398896dbb5b4bca43..97ca9b21656101c57cdaa484e17d5ce3cd7eb2e7 100644 (file)
--- 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
@@ -4,7 +4,7 @@
       author_login="[null]"
       checksum="[null]"
       effort_to_fix="[null]"
-      description="[null]"
+      message="[null]"
       line="5000"
       resource_id="100"
       rule_id="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
index 21bda6c581bbc8d5453982e8f484e36cd1644d39..862d14f2b750073c3d2ec15a7d60f60c0bfee6d6 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml
@@ -9,7 +9,7 @@
           author_login="simon"
           checksum="FFFFF"
           effort_to_fix="[null]"
-          description="[null]"
+          message="[null]"
           line="5000"
           resource_id="100"
           rule_id="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
index 2003f24b0b970c9752331f3485917b46edd84b5c..4d8e2449c578896472a29d26cc4013debb724ecd 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues.xml
@@ -9,7 +9,7 @@
           author_login="simon"
           checksum="FFFFF"
           effort_to_fix="[null]"
-          description="[null]"
+          message="[null]"
           line="3000"
           resource_id="100"
           rule_id="200"

diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml b/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
index 1077aefc797e04eff91b3072d7048bde3cd55b6c..5bf87b320ac82995aafdf0e7bb925fb5db73d7e2 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
@@ -25,7 +25,7 @@
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="200"
       effort_to_fix="[null]"
       status="OPEN"
@@ -49,7 +49,7 @@
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
-      description="[null]"
+      message="[null]"
       line="120"
       effort_to_fix="[null]"
       status="CLOSED"

diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml
index 959e26efeedfe1c52bde0da988cf98fc9936f1c1..e8a31f031de75e9fe68aa7d68b27e02bd8ca4ee9 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteResource.xml
@@ -27,7 +27,7 @@
   <issues id="1" kee="ABCDE" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="BLOCKER"
           reporter="perceval" assignee="arthur" rule_id="500"
           manual_severity="[false]"
-          description="[null]"
+          message="[null]"
           issue_creation_date="2013-04-16"
           issue_update_date="2013-04-16"
           issue_close_date="2013-04-16"

diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
index 725b7aaf0c942f1096e24fbdf3fd87d56c513761..5c57259dab6ac1a810d961110c79ad0bea54f6c3 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
@@ -33,7 +33,9 @@
 
   <issues id="1" kee="ABCDE" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="BLOCKER"
           reporter="perceval" assignee="arthur" rule_id="500"
-          manual_severity="[false]" description="[null]" action_plan_key="[null]"
+          manual_severity="[false]"
+          message="[null]"
+          action_plan_key="[null]"
           created_at="[null]"
           updated_at="[null]"
           issue_creation_date="2013-04-16"
@@ -43,7 +45,9 @@
 
   <issues id="2" kee="ABCDF" resource_id="1" status="CLOSED" resolution="[null]" line="200" severity="BLOCKER"
           reporter="perceval" assignee="arthur" rule_id="500"
-          manual_severity="[false]" description="[null]" action_plan_key="[null]"
+          manual_severity="[false]"
+          message="[null]"
+          action_plan_key="[null]"
           created_at="[null]"
           updated_at="[null]"
           issue_creation_date="2013-04-16"

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 c2390849ebf493f79b953c47fd2891996aed3dd7..3dd8d7412622f9cdcfe4f228aaea010a9f5e6e88 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
@@ -36,13 +36,13 @@ public interface Issuable extends Perspective {
 
     IssueBuilder line(@Nullable Integer line);
 
-    IssueBuilder description(String description);
+    IssueBuilder message(@Nullable String message);
 
     IssueBuilder severity(String severity);
 
-    IssueBuilder effortToFix(@Nullable Double d);
+    IssueBuilder reporter(String reporter);
 
-    IssueBuilder manual(boolean b);
+    IssueBuilder effortToFix(@Nullable Double d);
 
     IssueBuilder attribute(String key, @Nullable String value);
 

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 ae18533e7b92edeac24837bdf94c53271464da4c..42a38bf419026f0760057ef1d8666cd5790ebede 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
@@ -33,7 +33,7 @@ import java.util.Map;
  */
 public interface Issue extends Serializable {
 
-  int DESCRIPTION_MAX_SIZE = 4000;
+  int MESSAGE_MAX_SIZE = 4000;
 
   String STATUS_OPEN = "OPEN";
   String STATUS_REOPENED = "REOPENED";
@@ -54,7 +54,8 @@ public interface Issue extends Serializable {
 
   String severity();
 
-  String description();
+  @CheckForNull
+  String message();
 
   @CheckForNull
   Integer line();

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueHandler.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueHandler.java
index c0882086d2249a1e3496265e9369ff0d7385e6e7..8835ddfba8fdf027774baff20e44e0d70eb8b874 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueHandler.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueHandler.java
@@ -36,15 +36,15 @@ public interface IssueHandler extends BatchExtension {
     // TODO rename isClosed()
     boolean isAlive();
 
-    Context setLine(@Nullable Integer line);
+    Context setLine(@Nullable Integer i);
 
-    Context setDescription(@Nullable String description);
+    Context setMessage(@Nullable String s);
 
-    Context setSeverity(String severity);
+    Context setSeverity(String s);
 
-    Context setEffortToFix(@Nullable Double effortToFix);
+    Context setEffortToFix(@Nullable Double d);
 
-    Context setAuthorLogin(@Nullable String login);
+    Context setAuthorLogin(@Nullable String s);
 
     Context setAttribute(String key, @Nullable String value);
 

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueQuery.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueQuery.java
index 07e5154acd9072727a0ab997c55f72233ac43dab..887d57bc0b36eade7f1a597314fdaa96f0eaba7a 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueQuery.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueQuery.java
@@ -39,7 +39,7 @@ public class IssueQuery {
   public static final int MAX_ISSUE_KEYS = 500;
 
   public static enum Sort {
-    CREATION_DATE, UPDATE_DATE, CLOSE_DATE, ASSIGNEE
+    CREATION_DATE, UPDATE_DATE, CLOSE_DATE, ASSIGNEE, SEVERITY
   }
 
   private final Collection<String> issueKeys;

diff --git a/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java b/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java
index f01dff841147446e70626d4b359661b0a3077a80..ec1c1f56e31b41c259181ba7ab2123e3d31e6dde 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/InternalRubyIssueService.java
@@ -103,13 +103,12 @@ public class InternalRubyIssueService implements ServerComponent {
     DefaultIssueBuilder builder = new DefaultIssueBuilder().componentKey(componentKey);
     String line = parameters.get("line");
     builder.line(line != null ? Integer.parseInt(line) : null);
-    builder.description(parameters.get("description"));
+    builder.message(parameters.get("message"));
     builder.severity(parameters.get("severity"));
     String effortToFix = parameters.get("effortToFix");
     builder.effortToFix(effortToFix != null ? Double.parseDouble(effortToFix) : null);
     // TODO verify existence of rule
     builder.ruleKey(RuleKey.parse(parameters.get("rule")));
-    builder.manual(true);
     Issue issue = builder.build();
     return issueService.create((DefaultIssue) issue, UserSession.get());
   }

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 c5264c589e8ebbad0adf21ac7b0d3ec0d356fdda..ec614f6c39b7142e3b75a6a1d356905cdf140c66 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/issue.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/issue.rb
@@ -29,7 +29,7 @@ class Issue
     hash[:actionPlan] = issue.actionPlanKey if issue.actionPlanKey
     hash[:resolution] = issue.resolution if issue.resolution
     hash[:severity] = issue.severity if issue.severity
-    hash[:desc] = issue.description if issue.description
+    hash[:message] = issue.message if issue.message
     hash[:line] = issue.line.to_i if issue.line
     hash[:effortToFix] = issue.effortToFix.to_f if issue.effortToFix
     hash[:reporter] = issue.reporter if issue.reporter

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 10d2fddfd396159e30a9fb1386c1ed50f99a1ecd..f38b06a1dff640f5f68436fad37b4be662ba0556 100644 (file)
--- 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,7 +30,7 @@ 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 :description,          :string,    :null => true,    :limit => 4000
+      t.column :message,              :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

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 525eeee36357b56fcbc3307c2556e2d5235fab15..69cab8fc29cebae70e3604b0c4e4126cb5c89b89 100644 (file)
--- 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
@@ -54,9 +54,17 @@ public class Issue {
     return JsonUtils.getString(json, "severity");
   }
 
+  /**
+   * TODO to be removed
+   */
   @CheckForNull
   public String description() {
-    return JsonUtils.getString(json, "desc");
+    return JsonUtils.getString(json, "message");
+  }
+
+  @CheckForNull
+  public String message() {
+    return JsonUtils.getString(json, "message");
   }
 
   @CheckForNull

diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/IssueParserTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/IssueParserTest.java
index 8ac410e59e3bc98d799051c0a3bbc27147c8b2df..2b2cb50984bbbf3a05ca9a8fbd5d3c788cbad740 100644 (file)
--- a/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/IssueParserTest.java
+++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/IssueParserTest.java
@@ -45,7 +45,7 @@ public class IssueParserTest {
     assertThat(first.resolution()).isEqualTo("FIXED");
     assertThat(first.status()).isEqualTo("OPEN");
     assertThat(first.assignee()).isEqualTo("karadoc");
-    assertThat(first.description()).isEqualTo("the desc");
+    assertThat(first.message()).isEqualTo("the message");
     assertThat(first.effortToFix()).isEqualTo(4.2);
     assertThat(first.userLogin()).isEqualTo("perceval");
     assertThat(first.creationDate()).isNotNull();

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 5eda187d3dbe635f6daa206b0a51a151a19e7fc0..8385fa8b09bcc7fe715b91e1b34cb843275dfe8c 100644 (file)
--- 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
@@ -10,7 +10,7 @@
       "status": "OPEN",
       "assignee": "karadoc",
       "effortToFix": 4.2,
-      "desc": "the desc",
+      "message": "the message",
       "title": "the title",
       "reporter": "perceval",
       "creationDate": "2013-05-18T12:45:34+0200",