SONAR-13848 remove deprecated response field 'debtTotal' from api/issues/search

diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java
index 040a1f9507135eb531274e574885a81f528893c5..b200d46938411f5503bd763a7d36795d61b7b6f3 100644 (file)
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java
@@ -92,7 +92,7 @@ public class SearchResponseFormat {
     SearchWsResponse.Builder response = SearchWsResponse.newBuilder();
 
     formatPaging(paging, response);
-    formatEffortTotal(data, response);
+    ofNullable(data.getEffortTotal()).ifPresent(response::setEffortTotal);
     response.addAllIssues(formatIssues(fields, data));
     response.addAllComponents(formatComponents(data));
     formatFacets(data, facets, response);
@@ -126,14 +126,6 @@ public class SearchResponseFormat {
     return response.build();
   }
 
-  private static void formatEffortTotal(SearchResponseData data, SearchWsResponse.Builder response) {
-    Long effort = data.getEffortTotal();
-    if (effort != null) {
-      response.setDebtTotal(effort);
-      response.setEffortTotal(effort);
-    }
-  }
-
   private static void formatPaging(Paging paging, SearchWsResponse.Builder response) {
     response.setP(paging.pageIndex());
     response.setPs(paging.pageSize());

diff --git a/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_leak_period.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_leak_period.json
index eaf0a994b23424a903bcf451c58cc03be0fbe9d8..cfc1450e3ae11f482dc57463c3bcf269dbe5f73c 100644 (file)
--- a/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_leak_period.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_leak_period.json
@@ -8,7 +8,6 @@
     "total": 1
   },
   "effortTotal": 10,
-  "debtTotal": 10,
   "issues": [
     {
       "key": "7b112bd4-b650-4037-80bc-82fd47d4eac2",

diff --git a/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_leak_period_has_no_effect_on_prs.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_leak_period_has_no_effect_on_prs.json
index ddf09eb8396f4355393722e51a6b4d0adb6cc8ae..f54458ec29a96d07a18cfba2dd44ebeb7f6c6553 100644 (file)
--- a/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_leak_period_has_no_effect_on_prs.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_leak_period_has_no_effect_on_prs.json
@@ -8,7 +8,6 @@
     "total": 2
   },
   "effortTotal": 20,
-  "debtTotal": 20,
   "issues": [
     {
       "key": "7b112bd4-b650-4037-80bc-82fd47d4eac2",

diff --git a/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_main_scope.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_main_scope.json
index 4f42d8869337fd6d0dbd14043f96a5a7fb9a24ef..740f756f39830922a5d262071648cb813b294166 100644 (file)
--- a/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_main_scope.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_main_scope.json
@@ -8,7 +8,6 @@
     "total": 2
   },
   "effortTotal": 20,
-  "debtTotal": 20,
   "issues": [
     {
       "key": "7b112bd4-b650-4037-80bc-82fd47d4eac2",

diff --git a/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_main_scope_2.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_main_scope_2.json
index 8dfd300765fc6c535169087923cc5caa507775d2..b5945de7c84dc2bcb0a883ad46dd4e223143412d 100644 (file)
--- a/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_main_scope_2.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_main_scope_2.json
@@ -8,7 +8,6 @@
     "total": 2
   },
   "effortTotal": 20,
-  "debtTotal": 20,
   "issues": [
     {
       "key": "7b112bd4-b650-4037-80bc-82fd47d4eac2",

diff --git a/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_test_scope.json b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_test_scope.json
index a0ba18c93ba1b29c8669dff870cdc0f90778e004..e87cfca059d5448b6e53bd31c27292c0035cf2f9 100644 (file)
--- a/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_test_scope.json
+++ b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/issue/ws/SearchActionTest/filter_by_test_scope.json
@@ -8,7 +8,6 @@
     "total": 1
   },
   "effortTotal": 10,
-  "debtTotal": 10,
   "issues": [
     {
       "key": "82fd47d4-4037-b650-80bc-7b112bd4eac2",

diff --git a/sonar-ws/src/main/protobuf/ws-issues.proto b/sonar-ws/src/main/protobuf/ws-issues.proto
index 13a5436b17767e1685c287eed89c80001f40fd7c..6c5f4ba193fdc22e165eb15cc2b06c433c5528ef 100644 (file)
--- a/sonar-ws/src/main/protobuf/ws-issues.proto
+++ b/sonar-ws/src/main/protobuf/ws-issues.proto
@@ -28,6 +28,7 @@ option optimize_for = SPEED;
 
 // Response of GET api/issues/search
 message SearchWsResponse {
+  reserved 5;
   optional int64 total = 1;
   optional int64 p = 2;
   optional int32 ps = 3;
@@ -35,8 +36,6 @@ message SearchWsResponse {
 
   // Total amount of effort, only when the facet "total" is enabled
   optional int64 effortTotal = 13;
-  // Deprecated since 5.5, replaced by effortTotal
-  optional int64 debtTotal = 5;
 
   repeated Issue issues = 6;
   repeated Component components = 7;