@@ -17,7 +17,7 @@ | |||
* along with this program; if not, write to the Free Software Foundation, | |||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |||
*/ | |||
package org.sonar.auth.github; | |||
package org.sonar.alm.client.github; | |||
import java.util.List; | |||
import java.util.Map; | |||
@@ -27,6 +27,7 @@ import java.util.stream.Collectors; | |||
import javax.annotation.Nullable; | |||
import org.slf4j.Logger; | |||
import org.slf4j.LoggerFactory; | |||
import org.sonar.auth.github.GsonRepositoryPermissions; | |||
import org.sonar.db.provisioning.GithubPermissionsMappingDto; | |||
import static java.util.function.Function.identity; |
@@ -17,7 +17,7 @@ | |||
* along with this program; if not, write to the Free Software Foundation, | |||
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |||
*/ | |||
package org.sonar.auth.github; | |||
package org.sonar.alm.client.github; | |||
import java.util.Arrays; | |||
import java.util.Set; | |||
@@ -25,6 +25,7 @@ import org.junit.Test; | |||
import org.junit.runner.RunWith; | |||
import org.junit.runners.Parameterized; | |||
import org.junit.runners.Suite; | |||
import org.sonar.auth.github.GsonRepositoryPermissions; | |||
import org.sonar.db.provisioning.GithubPermissionsMappingDto; | |||
import static org.assertj.core.api.Assertions.assertThat; |
@@ -33,7 +33,7 @@ import org.sonar.api.resources.Qualifiers; | |||
import org.sonar.api.server.ws.WebService; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.auth.github.GitHubSettings; | |||
import org.sonar.auth.github.GithubPermissionConverter; | |||
import org.sonar.alm.client.github.GithubPermissionConverter; | |||
import org.sonar.auth.github.GsonRepositoryPermissions; | |||
import org.sonar.core.i18n.I18n; | |||
import org.sonar.core.platform.EditionProvider; |
@@ -29,7 +29,7 @@ import org.sonar.alm.client.github.api.GsonRepositoryCollaborator; | |||
import org.sonar.alm.client.github.api.GsonRepositoryTeam; | |||
import org.sonar.alm.client.github.security.AccessToken; | |||
import org.sonar.api.web.UserRole; | |||
import org.sonar.auth.github.GithubPermissionConverter; | |||
import org.sonar.alm.client.github.GithubPermissionConverter; | |||
import org.sonar.auth.github.GsonRepositoryPermissions; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; |
@@ -30,7 +30,7 @@ import org.sonar.alm.client.github.config.GithubAppConfiguration; | |||
import org.sonar.alm.client.github.security.AccessToken; | |||
import org.sonar.api.server.ServerSide; | |||
import org.sonar.auth.github.GitHubSettings; | |||
import org.sonar.auth.github.GithubPermissionConverter; | |||
import org.sonar.alm.client.github.GithubPermissionConverter; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.alm.setting.ALM; |
@@ -32,7 +32,7 @@ import org.sonar.alm.client.github.AppInstallationToken; | |||
import org.sonar.alm.client.github.GithubApplicationClient; | |||
import org.sonar.alm.client.github.GithubGlobalSettingsValidator; | |||
import org.sonar.auth.github.GitHubSettings; | |||
import org.sonar.auth.github.GithubPermissionConverter; | |||
import org.sonar.alm.client.github.GithubPermissionConverter; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.alm.setting.ALM; |
@@ -38,7 +38,7 @@ import org.sonar.alm.client.github.api.GsonRepositoryTeam; | |||
import org.sonar.alm.client.github.security.AccessToken; | |||
import org.sonar.api.resources.Qualifiers; | |||
import org.sonar.api.web.UserRole; | |||
import org.sonar.auth.github.GithubPermissionConverter; | |||
import org.sonar.alm.client.github.GithubPermissionConverter; | |||
import org.sonar.auth.github.GsonRepositoryPermissions; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.alm.setting.ALM; |
@@ -41,7 +41,7 @@ import org.sonar.api.server.rule.RulesDefinitionXmlLoader; | |||
import org.sonar.auth.bitbucket.BitbucketModule; | |||
import org.sonar.auth.github.GitHubModule; | |||
import org.sonar.auth.github.GitHubSettings; | |||
import org.sonar.auth.github.GithubPermissionConverter; | |||
import org.sonar.alm.client.github.GithubPermissionConverter; | |||
import org.sonar.auth.gitlab.GitLabModule; | |||
import org.sonar.auth.ldap.LdapModule; | |||
import org.sonar.auth.saml.SamlModule; |