Fix quality flaws

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingDecorator.java
index 90ea63bd8e78d4c1645229595c9e7e239d787718..d8c9bd6936a1018c97927ecdf1cf10930ea65132 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingDecorator.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/IssueTrackingDecorator.java
@@ -167,7 +167,10 @@ public class IssueTrackingDecorator implements Decorator {
       updater.setPastLine(issue, ref.getLine());
       updater.setPastMessage(issue, ref.getMessage(), changeContext);
       updater.setPastEffortToFix(issue, ref.getEffortToFix(), changeContext);
-      updater.setPastTechnicalDebt(issue, TechnicalDebt.fromLong(ref.getTechnicalDebt()), changeContext);
+      Long technicalDebt = ref.getTechnicalDebt();
+      if (technicalDebt != null) {
+        updater.setPastTechnicalDebt(issue, TechnicalDebt.fromLong(technicalDebt), changeContext);
+      }
     }
   }
 

diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/TechnicalDebt.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/TechnicalDebt.java
index c2014b0dfe53e44859ffc98526b20b5327a9f938..c52d5f3ff3b58e920ce0f98eaa5d4cfab8c06c9d 100644 (file)
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/TechnicalDebt.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/TechnicalDebt.java
@@ -24,8 +24,10 @@ package org.sonar.wsclient.issue;
  */
 public interface TechnicalDebt {
 
-  int days();
-  int minutes();
-  int hours();
+  Integer days();
+
+  Integer minutes();
+
+  Integer hours();
 
 }

diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultTechnicalDebt.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultTechnicalDebt.java
index c82ceb13a41f42d23b4e4a7432aa36ddb14a8c37..5bd45d915a948d1323caf81246add583228490d2 100644 (file)
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultTechnicalDebt.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultTechnicalDebt.java
@@ -34,15 +34,15 @@ public class DefaultTechnicalDebt implements TechnicalDebt {
     this.json = json;
   }
 
-  public int days() {
+  public Integer days() {
     return JsonUtils.getInteger(json, "days");
   }
 
-  public int hours() {
+  public Integer hours() {
     return JsonUtils.getInteger(json, "hours");
   }
 
-  public int minutes() {
+  public Integer minutes() {
     return JsonUtils.getInteger(json, "minutes");
   }