SONAR-3755 rename Issue#message() to description()

6 files changed, 9 insertions, 37 deletions

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 c2cb2f7974b..cc8c89e3af2 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedViolations.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedViolations.java
@@ -55,7 +55,7 @@ public class DeprecatedViolations implements BatchComponent {
       .setRuleKey(RuleKey.of(violation.getRule().getRepositoryKey(), violation.getRule().getKey()))
       .setCost(violation.getCost())
       .setLine(violation.getLineId())
-      .setMessage(violation.getMessage())
+      .setDescription(violation.getMessage())
       .setStatus(Issue.STATUS_OPEN)
       .setSeverity(violation.getSeverity() != null ? violation.getSeverity().name() : null);
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/IssuePersister.java b/sonar-batch/src/main/java/org/sonar/batch/issue/IssuePersister.java
index 53b1c93e695..06465e89c8f 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/IssuePersister.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/issue/IssuePersister.java
@@ -23,7 +23,6 @@ import org.sonar.api.database.model.Snapshot;
 import org.sonar.api.issue.Issue;
 import org.sonar.api.rules.Rule;
 import org.sonar.api.rules.RuleFinder;
-import org.sonar.api.utils.KeyValueFormat;
 import org.sonar.batch.index.ScanPersister;
 import org.sonar.batch.index.SnapshotCache;
 import org.sonar.core.issue.DefaultIssue;
@@ -62,7 +61,7 @@ public class IssuePersister implements ScanPersister {
           throw new IllegalStateException("Rule not found: " + issue.ruleKey());
         }
 
-        IssueDto dto = toIssueDto((DefaultIssue) issue, snapshot.getResourceId(), rule.getId());
+        IssueDto dto = IssueDto.toDto((DefaultIssue) issue, snapshot.getResourceId(), rule.getId());
         if (issue.isNew()) {
           dao.insert(dto);
         } else {
@@ -73,29 +72,5 @@ public class IssuePersister implements ScanPersister {
     }
   }
 
-  private IssueDto toIssueDto(DefaultIssue issue, Integer componentId, Integer ruleId) {
-    return new IssueDto()
-      .setUuid(issue.key())
-      .setLine(issue.line())
-      .setTitle(issue.title())
-      .setMessage(issue.message())
-      .setCost(issue.cost())
-      .setResolution(issue.resolution())
-      .setStatus(issue.status())
-      .setSeverity(issue.severity())
-      .setChecksum(issue.getChecksum())
-      .setManualIssue(issue.isManual())
-      .setManualSeverity(issue.isManualSeverity())
-      .setUserLogin(issue.userLogin())
-      .setAssigneeLogin(issue.assigneeLogin())
-      .setCreatedAt(issue.createdAt())
-      .setUpdatedAt(issue.updatedAt())
-      .setClosedAt(issue.closedAt())
-      .setRuleId(ruleId)
-      .setResourceId(componentId)
-      .setData(issue.attributes() != null ? KeyValueFormat.format(issue.attributes()) : null)
-      // TODO
-//        .setPersonId()
-      ;
-  }
+
 }
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/IssuesDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/issue/IssuesDecorator.java
index 65286c6d124..5112867d6aa 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/IssuesDecorator.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/issue/IssuesDecorator.java
@@ -98,7 +98,7 @@ public class IssuesDecorator implements Decorator {
         rulesBag.add(rulefinder.findByKey(issue.ruleKey().repository(), issue.ruleKey().rule()));
         issuesPerSeverities.put(RulePriority.valueOf(issue.severity()), issue);
 
-        if (issue.assigneeLogin() == null) {
+        if (issue.assignee() == null) {
           countUnassigned++;
         }
         if (Issue.RESOLUTION_FALSE_POSITIVE.equals(issue.resolution())) {
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ScanIssueChanges.java b/sonar-batch/src/main/java/org/sonar/batch/issue/ScanIssueChanges.java
index 702e87c14f2..ada2613e2e9 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/ScanIssueChanges.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/issue/ScanIssueChanges.java
@@ -54,13 +54,13 @@ public class ScanIssueChanges implements IssueChanges {
       issue.setCost(change.cost());
     }
     if (change.manualSeverity() != null) {
-      change.setManualSeverity(change.manualSeverity().booleanValue());
+      change.setManualSeverity(change.manualSeverity());
     }
     if (change.severity() != null) {
       issue.setSeverity(change.severity());
     }
     if (change.isAssigneeChanged()) {
-      issue.setAssigneeLogin(change.assignee());
+      issue.setAssignee(change.assignee());
     }
     if (change.resolution() != null) {
       issue.setResolution(change.resolution());
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/IssuesDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/issue/IssuesDecoratorTest.java
index 4a331b8ea72..1ea1397c160 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/IssuesDecoratorTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/issue/IssuesDecoratorTest.java
@@ -212,7 +212,7 @@ public class IssuesDecoratorTest {
     List<Issue> issues = newArrayList();
     issues.add(new DefaultIssue().setRuleKey(ruleA1.ruleKey()).setStatus(Issue.STATUS_OPEN).setSeverity(RulePriority.CRITICAL.name()));
     issues.add(new DefaultIssue().setRuleKey(ruleA1.ruleKey()).setStatus(Issue.STATUS_REOPENED).setSeverity(RulePriority.CRITICAL.name()));
-    issues.add(new DefaultIssue().setRuleKey(ruleA2.ruleKey()).setStatus(Issue.STATUS_OPEN).setAssigneeLogin("arthur").setSeverity(RulePriority.CRITICAL.name()));
+    issues.add(new DefaultIssue().setRuleKey(ruleA2.ruleKey()).setStatus(Issue.STATUS_OPEN).setAssignee("arthur").setSeverity(RulePriority.CRITICAL.name()));
     when(issuable.issues()).thenReturn(issues);
 
     decorator.decorate(resource, context);
diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/ScanIssueChangesTest.java b/sonar-batch/src/test/java/org/sonar/batch/issue/ScanIssueChangesTest.java
index 45abe7b6c79..0325aae3dc3 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/issue/ScanIssueChangesTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/issue/ScanIssueChangesTest.java
@@ -27,10 +27,7 @@ import org.sonar.core.issue.DefaultIssue;
 
 import static org.fest.assertions.Assertions.assertThat;
 import static org.fest.assertions.Fail.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 public class ScanIssueChangesTest {
 
@@ -77,7 +74,7 @@ public class ScanIssueChangesTest {
     assertThat(changed.resolution()).isEqualTo(Issue.RESOLUTION_FALSE_POSITIVE);
     assertThat(changed.attribute("JIRA")).isEqualTo("FOO-123");
     assertThat(changed.severity()).isEqualTo(Severity.CRITICAL);
-    assertThat(changed.assigneeLogin()).isEqualTo("arthur");
+    assertThat(changed.assignee()).isEqualTo("arthur");
     assertThat(changed.cost()).isEqualTo(4.2);
     assertThat(changed.updatedAt()).isNotNull();
   }