}
public OrganizationService service() {
- return session.wsClient().organizations();
+ return session.wsClient().organizationsOld();
}
}
}
public QualityProfilesService service() {
- return session.wsClient().qualityProfiles();
+ return session.wsClient().qualityProfilesOld();
}
@SafeVarargs
@SafeVarargs
public final User generateAdministrator(Consumer<CreateRequest.Builder>... populators) {
User user = generate(populators);
- session.wsClient().permissions().addUser(new org.sonarqube.ws.client.permission.AddUserRequest().setLogin(user.getLogin()).setPermission("admin"));
+ session.wsClient().permissionsOld().addUser(new org.sonarqube.ws.client.permission.AddUserRequest().setLogin(user.getLogin()).setPermission("admin"));
session.wsClient().userGroups().addUser(new AddUserRequest().setLogin(user.getLogin()).setName("sonar-administrators"));
return user;
}
public final User generateAdministrator(Organizations.Organization organization, Consumer<CreateRequest.Builder>... populators) {
String organizationKey = organization.getKey();
User user = generate(populators);
- session.wsClient().organizations().addMember(organizationKey, user.getLogin());
+ session.wsClient().organizationsOld().addMember(organizationKey, user.getLogin());
session.wsClient().userGroups().addUser(new AddUserRequest()
.setOrganization(organizationKey)
.setLogin(user.getLogin())
@SafeVarargs
public final User generateAdministratorOnDefaultOrganization(Consumer<CreateRequest.Builder>... populators) {
User user = generate(populators);
- session.wsClient().organizations().addMember(DEFAULT_ORGANIZATION_KEY, user.getLogin());
+ session.wsClient().organizationsOld().addMember(DEFAULT_ORGANIZATION_KEY, user.getLogin());
session.wsClient().userGroups().addUser(new AddUserRequest()
.setOrganization(DEFAULT_ORGANIZATION_KEY)
.setLogin(user.getLogin())
@SafeVarargs
public final User generateMember(Organizations.Organization organization, Consumer<CreateRequest.Builder>... populators) {
User user = generate(populators);
- session.wsClient().organizations().addMember(organization.getKey(), user.getLogin());
+ session.wsClient().organizationsOld().addMember(organization.getKey(), user.getLogin());
return user;
}
@SafeVarargs
public final User generateMemberOfDefaultOrganization(Consumer<CreateRequest.Builder>... populators) {
User user = generate(populators);
- session.wsClient().organizations().addMember(DEFAULT_ORGANIZATION_KEY, user.getLogin());
+ session.wsClient().organizationsOld().addMember(DEFAULT_ORGANIZATION_KEY, user.getLogin());
return user;
}
package org.sonarqube.ws.client;
import org.sonarqube.ws.client.ce.CeService;
-import org.sonarqube.ws.client.component.ComponentsService;
+import org.sonarqube.ws.client.components.ComponentsService;
import org.sonarqube.ws.client.favorites.FavoritesService;
-import org.sonarqube.ws.client.issue.IssuesService;
-import org.sonarqube.ws.client.measure.MeasuresService;
+import org.sonarqube.ws.client.issues.IssuesService;
+import org.sonarqube.ws.client.measures.MeasuresService;
import org.sonarqube.ws.client.notifications.NotificationsService;
import org.sonarqube.ws.client.organization.OrganizationService;
-import org.sonarqube.ws.client.permission.PermissionsService;
+import org.sonarqube.ws.client.organizations.OrganizationsService;
+import org.sonarqube.ws.client.permissions.PermissionsService;
import org.sonarqube.ws.client.project.ProjectsService;
+import org.sonarqube.ws.client.projectanalyses.ProjectAnalysesService;
import org.sonarqube.ws.client.projectanalysis.ProjectAnalysisService;
import org.sonarqube.ws.client.projectbranches.ProjectBranchesService;
import org.sonarqube.ws.client.projectlinks.ProjectLinksService;
import org.sonarqube.ws.client.qualitygates.QualitygatesService;
import org.sonarqube.ws.client.qualityprofile.QualityProfilesService;
+import org.sonarqube.ws.client.qualityprofiles.QualityprofilesService;
import org.sonarqube.ws.client.roots.RootsService;
import org.sonarqube.ws.client.rules.RulesService;
import org.sonarqube.ws.client.settings.SettingsService;
class DefaultWsClient implements WsClient {
private final WsConnector wsConnector;
- private final OrganizationService organizations;
- private final PermissionsService permissionsService;
- private final ComponentsService componentsService;
+ private final OrganizationService organizationsOld;
+ private final OrganizationsService organizations;
+ private final org.sonarqube.ws.client.permission.PermissionsService permissionsOld;
+ private final PermissionsService permissions;
+ private final org.sonarqube.ws.client.component.ComponentsService componentsOld;
+ private final ComponentsService components;
private final FavoritesService favoritesService;
- private final QualityProfilesService qualityProfilesService;
- private final IssuesService issuesService;
+ private final QualityProfilesService qualityProfilesOld;
+ private final QualityprofilesService qualityprofiles;
+ private final org.sonarqube.ws.client.issue.IssuesService issuesOld;
+ private final IssuesService issues;
private final UsersService usersService;
private final UserGroupsService userGroupsService;
private final UserTokensService userTokensService;
private final QualitygatesService qualityGatesService;
- private final MeasuresService measuresService;
+ private final org.sonarqube.ws.client.measure.MeasuresService measuresOld;
+ private final MeasuresService measures;
private final SystemService systemService;
private final CeService ceService;
private final RulesService rulesService;
private final SettingsService settingsService;
private final RootsService rootsService;
private final WebhooksService webhooksService;
- private final ProjectAnalysisService projectAnalysisService;
+ private final ProjectAnalysisService projectAnalysisOld;
+ private final ProjectAnalysesService projectAnalyses;
private final NotificationsService notificationsService;
private final ProjectBranchesService projectBranchesService;
DefaultWsClient(WsConnector wsConnector) {
this.wsConnector = wsConnector;
- this.organizations = new OrganizationService(wsConnector);
- this.permissionsService = new PermissionsService(wsConnector);
- this.componentsService = new ComponentsService(wsConnector);
+ this.organizationsOld = new OrganizationService(wsConnector);
+ this.organizations = new OrganizationsService(wsConnector);
+ this.permissionsOld = new org.sonarqube.ws.client.permission.PermissionsService(wsConnector);
+ this.permissions = new PermissionsService(wsConnector);
+ this.componentsOld = new org.sonarqube.ws.client.component.ComponentsService(wsConnector);
+ this.components = new ComponentsService(wsConnector);
this.favoritesService = new FavoritesService(wsConnector);
- this.qualityProfilesService = new QualityProfilesService(wsConnector);
- this.issuesService = new IssuesService(wsConnector);
+ this.qualityProfilesOld = new QualityProfilesService(wsConnector);
+ this.qualityprofiles = new QualityprofilesService(wsConnector);
+ this.issuesOld = new org.sonarqube.ws.client.issue.IssuesService(wsConnector);
+ this.issues = new IssuesService(wsConnector);
this.usersService = new UsersService(wsConnector);
this.userGroupsService = new UserGroupsService(wsConnector);
this.userTokensService = new UserTokensService(wsConnector);
this.qualityGatesService = new QualitygatesService(wsConnector);
- this.measuresService = new MeasuresService(wsConnector);
+ this.measuresOld = new org.sonarqube.ws.client.measure.MeasuresService(wsConnector);
+ this.measures = new MeasuresService(wsConnector);
this.systemService = new SystemService(wsConnector);
this.ceService = new CeService(wsConnector);
this.rulesService = new RulesService(wsConnector);
this.settingsService = new SettingsService(wsConnector);
this.rootsService = new RootsService(wsConnector);
this.webhooksService = new WebhooksService(wsConnector);
- this.projectAnalysisService = new ProjectAnalysisService(wsConnector);
+ this.projectAnalysisOld = new ProjectAnalysisService(wsConnector);
+ this.projectAnalyses = new ProjectAnalysesService(wsConnector);
this.projectBranchesService = new ProjectBranchesService(wsConnector);
this.notificationsService = new NotificationsService(wsConnector);
}
}
@Override
- public OrganizationService organizations() {
+ public OrganizationService organizationsOld() {
+ return organizationsOld;
+ }
+
+ @Override
+ public OrganizationsService organizations() {
return organizations;
}
+ @Override
+ public org.sonarqube.ws.client.permission.PermissionsService permissionsOld() {
+ return this.permissionsOld;
+ }
+
@Override
public PermissionsService permissions() {
- return this.permissionsService;
+ return permissions;
+ }
+
+ @Override
+ public org.sonarqube.ws.client.component.ComponentsService componentsOld() {
+ return componentsOld;
}
@Override
public ComponentsService components() {
- return componentsService;
+ return components;
}
@Override
}
@Override
- public QualityProfilesService qualityProfiles() {
- return qualityProfilesService;
+ public QualityProfilesService qualityProfilesOld() {
+ return qualityProfilesOld;
+ }
+
+ @Override
+ public QualityprofilesService qualityProfiles() {
+ return qualityprofiles;
+ }
+
+ @Override
+ public org.sonarqube.ws.client.issue.IssuesService issuesOld() {
+ return issuesOld;
}
@Override
public IssuesService issues() {
- return issuesService;
+ return issues;
}
@Override
return qualityGatesService;
}
+ @Override
+ public org.sonarqube.ws.client.measure.MeasuresService measuresOld() {
+ return measuresOld;
+ }
+
@Override
public MeasuresService measures() {
- return measuresService;
+ return measures;
}
@Override
}
@Override
- public ProjectAnalysisService projectAnalysis() {
- return projectAnalysisService;
+ public ProjectAnalysisService projectAnalysisOld() {
+ return projectAnalysisOld;
+ }
+
+ @Override
+ public ProjectAnalysesService projectAnalyses() {
+ return projectAnalyses;
}
@Override
package org.sonarqube.ws.client;
import org.sonarqube.ws.client.ce.CeService;
-import org.sonarqube.ws.client.component.ComponentsService;
+import org.sonarqube.ws.client.components.ComponentsService;
import org.sonarqube.ws.client.favorites.FavoritesService;
-import org.sonarqube.ws.client.issue.IssuesService;
-import org.sonarqube.ws.client.measure.MeasuresService;
+import org.sonarqube.ws.client.issues.IssuesService;
+import org.sonarqube.ws.client.measures.MeasuresService;
import org.sonarqube.ws.client.notifications.NotificationsService;
import org.sonarqube.ws.client.organization.OrganizationService;
-import org.sonarqube.ws.client.permission.PermissionsService;
+import org.sonarqube.ws.client.organizations.OrganizationsService;
+import org.sonarqube.ws.client.permissions.PermissionsService;
import org.sonarqube.ws.client.project.ProjectsService;
+import org.sonarqube.ws.client.projectanalyses.ProjectAnalysesService;
import org.sonarqube.ws.client.projectanalysis.ProjectAnalysisService;
import org.sonarqube.ws.client.projectbranches.ProjectBranchesService;
import org.sonarqube.ws.client.projectlinks.ProjectLinksService;
import org.sonarqube.ws.client.qualitygates.QualitygatesService;
import org.sonarqube.ws.client.qualityprofile.QualityProfilesService;
+import org.sonarqube.ws.client.qualityprofiles.QualityprofilesService;
import org.sonarqube.ws.client.roots.RootsService;
import org.sonarqube.ws.client.rules.RulesService;
import org.sonarqube.ws.client.settings.SettingsService;
* @since 5.3
*/
public interface WsClient {
- OrganizationService organizations();
+
+ /**
+ * @deprecated since 7.0 use {@link #organizations()} instead
+ */
+ @Deprecated
+ OrganizationService organizationsOld();
+
+ OrganizationsService organizations();
+
+ /**
+ * @deprecated since 7.0 use {@link #components()} instead
+ */
+ @Deprecated
+ org.sonarqube.ws.client.component.ComponentsService componentsOld();
ComponentsService components();
FavoritesService favorites();
+ /**
+ * @deprecated since 7.0 use {@link #issues()} instead
+ */
+ @Deprecated
+ org.sonarqube.ws.client.issue.IssuesService issuesOld();
+
IssuesService issues();
NotificationsService notifications();
+ /**
+ * @deprecated since 7.0 use {@link #permissions()} instead
+ */
+ @Deprecated
+ org.sonarqube.ws.client.permission.PermissionsService permissionsOld();
+
PermissionsService permissions();
- QualityProfilesService qualityProfiles();
+ /**
+ * @deprecated since 7.0 use {@link #qualityProfiles()} instead
+ */
+ @Deprecated
+ QualityProfilesService qualityProfilesOld();
+
+ QualityprofilesService qualityProfiles();
UsersService users();
QualitygatesService qualityGates();
+ /**
+ * @deprecated since 7.0 use {@link #measures()} instead
+ */
+ @Deprecated
+ org.sonarqube.ws.client.measure.MeasuresService measuresOld();
+
MeasuresService measures();
SystemService system();
/**
* @since 6.3
+ * @deprecated since 7.0 use {@link #projectAnalyses()} instead
*/
- ProjectAnalysisService projectAnalysis();
+ @Deprecated
+ ProjectAnalysisService projectAnalysisOld();
+
+ ProjectAnalysesService projectAnalyses();
/**
* @since 6.6>
SearchRequest request = new SearchRequest()
.setProjectKeys(Collections.singletonList(projectKey))
.setFacets(Collections.singletonList("statuses"));
- return tester.wsClient().issues().search(request);
+ return tester.wsClient().issuesOld().search(request);
}
private List<String> searchFile(String key, Organization organization) {
.setS(key)
.build();
Map<String, Object> response = ItUtils.jsonToMap(
- tester.wsClient().components().suggestions(query).content()
+ tester.wsClient().componentsOld().suggestions(query).content()
);
List results = (List) response.get("results");
Map trkResult = (Map) results.stream().filter(result -> "FIL".equals(((Map) result).get("q"))).findAny().get();
}
private void addProjectCreatorPermission() {
- Permissions.SearchTemplatesWsResponse permissionTemplates = adminWsClient.permissions().searchTemplates(new SearchTemplatesRequest());
+ Permissions.SearchTemplatesWsResponse permissionTemplates = adminWsClient.permissionsOld().searchTemplates(new SearchTemplatesRequest());
assertThat(permissionTemplates.getDefaultTemplatesCount()).isEqualTo(1);
- adminWsClient.permissions().addProjectCreatorToTemplate(AddProjectCreatorToTemplateRequest.builder()
+ adminWsClient.permissionsOld().addProjectCreatorToTemplate(AddProjectCreatorToTemplateRequest.builder()
.setTemplateId(permissionTemplates.getDefaultTemplates(0).getTemplateId())
.setPermission("admin")
.build());
}
private void removeProjectCreatorPermission() {
- Permissions.SearchTemplatesWsResponse permissionTemplates = adminWsClient.permissions().searchTemplates(new SearchTemplatesRequest());
+ Permissions.SearchTemplatesWsResponse permissionTemplates = adminWsClient.permissionsOld().searchTemplates(new SearchTemplatesRequest());
assertThat(permissionTemplates.getDefaultTemplatesCount()).isEqualTo(1);
- adminWsClient.permissions().removeProjectCreatorFromTemplate(RemoveProjectCreatorFromTemplateRequest.builder()
+ adminWsClient.permissionsOld().removeProjectCreatorFromTemplate(RemoveProjectCreatorFromTemplateRequest.builder()
.setTemplateId(permissionTemplates.getDefaultTemplates(0).getTemplateId())
.setPermission("admin")
.build());
}
public static List<Component> getComponents(String qualifier) {
- return newWsClient(orchestrator).components().tree(new TreeRequest().setBaseComponentKey(PROJECT).setQualifiers(singletonList(qualifier))).getComponentsList();
+ return newWsClient(orchestrator).componentsOld().tree(new TreeRequest().setBaseComponentKey(PROJECT).setQualifiers(singletonList(qualifier))).getComponentsList();
}
}
tester.projects().provision(p -> p
.setKey("com.sonarsource.it.samples:multi-modules-exclusions")
.setName("Sonar :: Integration Tests :: Multi-modules With Exclusions"));
- tester.wsClient().qualityProfiles().addProject(AddProjectRequest.builder().setProjectKey("com.sonarsource.it.samples:multi-modules-exclusions")
+ tester.wsClient().qualityProfilesOld().addProject(AddProjectRequest.builder().setProjectKey("com.sonarsource.it.samples:multi-modules-exclusions")
.setLanguage("xoo").setQualityProfile("with-many-rules").build());
SonarScanner scan = SonarScanner.create(ItUtils.projectDir(PROJECT_DIR))
}
private void addUserPermission(String login, String permission, @Nullable String projectKey) {
- adminWsClient.permissions().addUser(new AddUserRequest()
+ adminWsClient.permissionsOld().addUser(new AddUserRequest()
.setLogin(login)
.setPermission(permission)
.setProjectKey(projectKey));
scan("shared/xoo-multi-modules-sample");
scan("shared/xoo-multi-modules-sample", "sonar.branch", "branch/0.x");
- assertThat(tester.wsClient().components().search(new SearchRequest().setQualifiers(singletonList("TRK"))).getComponentsList()).hasSize(2);
+ assertThat(tester.wsClient().componentsOld().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");
@Test
public void execute_analysis_with_scan_on_default_template() {
removeGlobalPermission("anyone", "scan");
- tester.wsClient().permissions().addProjectCreatorToTemplate(AddProjectCreatorToTemplateRequest.builder()
+ tester.wsClient().permissionsOld().addProjectCreatorToTemplate(AddProjectCreatorToTemplateRequest.builder()
.setPermission("scan")
.setTemplateId("default_template")
.build());
}
private void addProjectPermission(String groupName, String projectKey, String permission) {
- tester.wsClient().permissions().addGroup(new AddGroupRequest().setGroupName(groupName).setProjectKey(projectKey).setPermission(permission));
+ tester.wsClient().permissionsOld().addGroup(new AddGroupRequest().setGroupName(groupName).setProjectKey(projectKey).setPermission(permission));
}
private void addGlobalPermission(String groupName, String permission) {
- tester.wsClient().permissions().addGroup(new AddGroupRequest().setGroupName(groupName).setPermission(permission));
+ tester.wsClient().permissionsOld().addGroup(new AddGroupRequest().setGroupName(groupName).setPermission(permission));
}
private void removeGlobalPermission(String groupName, String permission) {
- tester.wsClient().permissions().removeGroup(new RemoveGroupRequest().setGroupName(groupName).setPermission(permission));
+ tester.wsClient().permissionsOld().removeGroup(new RemoveGroupRequest().setGroupName(groupName).setPermission(permission));
}
private static void executeLoggedAnalysis() {
}
private Issues.BulkChangeWsResponse makeBlockerAndFalsePositive(String user, Issue issueOnPrivateProject, Issue issueOnPublicProject) {
- return newUserWsClient(orchestrator, user, "password").issues()
+ return newUserWsClient(orchestrator, user, "password").issuesOld()
.bulkChange(BulkChangeRequest.builder().setIssues(asList(issueOnPrivateProject.key(), issueOnPublicProject.key()))
.setSetSeverity("BLOCKER")
.setDoTransition("falsepositive")
}
private void addUserPermission(String login, String projectKey, String permission) {
- tester.wsClient().permissions().addUser(
+ tester.wsClient().permissionsOld().addUser(
new AddUserRequest()
.setLogin(login)
.setProjectKey(projectKey)
}
private static Issues.ChangelogWsResponse changelog(String issueKey, String login, String password) {
- return newUserWsClient(orchestrator, login, password).issues().changelog(issueKey);
+ return newUserWsClient(orchestrator, login, password).issuesOld().changelog(issueKey);
}
}
@Test
public void permission_web_services() {
- tester.wsClient().permissions().addUser(
+ tester.wsClient().permissionsOld().addUser(
new AddUserRequest()
.setPermission("admin")
.setLogin(LOGIN));
- tester.wsClient().permissions().addGroup(
+ tester.wsClient().permissionsOld().addGroup(
new AddGroupRequest()
.setPermission("admin")
.setGroupName(GROUP_NAME));
- Permissions.WsSearchGlobalPermissionsResponse searchGlobalPermissionsWsResponse = tester.wsClient().permissions().searchGlobalPermissions();
+ Permissions.WsSearchGlobalPermissionsResponse searchGlobalPermissionsWsResponse = tester.wsClient().permissionsOld().searchGlobalPermissions();
assertThat(searchGlobalPermissionsWsResponse.getPermissionsList().get(0).getKey()).isEqualTo("admin");
assertThat(searchGlobalPermissionsWsResponse.getPermissionsList().get(0).getUsersCount()).isEqualTo(1);
// by default, a group has the global admin permission
assertThat(searchGlobalPermissionsWsResponse.getPermissionsList().get(0).getGroupsCount()).isEqualTo(2);
- Permissions.UsersWsResponse users = tester.wsClient().permissions()
+ Permissions.UsersWsResponse users = tester.wsClient().permissionsOld()
.users(new UsersRequest().setPermission("admin"));
assertThat(users.getUsersList()).extracting("login").contains(LOGIN);
- Permissions.WsGroupsResponse groupsResponse = tester.wsClient().permissions()
+ Permissions.WsGroupsResponse groupsResponse = tester.wsClient().permissionsOld()
.groups(new GroupsRequest()
.setPermission("admin"));
assertThat(groupsResponse.getGroupsList()).extracting("name").contains(GROUP_NAME);
@Test
public void template_permission_web_services() {
- Permissions.CreateTemplateWsResponse createTemplateWsResponse = tester.wsClient().permissions().createTemplate(
+ Permissions.CreateTemplateWsResponse createTemplateWsResponse = tester.wsClient().permissionsOld().createTemplate(
new CreateTemplateRequest()
.setName("my-new-template")
.setDescription("template-used-in-tests"));
assertThat(createTemplateWsResponse.getPermissionTemplate().getName()).isEqualTo("my-new-template");
- tester.wsClient().permissions().addUserToTemplate(
+ tester.wsClient().permissionsOld().addUserToTemplate(
new AddUserToTemplateRequest()
.setPermission("admin")
.setTemplateName("my-new-template")
.setLogin(LOGIN));
- tester.wsClient().permissions().addGroupToTemplate(
+ tester.wsClient().permissionsOld().addGroupToTemplate(
new AddGroupToTemplateRequest()
.setPermission("admin")
.setTemplateName("my-new-template")
.setGroupName(GROUP_NAME));
- tester.wsClient().permissions().addProjectCreatorToTemplate(
+ tester.wsClient().permissionsOld().addProjectCreatorToTemplate(
AddProjectCreatorToTemplateRequest.builder()
.setPermission("admin")
.setTemplateName("my-new-template")
.build());
- SearchTemplatesWsResponse searchTemplatesWsResponse = tester.wsClient().permissions().searchTemplates(
+ SearchTemplatesWsResponse searchTemplatesWsResponse = tester.wsClient().permissionsOld().searchTemplates(
new SearchTemplatesRequest()
.setQuery("my-new-template"));
assertThat(searchTemplatesWsResponse.getPermissionTemplates(0).getName()).isEqualTo("my-new-template");
assertThat(searchTemplatesWsResponse.getPermissionTemplates(0).getPermissions(0).getGroupsCount()).isEqualTo(1);
assertThat(searchTemplatesWsResponse.getPermissionTemplates(0).getPermissions(0).getWithProjectCreator()).isTrue();
- tester.wsClient().permissions().removeGroupFromTemplate(
+ tester.wsClient().permissionsOld().removeGroupFromTemplate(
new RemoveGroupFromTemplateRequest()
.setPermission("admin")
.setTemplateName("my-new-template")
.setGroupName(GROUP_NAME));
- tester.wsClient().permissions().removeUserFromTemplate(
+ tester.wsClient().permissionsOld().removeUserFromTemplate(
new RemoveUserFromTemplateRequest()
.setPermission("admin")
.setTemplateName("my-new-template")
.setLogin(LOGIN));
- tester.wsClient().permissions().removeProjectCreatorFromTemplate(
+ tester.wsClient().permissionsOld().removeProjectCreatorFromTemplate(
RemoveProjectCreatorFromTemplateRequest.builder()
.setPermission("admin")
.setTemplateName("my-new-template")
.build()
);
- SearchTemplatesWsResponse clearedSearchTemplatesWsResponse = tester.wsClient().permissions().searchTemplates(
+ SearchTemplatesWsResponse clearedSearchTemplatesWsResponse = tester.wsClient().permissionsOld().searchTemplates(
new SearchTemplatesRequest()
.setQuery("my-new-template"));
assertThat(clearedSearchTemplatesWsResponse.getPermissionTemplates(0).getPermissionsList())
String userLogin = tester.users().generateMemberOfDefaultOrganization().getLogin();
String adminLogin = tester.users().generateAdministratorOnDefaultOrganization().getLogin();
- tester.wsClient().permissions().createTemplate(new CreateTemplateRequest().setName("foo-template"));
- tester.wsClient().permissions().addUserToTemplate(
+ tester.wsClient().permissionsOld().createTemplate(new CreateTemplateRequest().setName("foo-template"));
+ tester.wsClient().permissionsOld().addUserToTemplate(
new AddUserToTemplateRequest()
.setPermission("admin")
.setTemplateName("foo-template")
ProjectsManagementPage page = tester.openBrowser().logIn().submitCredentials(adminLogin).openProjectsManagement();
page.shouldHaveProject(project);
page.bulkApplyPermissionTemplate("foo-template");
- Permissions.UsersWsResponse usersResponse = tester.wsClient().permissions().users(new UsersRequest()
+ Permissions.UsersWsResponse usersResponse = tester.wsClient().permissionsOld().users(new UsersRequest()
.setProjectKey(project)
.setPermission("admin")
);
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 AddUserToTemplateRequest()
+ tester.wsClient().permissionsOld().addUserToTemplate(new AddUserToTemplateRequest()
.setOrganization(organization.getKey())
.setTemplateId(template.getId())
.setLogin(user.getLogin())
Project project2 = createPrivateProject(organization);
Project untouchedProject = createPrivateProject(organization);
- tester.wsClient().permissions().bulkApplyTemplate(new BulkApplyTemplateRequest()
+ tester.wsClient().permissionsOld().bulkApplyTemplate(new BulkApplyTemplateRequest()
.setOrganization(organization.getKey())
.setTemplateId(template.getId())
.setProjects(Arrays.asList(project1.getKey(), project2.getKey())));
*/
private void createAndApplyTemplate(Organization organization, Project project, CreateWsResponse.User user) {
String templateName = "For user";
- PermissionsService service = tester.wsClient().permissions();
+ PermissionsService service = tester.wsClient().permissionsOld();
service.createTemplate(new CreateTemplateRequest()
.setOrganization(organization.getKey())
.setName(templateName)
}
private CreateTemplateWsResponse createTemplate(Organization organization) {
- return tester.wsClient().permissions().createTemplate(new CreateTemplateRequest()
+ return tester.wsClient().permissionsOld().createTemplate(new CreateTemplateRequest()
.setOrganization(organization.getKey())
.setName(randomAlphabetic(20)));
}
private boolean userHasAccessToIndexedProject(CreateWsResponse.User user, Organization organization, Project project) {
SearchProjectsRequest request = SearchProjectsRequest.builder().setOrganization(organization.getKey()).build();
WsClient userSession = tester.as(user.getLogin()).wsClient();
- return userSession.components().searchProjects(request)
+ return userSession.componentsOld().searchProjects(request)
.getComponentsList().stream()
.anyMatch(c -> c.getKey().equals(project.getKey()));
}
.setOrganization(organization.getKey())
.setProjectKey(project.getKey())
.setPermission("user");
- Permissions.UsersWsResponse response = tester.wsClient().permissions().users(request);
+ Permissions.UsersWsResponse response = tester.wsClient().permissionsOld().users(request);
Optional<Permissions.User> found = response.getUsersList().stream()
.filter(u -> user.getLogin().equals(u.getLogin()))
.findFirst();
@BeforeClass
public static void init() {
// remove default permission "provisioning" from anyone();
- tester.wsClient().permissions().removeGroup(new RemoveGroupRequest().setGroupName("anyone").setPermission("provisioning"));
+ tester.wsClient().permissionsOld().removeGroup(new RemoveGroupRequest().setGroupName("anyone").setPermission("provisioning"));
tester.users().generate(u -> u.setLogin(ADMIN_WITH_PROVISIONING).setPassword(PASSWORD));
addUserPermission(ADMIN_WITH_PROVISIONING, "admin");
@AfterClass
public static void restoreData() throws Exception {
- tester.wsClient().permissions().addGroup(new AddGroupRequest().setGroupName("anyone").setPermission("provisioning"));
+ tester.wsClient().permissionsOld().addGroup(new AddGroupRequest().setGroupName("anyone").setPermission("provisioning"));
}
/**
}
private static void addUserPermission(String login, String permission) {
- tester.wsClient().permissions().addUser(new AddUserRequest().setLogin(login).setPermission(permission));
+ tester.wsClient().permissionsOld().addUser(new AddUserRequest().setLogin(login).setPermission(permission));
}
private static void removeUserPermission(String login, String permission) {
- tester.wsClient().permissions().removeUser(new RemoveUserRequest().setLogin(login).setPermission(permission));
+ tester.wsClient().permissionsOld().removeUser(new RemoveUserRequest().setLogin(login).setPermission(permission));
}
}
tester.users().generate(u -> u.setLogin("not_profileadm").setPassword("userpwd"));
tester.users().generate(u -> u.setLogin("profileadm").setPassword("papwd"));
- tester.wsClient().permissions().addUser(new AddUserRequest().setLogin("profileadm").setPermission("profileadmin"));
+ tester.wsClient().permissionsOld().addUser(new AddUserRequest().setLogin("profileadm").setPermission("profileadmin"));
createProfile("xoo", "foo");
Selenese.runSelenese(orchestrator,
}
private void createProfile(String language, String name) {
- tester.wsClient().qualityProfiles().create(CreateRequest.builder()
+ tester.wsClient().qualityProfilesOld().create(CreateRequest.builder()
.setLanguage(language)
.setName(name)
.build());
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 AddUserRequest()
+ tester.wsClient().permissionsOld().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 AddUserRequest()
+ tester.wsClient().permissionsOld().addUser(new AddUserRequest()
.setLogin(user2.getLogin())
.setPermission("admin")
.setProjectKey(project2.getKey()));
@Test
public void show() {
- Components.ShowWsResponse response = tester.wsClient().components().show(new ShowRequest().setKey(FILE_KEY));
+ Components.ShowWsResponse response = tester.wsClient().componentsOld().show(new ShowRequest().setKey(FILE_KEY));
assertThat(response).isNotNull();
assertThat(response.getComponent().getKey()).isEqualTo(FILE_KEY);
@Test
public void search() {
- Components.SearchWsResponse response = tester.wsClient().components().search(new SearchRequest()
+ Components.SearchWsResponse response = tester.wsClient().componentsOld().search(new SearchRequest()
.setQualifiers(singletonList("FIL")));
assertThat(response).isNotNull();
}
private List<Issue> findIssues(String componentKey, String ruleKey) {
- return adminWsClient.issues().search(
+ return adminWsClient.issuesOld().search(
new SearchRequest()
.setComponents(singletonList(componentKey))
.setRules(singletonList(ruleKey)))
this.projectAnalysis = projectAnalysisRule.newProjectAnalysis(projectKey).withQualityProfile(qualityProfileKey);
this.projectAnalysis.run();
- this.issuesService = newAdminWsClient(ORCHESTRATOR).issues();
+ this.issuesService = newAdminWsClient(ORCHESTRATOR).issuesOld();
this.randomIssue = issueRule.getRandomIssue();
}
String projectKey = projectAnalysisRule.registerProject("shared/xoo-sample");
this.xooSampleLittleIssuesAnalysis = projectAnalysisRule.newProjectAnalysis(projectKey)
.withQualityProfile(qualityProfileKey);
- this.issuesService = newAdminWsClient(ORCHESTRATOR).issues();
+ this.issuesService = newAdminWsClient(ORCHESTRATOR).issuesOld();
}
@Test
}
private static Issues.ChangelogWsResponse changelog(String issueKey) {
- return adminClient.issues().changelog(issueKey);
+ return adminClient.issuesOld().changelog(issueKey);
}
}
private static Date getAnalysisDate(Function<List<ProjectAnalyses.Analysis>, Optional<ProjectAnalyses.Analysis>> chooseItem) {
return Optional.of(
ItUtils.newWsClient(ORCHESTRATOR)
- .projectAnalysis()
+ .projectAnalysisOld()
.search(SearchRequest.builder().setProject(SAMPLE_PROJECT_KEY).build())
.getAnalysesList())
.flatMap(chooseItem)
}
private List<Issues.Issue> findIssuesByRuleKey(String ruleKey) {
- return adminWsClient.issues().search(
+ return adminWsClient.issuesOld().search(
new SearchRequest()
.setComponents(singletonList(FILE_KEY))
.setRules(singletonList(ruleKey)))
}
private List<Issues.Issue> findAllIssues() {
- return adminWsClient.issues().search(new SearchRequest()).getIssuesList();
+ return adminWsClient.issuesOld().search(new SearchRequest()).getIssuesList();
}
}
clearSmtpMessages();
// Change assignee
- SearchWsResponse issues = tester.wsClient().issues().search(new SearchRequest().setProjectKeys(singletonList(PROJECT_KEY)));
+ SearchWsResponse issues = tester.wsClient().issuesOld().search(new SearchRequest().setProjectKeys(singletonList(PROJECT_KEY)));
Issue issue = issues.getIssuesList().get(0);
- tester.wsClient().issues().assign(new AssignRequest(issue.getKey(), userWithUserRole.getLogin()));
+ tester.wsClient().issuesOld().assign(new AssignRequest(issue.getKey(), userWithUserRole.getLogin()));
// Only the assignee should receive the email
waitUntilAllNotificationsAreDelivered(1);
assertThat(smtpServer.getMessages()).hasSize(privateProject ? 2 : 3);
clearSmtpMessages();
- SearchWsResponse issues = tester.wsClient().issues().search(new SearchRequest().setProjectKeys(singletonList(PROJECT_KEY)));
+ SearchWsResponse issues = tester.wsClient().issuesOld().search(new SearchRequest().setProjectKeys(singletonList(PROJECT_KEY)));
Issue issue = issues.getIssuesList().get(0);
// bulk change without notification by default
- tester.wsClient().issues().bulkChange(BulkChangeRequest.builder()
+ tester.wsClient().issuesOld().bulkChange(BulkChangeRequest.builder()
.setIssues(singletonList(issue.getKey()))
.setAssign(userWithUserRole.getLogin())
.setSetSeverity("MINOR")
.build());
// bulk change with notification
- tester.wsClient().issues().bulkChange(BulkChangeRequest.builder()
+ tester.wsClient().issuesOld().bulkChange(BulkChangeRequest.builder()
.setIssues(singletonList(issue.getKey()))
.setSetSeverity("BLOCKER")
.setSendNotifications(true)
.setName("userWithUserRole")
.setEmail("userWithUserRole@nowhere.com"));
tester.organizations().addMember(organization, userWithUserRole);
- tester.wsClient().permissions().addUser(
+ tester.wsClient().permissionsOld().addUser(
new AddUserRequest()
.setLogin(userWithUserRole.getLogin())
.setProjectKey(PROJECT_KEY)
}
private SearchWsResponse searchIssues(SearchRequest request) throws IOException {
- return newAdminWsClient(ORCHESTRATOR).issues().search(request);
+ return newAdminWsClient(ORCHESTRATOR).issuesOld().search(request);
}
}
.build());
analyzeProject(organization.getKey(), projectKey);
- String issue = tester.wsClient().issues().search(new SearchRequest()).getIssues(0).getKey();
- tester.wsClient().issues().setTags(issue, "bla", "blubb");
+ String issue = tester.wsClient().issuesOld().search(new SearchRequest()).getIssues(0).getKey();
+ tester.wsClient().issuesOld().setTags(issue, "bla", "blubb");
String[] publicTags = {"bad-practice", "convention", "pitfall"};
String[] privateTags = {"bad-practice", "bla", "blubb", "convention", "pitfall"};
}
private void grantUserPermission(String projectKey, User member) {
- tester.wsClient().permissions().addUser(
+ tester.wsClient().permissionsOld().addUser(
new AddUserRequest()
.setLogin(member.getLogin())
.setPermission("user")
(List<String>) ItUtils.jsonToMap(
tester.as(userLogin)
.wsClient()
- .issues()
+ .issuesOld()
.getTags(organization)
.content())
.get("tags")).containsExactly(
}
private static SearchWsResponse searchIssues(SearchRequest request) {
- return adminClient.issues().search(request);
+ return adminClient.issuesOld().search(request);
}
}
@Before
public void before() {
- issuesService = newAdminWsClient(ORCHESTRATOR).issues();
+ issuesService = newAdminWsClient(ORCHESTRATOR).issuesOld();
String oneIssuePerFileProfileKey = projectAnalysisRule.registerProfile("/issue/IssueWorkflowTest/xoo-one-issue-per-line-profile.xml");
String analyzedProjectKey = projectAnalysisRule.registerProject("issue/workflow");
analysisWithIssues = projectAnalysisRule.newProjectAnalysis(analyzedProjectKey).withQualityProfile(oneIssuePerFileProfileKey);
}
private Issues.SearchWsResponse searchIssues(SearchRequest request) {
- return newAdminWsClient(ORCHESTRATOR).issues().search(request);
+ return newAdminWsClient(ORCHESTRATOR).issuesOld().search(request);
}
}
provisionAndAnalyseProject("sample2", org2.getKey());
List<String> issues = issueRule.search(new SearchRequest()).getIssuesList().stream().map(Issue::getKey).collect(Collectors.toList());
- Issues.BulkChangeWsResponse response = tester.wsClient().issues()
+ Issues.BulkChangeWsResponse response = tester.wsClient().issuesOld()
.bulkChange(BulkChangeRequest.builder().setIssues(issues).setAssign(user.getLogin()).build());
assertThat(response.getIgnored()).isGreaterThan(0);
}
private void addQualityProfileToProject(String organization, String projectKey) {
- tester.wsClient().qualityProfiles().addProject(
+ tester.wsClient().qualityProfilesOld().addProject(
AddProjectRequest.builder()
.setProjectKey(projectKey)
.setOrganization(organization)
}
private Issues.Operation assignIssueTo(Issue issue, User u) {
- return tester.wsClient().issues().assign(new AssignRequest(issue.getKey(), u.getLogin()));
+ return tester.wsClient().issuesOld().assign(new AssignRequest(issue.getKey(), u.getLogin()));
}
}
@Test
public void call_issues_ws() {
// all issues
- IssuesService issuesService = tester.wsClient().issues();
+ IssuesService issuesService = tester.wsClient().issuesOld();
Issues.SearchWsResponse response = issuesService.search(new SearchRequest());
assertThat(response.getIssuesCount()).isGreaterThan(0);
@Test
public void call_components_ws() {
// files in project
- Components.TreeWsResponse tree = tester.wsClient().components().tree(new TreeRequest()
+ Components.TreeWsResponse tree = tester.wsClient().componentsOld().tree(new TreeRequest()
.setBaseComponentKey(PROJECT_KEY)
.setQualifiers(singletonList("FIL")));
assertThat(tree.getComponentsCount()).isEqualTo(4);
@Test
public void call_measures_ws() {
// project measures
- MeasuresService measuresService = tester.wsClient().measures();
+ MeasuresService measuresService = tester.wsClient().measuresOld();
Measures.ComponentWsResponse component = measuresService.component(new ComponentRequest()
.setComponentKey(PROJECT_KEY)
.setMetricKeys(asList("lines", "ncloc", "files")));
public void component_tree() {
scanXooSample();
- ComponentTreeWsResponse response = tester.wsClient().measures().componentTree(new ComponentTreeRequest()
+ ComponentTreeWsResponse response = tester.wsClient().measuresOld().componentTree(new ComponentTreeRequest()
.setComponent("sample")
.setMetricKeys(singletonList("ncloc"))
.setAdditionalFields(asList("metrics", "periods")));
}
private void verifyComponentTreeWithChildren(String baseComponentKey, String... childKeys) {
- ComponentTreeWsResponse response = tester.wsClient().measures().componentTree(new ComponentTreeRequest()
+ ComponentTreeWsResponse response = tester.wsClient().measuresOld().componentTree(new ComponentTreeRequest()
.setComponent(baseComponentKey)
.setMetricKeys(singletonList("ncloc"))
.setStrategy("children"));
public void component() {
scanXooSample();
- ComponentWsResponse response = tester.wsClient().measures().component(new ComponentRequest()
+ ComponentWsResponse response = tester.wsClient().measuresOld().component(new ComponentRequest()
.setComponent("sample")
.setMetricKeys(singletonList("ncloc"))
.setAdditionalFields(newArrayList("metrics", "periods")));
public void noDataForInterval() {
Date now = new Date();
- SearchHistoryResponse response = tester.wsClient().measures().searchHistory(SearchHistoryRequest.builder()
+ SearchHistoryResponse response = tester.wsClient().measuresOld().searchHistory(SearchHistoryRequest.builder()
.setComponent(PROJECT_KEY)
.setMetrics(singletonList("lines"))
.setFrom(formatDate(now))
}
private static SearchHistoryResponse searchHistory(String... metrics) {
- return tester.wsClient().measures().searchHistory(SearchHistoryRequest.builder()
+ return tester.wsClient().measuresOld().searchHistory(SearchHistoryRequest.builder()
.setComponent(PROJECT_KEY)
.setMetrics(Arrays.asList(metrics))
.build());
public void does_not_fail_to_update_default_projects_visibility_to_private() {
tester.settings().setGlobalSettings("sonar.billing.preventUpdatingProjectsVisibilityToPrivate", "false");
- tester.wsClient().organizations().updateProjectVisibility(UpdateProjectVisibilityRequest.builder()
+ tester.wsClient().organizationsOld().updateProjectVisibility(UpdateProjectVisibilityRequest.builder()
.setOrganization(organization.getKey())
.setProjectVisibility("private")
.build());
expectHttpError(400,
format("Organization %s cannot use private project", organization.getKey()),
- () -> tester.wsClient().organizations()
+ () -> tester.wsClient().organizationsOld()
.updateProjectVisibility(UpdateProjectVisibilityRequest.builder().setOrganization(organization.getKey()).setProjectVisibility("private").build()));
}
User user = tester.users().generate();
addMembership(organization, user);
- tester.wsClient().permissions().addUser(new AddUserRequest().setLogin(user.getLogin()).setPermission("admin").setOrganization(organization.getKey()));
+ tester.wsClient().permissionsOld().addUser(new AddUserRequest().setLogin(user.getLogin()).setPermission("admin").setOrganization(organization.getKey()));
tester.organizations().assertThatMemberOf(organization, user);
removeMembership(organization, user);
User user = tester.users().generate();
addMembership(organization, user);
- tester.wsClient().permissions().addUser(new AddUserRequest().setLogin(user.getLogin()).setPermission("admin").setOrganization(organization.getKey()));
+ tester.wsClient().permissionsOld().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");
+ tester.wsClient().organizationsOld().removeMember(organization.getKey(), "admin");
expectedException.expect(HttpException.class);
expectedException.expectMessage("The last administrator member cannot be removed");
}
private void removeMembership(Organization organization, User user) {
- tester.wsClient().organizations().removeMember(organization.getKey(), user.getLogin());
+ tester.wsClient().organizationsOld().removeMember(organization.getKey(), user.getLogin());
}
}
"sonar.organization", organization.getKey(),
"sonar.login", user.getLogin(),
"sonar.password", user.getLogin());
- ComponentsService componentsService = tester.as(user.getLogin()).wsClient().components();
+ ComponentsService componentsService = tester.as(user.getLogin()).wsClient().componentsOld();
assertThat(searchSampleProject(organization.getKey(), componentsService).getComponentsList()).hasSize(1);
}
assertThat(e.getResult().getLogs()).contains("Insufficient privileges");
}
- ComponentsService componentsService = tester.wsClient().components();
+ ComponentsService componentsService = tester.wsClient().componentsOld();
assertThat(searchSampleProject(organization.getKey(), componentsService).getComponentsCount()).isEqualTo(0);
}
runProjectAnalysis(orchestrator, "shared/xoo-sample", "sonar.organization", organization.getKey(), "sonar.login", "admin", "sonar.password", "admin");
- ComponentsService componentsService = tester.asAnonymous().wsClient().components();
+ ComponentsService componentsService = tester.asAnonymous().wsClient().componentsOld();
assertThat(searchSampleProject(organization.getKey(), componentsService).getComponentsList()).hasSize(1);
}
private void addPermissionsToUser(String orgKeyAndName, String login, String permission, String... otherPermissions) {
- PermissionsService permissionsService = tester.wsClient().permissions();
+ PermissionsService permissionsService = tester.wsClient().permissionsOld();
permissionsService.addUser(new AddUserRequest().setLogin(login).setOrganization(orgKeyAndName).setPermission(permission));
for (String otherPermission : otherPermissions) {
permissionsService.addUser(new AddUserRequest().setLogin(login).setOrganization(orgKeyAndName).setPermission(otherPermission));
"sonar.organization", organization.getKey(),
"sonar.login", "admin",
"sonar.password", "admin");
- ComponentsService componentsService = tester.wsClient().components();
+ ComponentsService componentsService = tester.wsClient().componentsOld();
assertThat(searchSampleProject(organization.getKey(), componentsService).getComponentsList()).hasSize(1);
tester.organizations().service().delete(organization.getKey());
private void assertThatBuiltInQualityProfilesExist(Organization org) {
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);
+ Qualityprofiles.SearchWsResponse response = tester.wsClient().qualityProfilesOld().search(profilesRequest);
assertThat(response.getProfilesCount()).isGreaterThan(0);
response.getProfilesList().forEach(p -> {
}
private void assertThatQualityProfilesDoNotExist(Organization org) {
- expectNotFoundError(() -> tester.wsClient().qualityProfiles().search(
+ expectNotFoundError(() -> tester.wsClient().qualityProfilesOld().search(
new org.sonarqube.ws.client.qualityprofile.SearchRequest().setOrganizationKey(org.getKey())));
}
}
public void personal_organizations_are_created_for_new_users() {
Users.CreateWsResponse.User user = tester.users().generate();
- List<Organizations.Organization> existing = tester.wsClient().organizations().search(SearchRequest.builder().build()).getOrganizationsList();
+ List<Organizations.Organization> existing = tester.wsClient().organizationsOld().search(SearchRequest.builder().build()).getOrganizationsList();
assertThat(existing)
.filteredOn(Organizations.Organization::getGuarded)
.filteredOn(o -> o.getKey().equals(user.getLogin()))
}
private Map<String, Double> getMeasures(String key) {
- return newWsClient().measures().component(new ComponentRequest()
+ return newWsClient().measuresOld().component(new ComponentRequest()
.setComponentKey(key)
.setMetricKeys(asList("duplicated_lines", "duplicated_blocks", "duplicated_files", "duplicated_lines_density")))
.getComponent().getMeasuresList()
$(".modal button").click();
$("#projects-management-page").shouldNotHave(text(project1.getName())).shouldNotHave(text(project3.getName()));
- assertThat(tester.wsClient().components().searchProjects(SearchProjectsRequest.builder().build())
+ assertThat(tester.wsClient().componentsOld().searchProjects(SearchProjectsRequest.builder().build())
.getComponentsCount()).isEqualTo(1);
}
}
* Projects page - api/components/search_projects - uses ES + DB
*/
private boolean isInComponentSearchProjects(String name) {
- Components.SearchProjectsWsResponse response = tester.wsClient().components().searchProjects(
+ Components.SearchProjectsWsResponse response = tester.wsClient().componentsOld().searchProjects(
SearchProjectsRequest.builder().setFilter("query=\"" + name + "\"").build());
return response.getComponentsCount() > 0;
}
}
private SearchProjectsWsResponse searchProjects(SearchProjectsRequest request) throws IOException {
- return tester.wsClient().components().searchProjects(request);
+ return tester.wsClient().componentsOld().searchProjects(request);
}
private void verifyFilterMatches(String projectKey, String filter) throws IOException {
public void update_key() {
analyzeXooSample();
String newProjectKey = "another_project_key";
- Components.Component project = tester.wsClient().components().show(new ShowRequest().setKey(PROJECT_KEY)).getComponent();
+ Components.Component project = tester.wsClient().componentsOld().show(new ShowRequest().setKey(PROJECT_KEY)).getComponent();
assertThat(project.getKey()).isEqualTo(PROJECT_KEY);
tester.wsClient().projects().updateKey(UpdateKeyRequest.builder()
.setNewKey(newProjectKey)
.build());
- assertThat(tester.wsClient().components().show(new ShowRequest().setId(project.getId())).getComponent().getKey()).isEqualTo(newProjectKey);
+ assertThat(tester.wsClient().componentsOld().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 ShowRequest().setKey(PROJECT_KEY)).getComponent();
+ Components.Component project = tester.wsClient().componentsOld().show(new ShowRequest().setKey(PROJECT_KEY)).getComponent();
assertThat(project.getKey()).isEqualTo(PROJECT_KEY);
Projects.BulkUpdateKeyWsResponse result = tester.wsClient().projects().bulkUpdateKey(BulkUpdateKeyRequest.builder()
.setTo(newProjectKey)
.build());
- assertThat(tester.wsClient().components().show(new ShowRequest().setId(project.getId())).getComponent().getKey()).isEqualTo(newProjectKey);
+ assertThat(tester.wsClient().componentsOld().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)
*/
@CheckForNull
private String keyInComponentSearchProjects(String name) {
- Components.SearchProjectsWsResponse response = tester.wsClient().components().searchProjects(
+ Components.SearchProjectsWsResponse response = tester.wsClient().componentsOld().searchProjects(
SearchProjectsRequest.builder().setFilter("query=\"" + name + "\"").build());
if (response.getComponentsCount() > 0) {
return response.getComponents(0).getKey();
* Projects page - api/components/search_projects - uses ES + DB
*/
private boolean isInComponentSearchProjects(String name) {
- Components.SearchProjectsWsResponse response = tester.wsClient().components().searchProjects(
+ Components.SearchProjectsWsResponse response = tester.wsClient().componentsOld().searchProjects(
SearchProjectsRequest.builder().setFilter("query=\"" + name + "\"").build());
return response.getComponentsCount() > 0;
}
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 RemoveGroupRequest().setProjectKey("sample2").setGroupName("sonar-administrators").setPermission("admin"));
+ tester.wsClient().permissionsOld().removeGroup(new RemoveGroupRequest().setProjectKey("sample2").setGroupName("sonar-administrators").setPermission("admin"));
tester.openBrowser().logIn().submitCredentials(adminUser)
.openProjectsManagement("default-organization")
.createProject("foo", "foo", visibility)
.shouldHaveProjectsCount(1);
- Components.SearchProjectsWsResponse response = newAdminWsClient(orchestrator).components().searchProjects(
+ Components.SearchProjectsWsResponse response = newAdminWsClient(orchestrator).componentsOld().searchProjects(
SearchProjectsRequest.builder().build());
assertThat(response.getComponentsCount()).isEqualTo(1);
assertThat(response.getComponents(0).getKey()).isEqualTo("foo");
organization = tester.organizations().generate();
gateAdmin = tester.users().generate();
tester.organizations().addMember(tester.organizations().getDefaultOrganization(), gateAdmin);
- tester.wsClient().permissions().addUser(new AddUserRequest().setLogin(gateAdmin.getLogin()).setPermission("gateadmin"));
+ tester.wsClient().permissionsOld().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());
// 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 AddUserRequest().setLogin(user.getLogin()).setPermission("gateadmin").setOrganization(organization.getKey()));
+ tester.wsClient().permissionsOld().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
orchestrator.executeBuild(SonarScanner.create(projectDir("shared/xoo-sample"))
.setProperties("sonar.oneIssuePerFile.effortToFix", "10"));
- Issues.Issue firstIssue = tester.wsClient().issues().search(new SearchRequest()).getIssues(0);
+ Issues.Issue firstIssue = tester.wsClient().issuesOld().search(new SearchRequest()).getIssues(0);
List<Issues.ChangelogWsResponse.Changelog> changes = changelog(firstIssue.getKey()).getChangelogList();
assertThat(changes).hasSize(1);
}
private Issues.ChangelogWsResponse changelog(String issueKey) {
- return tester.wsClient().issues().changelog(issueKey);
+ return tester.wsClient().issuesOld().changelog(issueKey);
}
}
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 SearchRequest()).getIssuesList();
+ List<Issues.Issue> issues = tester.wsClient().issuesOld().search(new SearchRequest()).getIssuesList();
assertThat(issues).isNotEmpty();
for (Issues.Issue issue : issues) {
assertThat(issue.getDebt()).isEqualTo("1min");
userRule = UserRule.from(orchestrator);
Users.CreateWsResponse.User profileAdmin1 = userRule.generate();
WsClient wsClient = ItUtils.newAdminWsClient(orchestrator);
- wsClient.permissions().addUser(new AddUserRequest().setLogin(profileAdmin1.getLogin()).setPermission("profileadmin"));
+ wsClient.permissionsOld().addUser(new AddUserRequest().setLogin(profileAdmin1.getLogin()).setPermission("profileadmin"));
orchestrator.restartServer();
// Create a quality profile administrator (user having direct permission)
Users.CreateWsResponse.User profileAdmin1 = userRule.generate();
WsClient wsClient = ItUtils.newAdminWsClient(orchestrator);
- wsClient.permissions().addUser(new AddUserRequest().setLogin(profileAdmin1.getLogin()).setPermission("profileadmin"));
+ wsClient.permissionsOld().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 AddGroupRequest().setPermission("profileadmin").setGroupName(groupName));
+ wsClient.permissionsOld().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();
// Create a child profile on the built-in profile => The notification should not take into account updates of this profile
- wsClient.qualityProfiles().create(CreateRequest.builder().setLanguage("foo").setName("child").build());
- wsClient.qualityProfiles().changeParent(ChangeParentRequest.builder().setProfileName("child").setParentName("Basic").setLanguage("foo").build());
+ wsClient.qualityProfilesOld().create(CreateRequest.builder().setLanguage("foo").setName("child").build());
+ wsClient.qualityProfilesOld().changeParent(ChangeParentRequest.builder().setProfileName("child").setParentName("Basic").setLanguage("foo").build());
// uninstall plugin V1
wsClient.wsConnector().call(new PostRequest("api/plugins/uninstall").setParam("key", "foo")).failIfNotSuccessful();
userRule = UserRule.from(orchestrator);
Users.CreateWsResponse.User profileAdmin1 = userRule.generate();
WsClient wsClient = ItUtils.newAdminWsClient(orchestrator);
- wsClient.permissions().addUser(new AddUserRequest().setLogin(profileAdmin1.getLogin()).setPermission("profileadmin"));
+ wsClient.permissionsOld().addUser(new AddUserRequest().setLogin(profileAdmin1.getLogin()).setPermission("profileadmin"));
// uninstall plugin V1
wsClient.wsConnector().call(new PostRequest("api/plugins/uninstall").setParam("key", "foo")).failIfNotSuccessful();
}
private void inheritProfile(String language, String name, String parentName) {
- tester.wsClient().qualityProfiles().changeParent(ChangeParentRequest.builder()
+ tester.wsClient().qualityProfilesOld().changeParent(ChangeParentRequest.builder()
.setLanguage(language)
.setProfileName(name)
.setParentName(parentName)
}
private void addProfileToProject(String language, String profileName, String projectKey) {
- tester.wsClient().qualityProfiles().addProject(AddProjectRequest.builder()
+ tester.wsClient().qualityProfilesOld().addProject(AddProjectRequest.builder()
.setLanguage(language)
.setQualityProfile(profileName)
.setProjectKey(projectKey)
Organization organization = tester.organizations().generate();
User user = tester.users().generateMember(organization);
CreateWsResponse.QualityProfile xooProfile = tester.qProfiles().createXooProfile(organization);
- tester.wsClient().permissions().addUser(new AddUserRequest().setOrganization(organization.getKey()).setLogin(user.getLogin()).setPermission("profileadmin"));
+ tester.wsClient().permissionsOld().addUser(new AddUserRequest().setOrganization(organization.getKey()).setLogin(user.getLogin()).setPermission("profileadmin"));
SearchWsResponse result = tester.as(user.getLogin())
.qProfiles().service().search(new SearchRequest().setOrganizationKey(organization.getKey()));
}
private void createProfile(String language, String name) {
- tester.wsClient().qualityProfiles().create(CreateRequest.builder()
+ tester.wsClient().qualityProfilesOld().create(CreateRequest.builder()
.setLanguage(language)
.setName(name)
.build());
}
private void inheritProfile(String language, String name, String parentName) {
- tester.wsClient().qualityProfiles().changeParent(ChangeParentRequest.builder()
+ tester.wsClient().qualityProfilesOld().changeParent(ChangeParentRequest.builder()
.setLanguage(language)
.setProfileName(name)
.setParentName(parentName)
}
private void addProfileToProject(String language, String profileName, String projectKey) {
- tester.wsClient().qualityProfiles().addProject(AddProjectRequest.builder()
+ tester.wsClient().qualityProfilesOld().addProject(AddProjectRequest.builder()
.setLanguage(language)
.setQualityProfile(profileName)
.setProjectKey(projectKey)
Organization org = tester.organizations().generate();
CreateWsResponse.QualityProfile profile = tester.qProfiles().createXooProfile(org);
- String changelog = tester.wsClient().qualityProfiles().changelog(ChangelogRequest.builder()
+ String changelog = tester.wsClient().qualityProfilesOld().changelog(ChangelogRequest.builder()
.setOrganization(org.getKey())
.setLanguage(profile.getLanguage())
.setQualityProfile(profile.getName())
tester.qProfiles().activateRule(profile, RULE_ONE_BUG_PER_LINE);
tester.qProfiles().activateRule(profile, RULE_ONE_ISSUE_PER_LINE);
- String changelog2 = tester.wsClient().qualityProfiles().changelog(ChangelogRequest.builder()
+ String changelog2 = tester.wsClient().qualityProfilesOld().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(ChangelogRequest.builder()
+ String changelog3 = tester.wsClient().qualityProfilesOld().changelog(ChangelogRequest.builder()
.setOrganization(org.getKey())
.setLanguage(profile.getLanguage())
.setQualityProfile(profile.getName())
private void generateSqlAndEsLogsInWebAndCe() {
orchestrator.executeBuild(SonarScanner.create(projectDir("shared/xoo-sample")));
- ItUtils.newAdminWsClient(orchestrator).issues().search(new SearchRequest()
+ ItUtils.newAdminWsClient(orchestrator).issuesOld().search(new SearchRequest()
.setProjectKeys(Collections.singletonList("sample")));
}
private void createSystemAdministrator(String login, String password) {
WsClient wsClient = newAdminWsClient(orchestrator);
createNonSystemAdministrator(wsClient, login, password);
- wsClient.permissions().addUser(new AddUserRequest().setLogin(login).setPermission("admin"));
+ wsClient.permissionsOld().addUser(new AddUserRequest().setLogin(login).setPermission("admin"));
}
private void createNonSystemAdministrator(String login, String password) {
userRule.createUser("scanner-user", "scanner-user");
adminWsClient = newAdminWsClient(orchestrator);
// Remove 'Execute Analysis' permission from anyone
- adminWsClient.permissions().removeGroup(new RemoveGroupRequest().setGroupName("anyone").setPermission("scan"));
+ adminWsClient.permissionsOld().removeGroup(new RemoveGroupRequest().setGroupName("anyone").setPermission("scan"));
// Anonymous user, without 'Execute Analysis' permission
anonymousSettingsService = newWsClient(orchestrator).settings();
userSettingsService = newUserWsClient(orchestrator, "setting-user", "setting-user").settings();
// User with 'Execute Analysis' permission
- adminWsClient.permissions().addUser(new AddUserRequest().setLogin("scanner-user").setPermission("scan"));
+ adminWsClient.permissionsOld().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
public static void tearDown() throws Exception {
userRule.deactivateUsers("setting-user", "scanner-user");
// Restore 'Execute Analysis' permission to anyone
- adminWsClient.permissions().addGroup(new AddGroupRequest().setGroupName("anyone").setPermission("scan"));
+ adminWsClient.permissionsOld().addGroup(new AddGroupRequest().setGroupName("anyone").setPermission("scan"));
}
@After
}
private int countFiles(String key) {
- Measure measure = newWsClient(orchestrator).measures().component(new ComponentRequest().setComponentKey(key).setMetricKeys(Collections.singletonList("files")))
+ Measure measure = newWsClient(orchestrator).measuresOld().component(new ComponentRequest().setComponentKey(key).setMetricKeys(Collections.singletonList("files")))
.getComponent().getMeasures(0);
return parseInt(measure.getValue());
}
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 AddUserRequest().setLogin(USER_LOGIN).setPermission("admin"));
+ tester.wsClient().permissionsOld().addUser(new AddUserRequest().setLogin(USER_LOGIN).setPermission("admin"));
Navigation nav = tester.openBrowser();
// Try to go to the settings page
Group group = tester.groups().generate(null);
User user = tester.users().generate();
// Add user as member of default organization
- tester.wsClient().organizations().addMember("default-organization", user.getLogin());
+ tester.wsClient().organizationsOld().addMember("default-organization", user.getLogin());
tester.groups().assertThatUserIsMemberOf(null, user.getLogin(), "Members");
enableUserCreationByAuthPlugin(user.getLogin());
// No group is returned by the plugin
}
private static Stream<Measure> getStreamMeasures(Orchestrator orchestrator, String componentKey, String... metricKeys) {
- return newWsClient(orchestrator).measures().component(new ComponentRequest()
+ return newWsClient(orchestrator).measuresOld().component(new ComponentRequest()
.setComponent(componentKey)
.setMetricKeys(asList(metricKeys)))
.getComponent().getMeasuresList()
@CheckForNull
public static Measure getMeasureWithVariation(Orchestrator orchestrator, String componentKey, String metricKey) {
- Measures.ComponentWsResponse response = newWsClient(orchestrator).measures().component(new ComponentRequest()
+ Measures.ComponentWsResponse response = newWsClient(orchestrator).measuresOld().component(new ComponentRequest()
.setComponent(componentKey)
.setMetricKeys(singletonList(metricKey))
.setAdditionalFields(singletonList("periods")));
@CheckForNull
public static Map<String, Measure> getMeasuresWithVariationsByMetricKey(Orchestrator orchestrator, String componentKey, String... metricKeys) {
- return newWsClient(orchestrator).measures().component(new ComponentRequest()
+ return newWsClient(orchestrator).measuresOld().component(new ComponentRequest()
.setComponentKey(componentKey)
.setMetricKeys(asList(metricKeys))
.setAdditionalFields(singletonList("periods"))).getComponent().getMeasuresList()
@CheckForNull
public static Component getComponent(Orchestrator orchestrator, String componentKey) {
try {
- return newWsClient(orchestrator).components().show(new ShowRequest().setKey((componentKey))).getComponent();
+ return newWsClient(orchestrator).componentsOld().show(new ShowRequest().setKey((componentKey))).getComponent();
} catch (org.sonarqube.ws.client.HttpException e) {
if (e.code() == 404) {
return null;
throw new IllegalArgumentException("Cannot find quality profile xml file '" + resource + "' in classpath");
}
newAdminWsClient(orchestrator)
- .qualityProfiles()
+ .qualityProfilesOld()
.restoreProfile(
RestoreRequest.builder()
.setBackup(new File(uri))
}
public SearchWsResponse search(SearchRequest request) {
- return adminWsClient().issues().search(request);
+ return adminWsClient().issuesOld().search(request);
}
public Issue getRandomIssue() {
public String createAdminUser(String login, String password) {
createUser(login, password);
- adminWsClient.permissions().addUser(new AddUserRequest().setLogin(login).setPermission("admin"));
+ adminWsClient.permissionsOld().addUser(new AddUserRequest().setLogin(login).setPermission("admin"));
adminWsClient.userGroups().addUser(new org.sonarqube.ws.client.usergroups.AddUserRequest().setLogin(login).setName("sonar-administrators"));
return login;
}
projects / sonarqube.git / commitdiff