@@ -1,43 +0,0 @@ | |||
/* | |||
* SonarQube | |||
* Copyright (C) 2009-2016 SonarSource SA | |||
* mailto:contact AT sonarsource DOT com | |||
* | |||
* This program is free software; you can redistribute it and/or | |||
* modify it under the terms of the GNU Lesser General Public | |||
* License as published by the Free Software Foundation; either | |||
* version 3 of the License, or (at your option) any later version. | |||
* | |||
* This program is distributed in the hope that it will be useful, | |||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |||
* Lesser General Public License for more details. | |||
* | |||
* You should have received a copy of the GNU Lesser General Public License | |||
* 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.server.db; | |||
import java.util.Map; | |||
import org.sonar.db.Dao; | |||
import org.sonar.db.Database; | |||
import org.sonar.db.MyBatis; | |||
/** | |||
* Should be replaced by {@link org.sonar.db.DbClient}, but some DAOs | |||
* still depend on other sonar-server classes. | |||
* @deprecated since 5.2 - should be removed as soon as the remaining daos are moved to sonar-db | |||
*/ | |||
@Deprecated | |||
public class DbClient extends org.sonar.db.DbClient { | |||
public DbClient(Database database, MyBatis myBatis, Dao... daos) { | |||
super(database, myBatis, daos); | |||
} | |||
@Override | |||
protected void doOnLoad(Map<Class, Dao> daoByClass) { | |||
} | |||
} |
@@ -27,10 +27,10 @@ import java.util.List; | |||
import javax.annotation.Nonnull; | |||
import org.sonar.api.measures.Metric; | |||
import org.sonar.api.measures.MetricFinder; | |||
import org.sonar.db.metric.MetricDto; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.MyBatis; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.db.metric.MetricDto; | |||
import static com.google.common.collect.FluentIterable.from; | |||
@@ -27,13 +27,13 @@ import org.sonar.core.config.CorePropertyDefinitions; | |||
import org.sonar.core.util.UuidFactoryImpl; | |||
import org.sonar.db.DaoModule; | |||
import org.sonar.db.DatabaseChecker; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DefaultDatabase; | |||
import org.sonar.db.purge.PurgeProfiler; | |||
import org.sonar.db.semaphore.SemaphoresImpl; | |||
import org.sonar.db.version.DatabaseVersion; | |||
import org.sonar.db.version.MigrationStepModule; | |||
import org.sonar.server.computation.property.CePropertyDefinitions; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.db.EmbeddedDatabaseFactory; | |||
import org.sonar.server.issue.index.IssueIndex; | |||
import org.sonar.server.platform.DatabaseServerCompatibility; |
@@ -69,21 +69,21 @@ public class QProfileExporters { | |||
/** | |||
* Used by Pico if no {@link ProfileImporter} is found | |||
*/ | |||
public QProfileExporters(QProfileLoader loader, RuleFinder ruleFinder, RuleActivator ruleActivator, ProfileExporter[] exporters, DbClient dbClient) { | |||
public QProfileExporters(DbClient dbClient, QProfileLoader loader, RuleFinder ruleFinder, RuleActivator ruleActivator, ProfileExporter[] exporters) { | |||
this(dbClient, loader, ruleFinder, ruleActivator, exporters, new ProfileImporter[0]); | |||
} | |||
/** | |||
* Used by Pico if no {@link ProfileExporter} is found | |||
*/ | |||
public QProfileExporters(QProfileLoader loader, RuleFinder ruleFinder, RuleActivator ruleActivator, ProfileImporter[] importers, DbClient dbClient) { | |||
public QProfileExporters(DbClient dbClient, QProfileLoader loader, RuleFinder ruleFinder, RuleActivator ruleActivator, ProfileImporter[] importers) { | |||
this(dbClient, loader, ruleFinder, ruleActivator, new ProfileExporter[0], importers); | |||
} | |||
/** | |||
* Used by Pico if no {@link ProfileImporter} nor {@link ProfileExporter} is found | |||
*/ | |||
public QProfileExporters(QProfileLoader loader, RuleFinder ruleFinder, RuleActivator ruleActivator, DbClient dbClient) { | |||
public QProfileExporters(DbClient dbClient, QProfileLoader loader, RuleFinder ruleFinder, RuleActivator ruleActivator) { | |||
this(dbClient, loader, ruleFinder, ruleActivator, new ProfileExporter[0], new ProfileImporter[0]); | |||
} | |||
@@ -22,11 +22,11 @@ package org.sonar.server.qualityprofile; | |||
import org.sonar.api.server.ServerSide; | |||
import org.sonar.api.web.UserRole; | |||
import org.sonar.core.permission.GlobalPermissions; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.MyBatis; | |||
import org.sonar.db.component.ComponentDto; | |||
import org.sonar.db.qualityprofile.QualityProfileDto; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.exceptions.ForbiddenException; | |||
import org.sonar.server.user.UserSession; | |||
@@ -23,13 +23,13 @@ import com.google.common.base.Optional; | |||
import java.util.Collection; | |||
import org.sonar.api.rule.RuleKey; | |||
import org.sonar.api.server.ServerSide; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.qualityprofile.ActiveRuleDto; | |||
import org.sonar.db.qualityprofile.ActiveRuleKey; | |||
import org.sonar.db.qualityprofile.ActiveRuleParamDto; | |||
import org.sonar.db.qualityprofile.QualityProfileDto; | |||
import org.sonar.db.rule.RuleDto; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.exceptions.BadRequestException; | |||
@ServerSide |
@@ -36,12 +36,12 @@ import org.sonar.api.rule.Severity; | |||
import org.sonar.api.server.ServerSide; | |||
import org.sonar.api.server.debt.DebtRemediationFunction; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.qualityprofile.ActiveRuleDto; | |||
import org.sonar.db.qualityprofile.ActiveRuleParamDto; | |||
import org.sonar.db.rule.RuleDto; | |||
import org.sonar.db.rule.RuleParamDto; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.rule.index.RuleIndexer; | |||
import org.sonar.server.user.UserSession; | |||
@@ -19,16 +19,15 @@ | |||
*/ | |||
package org.sonar.server.search; | |||
import org.elasticsearch.action.update.UpdateRequest; | |||
import org.sonar.db.Dto; | |||
import org.sonar.server.db.DbClient; | |||
import java.io.Serializable; | |||
import java.util.ArrayList; | |||
import java.util.HashMap; | |||
import java.util.List; | |||
import java.util.Map; | |||
import java.util.Set; | |||
import org.elasticsearch.action.update.UpdateRequest; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.Dto; | |||
public abstract class BaseNormalizer<DTO extends Dto<KEY>, KEY extends Serializable> { | |||
@@ -29,11 +29,11 @@ import org.sonar.api.server.ws.WebService.SelectionMode; | |||
import org.sonar.api.utils.Paging; | |||
import org.sonar.api.utils.text.JsonWriter; | |||
import org.sonar.core.permission.GlobalPermissions; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.user.GroupMembershipDto; | |||
import org.sonar.db.user.GroupMembershipQuery; | |||
import org.sonar.db.user.UserDto; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.exceptions.NotFoundException; | |||
import org.sonar.server.user.UserSession; | |||
@@ -29,9 +29,9 @@ import org.junit.rules.TemporaryFolder; | |||
import org.junit.runner.RunWith; | |||
import org.mockito.Mock; | |||
import org.mockito.runners.MockitoJUnitRunner; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.property.PropertiesDao; | |||
import org.sonar.server.component.ComponentFinder; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.issue.index.IssueIndex; | |||
import org.sonar.server.tester.UserSessionRule; | |||
import org.sonar.server.ws.WsTester; |
@@ -29,8 +29,8 @@ import org.sonar.api.resources.ResourceTypes; | |||
import org.sonar.api.server.ws.RailsHandler; | |||
import org.sonar.api.server.ws.WebService; | |||
import org.sonar.api.utils.Durations; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.server.component.ComponentFinder; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.tester.UserSessionRule; | |||
import org.sonar.server.ws.WsTester; | |||
@@ -30,6 +30,7 @@ import org.junit.runner.RunWith; | |||
import org.mockito.ArgumentCaptor; | |||
import org.mockito.Mockito; | |||
import org.sonar.api.config.Settings; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.purge.IdUuidPair; | |||
import org.sonar.server.computation.batch.TreeRootHolderRule; | |||
@@ -39,7 +40,6 @@ import org.sonar.server.computation.component.ReportComponent; | |||
import org.sonar.server.computation.component.SettingsRepository; | |||
import org.sonar.server.computation.component.ViewsComponent; | |||
import org.sonar.server.computation.dbcleaner.ProjectCleaner; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.util.WrapInSingleElementArray; | |||
import static java.util.Arrays.asList; |
@@ -25,13 +25,13 @@ import org.junit.Test; | |||
import org.junit.experimental.categories.Category; | |||
import org.sonar.api.utils.DateUtils; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.db.component.SnapshotDao; | |||
import org.sonar.server.computation.batch.TreeRootHolderRule; | |||
import org.sonar.server.computation.component.Component; | |||
import org.sonar.server.computation.component.DbIdsRepositoryImpl; | |||
import org.sonar.server.computation.component.ReportComponent; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.test.DbTests; | |||
import static org.mockito.Mockito.mock; |
@@ -22,9 +22,9 @@ package org.sonar.server.duplication.ws; | |||
import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.sonar.api.server.ws.WebService; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.measure.MeasureDao; | |||
import org.sonar.server.component.ComponentFinder; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.tester.UserSessionRule; | |||
import org.sonar.server.ws.WsTester; | |||
@@ -30,8 +30,8 @@ import org.junit.Test; | |||
import org.junit.experimental.categories.Category; | |||
import org.sonar.api.config.Settings; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.es.EsTester; | |||
import org.sonar.test.DbTests; | |||
@@ -29,8 +29,8 @@ import org.junit.experimental.categories.Category; | |||
import org.sonar.api.config.Settings; | |||
import org.sonar.api.rule.RuleKey; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.es.EsTester; | |||
import org.sonar.test.DbTests; | |||
@@ -23,8 +23,8 @@ import org.junit.Before; | |||
import org.junit.Test; | |||
import org.sonar.api.server.ws.WebService; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.server.component.ComponentFinder; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.user.UserSession; | |||
import org.sonar.server.user.index.UserIndex; | |||
import org.sonar.server.ws.WsTester; |
@@ -35,22 +35,22 @@ import org.sonar.api.utils.DateUtils; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.api.web.UserRole; | |||
import org.sonar.core.permission.GlobalPermissions; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.db.component.ComponentDao; | |||
import org.sonar.db.component.ComponentDto; | |||
import org.sonar.db.component.ComponentTesting; | |||
import org.sonar.db.component.SnapshotDao; | |||
import org.sonar.db.component.SnapshotTesting; | |||
import org.sonar.db.measure.custom.CustomMeasureDao; | |||
import org.sonar.db.measure.custom.CustomMeasureDto; | |||
import org.sonar.db.metric.MetricDao; | |||
import org.sonar.db.metric.MetricDto; | |||
import org.sonar.server.component.ComponentFinder; | |||
import org.sonar.db.component.ComponentTesting; | |||
import org.sonar.db.component.SnapshotTesting; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.es.EsTester; | |||
import org.sonar.server.exceptions.ForbiddenException; | |||
import org.sonar.server.exceptions.NotFoundException; | |||
import org.sonar.db.measure.custom.CustomMeasureDao; | |||
import org.sonar.db.metric.MetricDao; | |||
import org.sonar.server.tester.UserSessionRule; | |||
import org.sonar.server.user.index.UserDoc; | |||
import org.sonar.server.user.index.UserIndex; |
@@ -25,8 +25,8 @@ import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.junit.experimental.categories.Category; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.db.metric.MetricDao; | |||
import org.sonar.test.DbTests; | |||
@@ -25,11 +25,11 @@ import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.junit.experimental.categories.Category; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.db.metric.MetricDto; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.db.metric.MetricDao; | |||
import org.sonar.db.metric.MetricDto; | |||
import org.sonar.server.ws.WsTester; | |||
import org.sonar.test.DbTests; | |||
import org.sonar.test.JsonAssert; |
@@ -22,7 +22,7 @@ package org.sonar.server.metric.ws; | |||
import org.junit.Before; | |||
import org.junit.Test; | |||
import org.sonar.api.server.ws.WebService; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.server.ruby.RubyBridge; | |||
import org.sonar.server.user.UserSession; | |||
import org.sonar.server.ws.WsTester; |
@@ -23,8 +23,8 @@ import org.junit.Before; | |||
import org.junit.Test; | |||
import org.sonar.api.server.ws.RailsHandler; | |||
import org.sonar.api.server.ws.WebService; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.server.component.ComponentCleanerService; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.user.UserSession; | |||
import org.sonar.server.ws.WsTester; | |||
@@ -30,8 +30,8 @@ import org.mockito.invocation.InvocationOnMock; | |||
import org.mockito.runners.MockitoJUnitRunner; | |||
import org.mockito.stubbing.Answer; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.language.LanguageTesting; | |||
import org.sonar.server.qualityprofile.QProfileBackuper; | |||
import org.sonar.server.qualityprofile.QProfileFactory; |
@@ -23,16 +23,16 @@ import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.core.permission.GlobalPermissions; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.db.qualityprofile.QualityProfileDao; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.language.LanguageTesting; | |||
import org.sonarqube.ws.MediaTypes; | |||
import org.sonar.server.qualityprofile.QProfileFactory; | |||
import org.sonar.server.tester.UserSessionRule; | |||
import org.sonar.server.ws.TestResponse; | |||
import org.sonar.server.ws.WsActionTester; | |||
import org.sonar.test.JsonAssert; | |||
import org.sonarqube.ws.MediaTypes; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.mockito.Mockito.mock; |
@@ -23,7 +23,6 @@ import com.google.common.collect.Sets; | |||
import java.io.IOException; | |||
import java.io.Writer; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.junit.After; | |||
import org.junit.Before; | |||
import org.junit.Rule; | |||
import org.junit.Test; | |||
@@ -34,11 +33,11 @@ import org.sonar.api.profiles.ProfileExporter; | |||
import org.sonar.api.profiles.RulesProfile; | |||
import org.sonar.api.server.ws.WebService.Action; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.db.qualityprofile.QualityProfileDao; | |||
import org.sonar.db.qualityprofile.QualityProfileDto; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.exceptions.NotFoundException; | |||
import org.sonar.server.language.LanguageTesting; | |||
import org.sonar.server.qualityprofile.QProfileBackuper; | |||
@@ -64,11 +63,11 @@ public class ExportActionTest { | |||
WsTester wsTester; | |||
QualityProfileDao qualityProfileDao; | |||
DbClient dbClient = db.getDbClient(); | |||
DbClient dbClient; | |||
DbSession session = db.getSession(); | |||
DbSession session; | |||
QualityProfileDao qualityProfileDao = dbClient.qualityProfileDao(); | |||
QProfileBackuper backuper; | |||
@@ -76,8 +75,6 @@ public class ExportActionTest { | |||
@Before | |||
public void before() { | |||
qualityProfileDao = new QualityProfileDao(db.myBatis(), mock(System2.class)); | |||
dbClient = new DbClient(db.database(), db.myBatis(), qualityProfileDao); | |||
session = dbClient.openSession(false); | |||
backuper = mock(QProfileBackuper.class); | |||
@@ -89,18 +86,14 @@ public class ExportActionTest { | |||
ActiveRuleIndex activeRuleIndex = mock(ActiveRuleIndex.class); | |||
when(activeRuleIndex.findByProfile(Matchers.anyString())).thenReturn(Sets.<ActiveRuleDoc>newHashSet().iterator()); | |||
exporters = new QProfileExporters(dbClient, new QProfileLoader(dbClient, activeRuleIndex, mock(RuleIndex.class)), null, null, new ProfileExporter[] {exporter1, exporter2}, null); | |||
exporters = new QProfileExporters(dbClient, new QProfileLoader(dbClient, activeRuleIndex, mock(RuleIndex.class)), null, null, new ProfileExporter[] {exporter1, exporter2}, | |||
null); | |||
wsTester = new WsTester(new QProfilesWs(mock(RuleActivationActions.class), | |||
mock(BulkRuleActivationActions.class), | |||
mock(ProjectAssociationActions.class), | |||
new ExportAction(dbClient, new QProfileFactory(dbClient), backuper, exporters, LanguageTesting.newLanguages("xoo")))); | |||
} | |||
@After | |||
public void after() { | |||
session.close(); | |||
} | |||
private ProfileExporter newExporter(final String key) { | |||
return new ProfileExporter(key, StringUtils.capitalize(key)) { | |||
@Override |
@@ -26,23 +26,23 @@ import org.junit.Test; | |||
import org.junit.experimental.categories.Category; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.api.web.UserRole; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.db.component.ComponentDao; | |||
import org.sonar.db.component.ComponentDto; | |||
import org.sonar.db.component.ComponentTesting; | |||
import org.sonar.db.qualityprofile.QualityProfileDao; | |||
import org.sonar.db.qualityprofile.QualityProfileDto; | |||
import org.sonar.db.user.AuthorizationDao; | |||
import org.sonar.db.user.GroupRoleDto; | |||
import org.sonar.db.user.RoleDao; | |||
import org.sonar.db.user.UserDao; | |||
import org.sonar.db.user.UserDto; | |||
import org.sonar.db.user.UserRoleDto; | |||
import org.sonar.db.component.ComponentTesting; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.exceptions.NotFoundException; | |||
import org.sonar.server.qualityprofile.QProfileTesting; | |||
import org.sonar.server.tester.UserSessionRule; | |||
import org.sonar.db.user.UserDao; | |||
import org.sonar.server.ws.WsTester; | |||
import org.sonar.server.ws.WsTester.TestRequest; | |||
import org.sonar.test.DbTests; |
@@ -25,11 +25,11 @@ import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.core.permission.GlobalPermissions; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.db.qualityprofile.QualityProfileDao; | |||
import org.sonar.db.qualityprofile.QualityProfileDto; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.exceptions.BadRequestException; | |||
import org.sonar.server.exceptions.ForbiddenException; | |||
import org.sonar.server.exceptions.NotFoundException; |
@@ -26,11 +26,11 @@ import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.core.permission.GlobalPermissions; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.db.qualityprofile.QualityProfileDao; | |||
import org.sonar.db.qualityprofile.QualityProfileDto; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.exceptions.ForbiddenException; | |||
import org.sonar.server.exceptions.NotFoundException; | |||
import org.sonar.server.language.LanguageTesting; |
@@ -22,8 +22,8 @@ package org.sonar.server.source.ws; | |||
import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.sonar.api.server.ws.WebService; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.server.component.ComponentFinder; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.source.HtmlSourceDecorator; | |||
import org.sonar.server.source.SourceService; | |||
import org.sonar.server.tester.UserSessionRule; |
@@ -27,13 +27,13 @@ import org.junit.Test; | |||
import org.junit.experimental.categories.Category; | |||
import org.sonar.api.utils.DateUtils; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.db.dashboard.DashboardDao; | |||
import org.sonar.db.dashboard.WidgetDao; | |||
import org.sonar.db.dashboard.WidgetPropertyDao; | |||
import org.sonar.db.issue.IssueFilterDao; | |||
import org.sonar.db.loadedtemplate.LoadedTemplateDao; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.test.DbTests; | |||
import static org.assertj.core.api.Assertions.assertThat; |
@@ -33,17 +33,17 @@ import org.sonar.api.web.Page; | |||
import org.sonar.api.web.UserRole; | |||
import org.sonar.api.web.View; | |||
import org.sonar.core.permission.GlobalPermissions; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.db.dashboard.ActiveDashboardDao; | |||
import org.sonar.db.dashboard.ActiveDashboardDto; | |||
import org.sonar.db.dashboard.DashboardDao; | |||
import org.sonar.db.dashboard.DashboardDto; | |||
import org.sonar.db.user.UserDao; | |||
import org.sonar.db.user.UserDto; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.tester.UserSessionRule; | |||
import org.sonar.server.ui.Views; | |||
import org.sonar.db.user.UserDao; | |||
import org.sonar.server.ws.WsTester; | |||
import static org.mockito.Mockito.mock; |
@@ -31,6 +31,7 @@ import org.mockito.ArgumentCaptor; | |||
import org.sonar.api.config.Settings; | |||
import org.sonar.api.platform.NewUserHandler; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.db.user.GroupDao; | |||
@@ -41,7 +42,6 @@ import org.sonar.db.user.UserDao; | |||
import org.sonar.db.user.UserDto; | |||
import org.sonar.db.user.UserGroupDao; | |||
import org.sonar.db.user.UserTokenDao; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.es.EsTester; | |||
import org.sonar.server.exceptions.BadRequestException; | |||
import org.sonar.server.exceptions.Message; |
@@ -27,8 +27,8 @@ import org.junit.Test; | |||
import org.junit.experimental.categories.Category; | |||
import org.sonar.api.config.Settings; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.es.EsTester; | |||
import org.sonar.test.DbTests; | |||
@@ -28,13 +28,13 @@ import org.sonar.api.config.Settings; | |||
import org.sonar.api.server.ws.WebService; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.core.permission.GlobalPermissions; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.db.user.GroupDao; | |||
import org.sonar.db.user.GroupDto; | |||
import org.sonar.db.user.UserDao; | |||
import org.sonar.db.user.UserGroupDao; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.es.EsTester; | |||
import org.sonar.server.exceptions.BadRequestException; | |||
import org.sonar.server.exceptions.ForbiddenException; |
@@ -31,6 +31,7 @@ import org.sonar.api.i18n.I18n; | |||
import org.sonar.api.server.ws.WebService; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.core.permission.GlobalPermissions; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.db.user.GroupDao; | |||
@@ -38,7 +39,6 @@ import org.sonar.db.user.GroupDto; | |||
import org.sonar.db.user.UserDao; | |||
import org.sonar.db.user.UserGroupDao; | |||
import org.sonar.db.user.UserTesting; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.es.EsTester; | |||
import org.sonar.server.exceptions.ForbiddenException; | |||
import org.sonar.server.tester.UserSessionRule; |
@@ -28,13 +28,13 @@ import org.sonar.api.config.Settings; | |||
import org.sonar.api.server.ws.WebService; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.core.permission.GlobalPermissions; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.db.user.GroupMembershipDao; | |||
import org.sonar.db.user.UserDao; | |||
import org.sonar.db.user.UserDto; | |||
import org.sonar.db.user.UserTokenDao; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.es.EsTester; | |||
import org.sonar.server.exceptions.BadRequestException; | |||
import org.sonar.server.exceptions.ForbiddenException; |
@@ -27,19 +27,19 @@ import org.sonar.api.server.ws.WebService.Param; | |||
import org.sonar.api.server.ws.WebService.SelectionMode; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.core.permission.GlobalPermissions; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbSession; | |||
import org.sonar.db.DbTester; | |||
import org.sonar.db.user.GroupDao; | |||
import org.sonar.db.user.GroupDto; | |||
import org.sonar.db.user.GroupMembershipDao; | |||
import org.sonar.db.user.UserDao; | |||
import org.sonar.db.user.UserDto; | |||
import org.sonar.db.user.UserGroupDao; | |||
import org.sonar.db.user.UserGroupDto; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.server.exceptions.ForbiddenException; | |||
import org.sonar.server.exceptions.NotFoundException; | |||
import org.sonar.server.tester.UserSessionRule; | |||
import org.sonar.db.user.GroupDao; | |||
import org.sonar.db.user.UserDao; | |||
import org.sonar.server.ws.WsTester; | |||
public class GroupsActionTest { |
@@ -24,7 +24,7 @@ import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.sonar.api.i18n.I18n; | |||
import org.sonar.api.server.ws.WebService; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.server.tester.UserSessionRule; | |||
import org.sonar.server.user.UserUpdater; | |||
import org.sonar.server.user.index.UserIndex; |
@@ -23,7 +23,7 @@ import org.junit.Before; | |||
import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.sonar.api.server.ws.WebService; | |||
import org.sonar.server.db.DbClient; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.server.tester.UserSessionRule; | |||
import org.sonar.server.user.UserSession; | |||
import org.sonar.server.ws.WsTester; |