SONAR-19233 Drop deprecated paging response fields

server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualityprofile/ws/ChangelogActionIT.java

       .getInput();
 
     assertJson(response).isSimilarTo("{\n" +
-      "  \"total\": 1,\n" +
-      "  \"p\": 1,\n" +
-      "  \"ps\": 50,\n" +
       "  \"paging\": {\n" +
       "     \"pageIndex\": 1,\n" +
       "     \"pageSize\": 50,\n" +
       .execute()
       .getInput();
 
-    assertJson(response).isSimilarTo("{\"total\":0,\"p\":1,\"ps\":50,\"paging\":{\"pageIndex\":1,\"pageSize\":50,\"total\":0},\"events\":[]}");
+    assertJson(response).isSimilarTo("{\"paging\":{\"pageIndex\":1,\"pageSize\":50,\"total\":0},\"events\":[]}");
   }
 
   @Test
       .setChangeType(ActiveRuleChange.Type.ACTIVATED.name())
       .setData(ImmutableMap.of("severity", "MAJOR", "param_format", "^[A-Z][a-zA-Z0-9]*$", "ruleUuid", rule3.getUuid())));
 
-    ws.newRequest()
+    String result = ws.newRequest()
       .setMethod("GET")
       .setParam(PARAM_LANGUAGE, profile.getLanguage())
       .setParam(PARAM_QUALITY_PROFILE, profile.getName())
       .setParam("ps", "10")
       .execute()
-      .assertJson(this.getClass(), "changelog_example.json");
+      .getInput();
+    assertJson(result).isSimilarTo(ws.getDef().responseExampleAsString());
   }
 
   @Test

server/sonar-webserver-webapi/src/it/java/org/sonar/server/rule/ws/SearchActionIT.java

       .setParam(WebService.Param.FIELDS, "actives")
       .executeProtobuf(Rules.SearchResponse.class);
 
-    assertThat(response.getTotal()).isZero();
-    assertThat(response.getP()).isOne();
     assertThat(response.getPaging().getTotal()).isZero();
     assertThat(response.getPaging().getPageIndex()).isOne();
     assertThat(response.getPaging().getPageSize()).isNotZero();
     SearchResponse result = ws.newRequest()
       .setParam("f", "langName")
       .executeProtobuf(SearchResponse.class);
-    assertThat(result.getTotal()).isOne();
     assertThat(result.getPaging().getTotal()).isOne();
     assertThat(result.getPaging().getPageIndex()).isOne();
     assertThat(result.getRulesCount()).isOne();
     SearchResponse result = ws.newRequest()
       .setParam("f", "debtRemFn,remFnOverloaded,defaultDebtRemFn")
       .executeProtobuf(SearchResponse.class);
-    assertThat(result.getTotal()).isOne();
     assertThat(result.getPaging().getTotal()).isOne();
     assertThat(result.getPaging().getPageIndex()).isOne();
     assertThat(result.getRulesCount()).isOne();
     SearchResponse result = ws.newRequest()
       .setParam("f", "debtRemFn,remFnOverloaded,defaultDebtRemFn")
       .executeProtobuf(SearchResponse.class);
-    assertThat(result.getTotal()).isOne();
     assertThat(result.getPaging().getTotal()).isOne();
     assertThat(result.getPaging().getPageIndex()).isOne();
     assertThat(result.getRulesCount()).isOne();
     SearchResponse result = ws.newRequest()
       .setParam("f", "debtRemFn,remFnOverloaded,defaultDebtRemFn")
       .executeProtobuf(SearchResponse.class);
-    assertThat(result.getTotal()).isOne();
     assertThat(result.getPaging().getTotal()).isOne();
     assertThat(result.getPaging().getPageIndex()).isOne();
     assertThat(result.getRulesCount()).isOne();
       .setParam("f", "isTemplate")
       .setParam("is_template", "true")
       .executeProtobuf(SearchResponse.class);
-    assertThat(result.getTotal()).isOne();
     assertThat(result.getPaging().getTotal()).isOne();
     assertThat(result.getPaging().getPageIndex()).isOne();
     assertThat(result.getRulesCount()).isOne();
       .setParam("f", "templateKey")
       .setParam("template_key", templateRule.getRepositoryKey() + ":" + templateRule.getRuleKey())
       .executeProtobuf(SearchResponse.class);
-    assertThat(result.getTotal()).isOne();
     assertThat(result.getPaging().getTotal()).isOne();
     assertThat(result.getPaging().getPageIndex()).isOne();
     assertThat(result.getRulesCount()).isOne();
 
     SearchResponse result = ws.newRequest().executeProtobuf(SearchResponse.class);
 
-    assertThat(result.getTotal()).isZero();
     assertThat(result.getPaging().getTotal()).isZero();
     assertThat(result.getPaging().getPageIndex()).isOne();
     assertThat(result.getRulesCount()).isZero();
       .setParam("q", rule.getName())
       .setParam("activation", "true")
       .executeProtobuf(SearchResponse.class);
-    assertThat(result.getTotal()).isOne();
     assertThat(result.getPaging().getTotal()).isOne();
     assertThat(result.getPaging().getPageIndex()).isOne();
     assertThat(result.getRulesCount()).isOne();
       .setParam("activation", "true")
       .setParam("qprofile", profile.getKee())
       .executeProtobuf(SearchResponse.class);
-    assertThat(result.getTotal()).isOne();
     assertThat(result.getPaging().getTotal()).isOne();
     assertThat(result.getPaging().getPageIndex()).isOne();
     assertThat(result.getRulesCount()).isOne();
       .setParam("qprofile", profile.getKee())
       .executeProtobuf(SearchResponse.class);
 
-    assertThat(result.getTotal()).isOne();
     assertThat(result.getPaging().getTotal()).isOne();
     assertThat(result.getPaging().getPageIndex()).isOne();
     assertThat(result.getRulesCount()).isOne();
     requestPopulator.accept(request);
     Rules.SearchResponse response = request.executeProtobuf(Rules.SearchResponse.class);
 
-    assertThat(response.getP()).isOne();
     assertThat(response.getPaging().getPageIndex()).isOne();
     assertThat(response.getPaging().getPageSize()).isNotZero();
     RuleKey[] expectedRuleKeys = stream(expectedRules).map(RuleDto::getKey).toList().toArray(new RuleKey[0]);
     assertThat(response.getRulesList())
       .extracting(r -> RuleKey.parse(r.getKey()))
       .containsExactlyInAnyOrder(expectedRuleKeys);
-    assertThat(response.getTotal()).isEqualTo(expectedRules.length);
     assertThat(response.getPaging().getTotal()).isEqualTo(expectedRules.length);
     assertThat(response.getRulesCount()).isEqualTo(expectedRules.length);
   }

server/sonar-webserver-webapi/src/it/java/org/sonar/server/usergroups/ws/UsersActionIT.java

     assertThat(wsDef.since()).isEqualTo("5.2");
     assertThat(wsDef.isPost()).isFalse();
     assertThat(wsDef.changelog()).extracting(Change::getVersion, Change::getDescription).containsOnly(
+      tuple("10.2", "Response fields 'total', 's', 'ps' dropped"),
       tuple("10.0", "Field 'managed' added to the payload."),
       tuple("10.0", "Parameter 'id' is removed. Use 'name' instead."),
       tuple("9.8", "response fields 'total', 's', 'ps' have been deprecated, please use 'paging' object instead."),
 
     assertJson(result).isSimilarTo("""
       {
-        "p": 1,
-        "total": 0,
         "paging": {
           "pageIndex": 1,
           "pageSize": 25,
       .execute()
       .getInput()).isSimilarTo("""
       {
-        "p": 1,
-        "ps": 1,
-        "total": 2,
         "paging": {
           "pageIndex": 1,
           "pageSize": 1,
       .execute()
       .getInput()).isSimilarTo("""
       {
-        "p": 2,
-        "ps": 1,
-        "total": 2,
         "paging": {
           "pageIndex": 2,
           "pageSize": 1,

server/sonar-webserver-webapi/src/it/resources/org/sonar/server/issue/ws/SearchActionComponentsIT/no_issue.json

 {
-  "total": 0,
+  "paging": {
+    "total": 0
+  },
   "issues": []
 }

server/sonar-webserver-webapi/src/it/resources/org/sonar/server/issue/ws/SearchActionIT/apply_paging_with_one_component.json

 {
-  "total": 501,
-  "p": 1,
-  "ps": 100,
   "paging": {
     "pageIndex": 1,
     "pageSize": 100,

server/sonar-webserver-webapi/src/it/resources/org/sonar/server/issue/ws/SearchActionIT/default_page_size_is_100.json

 {
-  "total": 0,
-  "p": 1,
-  "ps": 100,
   "paging": {
     "pageIndex": 1,
     "pageSize": 100,

server/sonar-webserver-webapi/src/it/resources/org/sonar/server/issue/ws/SearchActionIT/empty_result.json

 {
-  "total": 0,
-  "p": 1,
-  "ps": 100,
   "paging": {
     "pageIndex": 1,
     "pageSize": 100,

server/sonar-webserver-webapi/src/it/resources/org/sonar/server/issue/ws/SearchActionIT/filter_by_leak_period.json

 {
-  "total": 1,
-  "p": 1,
-  "ps": 100,
   "paging": {
     "pageIndex": 1,
     "pageSize": 100,

server/sonar-webserver-webapi/src/it/resources/org/sonar/server/issue/ws/SearchActionIT/filter_by_leak_period_has_no_effect_on_prs.json

 {
-  "total": 2,
-  "p": 1,
-  "ps": 100,
   "paging": {
     "pageIndex": 1,
     "pageSize": 100,

server/sonar-webserver-webapi/src/it/resources/org/sonar/server/issue/ws/SearchActionIT/filter_by_main_scope.json

 {
-  "total": 2,
-  "p": 1,
-  "ps": 100,
   "paging": {
     "pageIndex": 1,
     "pageSize": 100,

server/sonar-webserver-webapi/src/it/resources/org/sonar/server/issue/ws/SearchActionIT/filter_by_main_scope_2.json

 {
-  "total": 2,
-  "p": 1,
-  "ps": 100,
   "paging": {
     "pageIndex": 1,
     "pageSize": 100,

server/sonar-webserver-webapi/src/it/resources/org/sonar/server/issue/ws/SearchActionIT/filter_by_test_scope.json

 {
-  "total": 1,
-  "p": 1,
-  "ps": 100,
   "paging": {
     "pageIndex": 1,
     "pageSize": 100,

server/sonar-webserver-webapi/src/it/resources/org/sonar/server/issue/ws/SearchActionIT/no_issue.json

 {
-  "total": 0,
   "issues": [],
   "paging": {
     "pageIndex": 1,

server/sonar-webserver-webapi/src/it/resources/org/sonar/server/issue/ws/SearchActionIT/paging.json

 {
-  "total": 12,
-  "p": 2,
-  "ps": 9,
   "paging": {
     "pageIndex": 2,
     "pageSize": 9,

server/sonar-webserver-webapi/src/it/resources/org/sonar/server/issue/ws/SearchActionIT/result_for_rule_search.json

 {
-  "total": 1,
-  "p": 1,
-  "ps": 100,
   "paging": {
     "pageIndex": 1,
     "pageSize": 100,

server/sonar-webserver-webapi/src/it/resources/org/sonar/server/issue/ws/SearchActionIT/search_by_variants_with_facets.json

 {
-  "total": 3,
-  "p": 1,
-  "ps": 100,
   "paging": {
     "pageIndex": 1,
     "pageSize": 100,

server/sonar-webserver-webapi/src/it/resources/org/sonar/server/qualityprofile/ws/ChangelogActionIT/changelog_example.json

-{
-  "total": 3,
-  "ps": 10,
-  "p": 1,
-  "paging": {
-    "pageSize": 10,
-    "total": 3,
-    "pageIndex": 1
-  },
-  "events": [
-    {
-      "date" : "2015-02-23T17:58:39+0100",
-      "action" : "ACTIVATED",
-      "authorLogin" : "anakin.skywalker",
-      "authorName" : "Anakin Skywalker",
-      "ruleKey" : "java:S2438",
-      "ruleName" : "\"Threads\" should not be used where \"Runnables\" are expected",
-      "params" : {
-        "severity" : "CRITICAL"
-      }
-    },
-    {
-      "date" : "2015-02-23T17:58:18+0100",
-      "action" : "DEACTIVATED",
-      "authorLogin" : "padme.amidala",
-      "authorName" : "Padme Amidala",
-      "ruleKey" : "java:S2162",
-      "ruleName" : "\"equals\" methods should be symmetric and work for subclasses"
-    },
-    {
-      "action" : "ACTIVATED",
-      "authorLogin" : "obiwan.kenobi",
-      "authorName" : "Obiwan Kenobi",
-      "ruleKey" : "java:S00101",
-      "ruleName" : "Class names should comply with a naming convention",
-      "date" : "2014-09-12T15:20:46+0200",
-      "params" : {
-        "severity" : "MAJOR",
-        "format" : "^[A-Z][a-zA-Z0-9]*$"
-      }
-    }
-  ]
-}

server/sonar-webserver-webapi/src/it/resources/org/sonar/server/rule/ws/SearchActionIT/paging.json

 {
-  "total": 12,
-  "p": 2,
-  "ps": 9,
   "paging": {
     "pageIndex": 2,
     "pageSize": 9,

server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAction.java

         + "<br/>When issue indexation is in progress returns 503 service unavailable HTTP code.")
       .setSince("3.6")
       .setChangelog(
+        new Change("10.2", "Response fields 'total', 's', 'ps' dropped"),
         new Change("10.2", format("Parameter '%s' renamed to '%s'", PARAM_COMPONENT_KEYS, PARAM_COMPONENTS)),
         new Change("10.1", "Add the 'codeVariants' parameter, facet and response field"),
         new Change("10.0", "Parameter 'sansTop25' is deprecated"),

server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java

   SearchWsResponse formatSearch(Set<SearchAdditionalField> fields, SearchResponseData data, Paging paging, Facets facets) {
     SearchWsResponse.Builder response = SearchWsResponse.newBuilder();
 
-    formatPaging(paging, response);
+    response.setPaging(formatPaging(paging));
     ofNullable(data.getEffortTotal()).ifPresent(response::setEffortTotal);
     response.addAllIssues(createIssues(fields, data));
     response.addAllComponents(formatComponents(data));
     return response.build();
   }
 
-  private static void formatPaging(Paging paging, SearchWsResponse.Builder response) {
-    response.setP(paging.pageIndex());
-    response.setPs(paging.pageSize());
-    response.setTotal(paging.total());
-    response.setPaging(formatPaging(paging));
-  }
-
   private static Common.Paging.Builder formatPaging(Paging paging) {
     return Common.Paging.newBuilder()
       .setPageIndex(paging.pageIndex())

server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogAction.java

       .setDescription("Get the history of changes on a quality profile: rule activation/deactivation, change in parameters/severity. " +
         "Events are ordered by date in descending order (most recent first).")
       .setChangelog(
+        new org.sonar.api.server.ws.Change("10.2", "Response fields 'total', 's', 'ps' dropped"),
         new org.sonar.api.server.ws.Change("9.8", "response fields 'total', 's', 'ps' have been deprecated, please use 'paging' object instead"),
         new org.sonar.api.server.ws.Change("9.8", "The field 'paging' has been added to the response"))
       .setHandler(this)
     Map<String, UserDto> usersByUuid, Map<String, RuleDto> rulesByRuleUuids) {
     json.beginObject();
     writePaging(json, total, page, pageSize);
-    json.name("paging").beginObject()
-      .prop("pageIndex", page)
-      .prop("pageSize", pageSize)
-      .prop("total", total)
-      .endObject();
     json.name("events").beginArray();
     changelogs.forEach(change -> {
       JsonWriter changeWriter = json.beginObject();
     json.endObject();
   }
 
-  /**
-   * @deprecated since 9.8 - replaced by 'paging' object structure.
-   */
-  @Deprecated(since = "9.8")
   private static void writePaging(JsonWriter json, int total, int page, int pageSize) {
-    json.prop("total", total);
-    json.prop(Param.PAGE, page);
-    json.prop(Param.PAGE_SIZE, pageSize);
+    json.name("paging").beginObject()
+      .prop("pageIndex", page)
+      .prop("pageSize", pageSize)
+      .prop("total", total)
+      .endObject();
   }
 
   /**

server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/SearchAction.java

         new Change("10.0", "The value 'debtRemFn' for the 'f' parameter has been deprecated, use 'remFn' instead"),
         new Change("10.0", "The value 'defaultDebtRemFn' for the 'f' parameter has been deprecated, use 'defaultRemFn' instead"),
         new Change("10.0", "The value 'sansTop25' for the parameter 'facets' has been deprecated"),
-        new Change("10.0", "Parameter 'sansTop25' is deprecated")
+        new Change("10.0", "Parameter 'sansTop25' is deprecated"),
+        new Change("10.2", "Response fields 'total', 's', 'ps' dropped")
       );
 
     action.createParam(FACETS)
 
   private SearchResponse buildResponse(DbSession dbSession, SearchRequest request, SearchOptions context, SearchResult result, RuleQuery query) {
     SearchResponse.Builder responseBuilder = SearchResponse.newBuilder();
-    writeStatistics(responseBuilder, result, context);
+    writePaging(responseBuilder, result, context);
     doContextResponse(dbSession, request, result, responseBuilder, query);
     if (!context.getFacets().isEmpty()) {
       writeFacets(responseBuilder, request, context, result);
     return responseBuilder.build();
   }
 
-  private static void writeStatistics(SearchResponse.Builder response, SearchResult searchResult, SearchOptions context) {
-    response.setTotal(searchResult.total);
-    response.setP(context.getPage());
-    response.setPs(context.getLimit());
+  private static void writePaging(SearchResponse.Builder response, SearchResult searchResult, SearchOptions context) {
     response.setPaging(formatPaging(searchResult.total, context.getPage(), context.getLimit()));
   }
 

server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java

       .addSearchQuery("freddy", "names", "logins")
       .addPagingParams(25)
       .setChangelog(
+        new Change("10.2", "Response fields 'total', 's', 'ps' dropped"),
         new Change("10.0", "Field 'managed' added to the payload."),
         new Change("10.0", "Parameter 'id' is removed. Use 'name' instead."),
         new Change("9.8", "response fields 'total', 's', 'ps' have been deprecated, please use 'paging' object instead."),
         json.beginObject();
         writeMembers(json, users, userUuidToIsManaged);
         writePaging(json, paging);
-        json.name("paging").beginObject()
-          .prop("pageIndex", page)
-          .prop("pageSize", pageSize)
-          .prop("total", total)
-          .endObject();
         json.endObject();
       }
     }
     json.endArray();
   }
 
-  /**
-   * @deprecated since 9.8 - replaced by 'paging' object structure.
-   */
-  @Deprecated(since = "9.8")
   private static void writePaging(JsonWriter json, Paging paging) {
-    json.prop(Param.PAGE, paging.pageIndex())
-      .prop(Param.PAGE_SIZE, paging.pageSize())
-      .prop("total", paging.total());
+    json.name("paging").beginObject()
+      .prop("pageIndex", paging.pageIndex())
+      .prop("pageSize", paging.pageSize())
+      .prop("total", paging.total())
+      .endObject();
   }
 
   private static String getMembership(String selected) {

sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/DefaultActiveRulesLoader.java

       SearchResponse response = loadFromStream(wsClient.call(getRequest).contentStream());
       List<LoadedActiveRule> pageRules = readPage(response);
       ruleList.addAll(pageRules);
-      loaded += response.getPs();
+      loaded += response.getPaging().getPageSize();
 
-      if (response.getTotal() <= loaded) {
+      if (response.getPaging().getTotal() <= loaded) {
         break;
       }
       page++;

sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/DefaultActiveRulesLoaderTest.java

 import org.sonar.scanner.WsTestUtil;
 import org.sonar.scanner.bootstrap.DefaultScannerWsClient;
 import org.sonar.scanner.scan.branch.BranchConfiguration;
+import org.sonarqube.ws.Common;
 import org.sonarqube.ws.Rules;
 import org.sonarqube.ws.Rules.Active;
 import org.sonarqube.ws.Rules.ActiveList;
       });
 
     rules.setActives(actives);
-    rules.setPs(numberOfRules);
-    rules.setTotal(total);
+    rules.setPaging(Common.Paging.newBuilder().setPageSize(numberOfRules).setTotal(total));
     return new ByteArrayInputStream(rules.build().toByteArray());
   }
 
       });
 
     rules.setActives(actives);
-    rules.setPs(3);
-    rules.setTotal(3);
+    rules.setPaging(Common.Paging.newBuilder().setPageSize(3).setTotal(3));
     return new ByteArrayInputStream(rules.build().toByteArray());
   }
 }

sonar-ws/src/main/protobuf/ws-issues.proto

 // Response of GET api/issues/search
 message SearchWsResponse {
   reserved 5;
-  optional int64 total = 1 [deprecated=true];
-  optional int64 p = 2 [deprecated=true];
-  optional int32 ps = 3 [deprecated=true];
+  reserved 1;
+  reserved 2;
+  reserved 3;
   optional sonarqube.ws.commons.Paging paging = 4;
 
   // Total amount of effort, only when the facet "total" is enabled

sonar-ws/src/main/protobuf/ws-rules.proto

 
 // WS api/rules/search
 message SearchResponse {
-  optional int64 total = 1 [deprecated=true];
-  optional int32 p = 2 [deprecated=true];
-  optional int64 ps = 3 [deprecated=true];
-
+  reserved 1;
+  reserved 2;
+  reserved 3;
   repeated Rule rules = 4;
   optional Actives actives = 5;
   optional QProfiles qProfiles = 6;