SONAR-7345 Rename Issue debt to effort in API

3 files changed, 37 insertions, 16 deletions

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 cb8e08a4981..37eebd3f91b 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
@@ -71,8 +71,8 @@ public class DefaultIssue implements Issue, Trackable, org.sonar.api.ce.measure.
   private boolean manualSeverity = false;
   private String message;
   private Integer line;
-  private Double effortToFix;
-  private Duration debt;
+  private Double gap;
+  private Duration effort;
   private String status;
   private String resolution;
   private String reporter;
@@ -267,34 +267,55 @@ public class DefaultIssue implements Issue, Trackable, org.sonar.api.ce.measure.
     return this;
   }
 
+  /**
+   * @deprecated since5.5, replaced by {@link #gap()}
+   */
+  @Deprecated
   @Override
   @CheckForNull
   public Double effortToFix() {
-    return effortToFix;
+    return gap();
+  }
+
+  @Override
+  @CheckForNull
+  public Double gap() {
+    return gap;
   }
 
-  public DefaultIssue setEffortToFix(@Nullable Double d) {
-    Preconditions.checkArgument(d == null || d >= 0, format("Effort to fix must be greater than or equal 0 (got %s)", d));
-    this.effortToFix = d;
+  public DefaultIssue setGap(@Nullable Double d) {
+    Preconditions.checkArgument(d == null || d >= 0, format("Gap must be greater than or equal 0 (got %s)", d));
+    this.gap = d;
     return this;
   }
 
   /**
-   * Elapsed time to fix the issue
+   * @deprecated since5.5, replaced by {@link #effort()}
    */
+  @Deprecated
   @Override
   @CheckForNull
   public Duration debt() {
-    return debt;
+    return effort();
   }
 
+  /**
+   * Elapsed time to fix the issue
+   */
+  @Override
+  @CheckForNull
+  public Duration effort() {
+    return effort;
+  }
+
+
   @CheckForNull
-  public Long debtInMinutes() {
-    return debt != null ? debt.toMinutes() : null;
+  public Long effortInMinutes() {
+    return effort != null ? effort.toMinutes() : null;
   }
 
-  public DefaultIssue setDebt(@Nullable Duration t) {
-    this.debt = t;
+  public DefaultIssue setEffort(@Nullable Duration t) {
+    this.effort = t;
     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 5055e705c91..a97a4c089bd 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssueBuilder.java
@@ -155,7 +155,7 @@ public class DefaultIssueBuilder implements Issuable.IssueBuilder {
     issue.setMessage(message);
     issue.setSeverity(severity);
     issue.setManualSeverity(false);
-    issue.setEffortToFix(effortToFix);
+    issue.setGap(effortToFix);
     issue.setLine(line);
     issue.setReporter(reporter);
     issue.setAssignee(assignee);
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 9bbd084c980..2dc8be7b155 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/DefaultIssueTest.java
@@ -49,8 +49,8 @@ public class DefaultIssueTest {
       .setManualSeverity(true)
       .setMessage("a message")
       .setLine(7)
-      .setEffortToFix(1.2d)
-      .setDebt(Duration.create(28800L))
+      .setGap(1.2d)
+      .setEffort(Duration.create(28800L))
       .setActionPlanKey("BCDE")
       .setStatus(Issue.STATUS_CLOSED)
       .setResolution(Issue.RESOLUTION_FIXED)
@@ -174,7 +174,7 @@ public class DefaultIssueTest {
 
   @Test
   public void test_nullable_fields() throws Exception {
-    issue.setEffortToFix(null).setSeverity(null).setLine(null);
+    issue.setGap(null).setSeverity(null).setLine(null);
     assertThat(issue.effortToFix()).isNull();
     assertThat(issue.severity()).isNull();
     assertThat(issue.line()).isNull();