From: Zipeng WU <zipeng.wu@sonarsource.com>
Date: Thu, 30 Mar 2023 12:34:53 +0000 (+0200)
Subject: SONAR-18747 Remove api/qualitygates/search deprecated more response field
X-Git-Tag: 10.0.0.68432~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b421136d98f29797e48b9ebe7fc2c211ed00a4fa;p=sonarqube.git

SONAR-18747 Remove api/qualitygates/search deprecated more response field
---

diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/SearchActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/SearchActionIT.java
index ce4a12c3fdb..5a4a329ed83 100644
--- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/SearchActionIT.java
+++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/qualitygate/ws/SearchActionIT.java
@@ -245,11 +245,11 @@ public class SearchActionIT {
       .executeProtobuf(SearchResponse.class);
 
     assertThat(response)
-      .extracting(SearchResponse::getMore,
+      .extracting(
         searchResponse -> searchResponse.getPaging().getPageIndex(),
         searchResponse -> searchResponse.getPaging().getPageSize(),
         searchResponse -> searchResponse.getPaging().getTotal())
-      .contains(true, 2, 5, 20);
+      .contains(2, 5, 20);
   }
 
   @Test
@@ -268,11 +268,11 @@ public class SearchActionIT {
       .executeProtobuf(SearchResponse.class);
 
     assertThat(response)
-      .extracting(SearchResponse::getMore,
+      .extracting(
         searchResponse -> searchResponse.getPaging().getPageIndex(),
         searchResponse -> searchResponse.getPaging().getPageSize(),
         searchResponse -> searchResponse.getPaging().getTotal())
-      .contains(false, 1, 100, 20);
+      .contains(1, 100, 20);
   }
 
   @Test
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java
index f452f7f09e7..e89d0b6c2c5 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java
@@ -67,6 +67,7 @@ public class SearchAction implements QualityGatesWsAction {
       .setSince("4.3")
       .setResponseExample(Resources.getResource(this.getClass(), "search-example.json"))
       .setChangelog(
+        new Change("10.0", "deprecated 'more' response field has been removed"),
         new Change("10.0", "Parameter 'gateId' is removed. Use 'gateName' instead."),
         new Change("8.4", "Parameter 'gateName' added"),
         new Change("8.4", "Parameter 'gateId' is deprecated. Format changes from integer to string. Use 'gateName' instead."),
@@ -123,7 +124,7 @@ public class SearchAction implements QualityGatesWsAction {
         .andTotal(authorizedProjects.size());
       List<ProjectQgateAssociationDto> paginatedProjects = getPaginatedProjects(authorizedProjects, paging);
 
-      Qualitygates.SearchResponse.Builder createResponse = Qualitygates.SearchResponse.newBuilder().setMore(paging.hasNextPage());
+      Qualitygates.SearchResponse.Builder createResponse = Qualitygates.SearchResponse.newBuilder();
       createResponse.getPagingBuilder()
         .setPageIndex(paging.pageIndex())
         .setPageSize(paging.pageSize())
diff --git a/sonar-ws/src/main/protobuf/ws-qualitygates.proto b/sonar-ws/src/main/protobuf/ws-qualitygates.proto
index 06dfa914fc1..4a5ec097696 100644
--- a/sonar-ws/src/main/protobuf/ws-qualitygates.proto
+++ b/sonar-ws/src/main/protobuf/ws-qualitygates.proto
@@ -136,8 +136,7 @@ message ShowWsResponse {
 
 // GET api/qualitygates/search
 message SearchResponse {
-  // Deprecated since 7.9
-  optional bool more = 1;
+  reserved 1; // drop more
   repeated Result results = 2;
   optional sonarqube.ws.commons.Paging paging = 3;