SONAR-3755 fix issue close date

diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/ScanIssues.java b/sonar-batch/src/main/java/org/sonar/batch/issue/ScanIssues.java
index 4d0e5863023f0eb7717b8779db09d2e4c571765d..fa59a1d64c4c77b55a1dec8ead3b97e9ac74b6b1 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/ScanIssues.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/issue/ScanIssues.java
@@ -77,7 +77,6 @@ public class ScanIssues implements BatchComponent {
     }
     issue.setCreationDate(project.getAnalysisDate());
     issue.setUpdateDate(project.getAnalysisDate());
-    issue.setCloseDate(project.getAnalysisDate());
     if (issue.severity() == null) {
       issue.setSeverity(activeRule.getSeverity().name());
     }

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 e3ec577a3ca648a7849ad381e896c402c7f6b45a..eea97b60d0b25bbdb0551f8c106ab03b6d1f1ef5 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
@@ -43,7 +43,6 @@ public class DefaultIssueBuilder implements Issuable.IssueBuilder {
   private String message;
   private String severity;
   private Double effortToFix;
-  private Date createdDate;
   private String reporter;
   private Map<String, String> attributes;
 
@@ -61,11 +60,6 @@ public class DefaultIssueBuilder implements Issuable.IssueBuilder {
     return this;
   }
 
-  public DefaultIssueBuilder createdDate(@Nullable Date date) {
-    this.createdDate = date;
-    return this;
-  }
-
   @Override
   public Issuable.IssueBuilder ruleKey(RuleKey ruleKey) {
     this.ruleKey = ruleKey;
@@ -122,23 +116,19 @@ public class DefaultIssueBuilder implements Issuable.IssueBuilder {
     String key = UUID.randomUUID().toString();
     Preconditions.checkState(!Strings.isNullOrEmpty(key), "Fail to generate issue key");
     issue.setKey(key);
-
-    Date now = new Date();
-    Date date = Objects.firstNonNull(createdDate, now);
-    issue.setCreationDate(date);
-    issue.setUpdateDate(date);
     issue.setComponentKey(componentKey);
     issue.setProjectKey(projectKey);
     issue.setRuleKey(ruleKey);
     issue.setMessage(message);
     issue.setSeverity(Objects.firstNonNull(severity, Severity.MAJOR));
+    issue.setManualSeverity(false);
     issue.setEffortToFix(effortToFix);
     issue.setLine(line);
-    issue.setManualSeverity(false);
     issue.setReporter(reporter);
     issue.setAttributes(attributes);
     issue.setResolution(null);
     issue.setStatus(Issue.STATUS_OPEN);
+    issue.setCloseDate(null);
     issue.setNew(true);
     issue.setEndOfLife(false);
     issue.setOnDisabledRule(false);