Remove legacy sonar-ws code for users

3 files changed, 20 insertions, 22 deletions

diff --git a/server/sonar-qa-util/src/main/java/org/sonarqube/qa/util/GroupTester.java b/server/sonar-qa-util/src/main/java/org/sonarqube/qa/util/GroupTester.java
index 29dfee6b234..3a901674e8a 100644
--- a/server/sonar-qa-util/src/main/java/org/sonarqube/qa/util/GroupTester.java
+++ b/server/sonar-qa-util/src/main/java/org/sonarqube/qa/util/GroupTester.java
@@ -29,9 +29,9 @@ import org.sonarqube.ws.Organizations;
 import org.sonarqube.ws.UserGroups;
 import org.sonarqube.ws.Users;
 import org.sonarqube.ws.Users.GroupsWsResponse.Group;
-import org.sonarqube.ws.client.user.GroupsRequest;
 import org.sonarqube.ws.client.usergroups.AddUserRequest;
 import org.sonarqube.ws.client.usergroups.CreateRequest;
+import org.sonarqube.ws.client.users.GroupsRequest;
 
 import static java.util.Arrays.stream;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -58,10 +58,9 @@ public class GroupTester {
   }
 
   public List<Group> getGroupsOfUser(@Nullable Organizations.Organization organization, String userLogin) {
-    GroupsRequest request = GroupsRequest.builder()
+    GroupsRequest request = new GroupsRequest()
       .setOrganization(organization != null ? organization.getKey() : null)
-      .setLogin(userLogin)
-      .build();
+      .setLogin(userLogin);
     Users.GroupsWsResponse response = session.users().service().groups(request);
     return response.getGroupsList();
   }
diff --git a/server/sonar-qa-util/src/main/java/org/sonarqube/qa/util/OrganizationTester.java b/server/sonar-qa-util/src/main/java/org/sonarqube/qa/util/OrganizationTester.java
index e6bdc24940b..acbcb940f3d 100644
--- a/server/sonar-qa-util/src/main/java/org/sonarqube/qa/util/OrganizationTester.java
+++ b/server/sonar-qa-util/src/main/java/org/sonarqube/qa/util/OrganizationTester.java
@@ -35,7 +35,7 @@ import org.sonarqube.ws.client.organizations.DeleteRequest;
 import org.sonarqube.ws.client.organizations.OrganizationsService;
 import org.sonarqube.ws.client.organizations.SearchMembersRequest;
 import org.sonarqube.ws.client.organizations.SearchRequest;
-import org.sonarqube.ws.client.user.GroupsRequest;
+import org.sonarqube.ws.client.users.GroupsRequest;
 
 import static java.util.Arrays.stream;
 
@@ -128,12 +128,11 @@ public class OrganizationTester {
   }
 
   private void verifyMembersGroupMembership(String userLogin, @Nullable Organizations.Organization organization, boolean isMember) {
-    List<Users.GroupsWsResponse.Group> groups = session.wsClient().users().groups(GroupsRequest.builder()
+    List<Users.GroupsWsResponse.Group> groups = session.wsClient().users().groups(new GroupsRequest()
       .setLogin(userLogin)
       .setOrganization(organization != null ? organization.getKey() : null)
-      .setQuery("Members")
-      .setSelected("selected")
-      .build())
+      .setQ("Members")
+      .setSelected("selected"))
       .getGroupsList();
     Assertions.assertThat(groups).hasSize(isMember ? 1 : 0);
   }
diff --git a/server/sonar-qa-util/src/main/java/org/sonarqube/qa/util/UserTester.java b/server/sonar-qa-util/src/main/java/org/sonarqube/qa/util/UserTester.java
index fca8bf4f1b8..c5309c3578e 100644
--- a/server/sonar-qa-util/src/main/java/org/sonarqube/qa/util/UserTester.java
+++ b/server/sonar-qa-util/src/main/java/org/sonarqube/qa/util/UserTester.java
@@ -28,10 +28,10 @@ import org.sonarqube.ws.Users;
 import org.sonarqube.ws.Users.CreateWsResponse.User;
 import org.sonarqube.ws.client.PostRequest;
 import org.sonarqube.ws.client.organizations.AddMemberRequest;
-import org.sonarqube.ws.client.user.CreateRequest;
-import org.sonarqube.ws.client.user.SearchRequest;
-import org.sonarqube.ws.client.user.UsersService;
 import org.sonarqube.ws.client.usergroups.AddUserRequest;
+import org.sonarqube.ws.client.users.CreateRequest;
+import org.sonarqube.ws.client.users.SearchRequest;
+import org.sonarqube.ws.client.users.UsersService;
 
 import static java.util.Arrays.stream;
 
@@ -47,7 +47,7 @@ public class UserTester {
   }
 
   void deleteAll() {
-    session.wsClient().users().search(SearchRequest.builder().build()).getUsersList()
+    session.wsClient().users().search(new SearchRequest()).getUsersList()
       .stream()
       .filter(u -> !"admin".equals(u.getLogin()))
       .forEach(u -> {
@@ -57,23 +57,23 @@ public class UserTester {
   }
 
   @SafeVarargs
-  public final User generate(Consumer<CreateRequest.Builder>... populators) {
+  public final User generate(Consumer<CreateRequest>... populators) {
     int id = ID_GENERATOR.getAndIncrement();
     String login = "login" + id;
-    CreateRequest.Builder request = CreateRequest.builder()
+    CreateRequest request = new CreateRequest()
       .setLogin(login)
       .setPassword(login)
       .setName("name" + id)
       .setEmail(id + "@test.com");
     stream(populators).forEach(p -> p.accept(request));
-    return service().create(request.build()).getUser();
+    return service().create(request).getUser();
   }
 
   /**
    * For standalone mode only
    */
   @SafeVarargs
-  public final User generateAdministrator(Consumer<CreateRequest.Builder>... populators) {
+  public final User generateAdministrator(Consumer<CreateRequest>... populators) {
     User user = generate(populators);
     session.wsClient().permissions().addUser(new org.sonarqube.ws.client.permissions.AddUserRequest().setLogin(user.getLogin()).setPermission("admin"));
     session.wsClient().userGroups().addUser(new AddUserRequest().setLogin(user.getLogin()).setName("sonar-administrators"));
@@ -81,7 +81,7 @@ public class UserTester {
   }
 
   @SafeVarargs
-  public final User generateAdministrator(Organizations.Organization organization, Consumer<CreateRequest.Builder>... populators) {
+  public final User generateAdministrator(Organizations.Organization organization, Consumer<CreateRequest>... populators) {
     String organizationKey = organization.getKey();
     User user = generate(populators);
     session.wsClient().organizations().addMember(new AddMemberRequest().setOrganization(organizationKey).setLogin(user.getLogin()));
@@ -93,7 +93,7 @@ public class UserTester {
   }
 
   @SafeVarargs
-  public final User generateAdministratorOnDefaultOrganization(Consumer<CreateRequest.Builder>... populators) {
+  public final User generateAdministratorOnDefaultOrganization(Consumer<CreateRequest>... populators) {
     User user = generate(populators);
     session.wsClient().organizations().addMember(new AddMemberRequest().setOrganization(DEFAULT_ORGANIZATION_KEY).setLogin(user.getLogin()));
     session.wsClient().userGroups().addUser(new AddUserRequest()
@@ -104,14 +104,14 @@ public class UserTester {
   }
 
   @SafeVarargs
-  public final User generateMember(Organizations.Organization organization, Consumer<CreateRequest.Builder>... populators) {
+  public final User generateMember(Organizations.Organization organization, Consumer<CreateRequest>... populators) {
     User user = generate(populators);
     session.wsClient().organizations().addMember(new AddMemberRequest().setOrganization(organization.getKey()).setLogin(user.getLogin()));
     return user;
   }
 
   @SafeVarargs
-  public final User generateMemberOfDefaultOrganization(Consumer<CreateRequest.Builder>... populators) {
+  public final User generateMemberOfDefaultOrganization(Consumer<CreateRequest>... populators) {
     User user = generate(populators);
     session.wsClient().organizations().addMember(new AddMemberRequest().setOrganization(DEFAULT_ORGANIZATION_KEY).setLogin(user.getLogin()));
     return user;
@@ -122,7 +122,7 @@ public class UserTester {
   }
 
   public Optional<Users.SearchWsResponse.User> getByLogin(String login) {
-    List<Users.SearchWsResponse.User> users = session.wsClient().users().search(SearchRequest.builder().setQuery(login).build()).getUsersList();
+    List<Users.SearchWsResponse.User> users = session.wsClient().users().search(new SearchRequest().setQ(login)).getUsersList();
     if (users.size() == 1) {
       return Optional.of(users.get(0));
     }