SONAR-6947 Fix paging in GroupsWsRequest and SearchProjectPermissionsWsRequest

2 files changed, 12 insertions, 8 deletions

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/GroupsWsRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/GroupsWsRequest.java
index 35690aaf80e..ceea2cf3d18 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/GroupsWsRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/GroupsWsRequest.java
@@ -28,8 +28,8 @@ public class GroupsWsRequest {
   private String permission;
   private String projectId;
   private String projectKey;
-  private int page;
-  private int pageSize;
+  private Integer page;
+  private Integer pageSize;
   private String query;
   private String selected;
 
@@ -62,7 +62,8 @@ public class GroupsWsRequest {
     return this;
   }
 
-  public int getPage() {
+  @CheckForNull
+  public Integer getPage() {
     return page;
   }
 
@@ -71,7 +72,8 @@ public class GroupsWsRequest {
     return this;
   }
 
-  public int getPageSize() {
+  @CheckForNull
+  public Integer getPageSize() {
     return pageSize;
   }
 
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/SearchProjectPermissionsWsRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/SearchProjectPermissionsWsRequest.java
index 59a764f1e46..2814bc10950 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/SearchProjectPermissionsWsRequest.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/permission/SearchProjectPermissionsWsRequest.java
@@ -26,8 +26,8 @@ import javax.annotation.Nullable;
 public class SearchProjectPermissionsWsRequest {
   private String projectId;
   private String projectKey;
-  private int page;
-  private int pageSize;
+  private Integer page;
+  private Integer pageSize;
   private String query;
 
   @CheckForNull
@@ -50,7 +50,8 @@ public class SearchProjectPermissionsWsRequest {
     return this;
   }
 
-  public int getPage() {
+  @CheckForNull
+  public Integer getPage() {
     return page;
   }
 
@@ -59,7 +60,8 @@ public class SearchProjectPermissionsWsRequest {
     return this;
   }
 
-  public int getPageSize() {
+  @CheckForNull
+  public Integer getPageSize() {
     return pageSize;
   }