WS api/favorites/search use a SearchRequest

2 files changed, 8 insertions, 6 deletions

diff --git a/it/it-tests/src/test/java/it/analysis/FavoriteTest.java b/it/it-tests/src/test/java/it/analysis/FavoriteTest.java
index c8602a377a6..5c5044b6c0f 100644
--- a/it/it-tests/src/test/java/it/analysis/FavoriteTest.java
+++ b/it/it-tests/src/test/java/it/analysis/FavoriteTest.java
@@ -32,6 +32,7 @@ import org.sonarqube.ws.Favorites;
 import org.sonarqube.ws.Favorites.Favorite;
 import org.sonarqube.ws.WsPermissions;
 import org.sonarqube.ws.client.WsClient;
+import org.sonarqube.ws.client.favorite.SearchRequest;
 import org.sonarqube.ws.client.permission.AddProjectCreatorToTemplateWsRequest;
 import org.sonarqube.ws.client.permission.RemoveProjectCreatorFromTemplateWsRequest;
 import org.sonarqube.ws.client.permission.SearchTemplatesWsRequest;
@@ -71,7 +72,7 @@ public class FavoriteTest {
 
     orchestrator.executeBuild(sampleProject);
 
-    Favorites.SearchResponse response = adminWsClient.favorites().search(null, null);
+    Favorites.SearchResponse response = adminWsClient.favorites().search(new SearchRequest());
     assertThat(response.getFavoritesList()).extracting(Favorite::getKey).contains(PROJECT_KEY);
   }
 
@@ -81,7 +82,7 @@ public class FavoriteTest {
 
     orchestrator.executeBuild(sampleProject);
 
-    Favorites.SearchResponse response = adminWsClient.favorites().search(null, null);
+    Favorites.SearchResponse response = adminWsClient.favorites().search(new SearchRequest());
     assertThat(response.getFavoritesList()).extracting(Favorite::getKey).doesNotContain(PROJECT_KEY);
   }
 
@@ -94,7 +95,7 @@ public class FavoriteTest {
 
     orchestrator.executeBuild(sampleProject);
 
-    Favorites.SearchResponse response = adminWsClient.favorites().search(null, null);
+    Favorites.SearchResponse response = adminWsClient.favorites().search(new SearchRequest());
     assertThat(response.getFavoritesList()).extracting(Favorite::getKey).doesNotContain(PROJECT_KEY);
   }
 
diff --git a/it/it-tests/src/test/java/it/user/FavoritesWsTest.java b/it/it-tests/src/test/java/it/user/FavoritesWsTest.java
index 357d1fa3bf2..febf7fc67f6 100644
--- a/it/it-tests/src/test/java/it/user/FavoritesWsTest.java
+++ b/it/it-tests/src/test/java/it/user/FavoritesWsTest.java
@@ -28,6 +28,7 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonarqube.ws.Favorites.Favorite;
 import org.sonarqube.ws.client.WsClient;
+import org.sonarqube.ws.client.favorite.SearchRequest;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.newAdminWsClient;
@@ -52,7 +53,7 @@ public class FavoritesWsTest {
   @Test
   public void favorites_web_service() {
     // GET (nothing)
-    List<Favorite> favorites = adminClient.favorites().search(null, null).getFavoritesList();
+    List<Favorite> favorites = adminClient.favorites().search(new SearchRequest()).getFavoritesList();
     assertThat(favorites).isEmpty();
 
     // POST (create favorites)
@@ -60,12 +61,12 @@ public class FavoritesWsTest {
     adminClient.favorites().add("sample:src/main/xoo/sample/Sample.xoo");
 
     // GET (created favorites)
-    favorites = adminClient.favorites().search(null, null).getFavoritesList();
+    favorites = adminClient.favorites().search(new SearchRequest()).getFavoritesList();
     assertThat(favorites.stream().map(Favorite::getKey)).containsOnly("sample", "sample:src/main/xoo/sample/Sample.xoo");
 
     // DELETE (a favorite)
     adminClient.favorites().remove("sample");
-    favorites = adminClient.favorites().search(null, null).getFavoritesList();
+    favorites = adminClient.favorites().search(new SearchRequest()).getFavoritesList();
     assertThat(favorites.stream().map(Favorite::getKey)).containsOnly("sample:src/main/xoo/sample/Sample.xoo");
   }