@@ -43,6 +43,9 @@ import org.sonar.db.user.UserDto; | |||
import org.sonar.server.almintegration.ws.ImportHelper; | |||
import org.sonar.server.common.almintegration.ProjectKeyGenerator; | |||
import org.sonar.server.common.component.ComponentUpdater; | |||
import org.sonar.server.common.newcodeperiod.NewCodeDefinitionResolver; | |||
import org.sonar.server.common.permission.PermissionTemplateService; | |||
import org.sonar.server.common.permission.PermissionUpdater; | |||
import org.sonar.server.es.TestIndexers; | |||
import org.sonar.server.exceptions.BadRequestException; | |||
import org.sonar.server.exceptions.ForbiddenException; | |||
@@ -50,10 +53,7 @@ import org.sonar.server.exceptions.NotFoundException; | |||
import org.sonar.server.exceptions.UnauthorizedException; | |||
import org.sonar.server.favorite.FavoriteUpdater; | |||
import org.sonar.server.l18n.I18nRule; | |||
import org.sonar.server.common.newcodeperiod.NewCodeDefinitionResolver; | |||
import org.sonar.server.permission.PermissionService; | |||
import org.sonar.server.common.permission.PermissionTemplateService; | |||
import org.sonar.server.common.permission.PermissionUpdater; | |||
import org.sonar.server.project.DefaultBranchNameResolver; | |||
import org.sonar.server.project.ProjectDefaultVisibility; | |||
import org.sonar.server.project.Visibility; | |||
@@ -462,6 +462,7 @@ public class ImportAzureProjectActionIT { | |||
tuple("repositoryName", true), | |||
tuple(PARAM_NEW_CODE_DEFINITION_TYPE, false), | |||
tuple(PARAM_NEW_CODE_DEFINITION_VALUE, false)); | |||
assertThat(def.deprecatedSince()).isEqualTo("10.5"); | |||
} | |||
private AlmSettingDto configureUserAndAlmSettings() { |
@@ -442,6 +442,7 @@ public class ImportBitbucketCloudRepoActionIT { | |||
tuple("repositorySlug", true), | |||
tuple(PARAM_NEW_CODE_DEFINITION_TYPE, false), | |||
tuple(PARAM_NEW_CODE_DEFINITION_VALUE, false)); | |||
assertThat(def.deprecatedSince()).isEqualTo("10.5"); | |||
} | |||
private AlmSettingDto configureUserAndPatAndAlmSettings() { |
@@ -49,6 +49,9 @@ import org.sonar.db.user.UserDto; | |||
import org.sonar.server.almintegration.ws.ImportHelper; | |||
import org.sonar.server.common.almintegration.ProjectKeyGenerator; | |||
import org.sonar.server.common.component.ComponentUpdater; | |||
import org.sonar.server.common.newcodeperiod.NewCodeDefinitionResolver; | |||
import org.sonar.server.common.permission.PermissionTemplateService; | |||
import org.sonar.server.common.permission.PermissionUpdater; | |||
import org.sonar.server.es.TestIndexers; | |||
import org.sonar.server.exceptions.BadRequestException; | |||
import org.sonar.server.exceptions.ForbiddenException; | |||
@@ -56,10 +59,7 @@ import org.sonar.server.exceptions.NotFoundException; | |||
import org.sonar.server.exceptions.UnauthorizedException; | |||
import org.sonar.server.favorite.FavoriteUpdater; | |||
import org.sonar.server.l18n.I18nRule; | |||
import org.sonar.server.common.newcodeperiod.NewCodeDefinitionResolver; | |||
import org.sonar.server.permission.PermissionService; | |||
import org.sonar.server.common.permission.PermissionTemplateService; | |||
import org.sonar.server.common.permission.PermissionUpdater; | |||
import org.sonar.server.project.DefaultBranchNameResolver; | |||
import org.sonar.server.project.ProjectDefaultVisibility; | |||
import org.sonar.server.project.Visibility; | |||
@@ -498,6 +498,7 @@ public class ImportBitbucketServerProjectActionIT { | |||
tuple("projectKey", true), | |||
tuple(PARAM_NEW_CODE_DEFINITION_TYPE, false), | |||
tuple(PARAM_NEW_CODE_DEFINITION_VALUE, false)); | |||
assertThat(def.deprecatedSince()).isEqualTo("10.5"); | |||
} | |||
private AlmSettingDto configureUserAndPatAndAlmSettings() { |
@@ -54,7 +54,14 @@ import org.sonar.server.almintegration.ws.ImportHelper; | |||
import org.sonar.server.common.almintegration.ProjectKeyGenerator; | |||
import org.sonar.server.common.almsettings.github.GithubProjectCreatorFactory; | |||
import org.sonar.server.common.component.ComponentUpdater; | |||
import org.sonar.server.common.newcodeperiod.NewCodeDefinitionResolver; | |||
import org.sonar.server.common.permission.GroupPermissionChanger; | |||
import org.sonar.server.common.permission.PermissionTemplateService; | |||
import org.sonar.server.common.permission.PermissionUpdater; | |||
import org.sonar.server.common.permission.UserPermissionChange; | |||
import org.sonar.server.common.permission.UserPermissionChanger; | |||
import org.sonar.server.common.project.ImportProjectService; | |||
import org.sonar.server.common.project.ProjectCreator; | |||
import org.sonar.server.es.EsTester; | |||
import org.sonar.server.es.IndexersImpl; | |||
import org.sonar.server.es.TestIndexers; | |||
@@ -63,20 +70,13 @@ import org.sonar.server.exceptions.NotFoundException; | |||
import org.sonar.server.exceptions.UnauthorizedException; | |||
import org.sonar.server.favorite.FavoriteUpdater; | |||
import org.sonar.server.management.ManagedProjectService; | |||
import org.sonar.server.common.newcodeperiod.NewCodeDefinitionResolver; | |||
import org.sonar.server.common.permission.GroupPermissionChanger; | |||
import org.sonar.server.permission.PermissionService; | |||
import org.sonar.server.permission.PermissionServiceImpl; | |||
import org.sonar.server.common.permission.PermissionTemplateService; | |||
import org.sonar.server.common.permission.PermissionUpdater; | |||
import org.sonar.server.common.permission.UserPermissionChange; | |||
import org.sonar.server.common.permission.UserPermissionChanger; | |||
import org.sonar.server.permission.index.FooIndexDefinition; | |||
import org.sonar.server.permission.index.PermissionIndexer; | |||
import org.sonar.server.project.DefaultBranchNameResolver; | |||
import org.sonar.server.project.ProjectDefaultVisibility; | |||
import org.sonar.server.project.Visibility; | |||
import org.sonar.server.common.project.ProjectCreator; | |||
import org.sonar.server.tester.UserSessionRule; | |||
import org.sonar.server.ws.TestRequest; | |||
import org.sonar.server.ws.WsActionTester; | |||
@@ -521,6 +521,7 @@ public class ImportGithubProjectActionIT { | |||
tuple(PARAM_REPOSITORY_KEY, true), | |||
tuple(PARAM_NEW_CODE_DEFINITION_TYPE, false), | |||
tuple(PARAM_NEW_CODE_DEFINITION_VALUE, false)); | |||
assertThat(def.deprecatedSince()).isEqualTo("10.5"); | |||
} | |||
private AlmSettingDto setupUserWithPatAndAlmSettings() { |
@@ -28,6 +28,7 @@ import org.junit.Test; | |||
import org.sonar.alm.client.gitlab.GitLabBranch; | |||
import org.sonar.alm.client.gitlab.GitlabApplicationClient; | |||
import org.sonar.alm.client.gitlab.Project; | |||
import org.sonar.api.server.ws.WebService; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.core.i18n.I18n; | |||
import org.sonar.core.platform.EditionProvider; | |||
@@ -44,18 +45,18 @@ import org.sonar.server.almintegration.ws.ImportHelper; | |||
import org.sonar.server.common.almintegration.ProjectKeyGenerator; | |||
import org.sonar.server.common.almsettings.gitlab.GitlabProjectCreatorFactory; | |||
import org.sonar.server.common.component.ComponentUpdater; | |||
import org.sonar.server.common.newcodeperiod.NewCodeDefinitionResolver; | |||
import org.sonar.server.common.permission.PermissionTemplateService; | |||
import org.sonar.server.common.permission.PermissionUpdater; | |||
import org.sonar.server.common.project.ImportProjectService; | |||
import org.sonar.server.common.project.ProjectCreator; | |||
import org.sonar.server.es.TestIndexers; | |||
import org.sonar.server.exceptions.NotFoundException; | |||
import org.sonar.server.favorite.FavoriteUpdater; | |||
import org.sonar.server.common.newcodeperiod.NewCodeDefinitionResolver; | |||
import org.sonar.server.permission.PermissionService; | |||
import org.sonar.server.common.permission.PermissionTemplateService; | |||
import org.sonar.server.common.permission.PermissionUpdater; | |||
import org.sonar.server.project.DefaultBranchNameResolver; | |||
import org.sonar.server.project.ProjectDefaultVisibility; | |||
import org.sonar.server.project.Visibility; | |||
import org.sonar.server.common.project.ProjectCreator; | |||
import org.sonar.server.tester.UserSessionRule; | |||
import org.sonar.server.ws.TestRequest; | |||
import org.sonar.server.ws.WsActionTester; | |||
@@ -75,6 +76,8 @@ import static org.mockito.Mockito.when; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.newcodeperiod.NewCodePeriodType.NUMBER_OF_DAYS; | |||
import static org.sonar.db.permission.GlobalPermission.PROVISION_PROJECTS; | |||
import static org.sonar.server.almintegration.ws.ImportHelper.PARAM_ALM_SETTING; | |||
import static org.sonar.server.almintegration.ws.gitlab.ImportGitLabProjectAction.PARAM_GITLAB_PROJECT_ID; | |||
import static org.sonar.server.tester.UserSessionRule.standalone; | |||
import static org.sonarqube.ws.client.project.ProjectsWsParameters.PARAM_NEW_CODE_DEFINITION_TYPE; | |||
import static org.sonarqube.ws.client.project.ProjectsWsParameters.PARAM_NEW_CODE_DEFINITION_VALUE; | |||
@@ -118,6 +121,22 @@ public class ImportGitLabProjectActionIT { | |||
when(defaultBranchNameResolver.getEffectiveMainBranchName()).thenReturn(DEFAULT_MAIN_BRANCH_NAME); | |||
} | |||
@Test | |||
public void definition() { | |||
WebService.Action def = ws.getDef(); | |||
assertThat(def.since()).isEqualTo("8.5"); | |||
assertThat(def.isPost()).isTrue(); | |||
assertThat(def.params()) | |||
.extracting(WebService.Param::key, WebService.Param::isRequired) | |||
.containsExactlyInAnyOrder( | |||
tuple(PARAM_ALM_SETTING, false), | |||
tuple(PARAM_GITLAB_PROJECT_ID, true), | |||
tuple(PARAM_NEW_CODE_DEFINITION_TYPE, false), | |||
tuple(PARAM_NEW_CODE_DEFINITION_VALUE, false)); | |||
assertThat(def.deprecatedSince()).isEqualTo("10.5"); | |||
} | |||
@Test | |||
public void import_project_developer_edition() { | |||
when(editionProvider.get()).thenReturn(Optional.of(EditionProvider.Edition.DEVELOPER)); |
@@ -38,11 +38,11 @@ import org.sonar.db.project.ProjectDto; | |||
import org.sonar.server.almintegration.ws.AlmIntegrationsWsAction; | |||
import org.sonar.server.almintegration.ws.ImportHelper; | |||
import org.sonar.server.common.almintegration.ProjectKeyGenerator; | |||
import org.sonar.server.component.ComponentCreationData; | |||
import org.sonar.server.common.component.ComponentCreationParameters; | |||
import org.sonar.server.common.component.ComponentUpdater; | |||
import org.sonar.server.common.component.NewComponent; | |||
import org.sonar.server.common.newcodeperiod.NewCodeDefinitionResolver; | |||
import org.sonar.server.component.ComponentCreationData; | |||
import org.sonar.server.project.DefaultBranchNameResolver; | |||
import org.sonar.server.project.ProjectDefaultVisibility; | |||
import org.sonar.server.user.UserSession; | |||
@@ -50,8 +50,8 @@ import org.sonarqube.ws.Projects.CreateWsResponse; | |||
import static java.util.Objects.requireNonNull; | |||
import static org.sonar.api.resources.Qualifiers.PROJECT; | |||
import static org.sonar.db.project.CreationMethod.Category.ALM_IMPORT; | |||
import static org.sonar.db.project.CreationMethod.getCreationMethod; | |||
import static org.sonar.db.project.CreationMethod.Category.ALM_IMPORT; | |||
import static org.sonar.server.almintegration.ws.ImportHelper.PARAM_ALM_SETTING; | |||
import static org.sonar.server.almintegration.ws.ImportHelper.toCreateResponse; | |||
import static org.sonar.server.common.component.NewComponent.newComponentBuilder; | |||
@@ -103,8 +103,10 @@ public class ImportAzureProjectAction implements AlmIntegrationsWsAction { | |||
.setSince("8.6") | |||
.setHandler(this) | |||
.setChangelog( | |||
new Change("10.5", "This endpoint is deprecated, please use its API v2 version /api/v2/dop-translation/bound-projects"), | |||
new Change("10.3", String.format("Parameter %s becomes optional if you have only one configuration for Azure", PARAM_ALM_SETTING)), | |||
new Change("10.3", "Endpoint visibility change from internal to public")); | |||
new Change("10.3", "Endpoint visibility change from internal to public")) | |||
.setDeprecatedSince("10.5"); | |||
action.createParam(PARAM_ALM_SETTING) | |||
.setMaximumLength(200) |
@@ -65,8 +65,10 @@ public class ImportBitbucketCloudRepoAction implements AlmIntegrationsWsAction { | |||
.setSince("9.0") | |||
.setHandler(this) | |||
.setChangelog( | |||
new Change("10.5", "This endpoint is deprecated, please use its API v2 version /api/v2/dop-translation/bound-projects"), | |||
new Change("10.3", String.format("Parameter %s becomes optional if you have only one configuration for BitBucket Cloud", PARAM_ALM_SETTING)), | |||
new Change("10.3", "Endpoint visibility change from internal to public")); | |||
new Change("10.3", "Endpoint visibility change from internal to public")) | |||
.setDeprecatedSince("10.5"); | |||
action.createParam(PARAM_REPO_SLUG) | |||
.setRequired(true) |
@@ -41,11 +41,11 @@ import org.sonar.db.project.ProjectDto; | |||
import org.sonar.server.almintegration.ws.AlmIntegrationsWsAction; | |||
import org.sonar.server.almintegration.ws.ImportHelper; | |||
import org.sonar.server.common.almintegration.ProjectKeyGenerator; | |||
import org.sonar.server.component.ComponentCreationData; | |||
import org.sonar.server.common.component.ComponentCreationParameters; | |||
import org.sonar.server.common.component.ComponentUpdater; | |||
import org.sonar.server.common.component.NewComponent; | |||
import org.sonar.server.common.newcodeperiod.NewCodeDefinitionResolver; | |||
import org.sonar.server.component.ComponentCreationData; | |||
import org.sonar.server.project.DefaultBranchNameResolver; | |||
import org.sonar.server.project.ProjectDefaultVisibility; | |||
import org.sonar.server.user.UserSession; | |||
@@ -53,8 +53,8 @@ import org.sonarqube.ws.Projects; | |||
import static java.util.Objects.requireNonNull; | |||
import static org.sonar.api.resources.Qualifiers.PROJECT; | |||
import static org.sonar.db.project.CreationMethod.Category.ALM_IMPORT; | |||
import static org.sonar.db.project.CreationMethod.getCreationMethod; | |||
import static org.sonar.db.project.CreationMethod.Category.ALM_IMPORT; | |||
import static org.sonar.server.almintegration.ws.ImportHelper.PARAM_ALM_SETTING; | |||
import static org.sonar.server.almintegration.ws.ImportHelper.toCreateResponse; | |||
import static org.sonar.server.common.component.NewComponent.newComponentBuilder; | |||
@@ -108,8 +108,10 @@ public class ImportBitbucketServerProjectAction implements AlmIntegrationsWsActi | |||
.setSince("8.2") | |||
.setHandler(this) | |||
.setChangelog( | |||
new Change("10.5", "This endpoint is deprecated, please use its API v2 version /api/v2/dop-translation/bound-projects"), | |||
new Change("10.3", String.format("Parameter %s becomes optional if you have only one configuration for BitBucket Server", PARAM_ALM_SETTING)), | |||
new Change("10.3", "Endpoint visibility change from internal to public")); | |||
new Change("10.3", "Endpoint visibility change from internal to public")) | |||
.setDeprecatedSince("10.5"); | |||
action.createParam(PARAM_ALM_SETTING) | |||
.setMaximumLength(200) |
@@ -64,9 +64,11 @@ public class ImportGithubProjectAction implements AlmIntegrationsWsAction { | |||
.setSince("8.4") | |||
.setHandler(this) | |||
.setChangelog( | |||
new Change("10.5", "This endpoint is deprecated, please use its API v2 version /api/v2/dop-translation/bound-projects"), | |||
new Change("10.3", "Parameter organization is not necessary anymore"), | |||
new Change("10.3", String.format("Parameter %s becomes optional if you have only one configuration for GitHub", PARAM_ALM_SETTING)), | |||
new Change("10.3", "Endpoint visibility change from internal to public")); | |||
new Change("10.3", "Endpoint visibility change from internal to public")) | |||
.setDeprecatedSince("10.5"); | |||
action.createParam(PARAM_ALM_SETTING) | |||
.setMaximumLength(200) |
@@ -63,7 +63,9 @@ public class ImportGitLabProjectAction implements AlmIntegrationsWsAction { | |||
.setSince("8.5") | |||
.setHandler(this) | |||
.setChangelog( | |||
new Change("10.3", String.format("Parameter %s becomes optional if you have only one configuration for GitLab", PARAM_ALM_SETTING))); | |||
new Change("10.5", "This endpoint is deprecated, please use its API v2 version /api/v2/dop-translation/bound-projects"), | |||
new Change("10.3", String.format("Parameter %s becomes optional if you have only one configuration for GitLab", PARAM_ALM_SETTING))) | |||
.setDeprecatedSince("10.5"); | |||
action.createParam(ImportHelper.PARAM_ALM_SETTING) | |||
.setDescription("DevOps Platform configuration key. This parameter is optional if you have only one GitLab integration."); |