SONAR-7345 Rename Issue debt to effort in API

3 files changed, 49 insertions, 6 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedIssueAdapterForFilter.java b/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedIssueAdapterForFilter.java
index d4f604a6624..567f66a3fcf 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedIssueAdapterForFilter.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedIssueAdapterForFilter.java
@@ -19,17 +19,16 @@
  */
 package org.sonar.batch.issue;
 
-import org.sonar.api.issue.Issue;
-import org.sonar.api.issue.IssueComment;
-import org.sonar.api.resources.Project;
-import org.sonar.api.rule.RuleKey;
-import org.sonar.api.utils.Duration;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import org.sonar.api.issue.Issue;
+import org.sonar.api.issue.IssueComment;
+import org.sonar.api.resources.Project;
+import org.sonar.api.rule.RuleKey;
+import org.sonar.api.utils.Duration;
 
 /**
  * @deprecated since 5.3
@@ -82,7 +81,13 @@ class DeprecatedIssueAdapterForFilter implements Issue {
   }
 
   @Override
+  @Deprecated
   public Double effortToFix() {
+    return gap();
+  }
+
+  @Override
+  public Double gap() {
     return rawIssue.hasEffortToFix() ? rawIssue.getEffortToFix() : null;
   }
 
@@ -151,8 +156,14 @@ class DeprecatedIssueAdapterForFilter implements Issue {
     throw unsupported();
   }
 
+  @Deprecated
   @Override
   public Duration debt() {
+    return effort();
+  }
+
+  @Override
+  public Duration effort() {
     throw unsupported();
   }
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedIssueWrapper.java b/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedIssueWrapper.java
index 0d63b4d8011..61e215cc931 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedIssueWrapper.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/issue/DeprecatedIssueWrapper.java
@@ -81,8 +81,17 @@ public class DeprecatedIssueWrapper implements Issue {
     return textRange != null ? textRange.start().line() : null;
   }
 
+  /**
+   * @deprecated since 5.5, replaced by {@link #gap()}
+   */
   @Override
+  @Deprecated
   public Double effortToFix() {
+    return gap();
+  }
+
+  @Override
+  public Double gap() {
     return newIssue.effortToFix();
   }
 
@@ -157,6 +166,11 @@ public class DeprecatedIssueWrapper implements Issue {
   }
 
   @Override
+  public Duration effort() {
+    return null;
+  }
+
+  @Override
   public String projectKey() {
     return null;
   }
diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/TrackedIssueAdapter.java b/sonar-batch/src/main/java/org/sonar/batch/issue/TrackedIssueAdapter.java
index c48b7a45895..f8f21ea2e0e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/issue/TrackedIssueAdapter.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/issue/TrackedIssueAdapter.java
@@ -68,8 +68,17 @@ public class TrackedIssueAdapter implements Issue {
     return issue.startLine();
   }
 
+  /**
+   * @deprecated since 5.5, replaced by {@link #gap()}
+   */
   @Override
+  @Deprecated
   public Double effortToFix() {
+    return gap();
+  }
+
+  @Override
+  public Double gap() {
     return issue.effortToFix();
   }
 
@@ -143,12 +152,21 @@ public class TrackedIssueAdapter implements Issue {
     return new ArrayList<>();
   }
 
+  /**
+   * @deprecated since 5.5, replaced by {@link #effort()}
+   */
   @Override
+  @Deprecated
   public Duration debt() {
     return null;
   }
 
   @Override
+  public Duration effort() {
+    return null;
+  }
+
+  @Override
   public String projectKey() {
     return null;
   }