Remove legacy sonar-ws code for qualityprofiles

server/sonar-qa-util/src/main/java/org/sonarqube/qa/util/QProfileTester.java

@@ -25,14 +25,15 @@
 import org.assertj.core.api.Assertions;
 import org.sonarqube.ws.Common;
 import org.sonarqube.ws.Organizations.Organization;
+import org.sonarqube.ws.Projects.CreateWsResponse.Project;
 import org.sonarqube.ws.Qualityprofiles.CreateWsResponse.QualityProfile;
 import org.sonarqube.ws.Rules;
-import org.sonarqube.ws.Projects.CreateWsResponse.Project;
 import org.sonarqube.ws.client.HttpException;
-import org.sonarqube.ws.client.qualityprofile.ActivateRuleRequest;
-import org.sonarqube.ws.client.qualityprofile.AddProjectRequest;
-import org.sonarqube.ws.client.qualityprofile.CreateRequest;
-import org.sonarqube.ws.client.qualityprofile.QualityProfilesService;
+import org.sonarqube.ws.client.qualityprofiles.ActivateRuleRequest;
+import org.sonarqube.ws.client.qualityprofiles.AddProjectRequest;
+import org.sonarqube.ws.client.qualityprofiles.CreateRequest;
+import org.sonarqube.ws.client.qualityprofiles.DeactivateRuleRequest;
+import org.sonarqube.ws.client.qualityprofiles.QualityprofilesService;
 import org.sonarqube.ws.client.rules.SearchRequest;
 
 import static java.util.Arrays.asList;
@@ -49,44 +50,42 @@ public class QProfileTester {
     this.session = session;
   }
 
-  public QualityProfilesService service() {
-    return session.wsClient().qualityProfilesOld();
+  public QualityprofilesService service() {
+    return session.wsClient().qualityprofiles();
   }
 
   @SafeVarargs
-  public final QualityProfile createXooProfile(Organization organization, Consumer<CreateRequest.Builder>... populators) {
+  public final QualityProfile createXooProfile(Organization organization, Consumer<CreateRequest>... populators) {
     int id = ID_GENERATOR.getAndIncrement();
-    CreateRequest.Builder request = CreateRequest.builder()
-      .setOrganizationKey(organization.getKey())
+    CreateRequest request = new CreateRequest()
+      .setOrganization(organization.getKey())
       .setLanguage("xoo")
       .setName("Profile" + id);
     stream(populators).forEach(p -> p.accept(request));
-    return service().create(request.build()).getProfile();
+    return service().create(request).getProfile();
   }
 
   public QProfileTester activateRule(QualityProfile profile, String ruleKey) {
     return activateRule(profile.getKey(), ruleKey);
   }
 
   public QProfileTester activateRule(String profileKey, String ruleKey) {
-    ActivateRuleRequest request = ActivateRuleRequest.builder()
+    ActivateRuleRequest request = new ActivateRuleRequest()
       .setKey(profileKey)
-      .setRuleKey(ruleKey)
-      .build();
+      .setRule(ruleKey);
     service().activateRule(request);
     return this;
   }
 
   public QProfileTester deactivateRule(QualityProfile profile, String ruleKey) {
-    service().deactivateRule(profile.getKey(), ruleKey);
+    service().deactivateRule(new DeactivateRuleRequest().setKey(profile.getKey()).setRule(ruleKey));
     return this;
   }
 
   public QProfileTester assignQProfileToProject(QualityProfile profile, Project project) {
-    service().addProject(AddProjectRequest.builder()
-      .setProjectKey(project.getKey())
-      .setKey(profile.getKey())
-      .build());
+    service().addProject(new AddProjectRequest()
+      .setProject(project.getKey())
+      .setKey(profile.getKey()));
     return this;
   }
 

sonar-ws/src/main/java/org/sonarqube/ws/client/DefaultWsClient.java

@@ -32,7 +32,6 @@
 import org.sonarqube.ws.client.projectbranches.ProjectBranchesService;
 import org.sonarqube.ws.client.projectlinks.ProjectLinksService;
 import org.sonarqube.ws.client.qualitygates.QualitygatesService;
-import org.sonarqube.ws.client.qualityprofile.QualityProfilesService;
 import org.sonarqube.ws.client.qualityprofiles.QualityprofilesService;
 import org.sonarqube.ws.client.roots.RootsService;
 import org.sonarqube.ws.client.rules.RulesService;
@@ -56,7 +55,6 @@ class DefaultWsClient implements WsClient {
   private final PermissionsService permissions;
   private final ComponentsService components;
   private final FavoritesService favoritesService;
-  private final QualityProfilesService qualityProfilesOld;
   private final QualityprofilesService qualityprofiles;
   private final IssuesService issues;
   private final UsersService usersService;
@@ -82,7 +80,6 @@ class DefaultWsClient implements WsClient {
     this.permissions = new PermissionsService(wsConnector);
     this.components = new ComponentsService(wsConnector);
     this.favoritesService = new FavoritesService(wsConnector);
-    this.qualityProfilesOld = new QualityProfilesService(wsConnector);
     this.qualityprofiles = new QualityprofilesService(wsConnector);
     this.issues = new IssuesService(wsConnector);
     this.usersService = new UsersService(wsConnector);
@@ -128,11 +125,6 @@ public FavoritesService favorites() {
     return favoritesService;
   }
 
-  @Override
-  public QualityProfilesService qualityProfilesOld() {
-    return qualityProfilesOld;
-  }
-
   @Override
   public QualityprofilesService qualityProfiles() {
     return qualityprofiles;

sonar-ws/src/main/java/org/sonarqube/ws/client/WsClient.java

@@ -32,7 +32,6 @@
 import org.sonarqube.ws.client.projectbranches.ProjectBranchesService;
 import org.sonarqube.ws.client.projectlinks.ProjectLinksService;
 import org.sonarqube.ws.client.qualitygates.QualitygatesService;
-import org.sonarqube.ws.client.qualityprofile.QualityProfilesService;
 import org.sonarqube.ws.client.qualityprofiles.QualityprofilesService;
 import org.sonarqube.ws.client.roots.RootsService;
 import org.sonarqube.ws.client.rules.RulesService;
@@ -75,12 +74,6 @@ public interface WsClient {
 
   PermissionsService permissions();
 
-  /**
-   * @deprecated since 7.0 use {@link #qualityProfiles()} instead
-   */
-  @Deprecated
-  QualityProfilesService qualityProfilesOld();
-
   QualityprofilesService qualityProfiles();
 
   UsersService users();