SONAR-20877 Update counters to compute new status

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueCounter.java

@@ -33,9 +33,8 @@ import org.sonar.ce.task.projectanalysis.measure.MeasureRepository;
 import org.sonar.ce.task.projectanalysis.metric.Metric;
 import org.sonar.ce.task.projectanalysis.metric.MetricRepository;
 import org.sonar.core.issue.DefaultIssue;
+import org.sonar.core.issue.status.IssueStatus;
 
-import static org.sonar.api.issue.Issue.RESOLUTION_FALSE_POSITIVE;
-import static org.sonar.api.issue.Issue.RESOLUTION_WONT_FIX;
 import static org.sonar.api.issue.Issue.STATUS_CONFIRMED;
 import static org.sonar.api.issue.Issue.STATUS_OPEN;
 import static org.sonar.api.issue.Issue.STATUS_REOPENED;
@@ -247,9 +246,9 @@ public class IssueCounter extends IssueVisitor {
         unresolved++;
         typeBag.add(issue.type());
         severityBag.add(issue.severity());
-      } else if (RESOLUTION_FALSE_POSITIVE.equals(issue.resolution())) {
+      } else if (IssueStatus.FALSE_POSITIVE.equals(issue.getIssueStatus())) {
         falsePositives++;
-      } else if (RESOLUTION_WONT_FIX.equals(issue.resolution())) {
+      } else if (IssueStatus.ACCEPTED.equals(issue.getIssueStatus())) {
         accepted++;
       }
       switch (issue.status()) {

server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueCounterTest.java

@@ -185,13 +185,13 @@ public class IssueCounterTest {
     underTest.onIssue(FILE1, createIssue(null, STATUS_OPEN, BLOCKER));
     underTest.onIssue(FILE1, createIssue(RESOLUTION_FIXED, STATUS_CLOSED, MAJOR));
     underTest.onIssue(FILE1, createIssue(RESOLUTION_FALSE_POSITIVE, STATUS_RESOLVED, MAJOR));
-    underTest.onIssue(FILE1, createIssue(RESOLUTION_WONT_FIX, STATUS_CLOSED, MAJOR));
+    underTest.onIssue(FILE1, createIssue(RESOLUTION_WONT_FIX, STATUS_RESOLVED, MAJOR));
     underTest.afterComponent(FILE1);
 
     underTest.beforeComponent(FILE2);
     underTest.onIssue(FILE2, createIssue(null, STATUS_CONFIRMED, BLOCKER));
     underTest.onIssue(FILE2, createIssue(null, STATUS_CONFIRMED, MAJOR));
-    underTest.onIssue(FILE2, createIssue(RESOLUTION_WONT_FIX, STATUS_CLOSED, MAJOR));
+    underTest.onIssue(FILE2, createIssue(RESOLUTION_WONT_FIX, STATUS_RESOLVED, MAJOR));
     underTest.afterComponent(FILE2);
 
     underTest.beforeComponent(FILE3);

sonar-core/src/main/java/org/sonar/core/issue/status/IssueStatus.java

@@ -29,6 +29,11 @@ public enum IssueStatus {
 
 
   OPEN,
+
+  @Deprecated(since = "10.4")
+  /*
+   * @deprecated use {@link IssueStatus#ACCEPTED} instead
+   */
   CONFIRMED,
   FALSE_POSITIVE,
   ACCEPTED,