diff options
| author | Daniel Schwarz <daniel.schwarz@sonarsource.com> | 2017-11-25 07:21:02 +0100 |
|---|---|---|
| committer | Daniel Schwarz <bartfastiel@users.noreply.github.com> | 2017-11-29 20:24:11 +0100 |
| commit | b4a1564642ca0fc1528f2bf4b638c57860649775 (patch) | |
| tree | dcf7abe674b93f6980bfb1e4c155b31539102e8d /tests | |
| parent | 2f73756a57ab7ead3d913aab95f9102242ae9aac (diff) | |
| download | sonarqube-b4a1564642ca0fc1528f2bf4b638c57860649775.tar.gz sonarqube-b4a1564642ca0fc1528f2bf4b638c57860649775.zip | |
Apply naming conventions in sonar-ws protobuf
Diffstat (limited to 'tests')
57 files changed, 271 insertions, 272 deletions
diff --git a/tests/src/test/java/org/sonarqube/tests/analysis/AnalysisEsResilienceTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/AnalysisEsResilienceTest.java index c0615144afd..a02bb02e8be 100644 --- a/tests/src/test/java/org/sonarqube/tests/analysis/AnalysisEsResilienceTest.java +++ b/tests/src/test/java/org/sonarqube/tests/analysis/AnalysisEsResilienceTest.java @@ -45,8 +45,8 @@ import org.sonarqube.ws.Qualityprofiles.CreateWsResponse.QualityProfile; import org.sonarqube.ws.Projects; import org.sonarqube.ws.Users.CreateWsResponse.User; import org.sonarqube.ws.client.ce.TaskRequest; -import org.sonarqube.ws.client.component.SuggestionsWsRequest; -import org.sonarqube.ws.client.issue.SearchWsRequest; +import org.sonarqube.ws.client.component.SuggestionsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -226,14 +226,14 @@ public class AnalysisEsResilienceTest { } private Issues.SearchWsResponse searchIssues(String projectKey) { - SearchWsRequest request = new SearchWsRequest() + SearchRequest request = new SearchRequest() .setProjectKeys(Collections.singletonList(projectKey)) .setFacets(Collections.singletonList("statuses")); return tester.wsClient().issues().search(request); } private List<String> searchFile(String key, Organization organization) { - SuggestionsWsRequest query = SuggestionsWsRequest.builder() + SuggestionsRequest query = SuggestionsRequest.builder() .setS(key) .build(); Map<String, Object> response = ItUtils.jsonToMap( diff --git a/tests/src/test/java/org/sonarqube/tests/analysis/FavoriteTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/FavoriteTest.java index 14b60781d47..6d291bca43d 100644 --- a/tests/src/test/java/org/sonarqube/tests/analysis/FavoriteTest.java +++ b/tests/src/test/java/org/sonarqube/tests/analysis/FavoriteTest.java @@ -32,9 +32,9 @@ import org.sonarqube.ws.Favorites.Favorite; import org.sonarqube.ws.Permissions; import org.sonarqube.ws.client.WsClient; import org.sonarqube.ws.client.favorites.SearchRequest; -import org.sonarqube.ws.client.permission.AddProjectCreatorToTemplateWsRequest; -import org.sonarqube.ws.client.permission.RemoveProjectCreatorFromTemplateWsRequest; -import org.sonarqube.ws.client.permission.SearchTemplatesWsRequest; +import org.sonarqube.ws.client.permission.AddProjectCreatorToTemplateRequest; +import org.sonarqube.ws.client.permission.RemoveProjectCreatorFromTemplateRequest; +import org.sonarqube.ws.client.permission.SearchTemplatesRequest; import static com.sonar.orchestrator.container.Server.ADMIN_LOGIN; import static com.sonar.orchestrator.container.Server.ADMIN_PASSWORD; @@ -105,18 +105,18 @@ public class FavoriteTest { } private void addProjectCreatorPermission() { - Permissions.SearchTemplatesWsResponse permissionTemplates = adminWsClient.permissions().searchTemplates(new SearchTemplatesWsRequest()); + Permissions.SearchTemplatesWsResponse permissionTemplates = adminWsClient.permissions().searchTemplates(new SearchTemplatesRequest()); assertThat(permissionTemplates.getDefaultTemplatesCount()).isEqualTo(1); - adminWsClient.permissions().addProjectCreatorToTemplate(AddProjectCreatorToTemplateWsRequest.builder() + adminWsClient.permissions().addProjectCreatorToTemplate(AddProjectCreatorToTemplateRequest.builder() .setTemplateId(permissionTemplates.getDefaultTemplates(0).getTemplateId()) .setPermission("admin") .build()); } private void removeProjectCreatorPermission() { - Permissions.SearchTemplatesWsResponse permissionTemplates = adminWsClient.permissions().searchTemplates(new SearchTemplatesWsRequest()); + Permissions.SearchTemplatesWsResponse permissionTemplates = adminWsClient.permissions().searchTemplates(new SearchTemplatesRequest()); assertThat(permissionTemplates.getDefaultTemplatesCount()).isEqualTo(1); - adminWsClient.permissions().removeProjectCreatorFromTemplate(RemoveProjectCreatorFromTemplateWsRequest.builder() + adminWsClient.permissions().removeProjectCreatorFromTemplate(RemoveProjectCreatorFromTemplateRequest.builder() .setTemplateId(permissionTemplates.getDefaultTemplates(0).getTemplateId()) .setPermission("admin") .build()); diff --git a/tests/src/test/java/org/sonarqube/tests/analysis/FileExclusionsTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/FileExclusionsTest.java index 980cd9cafae..17c6a7357bb 100644 --- a/tests/src/test/java/org/sonarqube/tests/analysis/FileExclusionsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/analysis/FileExclusionsTest.java @@ -28,7 +28,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.sonarqube.ws.Components.Component; -import org.sonarqube.ws.client.component.TreeWsRequest; +import org.sonarqube.ws.client.component.TreeRequest; import util.ItUtils; import static java.util.Collections.singletonList; @@ -134,6 +134,6 @@ public class FileExclusionsTest { } public static List<Component> getComponents(String qualifier) { - return newWsClient(orchestrator).components().tree(new TreeWsRequest().setBaseComponentKey(PROJECT).setQualifiers(singletonList(qualifier))).getComponentsList(); + return newWsClient(orchestrator).components().tree(new TreeRequest().setBaseComponentKey(PROJECT).setQualifiers(singletonList(qualifier))).getComponentsList(); } } diff --git a/tests/src/test/java/org/sonarqube/tests/analysis/PermissionTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/PermissionTest.java index b7d8921246d..d595e032cad 100644 --- a/tests/src/test/java/org/sonarqube/tests/analysis/PermissionTest.java +++ b/tests/src/test/java/org/sonarqube/tests/analysis/PermissionTest.java @@ -31,7 +31,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonarqube.ws.UserTokens; import org.sonarqube.ws.client.WsClient; -import org.sonarqube.ws.client.permission.AddUserWsRequest; +import org.sonarqube.ws.client.permission.AddUserRequest; import org.sonarqube.ws.client.usertokens.GenerateRequest; import org.sonarqube.ws.client.usertokens.RevokeRequest; import org.sonarqube.ws.client.usertokens.UserTokensService; @@ -147,7 +147,7 @@ public class PermissionTest { } private void addUserPermission(String login, String permission, @Nullable String projectKey) { - adminWsClient.permissions().addUser(new AddUserWsRequest() + adminWsClient.permissions().addUser(new AddUserRequest() .setLogin(login) .setPermission(permission) .setProjectKey(projectKey)); diff --git a/tests/src/test/java/org/sonarqube/tests/analysis/ScannerTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/ScannerTest.java index 53e0dc50abb..bdc330eec29 100644 --- a/tests/src/test/java/org/sonarqube/tests/analysis/ScannerTest.java +++ b/tests/src/test/java/org/sonarqube/tests/analysis/ScannerTest.java @@ -33,7 +33,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.sonarqube.qa.util.Tester; import org.sonarqube.tests.Category3Suite; -import org.sonarqube.ws.client.component.SearchWsRequest; +import org.sonarqube.ws.client.component.SearchRequest; import util.ItUtils; import static java.util.Collections.singletonList; @@ -68,7 +68,7 @@ public class ScannerTest { scan("shared/xoo-multi-modules-sample"); scan("shared/xoo-multi-modules-sample", "sonar.branch", "branch/0.x"); - assertThat(tester.wsClient().components().search(new SearchWsRequest().setQualifiers(singletonList("TRK"))).getComponentsList()).hasSize(2); + assertThat(tester.wsClient().components().search(new SearchRequest().setQualifiers(singletonList("TRK"))).getComponentsList()).hasSize(2); assertThat(getComponent(orchestrator, "com.sonarsource.it.samples:multi-modules-sample").getName()).isEqualTo("Sonar :: Integration Tests :: Multi-modules Sample"); assertThat(getComponent(orchestrator, "com.sonarsource.it.samples:multi-modules-sample:branch/0.x").getName()) .isEqualTo("Sonar :: Integration Tests :: Multi-modules Sample branch/0.x"); diff --git a/tests/src/test/java/org/sonarqube/tests/authorization/ExecuteAnalysisPermissionTest.java b/tests/src/test/java/org/sonarqube/tests/authorization/ExecuteAnalysisPermissionTest.java index 78f8cfc1e0a..3f3c0750f75 100644 --- a/tests/src/test/java/org/sonarqube/tests/authorization/ExecuteAnalysisPermissionTest.java +++ b/tests/src/test/java/org/sonarqube/tests/authorization/ExecuteAnalysisPermissionTest.java @@ -27,9 +27,9 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.sonarqube.qa.util.Tester; -import org.sonarqube.ws.client.permission.AddGroupWsRequest; -import org.sonarqube.ws.client.permission.AddProjectCreatorToTemplateWsRequest; -import org.sonarqube.ws.client.permission.RemoveGroupWsRequest; +import org.sonarqube.ws.client.permission.AddGroupRequest; +import org.sonarqube.ws.client.permission.AddProjectCreatorToTemplateRequest; +import org.sonarqube.ws.client.permission.RemoveGroupRequest; import org.sonarqube.ws.client.project.UpdateVisibilityRequest; import static org.assertj.core.api.Assertions.assertThat; @@ -112,7 +112,7 @@ public class ExecuteAnalysisPermissionTest { @Test public void execute_analysis_with_scan_on_default_template() { removeGlobalPermission("anyone", "scan"); - tester.wsClient().permissions().addProjectCreatorToTemplate(AddProjectCreatorToTemplateWsRequest.builder() + tester.wsClient().permissions().addProjectCreatorToTemplate(AddProjectCreatorToTemplateRequest.builder() .setPermission("scan") .setTemplateId("default_template") .build()); @@ -121,15 +121,15 @@ public class ExecuteAnalysisPermissionTest { } private void addProjectPermission(String groupName, String projectKey, String permission) { - tester.wsClient().permissions().addGroup(new AddGroupWsRequest().setGroupName(groupName).setProjectKey(projectKey).setPermission(permission)); + tester.wsClient().permissions().addGroup(new AddGroupRequest().setGroupName(groupName).setProjectKey(projectKey).setPermission(permission)); } private void addGlobalPermission(String groupName, String permission) { - tester.wsClient().permissions().addGroup(new AddGroupWsRequest().setGroupName(groupName).setPermission(permission)); + tester.wsClient().permissions().addGroup(new AddGroupRequest().setGroupName(groupName).setPermission(permission)); } private void removeGlobalPermission(String groupName, String permission) { - tester.wsClient().permissions().removeGroup(new RemoveGroupWsRequest().setGroupName(groupName).setPermission(permission)); + tester.wsClient().permissions().removeGroup(new RemoveGroupRequest().setGroupName(groupName).setPermission(permission)); } private static void executeLoggedAnalysis() { diff --git a/tests/src/test/java/org/sonarqube/tests/authorization/IssuePermissionTest.java b/tests/src/test/java/org/sonarqube/tests/authorization/IssuePermissionTest.java index 910bb6124c2..d3734d24e05 100644 --- a/tests/src/test/java/org/sonarqube/tests/authorization/IssuePermissionTest.java +++ b/tests/src/test/java/org/sonarqube/tests/authorization/IssuePermissionTest.java @@ -33,7 +33,7 @@ import org.sonar.wsclient.user.UserParameters; import org.sonarqube.qa.util.Tester; import org.sonarqube.ws.Issues; import org.sonarqube.ws.client.issue.BulkChangeRequest; -import org.sonarqube.ws.client.permission.AddUserWsRequest; +import org.sonarqube.ws.client.permission.AddUserRequest; import org.sonarqube.ws.client.project.UpdateVisibilityRequest; import util.ItUtils; @@ -265,7 +265,7 @@ public class IssuePermissionTest { private void addUserPermission(String login, String projectKey, String permission) { tester.wsClient().permissions().addUser( - new AddUserWsRequest() + new AddUserRequest() .setLogin(login) .setProjectKey(projectKey) .setPermission(permission)); diff --git a/tests/src/test/java/org/sonarqube/tests/authorization/PermissionSearchTest.java b/tests/src/test/java/org/sonarqube/tests/authorization/PermissionSearchTest.java index f14d2264b71..77a24d84976 100644 --- a/tests/src/test/java/org/sonarqube/tests/authorization/PermissionSearchTest.java +++ b/tests/src/test/java/org/sonarqube/tests/authorization/PermissionSearchTest.java @@ -30,18 +30,18 @@ import org.sonarqube.ws.Permissions; import org.sonarqube.ws.Permissions.Permission; import org.sonarqube.ws.Permissions.SearchTemplatesWsResponse; import org.sonarqube.ws.client.PostRequest; -import org.sonarqube.ws.client.permission.AddGroupToTemplateWsRequest; -import org.sonarqube.ws.client.permission.AddGroupWsRequest; -import org.sonarqube.ws.client.permission.AddProjectCreatorToTemplateWsRequest; -import org.sonarqube.ws.client.permission.AddUserToTemplateWsRequest; -import org.sonarqube.ws.client.permission.AddUserWsRequest; -import org.sonarqube.ws.client.permission.CreateTemplateWsRequest; -import org.sonarqube.ws.client.permission.GroupsWsRequest; -import org.sonarqube.ws.client.permission.RemoveGroupFromTemplateWsRequest; -import org.sonarqube.ws.client.permission.RemoveProjectCreatorFromTemplateWsRequest; -import org.sonarqube.ws.client.permission.RemoveUserFromTemplateWsRequest; -import org.sonarqube.ws.client.permission.SearchTemplatesWsRequest; -import org.sonarqube.ws.client.permission.UsersWsRequest; +import org.sonarqube.ws.client.permission.AddGroupToTemplateRequest; +import org.sonarqube.ws.client.permission.AddGroupRequest; +import org.sonarqube.ws.client.permission.AddProjectCreatorToTemplateRequest; +import org.sonarqube.ws.client.permission.AddUserToTemplateRequest; +import org.sonarqube.ws.client.permission.AddUserRequest; +import org.sonarqube.ws.client.permission.CreateTemplateRequest; +import org.sonarqube.ws.client.permission.GroupsRequest; +import org.sonarqube.ws.client.permission.RemoveGroupFromTemplateRequest; +import org.sonarqube.ws.client.permission.RemoveProjectCreatorFromTemplateRequest; +import org.sonarqube.ws.client.permission.RemoveUserFromTemplateRequest; +import org.sonarqube.ws.client.permission.SearchTemplatesRequest; +import org.sonarqube.ws.client.permission.UsersRequest; import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -79,11 +79,11 @@ public class PermissionSearchTest { @Test public void permission_web_services() { tester.wsClient().permissions().addUser( - new AddUserWsRequest() + new AddUserRequest() .setPermission("admin") .setLogin(LOGIN)); tester.wsClient().permissions().addGroup( - new AddGroupWsRequest() + new AddGroupRequest() .setPermission("admin") .setGroupName(GROUP_NAME)); @@ -94,11 +94,11 @@ public class PermissionSearchTest { assertThat(searchGlobalPermissionsWsResponse.getPermissionsList().get(0).getGroupsCount()).isEqualTo(2); Permissions.UsersWsResponse users = tester.wsClient().permissions() - .users(new UsersWsRequest().setPermission("admin")); + .users(new UsersRequest().setPermission("admin")); assertThat(users.getUsersList()).extracting("login").contains(LOGIN); Permissions.WsGroupsResponse groupsResponse = tester.wsClient().permissions() - .groups(new GroupsWsRequest() + .groups(new GroupsRequest() .setPermission("admin")); assertThat(groupsResponse.getGroupsList()).extracting("name").contains(GROUP_NAME); } @@ -106,31 +106,31 @@ public class PermissionSearchTest { @Test public void template_permission_web_services() { Permissions.CreateTemplateWsResponse createTemplateWsResponse = tester.wsClient().permissions().createTemplate( - new CreateTemplateWsRequest() + new CreateTemplateRequest() .setName("my-new-template") .setDescription("template-used-in-tests")); assertThat(createTemplateWsResponse.getPermissionTemplate().getName()).isEqualTo("my-new-template"); tester.wsClient().permissions().addUserToTemplate( - new AddUserToTemplateWsRequest() + new AddUserToTemplateRequest() .setPermission("admin") .setTemplateName("my-new-template") .setLogin(LOGIN)); tester.wsClient().permissions().addGroupToTemplate( - new AddGroupToTemplateWsRequest() + new AddGroupToTemplateRequest() .setPermission("admin") .setTemplateName("my-new-template") .setGroupName(GROUP_NAME)); tester.wsClient().permissions().addProjectCreatorToTemplate( - AddProjectCreatorToTemplateWsRequest.builder() + AddProjectCreatorToTemplateRequest.builder() .setPermission("admin") .setTemplateName("my-new-template") .build()); SearchTemplatesWsResponse searchTemplatesWsResponse = tester.wsClient().permissions().searchTemplates( - new SearchTemplatesWsRequest() + new SearchTemplatesRequest() .setQuery("my-new-template")); assertThat(searchTemplatesWsResponse.getPermissionTemplates(0).getName()).isEqualTo("my-new-template"); assertThat(searchTemplatesWsResponse.getPermissionTemplates(0).getPermissions(0).getKey()).isEqualTo("admin"); @@ -139,26 +139,26 @@ public class PermissionSearchTest { assertThat(searchTemplatesWsResponse.getPermissionTemplates(0).getPermissions(0).getWithProjectCreator()).isTrue(); tester.wsClient().permissions().removeGroupFromTemplate( - new RemoveGroupFromTemplateWsRequest() + new RemoveGroupFromTemplateRequest() .setPermission("admin") .setTemplateName("my-new-template") .setGroupName(GROUP_NAME)); tester.wsClient().permissions().removeUserFromTemplate( - new RemoveUserFromTemplateWsRequest() + new RemoveUserFromTemplateRequest() .setPermission("admin") .setTemplateName("my-new-template") .setLogin(LOGIN)); tester.wsClient().permissions().removeProjectCreatorFromTemplate( - RemoveProjectCreatorFromTemplateWsRequest.builder() + RemoveProjectCreatorFromTemplateRequest.builder() .setPermission("admin") .setTemplateName("my-new-template") .build() ); SearchTemplatesWsResponse clearedSearchTemplatesWsResponse = tester.wsClient().permissions().searchTemplates( - new SearchTemplatesWsRequest() + new SearchTemplatesRequest() .setQuery("my-new-template")); assertThat(clearedSearchTemplatesWsResponse.getPermissionTemplates(0).getPermissionsList()) .extracting(Permission::getUsersCount, Permission::getGroupsCount, Permission::getWithProjectCreator) diff --git a/tests/src/test/java/org/sonarqube/tests/authorization/PermissionTemplatePageTest.java b/tests/src/test/java/org/sonarqube/tests/authorization/PermissionTemplatePageTest.java index 8ef4d43e9f9..f5149f8c631 100644 --- a/tests/src/test/java/org/sonarqube/tests/authorization/PermissionTemplatePageTest.java +++ b/tests/src/test/java/org/sonarqube/tests/authorization/PermissionTemplatePageTest.java @@ -26,9 +26,9 @@ import org.junit.Test; import org.sonarqube.qa.util.Tester; import org.sonarqube.qa.util.pageobjects.ProjectsManagementPage; import org.sonarqube.ws.Permissions; -import org.sonarqube.ws.client.permission.AddUserToTemplateWsRequest; -import org.sonarqube.ws.client.permission.CreateTemplateWsRequest; -import org.sonarqube.ws.client.permission.UsersWsRequest; +import org.sonarqube.ws.client.permission.AddUserToTemplateRequest; +import org.sonarqube.ws.client.permission.CreateTemplateRequest; +import org.sonarqube.ws.client.permission.UsersRequest; import static org.assertj.core.api.Assertions.assertThat; @@ -48,9 +48,9 @@ public class PermissionTemplatePageTest { String userLogin = tester.users().generateMemberOfDefaultOrganization().getLogin(); String adminLogin = tester.users().generateAdministratorOnDefaultOrganization().getLogin(); - tester.wsClient().permissions().createTemplate(new CreateTemplateWsRequest().setName("foo-template")); + tester.wsClient().permissions().createTemplate(new CreateTemplateRequest().setName("foo-template")); tester.wsClient().permissions().addUserToTemplate( - new AddUserToTemplateWsRequest() + new AddUserToTemplateRequest() .setPermission("admin") .setTemplateName("foo-template") .setLogin(userLogin)); @@ -58,7 +58,7 @@ public class PermissionTemplatePageTest { ProjectsManagementPage page = tester.openBrowser().logIn().submitCredentials(adminLogin).openProjectsManagement(); page.shouldHaveProject(project); page.bulkApplyPermissionTemplate("foo-template"); - Permissions.UsersWsResponse usersResponse = tester.wsClient().permissions().users(new UsersWsRequest() + Permissions.UsersWsResponse usersResponse = tester.wsClient().permissions().users(new UsersRequest() .setProjectKey(project) .setPermission("admin") ); diff --git a/tests/src/test/java/org/sonarqube/tests/authorization/PermissionTemplateTest.java b/tests/src/test/java/org/sonarqube/tests/authorization/PermissionTemplateTest.java index a0d4d4c7860..1f20a5b549a 100644 --- a/tests/src/test/java/org/sonarqube/tests/authorization/PermissionTemplateTest.java +++ b/tests/src/test/java/org/sonarqube/tests/authorization/PermissionTemplateTest.java @@ -38,12 +38,12 @@ import org.sonarqube.ws.Projects.CreateWsResponse.Project; import org.sonarqube.ws.Users.CreateWsResponse; import org.sonarqube.ws.client.WsClient; import org.sonarqube.ws.client.component.SearchProjectsRequest; -import org.sonarqube.ws.client.permission.AddUserToTemplateWsRequest; -import org.sonarqube.ws.client.permission.ApplyTemplateWsRequest; -import org.sonarqube.ws.client.permission.BulkApplyTemplateWsRequest; -import org.sonarqube.ws.client.permission.CreateTemplateWsRequest; +import org.sonarqube.ws.client.permission.AddUserToTemplateRequest; +import org.sonarqube.ws.client.permission.ApplyTemplateRequest; +import org.sonarqube.ws.client.permission.BulkApplyTemplateRequest; +import org.sonarqube.ws.client.permission.CreateTemplateRequest; import org.sonarqube.ws.client.permission.PermissionsService; -import org.sonarqube.ws.client.permission.UsersWsRequest; +import org.sonarqube.ws.client.permission.UsersRequest; import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic; import static org.assertj.core.api.Assertions.assertThat; @@ -90,7 +90,7 @@ public class PermissionTemplateTest { CreateWsResponse.User user = tester.users().generateMember(organization); CreateWsResponse.User anotherUser = tester.users().generateMember(organization); Permissions.PermissionTemplate template = createTemplate(organization).getPermissionTemplate(); - tester.wsClient().permissions().addUserToTemplate(new AddUserToTemplateWsRequest() + tester.wsClient().permissions().addUserToTemplate(new AddUserToTemplateRequest() .setOrganization(organization.getKey()) .setTemplateId(template.getId()) .setLogin(user.getLogin()) @@ -99,7 +99,7 @@ public class PermissionTemplateTest { Project project2 = createPrivateProject(organization); Project untouchedProject = createPrivateProject(organization); - tester.wsClient().permissions().bulkApplyTemplate(new BulkApplyTemplateWsRequest() + tester.wsClient().permissions().bulkApplyTemplate(new BulkApplyTemplateRequest() .setOrganization(organization.getKey()) .setTemplateId(template.getId()) .setProjects(Arrays.asList(project1.getKey(), project2.getKey()))); @@ -157,23 +157,23 @@ public class PermissionTemplateTest { private void createAndApplyTemplate(Organization organization, Project project, CreateWsResponse.User user) { String templateName = "For user"; PermissionsService service = tester.wsClient().permissions(); - service.createTemplate(new CreateTemplateWsRequest() + service.createTemplate(new CreateTemplateRequest() .setOrganization(organization.getKey()) .setName(templateName) .setDescription("Give admin permissions to single user")); - service.addUserToTemplate(new AddUserToTemplateWsRequest() + service.addUserToTemplate(new AddUserToTemplateRequest() .setOrganization(organization.getKey()) .setLogin(user.getLogin()) .setPermission("user") .setTemplateName(templateName)); - service.applyTemplate(new ApplyTemplateWsRequest() + service.applyTemplate(new ApplyTemplateRequest() .setOrganization(organization.getKey()) .setProjectKey(project.getKey()) .setTemplateName(templateName)); } private CreateTemplateWsResponse createTemplate(Organization organization) { - return tester.wsClient().permissions().createTemplate(new CreateTemplateWsRequest() + return tester.wsClient().permissions().createTemplate(new CreateTemplateRequest() .setOrganization(organization.getKey()) .setName(randomAlphabetic(20))); } @@ -199,7 +199,7 @@ public class PermissionTemplateTest { } private boolean hasBrowsePermission(CreateWsResponse.User user, Organization organization, Project project) { - UsersWsRequest request = new UsersWsRequest() + UsersRequest request = new UsersRequest() .setOrganization(organization.getKey()) .setProjectKey(project.getKey()) .setPermission("user"); diff --git a/tests/src/test/java/org/sonarqube/tests/authorization/ProvisioningPermissionTest.java b/tests/src/test/java/org/sonarqube/tests/authorization/ProvisioningPermissionTest.java index 3a9da8f55a0..f2dd1d9a704 100644 --- a/tests/src/test/java/org/sonarqube/tests/authorization/ProvisioningPermissionTest.java +++ b/tests/src/test/java/org/sonarqube/tests/authorization/ProvisioningPermissionTest.java @@ -27,10 +27,10 @@ import org.junit.Test; import org.junit.rules.RuleChain; import org.sonarqube.qa.util.Tester; import org.sonarqube.ws.Projects.CreateWsResponse.Project; -import org.sonarqube.ws.client.permission.AddGroupWsRequest; -import org.sonarqube.ws.client.permission.AddUserWsRequest; -import org.sonarqube.ws.client.permission.RemoveGroupWsRequest; -import org.sonarqube.ws.client.permission.RemoveUserWsRequest; +import org.sonarqube.ws.client.permission.AddGroupRequest; +import org.sonarqube.ws.client.permission.AddUserRequest; +import org.sonarqube.ws.client.permission.RemoveGroupRequest; +import org.sonarqube.ws.client.permission.RemoveUserRequest; import org.sonarqube.ws.client.project.CreateRequest; import util.ItUtils; @@ -58,7 +58,7 @@ public class ProvisioningPermissionTest { @BeforeClass public static void init() { // remove default permission "provisioning" from anyone(); - tester.wsClient().permissions().removeGroup(new RemoveGroupWsRequest().setGroupName("anyone").setPermission("provisioning")); + tester.wsClient().permissions().removeGroup(new RemoveGroupRequest().setGroupName("anyone").setPermission("provisioning")); tester.users().generate(u -> u.setLogin(ADMIN_WITH_PROVISIONING).setPassword(PASSWORD)); addUserPermission(ADMIN_WITH_PROVISIONING, "admin"); @@ -77,7 +77,7 @@ public class ProvisioningPermissionTest { @AfterClass public static void restoreData() throws Exception { - tester.wsClient().permissions().addGroup(new AddGroupWsRequest().setGroupName("anyone").setPermission("provisioning")); + tester.wsClient().permissions().addGroup(new AddGroupRequest().setGroupName("anyone").setPermission("provisioning")); } /** @@ -130,10 +130,10 @@ public class ProvisioningPermissionTest { } private static void addUserPermission(String login, String permission) { - tester.wsClient().permissions().addUser(new AddUserWsRequest().setLogin(login).setPermission(permission)); + tester.wsClient().permissions().addUser(new AddUserRequest().setLogin(login).setPermission(permission)); } private static void removeUserPermission(String login, String permission) { - tester.wsClient().permissions().removeUser(new RemoveUserWsRequest().setLogin(login).setPermission(permission)); + tester.wsClient().permissions().removeUser(new RemoveUserRequest().setLogin(login).setPermission(permission)); } } diff --git a/tests/src/test/java/org/sonarqube/tests/authorization/QualityProfileAdminPermissionTest.java b/tests/src/test/java/org/sonarqube/tests/authorization/QualityProfileAdminPermissionTest.java index 97d784d596a..c06e735a031 100644 --- a/tests/src/test/java/org/sonarqube/tests/authorization/QualityProfileAdminPermissionTest.java +++ b/tests/src/test/java/org/sonarqube/tests/authorization/QualityProfileAdminPermissionTest.java @@ -24,7 +24,7 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.sonarqube.qa.util.Tester; -import org.sonarqube.ws.client.permission.AddUserWsRequest; +import org.sonarqube.ws.client.permission.AddUserRequest; import org.sonarqube.ws.client.qualityprofile.CreateRequest; import util.selenium.Selenese; @@ -49,7 +49,7 @@ public class QualityProfileAdminPermissionTest { tester.users().generate(u -> u.setLogin("not_profileadm").setPassword("userpwd")); tester.users().generate(u -> u.setLogin("profileadm").setPassword("papwd")); - tester.wsClient().permissions().addUser(new AddUserWsRequest().setLogin("profileadm").setPermission("profileadmin")); + tester.wsClient().permissions().addUser(new AddUserRequest().setLogin("profileadm").setPermission("profileadmin")); createProfile("xoo", "foo"); Selenese.runSelenese(orchestrator, diff --git a/tests/src/test/java/org/sonarqube/tests/ce/ReportFailureNotificationTest.java b/tests/src/test/java/org/sonarqube/tests/ce/ReportFailureNotificationTest.java index ed6f9c9f82f..ccb74e981ec 100644 --- a/tests/src/test/java/org/sonarqube/tests/ce/ReportFailureNotificationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/ce/ReportFailureNotificationTest.java @@ -48,7 +48,7 @@ import org.sonarqube.ws.Projects; import org.sonarqube.ws.Users; import org.sonarqube.ws.client.PostRequest; import org.sonarqube.ws.client.WsClient; -import org.sonarqube.ws.client.permission.AddUserWsRequest; +import org.sonarqube.ws.client.permission.AddUserRequest; import org.subethamail.wiser.Wiser; import org.subethamail.wiser.WiserMessage; @@ -109,12 +109,12 @@ public class ReportFailureNotificationTest { Projects.CreateWsResponse.Project project2 = tester.projects().provision(organization, t -> t.setName("Project2")); Projects.CreateWsResponse.Project project3 = tester.projects().provision(organization, t -> t.setName("Project3")); // user 1 is admin of project 1 and will subscribe to global notifications - tester.wsClient().permissions().addUser(new AddUserWsRequest() + tester.wsClient().permissions().addUser(new AddUserRequest() .setLogin(user1.getLogin()) .setPermission("admin") .setProjectKey(project1.getKey())); // user 2 is admin of project 2 but won't subscribe to global notifications - tester.wsClient().permissions().addUser(new AddUserWsRequest() + tester.wsClient().permissions().addUser(new AddUserRequest() .setLogin(user2.getLogin()) .setPermission("admin") .setProjectKey(project2.getKey())); diff --git a/tests/src/test/java/org/sonarqube/tests/component/ComponentsWsTest.java b/tests/src/test/java/org/sonarqube/tests/component/ComponentsWsTest.java index 81a621d0e05..a14c73445df 100644 --- a/tests/src/test/java/org/sonarqube/tests/component/ComponentsWsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/component/ComponentsWsTest.java @@ -27,8 +27,8 @@ import org.junit.Test; import org.junit.rules.RuleChain; import org.sonarqube.qa.util.Tester; import org.sonarqube.ws.Components; -import org.sonarqube.ws.client.component.SearchWsRequest; -import org.sonarqube.ws.client.component.ShowWsRequest; +import org.sonarqube.ws.client.component.SearchRequest; +import org.sonarqube.ws.client.component.ShowRequest; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; @@ -53,7 +53,7 @@ public class ComponentsWsTest { @Test public void show() { - Components.ShowWsResponse response = tester.wsClient().components().show(new ShowWsRequest().setKey(FILE_KEY)); + Components.ShowWsResponse response = tester.wsClient().components().show(new ShowRequest().setKey(FILE_KEY)); assertThat(response).isNotNull(); assertThat(response.getComponent().getKey()).isEqualTo(FILE_KEY); @@ -62,7 +62,7 @@ public class ComponentsWsTest { @Test public void search() { - Components.SearchWsResponse response = tester.wsClient().components().search(new SearchWsRequest() + Components.SearchWsResponse response = tester.wsClient().components().search(new SearchRequest() .setQualifiers(singletonList("FIL"))); assertThat(response).isNotNull(); diff --git a/tests/src/test/java/org/sonarqube/tests/duplication/CrossProjectDuplicationsTest.java b/tests/src/test/java/org/sonarqube/tests/duplication/CrossProjectDuplicationsTest.java index 10d46f72611..934b045de47 100644 --- a/tests/src/test/java/org/sonarqube/tests/duplication/CrossProjectDuplicationsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/duplication/CrossProjectDuplicationsTest.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.junit.rules.RuleChain; import org.sonarqube.qa.util.Tester; import org.sonarqube.ws.client.GetRequest; -import org.sonarqube.ws.client.issue.SearchWsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; import util.ItUtils; import util.issue.IssueRule; @@ -94,7 +94,7 @@ public class CrossProjectDuplicationsTest { @Test public void issue_on_duplicated_blocks_is_generated_on_file() throws Exception { - assertThat(issueRule.search(new SearchWsRequest().setComponentKeys(singletonList(DUPLICATE_FILE)).setRules(singletonList("common-xoo:DuplicatedBlocks"))).getIssuesList()) + assertThat(issueRule.search(new SearchRequest().setComponentKeys(singletonList(DUPLICATE_FILE)).setRules(singletonList("common-xoo:DuplicatedBlocks"))).getIssuesList()) .hasSize(1); } diff --git a/tests/src/test/java/org/sonarqube/tests/duplication/DuplicationsTest.java b/tests/src/test/java/org/sonarqube/tests/duplication/DuplicationsTest.java index 671513c579a..0efe0c0837b 100644 --- a/tests/src/test/java/org/sonarqube/tests/duplication/DuplicationsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/duplication/DuplicationsTest.java @@ -30,7 +30,7 @@ import org.junit.rules.RuleChain; import org.sonarqube.qa.util.Tester; import org.sonarqube.ws.client.GetRequest; import org.sonarqube.ws.client.WsResponse; -import org.sonarqube.ws.client.issue.SearchWsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; import util.ItUtils; import util.issue.IssueRule; @@ -153,7 +153,7 @@ public class DuplicationsTest { @Test public void issues_on_duplicated_blocks_are_generated_on_each_file() throws Exception { - assertThat(issueRule.search(new SearchWsRequest().setRules(singletonList("common-xoo:DuplicatedBlocks"))).getIssuesList()).hasSize(13); + assertThat(issueRule.search(new SearchRequest().setRules(singletonList("common-xoo:DuplicatedBlocks"))).getIssuesList()).hasSize(13); } @Test diff --git a/tests/src/test/java/org/sonarqube/tests/issue/CommonRulesTest.java b/tests/src/test/java/org/sonarqube/tests/issue/CommonRulesTest.java index 69cddb89b7a..e5a8aee0e5f 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/CommonRulesTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/CommonRulesTest.java @@ -24,7 +24,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.sonarqube.ws.Issues.Issue; import org.sonarqube.ws.client.WsClient; -import org.sonarqube.ws.client.issue.SearchWsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; import util.ItUtils; import static java.util.Collections.singletonList; @@ -87,7 +87,7 @@ public class CommonRulesTest extends AbstractIssueTest { private List<Issue> findIssues(String componentKey, String ruleKey) { return adminWsClient.issues().search( - new SearchWsRequest() + new SearchRequest() .setComponents(singletonList(componentKey)) .setRules(singletonList(ruleKey))) .getIssuesList(); diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueActionTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueActionTest.java index 6ef4ae9573e..dbb4d6eef17 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueActionTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueActionTest.java @@ -30,7 +30,7 @@ import org.sonarqube.ws.client.issue.AddCommentRequest; import org.sonarqube.ws.client.issue.AssignRequest; import org.sonarqube.ws.client.issue.EditCommentRequest; import org.sonarqube.ws.client.issue.IssuesService; -import org.sonarqube.ws.client.issue.SearchWsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; import org.sonarqube.ws.client.issue.SetSeverityRequest; import util.ProjectAnalysis; import util.ProjectAnalysisRule; @@ -157,18 +157,18 @@ public class IssueActionTest extends AbstractIssueTest { @Test public void assign() { assertThat(randomIssue.hasAssignee()).isFalse(); - Issues.SearchWsResponse response = issueRule.search(new SearchWsRequest().setIssues(singletonList(randomIssue.getKey()))); + Issues.SearchWsResponse response = issueRule.search(new SearchRequest().setIssues(singletonList(randomIssue.getKey()))); assertThat(response.getUsers().getUsersList()).isEmpty(); issuesService.assign(new AssignRequest(randomIssue.getKey(), "admin")); - assertThat(issueRule.search(new SearchWsRequest().setAssignees(singletonList("admin"))).getIssuesList()).hasSize(1); + assertThat(issueRule.search(new SearchRequest().setAssignees(singletonList("admin"))).getIssuesList()).hasSize(1); projectAnalysis.run(); Issue reloaded = issueRule.getByKey(randomIssue.getKey()); assertThat(reloaded.getAssignee()).isEqualTo("admin"); assertThat(reloaded.getCreationDate()).isEqualTo(randomIssue.getCreationDate()); - response = issueRule.search(new SearchWsRequest().setIssues(singletonList(randomIssue.getKey())).setAdditionalFields(singletonList("users"))); + response = issueRule.search(new SearchRequest().setIssues(singletonList(randomIssue.getKey())).setAdditionalFields(singletonList("users"))); assertThat(response.getUsers().getUsersList().stream().filter(user -> "admin".equals(user.getLogin())).findFirst()).isPresent(); assertThat(response.getUsers().getUsersList().stream().filter(user -> "Administrator".equals(user.getName())).findFirst()).isPresent(); @@ -176,7 +176,7 @@ public class IssueActionTest extends AbstractIssueTest { issuesService.assign(new AssignRequest(randomIssue.getKey(), null)); reloaded = issueRule.getByKey(randomIssue.getKey()); assertThat(reloaded.hasAssignee()).isFalse(); - assertThat(issueRule.search(new SearchWsRequest().setAssignees(singletonList("admin"))).getIssuesList()).isEmpty(); + assertThat(issueRule.search(new SearchRequest().setAssignees(singletonList("admin"))).getIssuesList()).isEmpty(); } /** @@ -194,7 +194,7 @@ public class IssueActionTest extends AbstractIssueTest { } private static List<Issue> searchIssuesBySeverities(String projectKey, String severity) { - return issueRule.search(new SearchWsRequest().setProjectKeys(singletonList(projectKey)).setSeverities(singletonList(severity))).getIssuesList(); + return issueRule.search(new SearchRequest().setProjectKeys(singletonList(projectKey)).setSeverities(singletonList(severity))).getIssuesList(); } } diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueBulkChangeTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueBulkChangeTest.java index b62cf49a22c..4c4fd88cf2d 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueBulkChangeTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueBulkChangeTest.java @@ -31,7 +31,7 @@ import org.sonarqube.ws.Issues; import org.sonarqube.ws.Issues.BulkChangeWsResponse; import org.sonarqube.ws.client.issue.BulkChangeRequest; import org.sonarqube.ws.client.issue.IssuesService; -import org.sonarqube.ws.client.issue.SearchWsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; import util.ProjectAnalysis; import util.ProjectAnalysisRule; import util.issue.IssueRule; @@ -259,7 +259,7 @@ public class IssueBulkChangeTest extends AbstractIssueTest { } private static String[] searchIssueKeys(int limit) { - return getIssueKeys(issueRule.search(new SearchWsRequest()).getIssuesList(), limit); + return getIssueKeys(issueRule.search(new SearchRequest()).getIssuesList(), limit); } private static String[] getIssueKeys(List<Issues.Issue> issues, int nbIssues) { diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueFilterOnCommonRulesTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueFilterOnCommonRulesTest.java index 8012aec2ef7..a7a8708a382 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueFilterOnCommonRulesTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueFilterOnCommonRulesTest.java @@ -25,7 +25,7 @@ import org.junit.Before; import org.junit.Test; import org.sonarqube.ws.Issues; import org.sonarqube.ws.client.WsClient; -import org.sonarqube.ws.client.issue.SearchWsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; import util.ItUtils; import static java.util.Collections.singletonList; @@ -113,14 +113,14 @@ public class IssueFilterOnCommonRulesTest extends AbstractIssueTest { private List<Issues.Issue> findIssuesByRuleKey(String ruleKey) { return adminWsClient.issues().search( - new SearchWsRequest() + new SearchRequest() .setComponents(singletonList(FILE_KEY)) .setRules(singletonList(ruleKey))) .getIssuesList(); } private List<Issues.Issue> findAllIssues() { - return adminWsClient.issues().search(new SearchWsRequest()).getIssuesList(); + return adminWsClient.issues().search(new SearchRequest()).getIssuesList(); } } diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java index b5bcef07954..529191d7145 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java @@ -52,8 +52,8 @@ import org.sonarqube.ws.client.PostRequest; import org.sonarqube.ws.client.WsClient; import org.sonarqube.ws.client.issue.AssignRequest; import org.sonarqube.ws.client.issue.BulkChangeRequest; -import org.sonarqube.ws.client.issue.SearchWsRequest; -import org.sonarqube.ws.client.permission.AddUserWsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; +import org.sonarqube.ws.client.permission.AddUserRequest; import org.subethamail.wiser.Wiser; import org.subethamail.wiser.WiserMessage; @@ -174,7 +174,7 @@ public class IssueNotificationsTest { clearSmtpMessages(); // Change assignee - SearchWsResponse issues = tester.wsClient().issues().search(new SearchWsRequest().setProjectKeys(singletonList(PROJECT_KEY))); + SearchWsResponse issues = tester.wsClient().issues().search(new SearchRequest().setProjectKeys(singletonList(PROJECT_KEY))); Issue issue = issues.getIssuesList().get(0); tester.wsClient().issues().assign(new AssignRequest(issue.getKey(), userWithUserRole.getLogin())); @@ -245,7 +245,7 @@ public class IssueNotificationsTest { assertThat(smtpServer.getMessages()).hasSize(privateProject ? 2 : 3); clearSmtpMessages(); - SearchWsResponse issues = tester.wsClient().issues().search(new SearchWsRequest().setProjectKeys(singletonList(PROJECT_KEY))); + SearchWsResponse issues = tester.wsClient().issues().search(new SearchRequest().setProjectKeys(singletonList(PROJECT_KEY))); Issue issue = issues.getIssuesList().get(0); // bulk change without notification by default @@ -307,7 +307,7 @@ public class IssueNotificationsTest { .setEmail("userWithUserRole@nowhere.com")); tester.organizations().addMember(organization, userWithUserRole); tester.wsClient().permissions().addUser( - new AddUserWsRequest() + new AddUserRequest() .setLogin(userWithUserRole.getLogin()) .setProjectKey(PROJECT_KEY) .setPermission("user")); diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueSearchTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueSearchTest.java index 1ad0be32cd9..a6984ddb4eb 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueSearchTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueSearchTest.java @@ -35,7 +35,7 @@ import org.sonar.wsclient.issue.Issue; import org.sonar.wsclient.issue.IssueQuery; import org.sonar.wsclient.issue.Issues; import org.sonarqube.ws.Common; -import org.sonarqube.ws.client.issue.SearchWsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; import util.ItUtils; import static java.util.Arrays.asList; @@ -261,16 +261,16 @@ public class IssueSearchTest extends AbstractIssueTest { @Test public void search_issues_by_types() throws IOException { - assertThat(searchIssues(new SearchWsRequest().setTypes(singletonList("CODE_SMELL"))).getPaging().getTotal()).isEqualTo(142); - assertThat(searchIssues(new SearchWsRequest().setTypes(singletonList("BUG"))).getPaging().getTotal()).isEqualTo(122); - assertThat(searchIssues(new SearchWsRequest().setTypes(singletonList("VULNERABILITY"))).getPaging().getTotal()).isEqualTo(8); + assertThat(searchIssues(new SearchRequest().setTypes(singletonList("CODE_SMELL"))).getPaging().getTotal()).isEqualTo(142); + assertThat(searchIssues(new SearchRequest().setTypes(singletonList("BUG"))).getPaging().getTotal()).isEqualTo(122); + assertThat(searchIssues(new SearchRequest().setTypes(singletonList("VULNERABILITY"))).getPaging().getTotal()).isEqualTo(8); } private List<org.sonarqube.ws.Issues.Issue> searchByRuleKey(String... ruleKey) throws IOException { - return searchIssues(new SearchWsRequest().setRules(asList(ruleKey))).getIssuesList(); + return searchIssues(new SearchRequest().setRules(asList(ruleKey))).getIssuesList(); } - private SearchWsResponse searchIssues(SearchWsRequest request) throws IOException { + private SearchWsResponse searchIssues(SearchRequest request) throws IOException { return newAdminWsClient(ORCHESTRATOR).issues().search(request); } diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueTagsTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueTagsTest.java index e802dc945ac..2e4f00e1885 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueTagsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueTagsTest.java @@ -32,8 +32,8 @@ import org.junit.Test; import org.sonarqube.qa.util.Tester; import org.sonarqube.ws.Organizations.Organization; import org.sonarqube.ws.Users.CreateWsResponse.User; -import org.sonarqube.ws.client.issue.SearchWsRequest; -import org.sonarqube.ws.client.permission.AddUserWsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; +import org.sonarqube.ws.client.permission.AddUserRequest; import org.sonarqube.ws.client.project.CreateRequest; import util.ItUtils; @@ -75,7 +75,7 @@ public class IssueTagsTest { .build()); analyzeProject(projectKey); - String issue = tester.wsClient().issues().search(new SearchWsRequest()).getIssues(0).getKey(); + String issue = tester.wsClient().issues().search(new SearchRequest()).getIssues(0).getKey(); tester.wsClient().issues().setTags(issue, "bla", "blubb"); String[] publicTags = {"bad-practice", "convention", "pitfall"}; @@ -112,7 +112,7 @@ public class IssueTagsTest { private void grantUserPermission(String projectKey, User member) { tester.wsClient().permissions().addUser( - new AddUserWsRequest() + new AddUserRequest() .setLogin(member.getLogin()) .setPermission("user") .setProjectKey(projectKey)); diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueTrackingTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueTrackingTest.java index 27a9ed0e80f..632cfa5d810 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueTrackingTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueTrackingTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.sonarqube.ws.Issues.Issue; import org.sonarqube.ws.Issues.SearchWsResponse; import org.sonarqube.ws.client.WsClient; -import org.sonarqube.ws.client.issue.SearchWsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; import util.ItUtils; import static java.util.Collections.singletonList; @@ -71,7 +71,7 @@ public class IssueTrackingTest extends AbstractIssueTest { "sonar.projectDate", NEW_DATE_STR, "sonar.exclusions", "**/*.xoo"); - issues = searchIssues(new SearchWsRequest().setProjectKeys(singletonList("sample"))).getIssuesList(); + issues = searchIssues(new SearchRequest().setProjectKeys(singletonList("sample"))).getIssuesList(); assertThat(issues).hasSize(1); assertThat(issues.get(0).getStatus()).isEqualTo("CLOSED"); assertThat(issues.get(0).getResolution()).isEqualTo("FIXED"); @@ -119,14 +119,14 @@ public class IssueTrackingTest extends AbstractIssueTest { runProjectAnalysis(ORCHESTRATOR, "shared/xoo-sample"); // Only one issue is created - assertThat(searchIssues(new SearchWsRequest()).getIssuesList()).hasSize(1); + assertThat(searchIssues(new SearchRequest()).getIssuesList()).hasSize(1); Issue issue = getRandomIssue(); // Re analysis of the same project runProjectAnalysis(ORCHESTRATOR, "shared/xoo-sample"); // No new issue should be created - assertThat(searchIssues(new SearchWsRequest()).getIssuesList()).hasSize(1); + assertThat(searchIssues(new SearchRequest()).getIssuesList()).hasSize(1); // The issue on module should stay open and be the same from the first analysis Issue reloadIssue = getIssueByKey(issue.getKey()); @@ -146,14 +146,14 @@ public class IssueTrackingTest extends AbstractIssueTest { runProjectAnalysis(ORCHESTRATOR, "shared/xoo-multi-modules-sample"); // One issue by module are created - List<Issue> issues = searchIssues(new SearchWsRequest()).getIssuesList(); + List<Issue> issues = searchIssues(new SearchRequest()).getIssuesList(); assertThat(issues).hasSize(4); // Re analysis of the same project runProjectAnalysis(ORCHESTRATOR, "shared/xoo-multi-modules-sample"); // No new issue should be created - assertThat(searchIssues(new SearchWsRequest()).getIssuesList()).hasSize(issues.size()); + assertThat(searchIssues(new SearchRequest()).getIssuesList()).hasSize(issues.size()); // Issues on modules should stay open and be the same from the first analysis for (Issue issue : issues) { @@ -200,20 +200,20 @@ public class IssueTrackingTest extends AbstractIssueTest { } private List<Issue> searchUnresolvedIssuesByComponent(String componentKey) { - return searchIssues(new SearchWsRequest().setComponentKeys(singletonList(componentKey)).setResolved(false)).getIssuesList(); + return searchIssues(new SearchRequest().setComponentKeys(singletonList(componentKey)).setResolved(false)).getIssuesList(); } private static Issue getRandomIssue() { - return searchIssues(new SearchWsRequest()).getIssues(0); + return searchIssues(new SearchRequest()).getIssues(0); } private static Issue getIssueByKey(String issueKey) { - SearchWsResponse search = searchIssues(new SearchWsRequest().setIssues(singletonList(issueKey))); + SearchWsResponse search = searchIssues(new SearchRequest().setIssues(singletonList(issueKey))); assertThat(search.getTotal()).isEqualTo(1); return search.getIssues(0); } - private static SearchWsResponse searchIssues(SearchWsRequest request) { + private static SearchWsResponse searchIssues(SearchRequest request) { return adminClient.issues().search(request); } diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueWorkflowTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueWorkflowTest.java index bfcd4afca84..47db3ad031c 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueWorkflowTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueWorkflowTest.java @@ -28,7 +28,7 @@ import org.sonarqube.ws.Issues; import org.sonarqube.ws.Issues.Issue; import org.sonarqube.ws.client.issue.DoTransitionRequest; import org.sonarqube.ws.client.issue.IssuesService; -import org.sonarqube.ws.client.issue.SearchWsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; import util.ProjectAnalysis; import util.ProjectAnalysisRule; import util.issue.IssueRule; @@ -70,7 +70,7 @@ public class IssueWorkflowTest extends AbstractIssueTest { */ @Test public void issue_is_closed_as_removed_when_rule_is_disabled() throws Exception { - SearchWsRequest ruleSearchRequest = new SearchWsRequest().setRules(singletonList("xoo:OneIssuePerLine")); + SearchRequest ruleSearchRequest = new SearchRequest().setRules(singletonList("xoo:OneIssuePerLine")); List<Issue> issues = issueRule.search(ruleSearchRequest).getIssuesList(); assertThat(issues).isNotEmpty(); @@ -302,12 +302,12 @@ public class IssueWorkflowTest extends AbstractIssueTest { } private List<String> transitions(String issueKey) { - Issues.SearchWsResponse response = searchIssues(new SearchWsRequest().setIssues(singletonList(issueKey)).setAdditionalFields(singletonList("transitions"))); + Issues.SearchWsResponse response = searchIssues(new SearchRequest().setIssues(singletonList(issueKey)).setAdditionalFields(singletonList("transitions"))); assertThat(response.getTotal()).isEqualTo(1); return response.getIssues(0).getTransitions().getTransitionsList(); } - private Issues.SearchWsResponse searchIssues(SearchWsRequest request) { + private Issues.SearchWsResponse searchIssues(SearchRequest request) { return newAdminWsClient(ORCHESTRATOR).issues().search(request); } diff --git a/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssueAssignTest.java b/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssueAssignTest.java index db359df1056..2f223fe66a1 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssueAssignTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssueAssignTest.java @@ -35,7 +35,7 @@ import org.sonarqube.ws.Organizations; import org.sonarqube.ws.Users.CreateWsResponse.User; import org.sonarqube.ws.client.issue.AssignRequest; import org.sonarqube.ws.client.issue.BulkChangeRequest; -import org.sonarqube.ws.client.issue.SearchWsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; import org.sonarqube.ws.client.project.CreateRequest; import org.sonarqube.ws.client.qualityprofile.AddProjectRequest; import org.sonarqube.qa.util.pageobjects.issues.IssuesPage; @@ -125,15 +125,15 @@ public class OrganizationIssueAssignTest { tester.organizations().addMember(org1, user); provisionAndAnalyseProject(SAMPLE_PROJECT_KEY, org1.getKey()); provisionAndAnalyseProject("sample2", org2.getKey()); - List<String> issues = issueRule.search(new org.sonarqube.ws.client.issue.SearchWsRequest()).getIssuesList().stream().map(Issue::getKey).collect(Collectors.toList()); + List<String> issues = issueRule.search(new SearchRequest()).getIssuesList().stream().map(Issue::getKey).collect(Collectors.toList()); Issues.BulkChangeWsResponse response = tester.wsClient().issues() .bulkChange(BulkChangeRequest.builder().setIssues(issues).setAssign(user.getLogin()).build()); assertThat(response.getIgnored()).isGreaterThan(0); - assertThat(issueRule.search(new SearchWsRequest().setProjectKeys(singletonList("sample"))).getIssuesList()).extracting(Issue::getAssignee) + assertThat(issueRule.search(new SearchRequest().setProjectKeys(singletonList("sample"))).getIssuesList()).extracting(Issue::getAssignee) .containsOnly(user.getLogin()); - assertThat(issueRule.search(new SearchWsRequest().setProjectKeys(singletonList("sample2"))).getIssuesList()).extracting(Issue::hasAssignee) + assertThat(issueRule.search(new SearchRequest().setProjectKeys(singletonList("sample2"))).getIssuesList()).extracting(Issue::hasAssignee) .containsOnly(false); } diff --git a/tests/src/test/java/org/sonarqube/tests/lite/LiteTest.java b/tests/src/test/java/org/sonarqube/tests/lite/LiteTest.java index 66245b7259e..84c4c4c1bf3 100644 --- a/tests/src/test/java/org/sonarqube/tests/lite/LiteTest.java +++ b/tests/src/test/java/org/sonarqube/tests/lite/LiteTest.java @@ -28,11 +28,11 @@ import org.sonarqube.qa.util.Tester; import org.sonarqube.ws.Issues; import org.sonarqube.ws.Components; import org.sonarqube.ws.Measures; -import org.sonarqube.ws.client.component.TreeWsRequest; +import org.sonarqube.ws.client.component.TreeRequest; import org.sonarqube.ws.client.issue.IssuesService; -import org.sonarqube.ws.client.issue.SearchWsRequest; -import org.sonarqube.ws.client.measure.ComponentTreeWsRequest; -import org.sonarqube.ws.client.measure.ComponentWsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; +import org.sonarqube.ws.client.measure.ComponentTreeRequest; +import org.sonarqube.ws.client.measure.ComponentRequest; import org.sonarqube.ws.client.measure.MeasuresService; import static java.util.Arrays.asList; @@ -64,18 +64,18 @@ public class LiteTest { public void call_issues_ws() { // all issues IssuesService issuesService = tester.wsClient().issues(); - Issues.SearchWsResponse response = issuesService.search(new SearchWsRequest()); + Issues.SearchWsResponse response = issuesService.search(new SearchRequest()); assertThat(response.getIssuesCount()).isGreaterThan(0); // project issues - response = issuesService.search(new SearchWsRequest().setProjectKeys(singletonList(PROJECT_KEY))); + response = issuesService.search(new SearchRequest().setProjectKeys(singletonList(PROJECT_KEY))); assertThat(response.getIssuesCount()).isGreaterThan(0); } @Test public void call_components_ws() { // files in project - Components.TreeWsResponse tree = tester.wsClient().components().tree(new TreeWsRequest() + Components.TreeWsResponse tree = tester.wsClient().components().tree(new TreeRequest() .setBaseComponentKey(PROJECT_KEY) .setQualifiers(singletonList("FIL"))); assertThat(tree.getComponentsCount()).isEqualTo(4); @@ -89,13 +89,13 @@ public class LiteTest { public void call_measures_ws() { // project measures MeasuresService measuresService = tester.wsClient().measures(); - Measures.ComponentWsResponse component = measuresService.component(new ComponentWsRequest() + Measures.ComponentWsResponse component = measuresService.component(new ComponentRequest() .setComponentKey(PROJECT_KEY) .setMetricKeys(asList("lines", "ncloc", "files"))); assertThat(component.getComponent().getMeasuresCount()).isEqualTo(3); // file measures - Measures.ComponentTreeWsResponse tree = measuresService.componentTree(new ComponentTreeWsRequest() + Measures.ComponentTreeWsResponse tree = measuresService.componentTree(new ComponentTreeRequest() .setBaseComponentKey(PROJECT_KEY) .setQualifiers(singletonList("FIL")) .setMetricKeys(asList("lines", "ncloc"))); diff --git a/tests/src/test/java/org/sonarqube/tests/measure/MeasuresWsTest.java b/tests/src/test/java/org/sonarqube/tests/measure/MeasuresWsTest.java index e83ab8f5c8a..71f1460addf 100644 --- a/tests/src/test/java/org/sonarqube/tests/measure/MeasuresWsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/measure/MeasuresWsTest.java @@ -30,8 +30,8 @@ import org.sonarqube.qa.util.Tester; import org.sonarqube.ws.Measures; import org.sonarqube.ws.Measures.ComponentTreeWsResponse; import org.sonarqube.ws.Measures.ComponentWsResponse; -import org.sonarqube.ws.client.measure.ComponentTreeWsRequest; -import org.sonarqube.ws.client.measure.ComponentWsRequest; +import org.sonarqube.ws.client.measure.ComponentTreeRequest; +import org.sonarqube.ws.client.measure.ComponentRequest; import static com.google.common.collect.Lists.newArrayList; import static java.util.Arrays.asList; @@ -59,7 +59,7 @@ public class MeasuresWsTest { public void component_tree() { scanXooSample(); - ComponentTreeWsResponse response = tester.wsClient().measures().componentTree(new ComponentTreeWsRequest() + ComponentTreeWsResponse response = tester.wsClient().measures().componentTree(new ComponentTreeRequest() .setComponent("sample") .setMetricKeys(singletonList("ncloc")) .setAdditionalFields(asList("metrics", "periods"))); @@ -123,7 +123,7 @@ public class MeasuresWsTest { } private void verifyComponentTreeWithChildren(String baseComponentKey, String... childKeys) { - ComponentTreeWsResponse response = tester.wsClient().measures().componentTree(new ComponentTreeWsRequest() + ComponentTreeWsResponse response = tester.wsClient().measures().componentTree(new ComponentTreeRequest() .setComponent(baseComponentKey) .setMetricKeys(singletonList("ncloc")) .setStrategy("children")); @@ -137,7 +137,7 @@ public class MeasuresWsTest { public void component() { scanXooSample(); - ComponentWsResponse response = tester.wsClient().measures().component(new ComponentWsRequest() + ComponentWsResponse response = tester.wsClient().measures().component(new ComponentRequest() .setComponent("sample") .setMetricKeys(singletonList("ncloc")) .setAdditionalFields(newArrayList("metrics", "periods"))); diff --git a/tests/src/test/java/org/sonarqube/tests/organization/BillingTest.java b/tests/src/test/java/org/sonarqube/tests/organization/BillingTest.java index 33c6de854b8..3ee724c08a4 100644 --- a/tests/src/test/java/org/sonarqube/tests/organization/BillingTest.java +++ b/tests/src/test/java/org/sonarqube/tests/organization/BillingTest.java @@ -34,7 +34,7 @@ import org.sonarqube.ws.Users.CreateWsResponse.User; import org.sonarqube.ws.client.GetRequest; import org.sonarqube.ws.client.WsResponse; import org.sonarqube.ws.client.ce.TaskRequest; -import org.sonarqube.ws.client.organization.UpdateProjectVisibilityWsRequest; +import org.sonarqube.ws.client.organization.UpdateProjectVisibilityRequest; import org.sonarqube.ws.client.project.CreateRequest; import org.sonarqube.ws.client.project.UpdateVisibilityRequest; import util.ItUtils; @@ -127,7 +127,7 @@ public class BillingTest { public void does_not_fail_to_update_default_projects_visibility_to_private() { tester.settings().setGlobalSettings("sonar.billing.preventUpdatingProjectsVisibilityToPrivate", "false"); - tester.wsClient().organizations().updateProjectVisibility(UpdateProjectVisibilityWsRequest.builder() + tester.wsClient().organizations().updateProjectVisibility(UpdateProjectVisibilityRequest.builder() .setOrganization(organization.getKey()) .setProjectVisibility("private") .build()); @@ -143,7 +143,7 @@ public class BillingTest { expectHttpError(400, format("Organization %s cannot use private project", organization.getKey()), () -> tester.wsClient().organizations() - .updateProjectVisibility(UpdateProjectVisibilityWsRequest.builder().setOrganization(organization.getKey()).setProjectVisibility("private").build())); + .updateProjectVisibility(UpdateProjectVisibilityRequest.builder().setOrganization(organization.getKey()).setProjectVisibility("private").build())); } @Test diff --git a/tests/src/test/java/org/sonarqube/tests/organization/OrganizationMembershipTest.java b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationMembershipTest.java index 2b738c24afd..27168955514 100644 --- a/tests/src/test/java/org/sonarqube/tests/organization/OrganizationMembershipTest.java +++ b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationMembershipTest.java @@ -31,7 +31,7 @@ import org.sonarqube.qa.util.Tester; import org.sonarqube.ws.Organizations.Organization; import org.sonarqube.ws.Users.CreateWsResponse.User; import org.sonarqube.ws.client.HttpException; -import org.sonarqube.ws.client.permission.AddUserWsRequest; +import org.sonarqube.ws.client.permission.AddUserRequest; public class OrganizationMembershipTest { @@ -78,7 +78,7 @@ public class OrganizationMembershipTest { User user = tester.users().generate(); addMembership(organization, user); - tester.wsClient().permissions().addUser(new AddUserWsRequest().setLogin(user.getLogin()).setPermission("admin").setOrganization(organization.getKey())); + tester.wsClient().permissions().addUser(new AddUserRequest().setLogin(user.getLogin()).setPermission("admin").setOrganization(organization.getKey())); tester.organizations().assertThatMemberOf(organization, user); removeMembership(organization, user); @@ -91,7 +91,7 @@ public class OrganizationMembershipTest { User user = tester.users().generate(); addMembership(organization, user); - tester.wsClient().permissions().addUser(new AddUserWsRequest().setLogin(user.getLogin()).setPermission("admin").setOrganization(organization.getKey())); + tester.wsClient().permissions().addUser(new AddUserRequest().setLogin(user.getLogin()).setPermission("admin").setOrganization(organization.getKey())); tester.organizations().assertThatMemberOf(organization, user); // Admin is the creator of the organization so he was granted with admin permission tester.wsClient().organizations().removeMember(organization.getKey(), "admin"); diff --git a/tests/src/test/java/org/sonarqube/tests/organization/OrganizationTest.java b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationTest.java index a0067d75aa1..8995f90a42d 100644 --- a/tests/src/test/java/org/sonarqube/tests/organization/OrganizationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationTest.java @@ -37,11 +37,11 @@ import org.sonarqube.ws.UserGroups.Group; import org.sonarqube.ws.Users; import org.sonarqube.ws.Users.CreateWsResponse.User; import org.sonarqube.ws.client.component.ComponentsService; -import org.sonarqube.ws.client.organization.CreateWsRequest; +import org.sonarqube.ws.client.organization.CreateRequest; import org.sonarqube.ws.client.organization.OrganizationService; -import org.sonarqube.ws.client.organization.SearchWsRequest; -import org.sonarqube.ws.client.organization.UpdateWsRequest; -import org.sonarqube.ws.client.permission.AddUserWsRequest; +import org.sonarqube.ws.client.organization.SearchRequest; +import org.sonarqube.ws.client.organization.UpdateRequest; +import org.sonarqube.ws.client.permission.AddUserRequest; import org.sonarqube.ws.client.permission.PermissionsService; import org.sonarqube.ws.client.roots.SetRootRequest; import org.sonarqube.ws.client.roots.UnsetRootRequest; @@ -77,7 +77,7 @@ public class OrganizationTest { @Test public void default_organization_should_exist() { - Organization defaultOrg = tester.organizations().service().search(SearchWsRequest.builder().build()) + Organization defaultOrg = tester.organizations().service().search(SearchRequest.builder().build()) .getOrganizationsList() .stream() .filter(Organization::getGuarded) @@ -111,7 +111,7 @@ public class OrganizationTest { assertThatBuiltInQualityProfilesExist(org); // update by key - service.update(new UpdateWsRequest.Builder() + service.update(new UpdateRequest.Builder() .setKey(org.getKey()) .setName("new name") .setDescription("new description") @@ -121,7 +121,7 @@ public class OrganizationTest { verifyOrganization(org, "new name", "new description", "new url", "new avatar url"); // remove optional fields - service.update(new UpdateWsRequest.Builder() + service.update(new UpdateRequest.Builder() .setKey(org.getKey()) .setName("new name 2") .setDescription("") @@ -136,7 +136,7 @@ public class OrganizationTest { assertThatQualityProfilesDoNotExist(org); // create again - service.create(new CreateWsRequest.Builder() + service.create(new CreateRequest.Builder() .setName(NAME) .setKey(org.getKey()) .build()) @@ -149,7 +149,7 @@ public class OrganizationTest { // create organization without key String name = "Foo Company to keyize"; String expectedKey = "foo-company-to-keyize"; - Organization createdOrganization = tester.organizations().service().create(new CreateWsRequest.Builder() + Organization createdOrganization = tester.organizations().service().create(new CreateRequest.Builder() .setName(name) .build()) .getOrganization(); @@ -163,7 +163,7 @@ public class OrganizationTest { OrganizationTester anonymousTester = tester.asAnonymous().organizations(); expectForbiddenError(() -> anonymousTester.generate()); - expectUnauthorizedError(() -> anonymousTester.service().update(new UpdateWsRequest.Builder().setKey(org.getKey()).setName("new name").build())); + expectUnauthorizedError(() -> anonymousTester.service().update(new UpdateRequest.Builder().setKey(org.getKey()).setName("new name").build())); expectUnauthorizedError(() -> anonymousTester.service().delete(org.getKey())); } @@ -174,7 +174,7 @@ public class OrganizationTest { OrganizationTester userTester = tester.as(user.getLogin()).organizations(); expectForbiddenError(() -> userTester.generate()); - expectForbiddenError(() -> userTester.service().update(new UpdateWsRequest.Builder().setKey(org.getKey()).setName("new name").build())); + expectForbiddenError(() -> userTester.service().update(new UpdateRequest.Builder().setKey(org.getKey()).setName("new name").build())); expectForbiddenError(() -> userTester.service().delete(org.getKey())); } @@ -238,9 +238,9 @@ public class OrganizationTest { private void addPermissionsToUser(String orgKeyAndName, String login, String permission, String... otherPermissions) { PermissionsService permissionsService = tester.wsClient().permissions(); - permissionsService.addUser(new AddUserWsRequest().setLogin(login).setOrganization(orgKeyAndName).setPermission(permission)); + permissionsService.addUser(new AddUserRequest().setLogin(login).setOrganization(orgKeyAndName).setPermission(permission)); for (String otherPermission : otherPermissions) { - permissionsService.addUser(new AddUserWsRequest().setLogin(login).setOrganization(orgKeyAndName).setPermission(otherPermission)); + permissionsService.addUser(new AddUserRequest().setLogin(login).setOrganization(orgKeyAndName).setPermission(otherPermission)); } } @@ -294,7 +294,7 @@ public class OrganizationTest { assertThat(organization.getKey()).isNotEmpty(); assertThat(organization.getGuarded()).isFalse(); - List<Organization> reloadedOrgs = tester.organizations().service().search(SearchWsRequest.builder().build()).getOrganizationsList(); + List<Organization> reloadedOrgs = tester.organizations().service().search(SearchRequest.builder().build()).getOrganizationsList(); assertThat(reloadedOrgs) .filteredOn(o -> o.getKey().equals(organization.getKey())) .hasSize(1); @@ -302,20 +302,20 @@ public class OrganizationTest { private Components.SearchWsResponse searchSampleProject(String organizationKey, ComponentsService componentsService) { return componentsService - .search(new org.sonarqube.ws.client.component.SearchWsRequest() + .search(new org.sonarqube.ws.client.component.SearchRequest() .setOrganization(organizationKey) .setQualifiers(singletonList("TRK")) .setQuery("sample")); } private void assertThatOrganizationDoesNotExit(Organization org) { - SearchWsRequest request = new SearchWsRequest.Builder().setOrganizations(org.getKey()).build(); + SearchRequest request = new SearchRequest.Builder().setOrganizations(org.getKey()).build(); assertThat(tester.organizations().service().search(request).getOrganizationsList()).isEmpty(); } private void verifyOrganization(Organization createdOrganization, String name, String description, String url, String avatarUrl) { - SearchWsRequest request = new SearchWsRequest.Builder().setOrganizations(createdOrganization.getKey()).build(); + SearchRequest request = new SearchRequest.Builder().setOrganizations(createdOrganization.getKey()).build(); List<Organization> result = tester.organizations().service().search(request).getOrganizationsList(); assertThat(result).hasSize(1); Organization searchedOrganization = result.get(0); @@ -339,7 +339,7 @@ public class OrganizationTest { } private void assertThatBuiltInQualityProfilesExist(Organization org) { - org.sonarqube.ws.client.qualityprofile.SearchWsRequest profilesRequest = new org.sonarqube.ws.client.qualityprofile.SearchWsRequest() + org.sonarqube.ws.client.qualityprofile.SearchRequest profilesRequest = new org.sonarqube.ws.client.qualityprofile.SearchRequest() .setOrganizationKey(org.getKey()); Qualityprofiles.SearchWsResponse response = tester.wsClient().qualityProfiles().search(profilesRequest); assertThat(response.getProfilesCount()).isGreaterThan(0); @@ -363,6 +363,6 @@ public class OrganizationTest { private void assertThatQualityProfilesDoNotExist(Organization org) { expectNotFoundError(() -> tester.wsClient().qualityProfiles().search( - new org.sonarqube.ws.client.qualityprofile.SearchWsRequest().setOrganizationKey(org.getKey()))); + new org.sonarqube.ws.client.qualityprofile.SearchRequest().setOrganizationKey(org.getKey()))); } } diff --git a/tests/src/test/java/org/sonarqube/tests/organization/PersonalOrganizationTest.java b/tests/src/test/java/org/sonarqube/tests/organization/PersonalOrganizationTest.java index a31f889a890..ac98f4e7d42 100644 --- a/tests/src/test/java/org/sonarqube/tests/organization/PersonalOrganizationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/organization/PersonalOrganizationTest.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.sonarqube.qa.util.Tester; import org.sonarqube.ws.Organizations; import org.sonarqube.ws.Users; -import org.sonarqube.ws.client.organization.SearchWsRequest; +import org.sonarqube.ws.client.organization.SearchRequest; import static org.assertj.core.api.Assertions.assertThat; @@ -52,7 +52,7 @@ public class PersonalOrganizationTest { public void personal_organizations_are_created_for_new_users() { Users.CreateWsResponse.User user = tester.users().generate(); - List<Organizations.Organization> existing = tester.wsClient().organizations().search(SearchWsRequest.builder().build()).getOrganizationsList(); + List<Organizations.Organization> existing = tester.wsClient().organizations().search(SearchRequest.builder().build()).getOrganizationsList(); assertThat(existing) .filteredOn(Organizations.Organization::getGuarded) .filteredOn(o -> o.getKey().equals(user.getLogin())) diff --git a/tests/src/test/java/org/sonarqube/tests/performance/scanner/DuplicationTest.java b/tests/src/test/java/org/sonarqube/tests/performance/scanner/DuplicationTest.java index 6d18fec7152..0ded98c31a3 100644 --- a/tests/src/test/java/org/sonarqube/tests/performance/scanner/DuplicationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/performance/scanner/DuplicationTest.java @@ -37,7 +37,7 @@ import org.sonarqube.ws.Measures; import org.sonarqube.ws.client.HttpConnector; import org.sonarqube.ws.client.WsClient; import org.sonarqube.ws.client.WsClientFactories; -import org.sonarqube.ws.client.measure.ComponentWsRequest; +import org.sonarqube.ws.client.measure.ComponentRequest; import static java.lang.Double.parseDouble; import static java.util.Arrays.asList; @@ -80,7 +80,7 @@ public class DuplicationTest extends AbstractPerfTest { } private Map<String, Double> getMeasures(String key) { - return newWsClient().measures().component(new ComponentWsRequest() + return newWsClient().measures().component(new ComponentRequest() .setComponentKey(key) .setMetricKeys(asList("duplicated_lines", "duplicated_blocks", "duplicated_files", "duplicated_lines_density"))) .getComponent().getMeasuresList() diff --git a/tests/src/test/java/org/sonarqube/tests/project/ProjectBulkDeletionTest.java b/tests/src/test/java/org/sonarqube/tests/project/ProjectBulkDeletionTest.java index 7036f46a69d..ce7fdb4bc33 100644 --- a/tests/src/test/java/org/sonarqube/tests/project/ProjectBulkDeletionTest.java +++ b/tests/src/test/java/org/sonarqube/tests/project/ProjectBulkDeletionTest.java @@ -30,7 +30,7 @@ import org.sonarqube.qa.util.Tester; import org.sonarqube.ws.Organizations; import org.sonarqube.ws.Projects.CreateWsResponse; import org.sonarqube.ws.Projects.SearchWsResponse.Component; -import org.sonarqube.ws.client.project.SearchWsRequest; +import org.sonarqube.ws.client.project.SearchRequest; import static org.assertj.core.api.Assertions.assertThat; import static util.ItUtils.runProjectAnalysis; @@ -52,12 +52,12 @@ public class ProjectBulkDeletionTest { analyzeProject(analyzedProject.getKey(), organization.getKey()); - tester.wsClient().projects().bulkDelete(SearchWsRequest.builder() + tester.wsClient().projects().bulkDelete(SearchRequest.builder() .setOrganization(organization.getKey()) .setQuery("FIRST-PROVISIONED") .setOnProvisionedOnly(true).build()); - List<Component> projects = tester.wsClient().projects().search(SearchWsRequest.builder().setOrganization(organization.getKey()).build()).getComponentsList(); + List<Component> projects = tester.wsClient().projects().search(SearchRequest.builder().setOrganization(organization.getKey()).build()).getComponentsList(); assertThat(projects).extracting(Component::getKey) .containsExactlyInAnyOrder(analyzedProject.getKey(), secondProvisionedProject.getKey()) .doesNotContain(firstProvisionedProject.getKey()); @@ -67,7 +67,7 @@ public class ProjectBulkDeletionTest { public void delete_more_than_50_projects_at_the_same_time() { Organizations.Organization organization = tester.organizations().generate(); IntStream.range(0, 60).forEach(i -> tester.projects().provision(organization)); - SearchWsRequest request = SearchWsRequest.builder().setOrganization(organization.getKey()).build(); + SearchRequest request = SearchRequest.builder().setOrganization(organization.getKey()).build(); assertThat(tester.wsClient().projects().search(request).getPaging().getTotal()).isEqualTo(60); tester.wsClient().projects().bulkDelete(request); diff --git a/tests/src/test/java/org/sonarqube/tests/project/ProjectDeletionTest.java b/tests/src/test/java/org/sonarqube/tests/project/ProjectDeletionTest.java index 6495e142727..be1b0b441e6 100644 --- a/tests/src/test/java/org/sonarqube/tests/project/ProjectDeletionTest.java +++ b/tests/src/test/java/org/sonarqube/tests/project/ProjectDeletionTest.java @@ -43,7 +43,7 @@ import org.sonarqube.ws.client.WsResponse; import org.sonarqube.ws.client.component.SearchProjectsRequest; import org.sonarqube.ws.client.project.CreateRequest; import org.sonarqube.ws.client.project.DeleteRequest; -import org.sonarqube.ws.client.project.SearchWsRequest; +import org.sonarqube.ws.client.project.SearchRequest; import util.ItUtils; import static java.util.Collections.singletonList; @@ -165,7 +165,7 @@ public class ProjectDeletionTest { } private void bulkDeleteProjects(Organizations.Organization organization, Project... projects) { - SearchWsRequest request = SearchWsRequest.builder() + SearchRequest request = SearchRequest.builder() .setOrganization(organization.getKey()) .setProjects(Arrays.stream(projects).map(Project::getKey).collect(Collectors.toList())) .build(); @@ -194,7 +194,7 @@ public class ProjectDeletionTest { */ private boolean isInProjectsSearch(Organizations.Organization organization, String name) { Projects.SearchWsResponse response = tester.wsClient().projects().search( - SearchWsRequest.builder().setOrganization(organization.getKey()).setQuery(name).setQualifiers(singletonList("TRK")).build()); + SearchRequest.builder().setOrganization(organization.getKey()).setQuery(name).setQualifiers(singletonList("TRK")).build()); return response.getComponentsCount() > 0; } diff --git a/tests/src/test/java/org/sonarqube/tests/project/ProjectKeyUpdateTest.java b/tests/src/test/java/org/sonarqube/tests/project/ProjectKeyUpdateTest.java index b560d54c68f..d209d9154f5 100644 --- a/tests/src/test/java/org/sonarqube/tests/project/ProjectKeyUpdateTest.java +++ b/tests/src/test/java/org/sonarqube/tests/project/ProjectKeyUpdateTest.java @@ -40,10 +40,10 @@ import org.sonarqube.ws.Projects; import org.sonarqube.ws.client.GetRequest; import org.sonarqube.ws.client.WsResponse; import org.sonarqube.ws.client.component.SearchProjectsRequest; -import org.sonarqube.ws.client.component.ShowWsRequest; -import org.sonarqube.ws.client.project.BulkUpdateKeyWsRequest; +import org.sonarqube.ws.client.component.ShowRequest; +import org.sonarqube.ws.client.project.BulkUpdateKeyRequest; import org.sonarqube.ws.client.project.CreateRequest; -import org.sonarqube.ws.client.project.UpdateKeyWsRequest; +import org.sonarqube.ws.client.project.UpdateKeyRequest; import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -71,31 +71,31 @@ public class ProjectKeyUpdateTest { public void update_key() { analyzeXooSample(); String newProjectKey = "another_project_key"; - Components.Component project = tester.wsClient().components().show(new ShowWsRequest().setKey(PROJECT_KEY)).getComponent(); + Components.Component project = tester.wsClient().components().show(new ShowRequest().setKey(PROJECT_KEY)).getComponent(); assertThat(project.getKey()).isEqualTo(PROJECT_KEY); - tester.wsClient().projects().updateKey(UpdateKeyWsRequest.builder() + tester.wsClient().projects().updateKey(UpdateKeyRequest.builder() .setKey(PROJECT_KEY) .setNewKey(newProjectKey) .build()); - assertThat(tester.wsClient().components().show(new ShowWsRequest().setId(project.getId())).getComponent().getKey()).isEqualTo(newProjectKey); + assertThat(tester.wsClient().components().show(new ShowRequest().setId(project.getId())).getComponent().getKey()).isEqualTo(newProjectKey); } @Test public void bulk_update_key() { analyzeXooSample(); String newProjectKey = "another_project_key"; - Components.Component project = tester.wsClient().components().show(new ShowWsRequest().setKey(PROJECT_KEY)).getComponent(); + Components.Component project = tester.wsClient().components().show(new ShowRequest().setKey(PROJECT_KEY)).getComponent(); assertThat(project.getKey()).isEqualTo(PROJECT_KEY); - Projects.BulkUpdateKeyWsResponse result = tester.wsClient().projects().bulkUpdateKey(BulkUpdateKeyWsRequest.builder() + Projects.BulkUpdateKeyWsResponse result = tester.wsClient().projects().bulkUpdateKey(BulkUpdateKeyRequest.builder() .setKey(PROJECT_KEY) .setFrom(PROJECT_KEY) .setTo(newProjectKey) .build()); - assertThat(tester.wsClient().components().show(new ShowWsRequest().setId(project.getId())).getComponent().getKey()).isEqualTo(newProjectKey); + assertThat(tester.wsClient().components().show(new ShowRequest().setId(project.getId())).getComponent().getKey()).isEqualTo(newProjectKey); assertThat(result.getKeysCount()).isEqualTo(1); assertThat(result.getKeys(0)) .extracting(Projects.BulkUpdateKeyWsResponse.Key::getKey, Projects.BulkUpdateKeyWsResponse.Key::getNewKey, Projects.BulkUpdateKeyWsResponse.Key::getDuplicate) @@ -229,11 +229,11 @@ public class ProjectKeyUpdateTest { } private void updateKey(Projects.CreateWsResponse.Project project, String newKey) { - tester.wsClient().projects().updateKey(UpdateKeyWsRequest.builder().setKey(project.getKey()).setNewKey(newKey).build()); + tester.wsClient().projects().updateKey(UpdateKeyRequest.builder().setKey(project.getKey()).setNewKey(newKey).build()); } private void updateKey(String initialKey, String newKey) { - tester.wsClient().projects().updateKey(UpdateKeyWsRequest.builder().setKey(initialKey).setNewKey(newKey).build()); + tester.wsClient().projects().updateKey(UpdateKeyRequest.builder().setKey(initialKey).setNewKey(newKey).build()); } private Projects.CreateWsResponse.Project createProject(Organizations.Organization organization, String key, String name) { diff --git a/tests/src/test/java/org/sonarqube/tests/project/ProjectProvisioningTest.java b/tests/src/test/java/org/sonarqube/tests/project/ProjectProvisioningTest.java index de8a6b65abc..4eb51516718 100644 --- a/tests/src/test/java/org/sonarqube/tests/project/ProjectProvisioningTest.java +++ b/tests/src/test/java/org/sonarqube/tests/project/ProjectProvisioningTest.java @@ -37,7 +37,7 @@ import org.sonarqube.ws.client.GetRequest; import org.sonarqube.ws.client.WsResponse; import org.sonarqube.ws.client.component.SearchProjectsRequest; import org.sonarqube.ws.client.project.CreateRequest; -import org.sonarqube.ws.client.project.SearchWsRequest; +import org.sonarqube.ws.client.project.SearchRequest; import util.ItUtils; import static java.util.Collections.singletonList; @@ -101,7 +101,7 @@ public class ProjectProvisioningTest { */ private boolean isInProjectsSearch(Organizations.Organization organization, String name) { Projects.SearchWsResponse response = tester.wsClient().projects().search( - SearchWsRequest.builder().setOrganization(organization.getKey()).setQuery(name).setQualifiers(singletonList("TRK")).build()); + SearchRequest.builder().setOrganization(organization.getKey()).setQuery(name).setQualifiers(singletonList("TRK")).build()); return response.getComponentsCount() > 0; } diff --git a/tests/src/test/java/org/sonarqube/tests/project/ProjectSearchTest.java b/tests/src/test/java/org/sonarqube/tests/project/ProjectSearchTest.java index 65da3c02981..12508573f70 100644 --- a/tests/src/test/java/org/sonarqube/tests/project/ProjectSearchTest.java +++ b/tests/src/test/java/org/sonarqube/tests/project/ProjectSearchTest.java @@ -32,7 +32,7 @@ import org.sonarqube.ws.Projects.CreateWsResponse; import org.sonarqube.ws.Projects.SearchWsResponse; import org.sonarqube.ws.Projects.SearchWsResponse.Component; import org.sonarqube.ws.client.GetRequest; -import org.sonarqube.ws.client.project.SearchWsRequest; +import org.sonarqube.ws.client.project.SearchRequest; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; @@ -59,7 +59,7 @@ public class ProjectSearchTest { analyzeProject(oldProject.getKey(), moreThanOneYearAgo, organization.getKey()); analyzeProject(recentProject.getKey(), now, organization.getKey()); - SearchWsResponse result = tester.wsClient().projects().search(SearchWsRequest.builder() + SearchWsResponse result = tester.wsClient().projects().search(SearchRequest.builder() .setOrganization(organization.getKey()) .setQualifiers(singletonList("TRK")) .setAnalyzedBefore(formatDate(oneYearAgo)).build()); @@ -78,7 +78,7 @@ public class ProjectSearchTest { analyzeProject(upperCaseProject.getKey(), organization.getKey()); analyzeProject(anotherProject.getKey(), organization.getKey()); - SearchWsResponse result = tester.wsClient().projects().search(SearchWsRequest.builder() + SearchWsResponse result = tester.wsClient().projects().search(SearchRequest.builder() .setOrganization(organization.getKey()) .setQualifiers(singletonList("TRK")) .setQuery("JeCt-K") @@ -101,7 +101,7 @@ public class ProjectSearchTest { String result = tester.wsClient().wsConnector().call(new GetRequest("api/projects/provisioned") .setParam("organization", organization.getKey())) .failIfNotSuccessful().content(); - SearchWsResponse searchResult = tester.wsClient().projects().search(SearchWsRequest.builder() + SearchWsResponse searchResult = tester.wsClient().projects().search(SearchRequest.builder() .setQualifiers(singletonList("TRK")) .setOrganization(organization.getKey()) .setOnProvisionedOnly(true).build()); diff --git a/tests/src/test/java/org/sonarqube/tests/project/ProjectVisibilityPageTest.java b/tests/src/test/java/org/sonarqube/tests/project/ProjectVisibilityPageTest.java index 92699c3332c..cc7546065c2 100644 --- a/tests/src/test/java/org/sonarqube/tests/project/ProjectVisibilityPageTest.java +++ b/tests/src/test/java/org/sonarqube/tests/project/ProjectVisibilityPageTest.java @@ -29,7 +29,7 @@ import org.sonarqube.qa.util.Tester; import org.sonarqube.qa.util.pageobjects.ProjectsManagementPage; import org.sonarqube.ws.Components; import org.sonarqube.ws.client.component.SearchProjectsRequest; -import org.sonarqube.ws.client.permission.RemoveGroupWsRequest; +import org.sonarqube.ws.client.permission.RemoveGroupRequest; import org.sonarqube.ws.client.project.UpdateVisibilityRequest; import static org.assertj.core.api.Assertions.assertThat; @@ -57,7 +57,7 @@ public class ProjectVisibilityPageTest { orchestrator.executeBuild(SonarScanner.create(projectDir("shared/xoo-sample")).setProperties("sonar.projectKey", "sample2")); tester.wsClient().projects().updateVisibility(UpdateVisibilityRequest.builder().setProject("sample2").setVisibility("private").build()); // Remove 'Admin' permission for admin group on project 2 -> No one can access or admin this project, expect System Admin - tester.wsClient().permissions().removeGroup(new RemoveGroupWsRequest().setProjectKey("sample2").setGroupName("sonar-administrators").setPermission("admin")); + tester.wsClient().permissions().removeGroup(new RemoveGroupRequest().setProjectKey("sample2").setGroupName("sonar-administrators").setPermission("admin")); tester.openBrowser().logIn().submitCredentials(adminUser) .openProjectsManagement("default-organization") diff --git a/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateUiTest.java b/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateUiTest.java index 507410d6b6b..d311e4aab1b 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateUiTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateUiTest.java @@ -32,6 +32,7 @@ import org.sonarqube.qa.util.pageobjects.ProjectDashboardPage; import org.sonarqube.qa.util.pageobjects.QualityGatePage; import org.sonarqube.ws.Organizations; import org.sonarqube.ws.Users; +import org.sonarqube.ws.client.permission.AddUserRequest; import util.issue.IssueRule; import static com.codeborne.selenide.Selenide.$; @@ -58,7 +59,7 @@ public class OrganizationQualityGateUiTest { organization = tester.organizations().generate(); gateAdmin = tester.users().generate(); tester.organizations().addMember(tester.organizations().getDefaultOrganization(), gateAdmin); - tester.wsClient().permissions().addUser(new org.sonarqube.ws.client.permission.AddUserWsRequest().setLogin(gateAdmin.getLogin()).setPermission("gateadmin")); + tester.wsClient().permissions().addUser(new AddUserRequest().setLogin(gateAdmin.getLogin()).setPermission("gateadmin")); user = tester.users().generate(); tester.organizations().addMember(organization, user); restoreProfile(orchestrator, getClass().getResource("/issue/with-many-rules.xml"), organization.getKey()); diff --git a/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateTest.java b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateTest.java index 12be1f95854..51439df8ea9 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateTest.java @@ -54,7 +54,7 @@ import org.sonarqube.ws.Users; import org.sonarqube.ws.client.GetRequest; import org.sonarqube.ws.client.PostRequest; import org.sonarqube.ws.client.WsResponse; -import org.sonarqube.ws.client.permission.AddUserWsRequest; +import org.sonarqube.ws.client.permission.AddUserRequest; import org.sonarqube.ws.client.qualitygates.CreateConditionRequest; import org.sonarqube.ws.client.qualitygates.CreateRequest; import org.sonarqube.ws.client.qualitygates.ProjectStatusRequest; @@ -293,7 +293,7 @@ public class QualityGateTest { // user is quality gate admin of default organization Organization organization = tester.organizations().getDefaultOrganization(); Users.CreateWsResponse.User user = tester.users().generateMember(organization); - tester.wsClient().permissions().addUser(new AddUserWsRequest().setLogin(user.getLogin()).setPermission("gateadmin").setOrganization(organization.getKey())); + tester.wsClient().permissions().addUser(new AddUserRequest().setLogin(user.getLogin()).setPermission("gateadmin").setOrganization(organization.getKey())); TesterSession qGateAdminTester = tester.as(user.getLogin()); QualitygatesService qGateService = qGateAdminTester.qGates().service(); // perform administration operations diff --git a/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtInIssueChangelogTest.java b/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtInIssueChangelogTest.java index 0bf2f9db32b..6e2ef0c0674 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtInIssueChangelogTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtInIssueChangelogTest.java @@ -27,7 +27,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonarqube.qa.util.Tester; import org.sonarqube.ws.Issues; -import org.sonarqube.ws.client.issue.SearchWsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -58,7 +58,7 @@ public class TechnicalDebtInIssueChangelogTest { orchestrator.executeBuild(SonarScanner.create(projectDir("shared/xoo-sample")) .setProperties("sonar.oneIssuePerFile.effortToFix", "10")); - Issues.Issue firstIssue = tester.wsClient().issues().search(new SearchWsRequest()).getIssues(0); + Issues.Issue firstIssue = tester.wsClient().issues().search(new SearchRequest()).getIssues(0); List<Issues.ChangelogWsResponse.Changelog> changes = changelog(firstIssue.getKey()).getChangelogList(); assertThat(changes).hasSize(1); diff --git a/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtTest.java b/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtTest.java index 5ce1e174a44..24d60d3b88a 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtTest.java @@ -27,7 +27,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonarqube.qa.util.Tester; import org.sonarqube.ws.Issues; -import org.sonarqube.ws.client.issue.SearchWsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -54,7 +54,7 @@ public class TechnicalDebtTest { orchestrator.executeBuild(SonarScanner.create(projectDir("shared/xoo-sample"))); // All the issues should have a technical debt - List<Issues.Issue> issues = tester.wsClient().issues().search(new SearchWsRequest()).getIssuesList(); + List<Issues.Issue> issues = tester.wsClient().issues().search(new SearchRequest()).getIssuesList(); assertThat(issues).isNotEmpty(); for (Issues.Issue issue : issues) { assertThat(issue.getDebt()).isEqualTo("1min"); diff --git a/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesNotificationTest.java b/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesNotificationTest.java index 3922d96b29c..ef08e8e8317 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesNotificationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesNotificationTest.java @@ -31,8 +31,8 @@ import org.junit.Test; import org.sonarqube.ws.Users; import org.sonarqube.ws.client.PostRequest; import org.sonarqube.ws.client.WsClient; -import org.sonarqube.ws.client.permission.AddGroupWsRequest; -import org.sonarqube.ws.client.permission.AddUserWsRequest; +import org.sonarqube.ws.client.permission.AddGroupRequest; +import org.sonarqube.ws.client.permission.AddUserRequest; import org.sonarqube.ws.client.qualityprofile.ChangeParentRequest; import org.sonarqube.ws.client.qualityprofile.CreateRequest; import org.subethamail.wiser.Wiser; @@ -77,7 +77,7 @@ public class BuiltInQualityProfilesNotificationTest { userRule = UserRule.from(orchestrator); Users.CreateWsResponse.User profileAdmin1 = userRule.generate(); WsClient wsClient = ItUtils.newAdminWsClient(orchestrator); - wsClient.permissions().addUser(new AddUserWsRequest().setLogin(profileAdmin1.getLogin()).setPermission("profileadmin")); + wsClient.permissions().addUser(new AddUserRequest().setLogin(profileAdmin1.getLogin()).setPermission("profileadmin")); orchestrator.restartServer(); @@ -100,12 +100,12 @@ public class BuiltInQualityProfilesNotificationTest { // Create a quality profile administrator (user having direct permission) Users.CreateWsResponse.User profileAdmin1 = userRule.generate(); WsClient wsClient = ItUtils.newAdminWsClient(orchestrator); - wsClient.permissions().addUser(new AddUserWsRequest().setLogin(profileAdmin1.getLogin()).setPermission("profileadmin")); + wsClient.permissions().addUser(new AddUserRequest().setLogin(profileAdmin1.getLogin()).setPermission("profileadmin")); // Create a quality profile administrator (user having permission from a group) Users.CreateWsResponse.User profileAdmin2 = userRule.generate(); String groupName = randomAlphanumeric(20); wsClient.wsConnector().call(new PostRequest("api/user_groups/create").setParam("name", groupName)).failIfNotSuccessful(); - wsClient.permissions().addGroup(new AddGroupWsRequest().setPermission("profileadmin").setGroupName(groupName)); + wsClient.permissions().addGroup(new AddGroupRequest().setPermission("profileadmin").setGroupName(groupName)); wsClient.wsConnector().call(new PostRequest("api/user_groups/add_user").setParam("name", groupName).setParam("login", profileAdmin2.getLogin())).failIfNotSuccessful(); // Create a user not being quality profile administrator Users.CreateWsResponse.User noProfileAdmin = userRule.generate(); @@ -156,7 +156,7 @@ public class BuiltInQualityProfilesNotificationTest { userRule = UserRule.from(orchestrator); Users.CreateWsResponse.User profileAdmin1 = userRule.generate(); WsClient wsClient = ItUtils.newAdminWsClient(orchestrator); - wsClient.permissions().addUser(new AddUserWsRequest().setLogin(profileAdmin1.getLogin()).setPermission("profileadmin")); + wsClient.permissions().addUser(new AddUserRequest().setLogin(profileAdmin1.getLogin()).setPermission("profileadmin")); // uninstall plugin V1 wsClient.wsConnector().call(new PostRequest("api/plugins/uninstall").setParam("key", "foo")).failIfNotSuccessful(); diff --git a/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesTest.java b/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesTest.java index 2ace14e222a..be5eb2a3ee9 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesTest.java @@ -36,7 +36,7 @@ import org.sonarqube.ws.Users.CreateWsResponse.User; import org.sonarqube.ws.client.qualityprofile.ChangeParentRequest; import org.sonarqube.ws.client.qualityprofile.CopyRequest; import org.sonarqube.ws.client.qualityprofile.QualityProfilesService; -import org.sonarqube.ws.client.qualityprofile.SearchWsRequest; +import org.sonarqube.ws.client.qualityprofile.SearchRequest; import org.sonarqube.ws.client.qualityprofile.SetDefaultRequest; import static org.assertj.core.api.Assertions.assertThat; @@ -55,7 +55,7 @@ public class BuiltInQualityProfilesTest { @Test public void built_in_profiles_are_available_in_new_organization() { Organization org = tester.organizations().generate(); - SearchWsResponse result = tester.qProfiles().service().search(new SearchWsRequest().setOrganizationKey(org.getKey())); + SearchWsResponse result = tester.qProfiles().service().search(new SearchRequest().setOrganizationKey(org.getKey())); assertThat(result.getProfilesList()) .extracting(QualityProfile::getName, QualityProfile::getLanguage, QualityProfile::getIsBuiltIn, QualityProfile::getIsDefault) @@ -70,7 +70,7 @@ public class BuiltInQualityProfilesTest { @Test public void built_in_profiles_are_available_in_default_organization() { - SearchWsResponse result = tester.qProfiles().service().search(new SearchWsRequest().setOrganizationKey("default-organization")); + SearchWsResponse result = tester.qProfiles().service().search(new SearchRequest().setOrganizationKey("default-organization")); assertThat(result.getProfilesList()) .extracting(QualityProfile::getOrganization, QualityProfile::getName, QualityProfile::getLanguage, QualityProfile::getIsBuiltIn, QualityProfile::getIsDefault) @@ -154,7 +154,7 @@ public class BuiltInQualityProfilesTest { } private QualityProfile getProfile(Organization organization, Predicate<QualityProfile> filter) { - return tester.qProfiles().service().search(new SearchWsRequest() + return tester.qProfiles().service().search(new SearchRequest() .setOrganizationKey(organization.getKey())).getProfilesList() .stream() .filter(filter) diff --git a/tests/src/test/java/org/sonarqube/tests/qualityProfile/CustomQualityProfilesTest.java b/tests/src/test/java/org/sonarqube/tests/qualityProfile/CustomQualityProfilesTest.java index fe00a8d4472..ef5199d1b64 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityProfile/CustomQualityProfilesTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityProfile/CustomQualityProfilesTest.java @@ -41,7 +41,7 @@ import org.sonarqube.ws.client.qualityprofile.AddProjectRequest; import org.sonarqube.ws.client.qualityprofile.ChangeParentRequest; import org.sonarqube.ws.client.qualityprofile.CopyRequest; import org.sonarqube.ws.client.qualityprofile.CreateRequest; -import org.sonarqube.ws.client.qualityprofile.SearchWsRequest; +import org.sonarqube.ws.client.qualityprofile.SearchRequest; import org.sonarqube.ws.client.qualityprofile.SetDefaultRequest; import util.ItUtils; @@ -154,10 +154,10 @@ public class CustomQualityProfilesTest { tester.organizations().service().delete(org.getKey()); - expectMissingError(() -> tester.qProfiles().service().search(new SearchWsRequest() + expectMissingError(() -> tester.qProfiles().service().search(new SearchRequest() .setOrganizationKey(org.getKey()))); - tester.qProfiles().service().search(new SearchWsRequest()).getProfilesList() + tester.qProfiles().service().search(new SearchRequest()).getProfilesList() .forEach(p -> { assertThat(p.getOrganization()).isNotEqualTo(org.getKey()); assertThat(p.getKey()).isNotIn(parentProfile.getKey(), copyResponse.getKey(), inheritedProfile1.getKey(), inheritedProfile2.getKey()); @@ -319,7 +319,7 @@ public class CustomQualityProfilesTest { } private Qualityprofiles.SearchWsResponse.QualityProfile getProfile(Organization organization, Predicate<Qualityprofiles.SearchWsResponse.QualityProfile> filter) { - return tester.qProfiles().service().search(new SearchWsRequest() + return tester.qProfiles().service().search(new SearchRequest() .setOrganizationKey(organization.getKey())).getProfilesList() .stream() .filter(filter) diff --git a/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfilesEditTest.java b/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfilesEditTest.java index b6e884eaa77..6b6ed149993 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfilesEditTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfilesEditTest.java @@ -35,14 +35,13 @@ import org.sonarqube.ws.Qualityprofiles.SearchWsResponse; import org.sonarqube.ws.UserGroups; import org.sonarqube.ws.Users.CreateWsResponse.User; import org.sonarqube.ws.client.PostRequest; -import org.sonarqube.ws.client.permission.AddUserWsRequest; +import org.sonarqube.ws.client.permission.AddUserRequest; import org.sonarqube.ws.client.qualityprofile.AddGroupRequest; -import org.sonarqube.ws.client.qualityprofile.AddUserRequest; import org.sonarqube.ws.client.qualityprofile.RemoveGroupRequest; import org.sonarqube.ws.client.qualityprofile.RemoveUserRequest; import org.sonarqube.ws.client.qualityprofile.SearchGroupsRequest; import org.sonarqube.ws.client.qualityprofile.SearchUsersRequest; -import org.sonarqube.ws.client.qualityprofile.SearchWsRequest; +import org.sonarqube.ws.client.qualityprofile.SearchRequest; import org.sonarqube.ws.client.qualityprofile.ShowRequest; import static org.assertj.core.api.Assertions.assertThat; @@ -211,7 +210,7 @@ public class QualityProfilesEditTest { CreateWsResponse.QualityProfile xooProfile3 = tester.qProfiles().createXooProfile(organization); SearchWsResponse result = tester.as(user.getLogin()) - .qProfiles().service().search(new SearchWsRequest().setOrganizationKey(organization.getKey())); + .qProfiles().service().search(new SearchRequest().setOrganizationKey(organization.getKey())); assertThat(result.getActions().getCreate()).isFalse(); assertThat(result.getProfilesList()) .extracting(SearchWsResponse.QualityProfile::getKey, qp -> qp.getActions().getEdit(), qp -> qp.getActions().getCopy(), qp -> qp.getActions().getSetAsDefault()) @@ -226,10 +225,10 @@ public class QualityProfilesEditTest { Organization organization = tester.organizations().generate(); User user = tester.users().generateMember(organization); CreateWsResponse.QualityProfile xooProfile = tester.qProfiles().createXooProfile(organization); - tester.wsClient().permissions().addUser(new AddUserWsRequest().setOrganization(organization.getKey()).setLogin(user.getLogin()).setPermission("profileadmin")); + tester.wsClient().permissions().addUser(new AddUserRequest().setOrganization(organization.getKey()).setLogin(user.getLogin()).setPermission("profileadmin")); SearchWsResponse result = tester.as(user.getLogin()) - .qProfiles().service().search(new SearchWsRequest().setOrganizationKey(organization.getKey())); + .qProfiles().service().search(new SearchRequest().setOrganizationKey(organization.getKey())); assertThat(result.getActions().getCreate()).isTrue(); assertThat(result.getProfilesList()) .extracting(SearchWsResponse.QualityProfile::getKey, qp -> qp.getActions().getEdit(), qp -> qp.getActions().getCopy(), qp -> qp.getActions().getSetAsDefault()) @@ -267,7 +266,7 @@ public class QualityProfilesEditTest { } private void addUserPermission(Organization organization, User user, CreateWsResponse.QualityProfile qProfile) { - tester.qProfiles().service().addUser(AddUserRequest.builder() + tester.qProfiles().service().addUser(org.sonarqube.ws.client.qualityprofile.AddUserRequest.builder() .setOrganization(organization.getKey()) .setQualityProfile(qProfile.getName()) .setLanguage(qProfile.getLanguage()) @@ -285,7 +284,7 @@ public class QualityProfilesEditTest { } private SearchWsResponse.QualityProfile getProfile(Organization organization, Predicate<SearchWsResponse.QualityProfile> filter) { - return tester.qProfiles().service().search(new SearchWsRequest() + return tester.qProfiles().service().search(new SearchRequest() .setOrganizationKey(organization.getKey())).getProfilesList() .stream() .filter(filter) diff --git a/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfilesWsTest.java b/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfilesWsTest.java index 21b319f6f78..f7837897556 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfilesWsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfilesWsTest.java @@ -38,8 +38,8 @@ import org.sonarqube.ws.Qualityprofiles.ShowResponse.QualityProfile; import org.sonarqube.ws.client.GetRequest; import org.sonarqube.ws.client.PostRequest; import org.sonarqube.ws.client.WsResponse; -import org.sonarqube.ws.client.qualityprofile.ChangelogWsRequest; -import org.sonarqube.ws.client.qualityprofile.SearchWsRequest; +import org.sonarqube.ws.client.qualityprofile.ChangelogRequest; +import org.sonarqube.ws.client.qualityprofile.SearchRequest; import org.sonarqube.ws.client.qualityprofile.ShowRequest; import static org.assertj.core.api.Assertions.assertThat; @@ -133,7 +133,7 @@ public class QualityProfilesWsTest { Organization org = tester.organizations().generate(); CreateWsResponse.QualityProfile profile = tester.qProfiles().createXooProfile(org); - String changelog = tester.wsClient().qualityProfiles().changelog(ChangelogWsRequest.builder() + String changelog = tester.wsClient().qualityProfiles().changelog(ChangelogRequest.builder() .setOrganization(org.getKey()) .setLanguage(profile.getLanguage()) .setQualityProfile(profile.getName()) @@ -143,14 +143,14 @@ public class QualityProfilesWsTest { tester.qProfiles().activateRule(profile, RULE_ONE_BUG_PER_LINE); tester.qProfiles().activateRule(profile, RULE_ONE_ISSUE_PER_LINE); - String changelog2 = tester.wsClient().qualityProfiles().changelog(ChangelogWsRequest.builder() + String changelog2 = tester.wsClient().qualityProfiles().changelog(ChangelogRequest.builder() .setOrganization(org.getKey()) .setLanguage(profile.getLanguage()) .setQualityProfile(profile.getName()) .build()); JSONAssert.assertEquals(EXPECTED_CHANGELOG, changelog2, JSONCompareMode.LENIENT); - String changelog3 = tester.wsClient().qualityProfiles().changelog(ChangelogWsRequest.builder() + String changelog3 = tester.wsClient().qualityProfiles().changelog(ChangelogRequest.builder() .setOrganization(org.getKey()) .setLanguage(profile.getLanguage()) .setQualityProfile(profile.getName()) @@ -160,7 +160,7 @@ public class QualityProfilesWsTest { } private SearchWsResponse.QualityProfile getProfile(Organization organization, Predicate<SearchWsResponse.QualityProfile> filter) { - return tester.qProfiles().service().search(new SearchWsRequest() + return tester.qProfiles().service().search(new SearchRequest() .setOrganizationKey(organization.getKey())).getProfilesList() .stream() .filter(filter) diff --git a/tests/src/test/java/org/sonarqube/tests/rule/RulesWsTest.java b/tests/src/test/java/org/sonarqube/tests/rule/RulesWsTest.java index f2249a9b6a8..31cef84c190 100644 --- a/tests/src/test/java/org/sonarqube/tests/rule/RulesWsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/rule/RulesWsTest.java @@ -83,7 +83,7 @@ public class RulesWsTest { } private SearchWsResponse.QualityProfile getProfile(Organization organization, Predicate<SearchWsResponse.QualityProfile> filter) { - return tester.qProfiles().service().search(new org.sonarqube.ws.client.qualityprofile.SearchWsRequest() + return tester.qProfiles().service().search(new org.sonarqube.ws.client.qualityprofile.SearchRequest() .setOrganizationKey(organization.getKey())).getProfilesList() .stream() .filter(filter) diff --git a/tests/src/test/java/org/sonarqube/tests/serverSystem/LogsTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/LogsTest.java index e9eb13360e9..d312aa09a3c 100644 --- a/tests/src/test/java/org/sonarqube/tests/serverSystem/LogsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/LogsTest.java @@ -36,7 +36,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.sonarqube.ws.client.GetRequest; import org.sonarqube.ws.client.WsClient; -import org.sonarqube.ws.client.issue.SearchWsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; import util.ItUtils; import static java.lang.String.format; @@ -116,7 +116,7 @@ public class LogsTest { private void generateSqlAndEsLogsInWebAndCe() { orchestrator.executeBuild(SonarScanner.create(projectDir("shared/xoo-sample"))); - ItUtils.newAdminWsClient(orchestrator).issues().search(new SearchWsRequest() + ItUtils.newAdminWsClient(orchestrator).issues().search(new SearchRequest() .setProjectKeys(Collections.singletonList("sample"))); } diff --git a/tests/src/test/java/org/sonarqube/tests/serverSystem/RestartTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/RestartTest.java index e1219ae9ee6..17bf6776746 100644 --- a/tests/src/test/java/org/sonarqube/tests/serverSystem/RestartTest.java +++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/RestartTest.java @@ -32,7 +32,7 @@ import org.junit.rules.Timeout; import org.sonarqube.ws.System; import org.sonarqube.ws.client.PostRequest; import org.sonarqube.ws.client.WsClient; -import org.sonarqube.ws.client.permission.AddUserWsRequest; +import org.sonarqube.ws.client.permission.AddUserRequest; import util.ItUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -97,7 +97,7 @@ public class RestartTest { private void createSystemAdministrator(String login, String password) { WsClient wsClient = newAdminWsClient(orchestrator); createNonSystemAdministrator(wsClient, login, password); - wsClient.permissions().addUser(new AddUserWsRequest().setLogin(login).setPermission("admin")); + wsClient.permissions().addUser(new AddUserRequest().setLogin(login).setPermission("admin")); } private void createNonSystemAdministrator(String login, String password) { diff --git a/tests/src/test/java/org/sonarqube/tests/settings/SettingsTest.java b/tests/src/test/java/org/sonarqube/tests/settings/SettingsTest.java index 9733ff6bb47..35741444b28 100644 --- a/tests/src/test/java/org/sonarqube/tests/settings/SettingsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/settings/SettingsTest.java @@ -35,9 +35,9 @@ import org.junit.rules.RuleChain; import org.sonarqube.tests.Category1Suite; import org.sonarqube.ws.Settings; import org.sonarqube.ws.client.WsClient; -import org.sonarqube.ws.client.permission.AddGroupWsRequest; -import org.sonarqube.ws.client.permission.AddUserWsRequest; -import org.sonarqube.ws.client.permission.RemoveGroupWsRequest; +import org.sonarqube.ws.client.permission.AddGroupRequest; +import org.sonarqube.ws.client.permission.AddUserRequest; +import org.sonarqube.ws.client.permission.RemoveGroupRequest; import org.sonarqube.ws.client.settings.ResetRequest; import org.sonarqube.ws.client.settings.SetRequest; import org.sonarqube.ws.client.settings.SettingsService; @@ -81,7 +81,7 @@ public class SettingsTest { userRule.createUser("scanner-user", "scanner-user"); adminWsClient = newAdminWsClient(orchestrator); // Remove 'Execute Analysis' permission from anyone - adminWsClient.permissions().removeGroup(new RemoveGroupWsRequest().setGroupName("anyone").setPermission("scan")); + adminWsClient.permissions().removeGroup(new RemoveGroupRequest().setGroupName("anyone").setPermission("scan")); // Anonymous user, without 'Execute Analysis' permission anonymousSettingsService = newWsClient(orchestrator).settings(); @@ -90,7 +90,7 @@ public class SettingsTest { userSettingsService = newUserWsClient(orchestrator, "setting-user", "setting-user").settings(); // User with 'Execute Analysis' permission - adminWsClient.permissions().addUser(new AddUserWsRequest().setLogin("scanner-user").setPermission("scan")); + adminWsClient.permissions().addUser(new AddUserRequest().setLogin("scanner-user").setPermission("scan")); scanSettingsService = newUserWsClient(orchestrator, "scanner-user", "scanner-user").settings(); // User with 'Administer System' permission but without 'Execute Analysis' permission @@ -101,7 +101,7 @@ public class SettingsTest { public static void tearDown() throws Exception { userRule.deactivateUsers("setting-user", "scanner-user"); // Restore 'Execute Analysis' permission to anyone - adminWsClient.permissions().addGroup(new AddGroupWsRequest().setGroupName("anyone").setPermission("scan")); + adminWsClient.permissions().addGroup(new AddGroupRequest().setGroupName("anyone").setPermission("scan")); } @After diff --git a/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java b/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java index 607ef2d4615..9f5f1a87b9f 100644 --- a/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java +++ b/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java @@ -42,7 +42,7 @@ import org.sonarqube.ws.client.HttpConnector; import org.sonarqube.ws.client.WsClient; import org.sonarqube.ws.client.WsClientFactories; import org.sonarqube.ws.client.WsResponse; -import org.sonarqube.ws.client.measure.ComponentWsRequest; +import org.sonarqube.ws.client.measure.ComponentRequest; import static com.codeborne.selenide.Condition.hasText; import static com.codeborne.selenide.Selenide.$; @@ -198,7 +198,7 @@ public class UpgradeTest { } private int countFiles(String key) { - Measure measure = newWsClient(orchestrator).measures().component(new ComponentWsRequest().setComponentKey(key).setMetricKeys(Collections.singletonList("files"))) + Measure measure = newWsClient(orchestrator).measures().component(new ComponentRequest().setComponentKey(key).setMetricKeys(Collections.singletonList("files"))) .getComponent().getMeasures(0); return parseInt(measure.getValue()); } diff --git a/tests/src/test/java/org/sonarqube/tests/user/OAuth2IdentityProviderTest.java b/tests/src/test/java/org/sonarqube/tests/user/OAuth2IdentityProviderTest.java index 2f6e7f36f1b..7e9a294fc49 100644 --- a/tests/src/test/java/org/sonarqube/tests/user/OAuth2IdentityProviderTest.java +++ b/tests/src/test/java/org/sonarqube/tests/user/OAuth2IdentityProviderTest.java @@ -38,7 +38,7 @@ import org.sonarqube.tests.Category4Suite; import org.sonarqube.ws.Users.SearchWsResponse.User; import org.sonarqube.ws.client.GetRequest; import org.sonarqube.ws.client.WsResponse; -import org.sonarqube.ws.client.permission.AddUserWsRequest; +import org.sonarqube.ws.client.permission.AddUserRequest; import org.sonarqube.ws.client.user.CreateRequest; import util.selenium.Selenese; @@ -125,7 +125,7 @@ public class OAuth2IdentityProviderTest { enablePlugin(); tester.users().generate(u -> u.setLogin(USER_LOGIN)); // Give user global admin permission as we want to go to a page where authentication is required - tester.wsClient().permissions().addUser(new AddUserWsRequest().setLogin(USER_LOGIN).setPermission("admin")); + tester.wsClient().permissions().addUser(new AddUserRequest().setLogin(USER_LOGIN).setPermission("admin")); Navigation nav = tester.openBrowser(); // Try to go to the settings page diff --git a/tests/src/test/java/util/ItUtils.java b/tests/src/test/java/util/ItUtils.java index 5f8a5a4b76b..7a9fbafcd54 100644 --- a/tests/src/test/java/util/ItUtils.java +++ b/tests/src/test/java/util/ItUtils.java @@ -70,9 +70,9 @@ import org.sonarqube.ws.client.GetRequest; import org.sonarqube.ws.client.HttpConnector; import org.sonarqube.ws.client.WsClient; import org.sonarqube.ws.client.WsClientFactories; -import org.sonarqube.ws.client.component.ShowWsRequest; -import org.sonarqube.ws.client.measure.ComponentWsRequest; -import org.sonarqube.ws.client.qualityprofile.RestoreWsRequest; +import org.sonarqube.ws.client.component.ShowRequest; +import org.sonarqube.ws.client.measure.ComponentRequest; +import org.sonarqube.ws.client.qualityprofile.RestoreRequest; import org.sonarqube.ws.client.settings.ResetRequest; import org.sonarqube.ws.client.settings.SetRequest; @@ -334,7 +334,7 @@ public class ItUtils { } private static Stream<Measure> getStreamMeasures(Orchestrator orchestrator, String componentKey, String... metricKeys) { - return newWsClient(orchestrator).measures().component(new ComponentWsRequest() + return newWsClient(orchestrator).measures().component(new ComponentRequest() .setComponent(componentKey) .setMetricKeys(asList(metricKeys))) .getComponent().getMeasuresList() @@ -343,7 +343,7 @@ public class ItUtils { @CheckForNull public static Measure getMeasureWithVariation(Orchestrator orchestrator, String componentKey, String metricKey) { - Measures.ComponentWsResponse response = newWsClient(orchestrator).measures().component(new ComponentWsRequest() + Measures.ComponentWsResponse response = newWsClient(orchestrator).measures().component(new ComponentRequest() .setComponentKey(componentKey) .setMetricKeys(singletonList(metricKey)) .setAdditionalFields(singletonList("periods"))); @@ -353,7 +353,7 @@ public class ItUtils { @CheckForNull public static Map<String, Measure> getMeasuresWithVariationsByMetricKey(Orchestrator orchestrator, String componentKey, String... metricKeys) { - return newWsClient(orchestrator).measures().component(new ComponentWsRequest() + return newWsClient(orchestrator).measures().component(new ComponentRequest() .setComponentKey(componentKey) .setMetricKeys(asList(metricKeys)) .setAdditionalFields(singletonList("periods"))).getComponent().getMeasuresList() @@ -373,7 +373,7 @@ public class ItUtils { @CheckForNull public static Component getComponent(Orchestrator orchestrator, String componentKey) { try { - return newWsClient(orchestrator).components().show(new ShowWsRequest().setKey((componentKey))).getComponent(); + return newWsClient(orchestrator).components().show(new ShowRequest().setKey((componentKey))).getComponent(); } catch (org.sonarqube.ws.client.HttpException e) { if (e.code() == 404) { return null; @@ -405,7 +405,7 @@ public class ItUtils { newAdminWsClient(orchestrator) .qualityProfiles() .restoreProfile( - RestoreWsRequest.builder() + RestoreRequest.builder() .setBackup(new File(uri)) .setOrganization(organization) .build()); diff --git a/tests/src/test/java/util/issue/IssueRule.java b/tests/src/test/java/util/issue/IssueRule.java index 7857d3cabdc..c055a2b4385 100644 --- a/tests/src/test/java/util/issue/IssueRule.java +++ b/tests/src/test/java/util/issue/IssueRule.java @@ -25,7 +25,7 @@ import org.junit.rules.ExternalResource; import org.sonarqube.ws.Issues.Issue; import org.sonarqube.ws.Issues.SearchWsResponse; import org.sonarqube.ws.client.WsClient; -import org.sonarqube.ws.client.issue.SearchWsRequest; +import org.sonarqube.ws.client.issue.SearchRequest; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; @@ -47,24 +47,24 @@ public class IssueRule extends ExternalResource { return new IssueRule(requireNonNull(orchestrator, "Orchestrator instance can not be null")); } - public SearchWsResponse search(SearchWsRequest request) { + public SearchWsResponse search(SearchRequest request) { return adminWsClient().issues().search(request); } public Issue getRandomIssue() { - List<Issue> issues = search(new SearchWsRequest()).getIssuesList(); + List<Issue> issues = search(new SearchRequest()).getIssuesList(); assertThat(issues).isNotEmpty(); return issues.get(0); } public Issue getByKey(String issueKey) { - List<Issue> issues = search(new SearchWsRequest().setIssues(singletonList(issueKey)).setAdditionalFields(singletonList("_all"))).getIssuesList(); + List<Issue> issues = search(new SearchRequest().setIssues(singletonList(issueKey)).setAdditionalFields(singletonList("_all"))).getIssuesList(); assertThat(issues).hasSize(1); return issues.iterator().next(); } public List<Issue> getByKeys(String... issueKeys) { - List<Issue> issues = search(new SearchWsRequest().setIssues(asList(issueKeys)).setAdditionalFields(singletonList("_all"))).getIssuesList(); + List<Issue> issues = search(new SearchRequest().setIssues(asList(issueKeys)).setAdditionalFields(singletonList("_all"))).getIssuesList(); assertThat(issues).hasSize(issueKeys.length); return issues; } diff --git a/tests/src/test/java/util/user/UserRule.java b/tests/src/test/java/util/user/UserRule.java index 9e8cc191020..9c2db03e6e7 100644 --- a/tests/src/test/java/util/user/UserRule.java +++ b/tests/src/test/java/util/user/UserRule.java @@ -35,12 +35,11 @@ import org.sonarqube.ws.client.GetRequest; import org.sonarqube.ws.client.PostRequest; import org.sonarqube.ws.client.WsClient; import org.sonarqube.ws.client.WsResponse; -import org.sonarqube.ws.client.permission.AddUserWsRequest; +import org.sonarqube.ws.client.permission.AddUserRequest; import org.sonarqube.ws.client.roots.SetRootRequest; 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 util.selenium.Consumer; import static java.util.Arrays.asList; @@ -148,8 +147,8 @@ public class UserRule extends ExternalResource implements GroupManagement { public String createAdminUser(String login, String password) { createUser(login, password); - adminWsClient.permissions().addUser(new AddUserWsRequest().setLogin(login).setPermission("admin")); - adminWsClient.userGroups().addUser(new AddUserRequest().setLogin(login).setName("sonar-administrators")); + adminWsClient.permissions().addUser(new AddUserRequest().setLogin(login).setPermission("admin")); + adminWsClient.userGroups().addUser(new org.sonarqube.ws.client.usergroups.AddUserRequest().setLogin(login).setName("sonar-administrators")); return login; } |