Fix quality flaws

3 files changed, 15 insertions, 5 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/ActionPlanStats.java b/sonar-core/src/main/java/org/sonar/core/issue/ActionPlanStats.java
index e82b23d3753..12805bce0ef 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/ActionPlanStats.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/ActionPlanStats.java
@@ -114,11 +114,11 @@ public class ActionPlanStats implements Serializable {
 
   @CheckForNull
   public Date deadLine() {
-    return deadLine;
+    return deadLine != null ? new Date(deadLine.getTime()) : null;
   }
 
   public ActionPlanStats setDeadLine(@Nullable Date deadLine) {
-    this.deadLine = deadLine;
+    this.deadLine = deadLine != null ? new Date(deadLine.getTime()) : null;
     return this;
   }
 
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/DefaultActionPlan.java b/sonar-core/src/main/java/org/sonar/core/issue/DefaultActionPlan.java
index a7b8d8c7b5f..be6fb18bd63 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultActionPlan.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultActionPlan.java
@@ -111,11 +111,11 @@ public class DefaultActionPlan implements ActionPlan {
 
   @CheckForNull
   public Date deadLine() {
-    return deadLine;
+    return deadLine != null ? new Date(deadLine.getTime()) : null;
   }
 
   public DefaultActionPlan setDeadLine(@Nullable Date deadLine) {
-    this.deadLine = deadLine;
+    this.deadLine = deadLine != null ? new Date(deadLine.getTime()) : null;
     return this;
   }
 
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 b3cd2510cae..dbb8da8afa7 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java
@@ -121,6 +121,7 @@ public class DefaultIssue implements Issue {
     return this;
   }
 
+  @CheckForNull
   public String description() {
     return description;
   }
@@ -130,6 +131,7 @@ public class DefaultIssue implements Issue {
     return this;
   }
 
+  @CheckForNull
   public Integer line() {
     return line;
   }
@@ -140,6 +142,7 @@ public class DefaultIssue implements Issue {
     return this;
   }
 
+  @CheckForNull
   public Double effortToFix() {
     return effortToFix;
   }
@@ -170,6 +173,7 @@ public class DefaultIssue implements Issue {
     return this;
   }
 
+  @CheckForNull
   public String userLogin() {
     return userLogin;
   }
@@ -179,6 +183,7 @@ public class DefaultIssue implements Issue {
     return this;
   }
 
+  @CheckForNull
   public String assignee() {
     return assignee;
   }
@@ -197,6 +202,7 @@ public class DefaultIssue implements Issue {
     return this;
   }
 
+  @CheckForNull
   public Date updateDate() {
     return updateDate;
   }
@@ -206,6 +212,7 @@ public class DefaultIssue implements Issue {
     return this;
   }
 
+  @CheckForNull
   public Date closeDate() {
     return closeDate;
   }
@@ -224,6 +231,7 @@ public class DefaultIssue implements Issue {
     return this;
   }
 
+  @CheckForNull
   public Date technicalCreationDate() {
     return technicalCreationDate;
   }
@@ -237,6 +245,7 @@ public class DefaultIssue implements Issue {
     return this;
   }
 
+  @CheckForNull
   public Date technicalUpdateDate() {
     return technicalUpdateDate;
   }
@@ -250,6 +259,7 @@ public class DefaultIssue implements Issue {
     return this;
   }
 
+  @CheckForNull
   public String getChecksum() {
     return checksum;
   }
@@ -323,7 +333,7 @@ public class DefaultIssue implements Issue {
     return actionPlanKey;
   }
 
-  public DefaultIssue setActionPlanKey(String actionPlanKey) {
+  public DefaultIssue setActionPlanKey(@Nullable String actionPlanKey) {
     this.actionPlanKey = actionPlanKey;
     return this;
   }