From: Simon Brandhof Date: Fri, 15 May 2015 11:59:51 +0000 (+0200) Subject: Remove direct usage of System2.INSTANCE in constructors X-Git-Tag: 5.2-RC1~1948 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=de0cefc33c9d3327ae64b2cf47a54a6d43fdc063;p=sonarqube.git Remove direct usage of System2.INSTANCE in constructors --- diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java index 96d3eb0ab44..a57572426b6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java @@ -53,10 +53,6 @@ import java.util.Map; @ServerSide public class ComponentDao extends BaseDao implements DaoComponent { - public ComponentDao() { - this(System2.INSTANCE); - } - public ComponentDao(System2 system) { super(ComponentMapper.class, system); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/db/AnalysisReportDao.java b/server/sonar-server/src/main/java/org/sonar/server/computation/db/AnalysisReportDao.java index f08edbf5b3a..115364cb4f4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/db/AnalysisReportDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/db/AnalysisReportDao.java @@ -38,10 +38,6 @@ public class AnalysisReportDao implements DaoComponent { private System2 system2; - public AnalysisReportDao() { - this(System2.INSTANCE); - } - public AnalysisReportDao(System2 system2) { this.system2 = system2; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java index 560363f81cb..90659cc54a4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java +++ b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelBackup.java @@ -73,14 +73,6 @@ public class DebtModelBackup { private final UserSession userSession; public DebtModelBackup(DbClient dbClient, DebtModelOperations debtModelOperations, RuleOperations ruleOperations, - DebtModelPluginRepository debtModelPluginRepository, DebtCharacteristicsXMLImporter characteristicsXMLImporter, DebtRulesXMLImporter rulesXMLImporter, - DebtModelXMLExporter debtModelXMLExporter, RuleDefinitionsLoader defLoader, UserSession userSession) { - this(dbClient, debtModelOperations, ruleOperations, debtModelPluginRepository, characteristicsXMLImporter, rulesXMLImporter, debtModelXMLExporter, - defLoader, System2.INSTANCE, userSession); - } - - @VisibleForTesting - DebtModelBackup(DbClient dbClient, DebtModelOperations debtModelOperations, RuleOperations ruleOperations, DebtModelPluginRepository debtModelPluginRepository, DebtCharacteristicsXMLImporter characteristicsXMLImporter, DebtRulesXMLImporter rulesXMLImporter, DebtModelXMLExporter debtModelXMLExporter, RuleDefinitionsLoader defLoader, System2 system2, UserSession userSession) { this.dbClient = dbClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelOperations.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelOperations.java index dcfd747e0b0..532a310d8bc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelOperations.java +++ b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelOperations.java @@ -52,12 +52,7 @@ public class DebtModelOperations { private final System2 system2; private final UserSession userSession; - public DebtModelOperations(DbClient dbClient, UserSession userSession) { - this(dbClient, System2.INSTANCE, userSession); - } - - @VisibleForTesting - DebtModelOperations(DbClient dbClient, System2 system2, UserSession userSession) { + public DebtModelOperations(DbClient dbClient, System2 system2, UserSession userSession) { this.dbClient = dbClient; this.system2 = system2; this.userSession = userSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java index 34cedf47052..3852b4c286d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueCommentService.java @@ -54,13 +54,11 @@ public class IssueCommentService { private final DbClient dbClient; private final IssueService issueService; private final IssueUpdater updater; - private final IssueChangeDao changeDao; - public IssueCommentService(DbClient dbClient, IssueService issueService, IssueUpdater updater, IssueChangeDao changeDao) { + public IssueCommentService(DbClient dbClient, IssueService issueService, IssueUpdater updater) { this.dbClient = dbClient; this.issueService = issueService; this.updater = updater; - this.changeDao = changeDao; } public List findComments(String issueKey) { @@ -81,11 +79,11 @@ public class IssueCommentService { } public List findComments(DbSession session, Collection issueKeys) { - return changeDao.selectCommentsByIssues(session, issueKeys); + return dbClient.issueChangeDao().selectCommentsByIssues(session, issueKeys); } public IssueComment findComment(String commentKey) { - return changeDao.selectCommentByKey(commentKey); + return dbClient.issueChangeDao().selectCommentByKey(commentKey); } public IssueComment addComment(String issueKey, String text, UserSession userSession) { @@ -114,7 +112,7 @@ public class IssueCommentService { } public IssueComment deleteComment(String commentKey, UserSession userSession) { - DefaultIssueComment comment = changeDao.selectCommentByKey(commentKey); + DefaultIssueComment comment = dbClient.issueChangeDao().selectCommentByKey(commentKey); if (comment == null) { throw new NotFoundException("Comment not found: " + commentKey); } @@ -125,12 +123,12 @@ public class IssueCommentService { // check authorization issueService.getByKey(comment.issueKey()); - changeDao.delete(commentKey); + dbClient.issueChangeDao().delete(commentKey); return comment; } public IssueComment editComment(String commentKey, String text, UserSession userSession) { - DefaultIssueComment comment = changeDao.selectCommentByKey(commentKey); + DefaultIssueComment comment = dbClient.issueChangeDao().selectCommentByKey(commentKey); if (StringUtils.isBlank(text)) { throw new BadRequestException("Cannot add empty comments to an issue"); } @@ -147,7 +145,7 @@ public class IssueCommentService { IssueChangeDto dto = IssueChangeDto.of(comment); dto.setUpdatedAt(System2.INSTANCE.now()); dto.setChangeData(text); - changeDao.update(dto); + dbClient.issueChangeDao().update(dto); return comment; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/ActiveRuleDao.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/ActiveRuleDao.java index 76994dbf49b..20a0bfeef22 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/ActiveRuleDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/db/ActiveRuleDao.java @@ -20,7 +20,6 @@ package org.sonar.server.qualityprofile.db; -import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import org.sonar.api.utils.System2; import org.sonar.core.persistence.DbSession; @@ -36,6 +35,7 @@ import org.sonar.server.rule.db.RuleDao; import org.sonar.server.search.IndexDefinition; import javax.annotation.CheckForNull; + import java.util.List; public class ActiveRuleDao extends BaseDao { @@ -54,11 +54,6 @@ public class ActiveRuleDao extends BaseDao { - public RuleDao() { - this(System2.INSTANCE); - } - - @VisibleForTesting public RuleDao(System2 system) { super(IndexDefinition.RULE, RuleMapper.class, system); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/db/GroupDao.java b/server/sonar-server/src/main/java/org/sonar/server/user/db/GroupDao.java index 174dd1e959d..56210ce9434 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/db/GroupDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/db/GroupDao.java @@ -20,7 +20,6 @@ package org.sonar.server.user.db; -import com.google.common.annotations.VisibleForTesting; import org.sonar.api.utils.System2; import org.sonar.core.persistence.DbSession; import org.sonar.core.user.GroupDto; @@ -34,11 +33,6 @@ import java.util.List; */ public class GroupDao extends BaseDao { - public GroupDao() { - this(System2.INSTANCE); - } - - @VisibleForTesting public GroupDao(System2 system) { super(GroupMapper.class, system); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java index 95ee7c4603e..7c377e4be94 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/IssuesActionTest.java @@ -20,9 +20,6 @@ package org.sonar.server.batch; -import java.io.ByteArrayInputStream; -import java.util.Arrays; -import javax.annotation.Nullable; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -56,6 +53,11 @@ import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsTester; import org.sonar.test.DbTests; +import javax.annotation.Nullable; + +import java.io.ByteArrayInputStream; +import java.util.Arrays; + import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -91,12 +93,12 @@ public class IssuesActionTest { es.truncateIndices(); this.session = db.myBatis().openSession(false); - DbClient dbClient = new DbClient(db.database(), db.myBatis(), new IssueDao(db.myBatis()), new ComponentDao()); + componentDao = new ComponentDao(mock(System2.class)); + DbClient dbClient = new DbClient(db.database(), db.myBatis(), new IssueDao(db.myBatis()), componentDao); issueIndex = new IssueIndex(es.client(), System2.INSTANCE, userSessionRule); issueIndexer = new IssueIndexer(null, es.client()); issueAuthorizationIndexer = new IssueAuthorizationIndexer(null, es.client()); issuesAction = new IssuesAction(dbClient, issueIndex, userSessionRule); - componentDao = new ComponentDao(); tester = new WsTester(new BatchWs(new BatchIndex(mock(Server.class)), issuesAction)); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProvisionedProjectsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProvisionedProjectsActionTest.java index 9ea902ced16..669c3054546 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProvisionedProjectsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProvisionedProjectsActionTest.java @@ -45,6 +45,7 @@ import org.sonar.server.ws.WsTester; import org.sonar.test.JsonAssert; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; public class ProvisionedProjectsActionTest { @@ -57,6 +58,7 @@ public class ProvisionedProjectsActionTest { DbClient dbClient; DbSession dbSession; ComponentDao componentDao; + System2 system2 = mock(System2.class); @After public void tearDown() { @@ -65,7 +67,7 @@ public class ProvisionedProjectsActionTest { @Before public void setUp() { - dbClient = new DbClient(db.database(), db.myBatis(), new ComponentDao(), new SnapshotDao(System2.INSTANCE)); + dbClient = new DbClient(db.database(), db.myBatis(), new ComponentDao(system2), new SnapshotDao(System2.INSTANCE)); dbSession = dbClient.openSession(false); componentDao = dbClient.componentDao(); db.truncateTables(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java index c63ff362391..629b2ff864a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java @@ -25,6 +25,7 @@ import org.junit.ClassRule; import org.junit.Rule; 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.core.persistence.DbTester; import org.sonar.core.user.AuthorizationDao; @@ -53,7 +54,7 @@ public class SearchActionTest { public void setUp() { dbTester.truncateTables(); DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), - new ComponentDao(), new AuthorizationDao(dbTester.myBatis()), new ComponentIndexDao() + new ComponentDao(mock(System2.class)), new AuthorizationDao(dbTester.myBatis()), new ComponentIndexDao() ); tester = new WsTester(new ComponentsWs(mock(ComponentAppAction.class), new SearchAction(dbClient, userSessionRule))); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java index ad635fbf7e7..38967d78e62 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java @@ -74,7 +74,7 @@ public class ComputationServiceTest { @Before public void setUp() { - DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new ComponentDao(), new SnapshotDao(system)); + DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new ComponentDao(system), new SnapshotDao(system)); sut = new ComputationService(dbClient, steps, activityService, settingsFactory, tempFolder, system); // db contains project with key "P1" diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ReportQueueTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ReportQueueTest.java index ba5ec765781..90655f3b337 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ReportQueueTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ReportQueueTest.java @@ -71,7 +71,7 @@ public class ReportQueueTest { settings.setProperty(ProcessProperties.PATH_DATA, dataDir.getAbsolutePath()); when(system.now()).thenReturn(NOW); - DbClient dbClient = new DbClient(db.database(), db.myBatis(), new ComponentDao(), new AnalysisReportDao(system)); + DbClient dbClient = new DbClient(db.database(), db.myBatis(), new ComponentDao(system), new AnalysisReportDao(system)); sut = new ReportQueue(dbClient, settings); try (DbSession session = dbClient.openSession(false)) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleCacheLoaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleCacheLoaderTest.java index 23fb6501a82..d65db7e5307 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleCacheLoaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/RuleCacheLoaderTest.java @@ -23,6 +23,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.rule.RuleKey; +import org.sonar.api.utils.System2; import org.sonar.core.persistence.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.rule.db.RuleDao; @@ -31,6 +32,7 @@ import java.util.Collections; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; public class RuleCacheLoaderTest { @@ -45,7 +47,7 @@ public class RuleCacheLoaderTest { @Test public void load_by_key() { dbTester.prepareDbUnit(getClass(), "shared.xml"); - DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new RuleDao()); + DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new RuleDao(mock(System2.class))); RuleCacheLoader loader = new RuleCacheLoader(dbClient); assertThat(loader.load(RuleKey.of("squid", "R001")).getName()).isEqualTo("Rule One"); @@ -54,7 +56,7 @@ public class RuleCacheLoaderTest { @Test public void load_by_keys_is_not_supported() { - DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new RuleDao()); + DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new RuleDao(mock(System2.class))); RuleCacheLoader loader = new RuleCacheLoader(dbClient); try { loader.loadAll(Collections.emptyList()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java index 80a1e0fc79d..0aa8bfa21f6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java @@ -69,7 +69,7 @@ public class PersistIssuesStepTest extends BaseStepTest { public void setup() throws Exception { dbTester.truncateTables(); session = dbTester.myBatis().openSession(false); - dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new IssueDao(dbTester.myBatis()), new RuleDao()); + dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new IssueDao(dbTester.myBatis()), new RuleDao(system2)); issueCache = new IssueCache(temp.newFile(), System2.INSTANCE); system2 = mock(System2.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeRemovedViewsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeRemovedViewsStepTest.java index a8ebac72f81..d91e2e35fda 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeRemovedViewsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeRemovedViewsStepTest.java @@ -23,6 +23,7 @@ package org.sonar.server.computation.step; import org.junit.*; import org.sonar.api.config.Settings; import org.sonar.api.resources.Qualifiers; +import org.sonar.api.utils.System2; import org.sonar.core.component.ComponentDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.DbTester; @@ -59,7 +60,7 @@ public class PurgeRemovedViewsStepTest extends BaseStepTest { public void setUp() { esTester.truncateIndices(); session = db.myBatis().openSession(false); - dbClient = new DbClient(db.database(), db.myBatis(), new IssueDao(db.myBatis()), new ComponentDao()); + dbClient = new DbClient(db.database(), db.myBatis(), new IssueDao(db.myBatis()), new ComponentDao(mock(System2.class))); sut = new PurgeRemovedViewsStep(new ViewIndex(esTester.client()), dbClient); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/design/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/design/ws/ShowActionTest.java index ecc362f865e..b5771b3e0eb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/design/ws/ShowActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/design/ws/ShowActionTest.java @@ -46,6 +46,7 @@ import org.sonar.server.ws.WsTester; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; +import static org.mockito.Mockito.mock; public class ShowActionTest { @@ -74,7 +75,7 @@ public class ShowActionTest { @Before public void setUp() { dbTester.truncateTables(); - dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new ComponentDao(), new SnapshotDao(System2.INSTANCE), new FileDependencyDao()); + dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new ComponentDao(mock(System2.class)), new SnapshotDao(System2.INSTANCE), new FileDependencyDao()); session = dbClient.openSession(false); tester = new WsTester(new DependenciesWs(new ShowAction(dbClient, userSessionRule))); controller = tester.controller("api/dependencies"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceTest.java index 49f18628b80..c4921fddb2a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueCommentServiceTest.java @@ -85,8 +85,9 @@ public class IssueCommentServiceTest { @Before public void setUp() { when(dbClient.openSession(false)).thenReturn(session); + when(dbClient.issueChangeDao()).thenReturn(changeDao); - issueCommentService = new IssueCommentService(dbClient, issueService, updater, changeDao); + issueCommentService = new IssueCommentService(dbClient, issueService, updater); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileDeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileDeleteActionTest.java index ec94fb14445..64045de0619 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileDeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileDeleteActionTest.java @@ -67,13 +67,15 @@ public class QProfileDeleteActionTest { private DbSession session; + System2 system2 = mock(System2.class); + @Before public void setUp() { dbTester.truncateTables(); qualityProfileDao = new QualityProfileDao(dbTester.myBatis(), mock(System2.class)); - componentDao = new ComponentDao(); + componentDao = new ComponentDao(mock(System2.class)); - dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), qualityProfileDao, new ActiveRuleDao(qualityProfileDao, new RuleDao())); + dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), qualityProfileDao, new ActiveRuleDao(qualityProfileDao, new RuleDao(system2), system2)); session = dbClient.openSession(false); xoo1 = LanguageTesting.newLanguage("xoo1"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest.java index 23fec4a8451..865db5a8539 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest.java @@ -68,12 +68,14 @@ public class QProfileProjectsActionTest { private RoleDao roleDao; + System2 system2 = mock(System2.class); + @Before public void setUp() { dbTester.truncateTables(); dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), - new QualityProfileDao(dbTester.myBatis(), mock(System2.class)), - new ComponentDao(), + new QualityProfileDao(dbTester.myBatis(), system2), + new ComponentDao(system2), new AuthorizationDao(dbTester.myBatis())); roleDao = new RoleDao(); session = dbClient.openSession(false); diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java index 3b1dde59945..4131fc8ab9f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/HashActionTest.java @@ -20,6 +20,7 @@ package org.sonar.server.source.ws; import org.junit.Rule; +import org.sonar.api.utils.System2; import org.sonar.server.source.db.FileSourceDao; import org.junit.After; @@ -41,6 +42,7 @@ import org.sonar.server.ws.WsTester; import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; @RunWith(MockitoJUnitRunner.class) @Category(DbTests.class) @@ -63,7 +65,7 @@ public class HashActionTest { db.truncateTables(); this.session = db.myBatis().openSession(false); - DbClient dbClient = new DbClient(db.database(), db.myBatis(), new FileSourceDao(db.myBatis()), new ComponentDao()); + DbClient dbClient = new DbClient(db.database(), db.myBatis(), new FileSourceDao(db.myBatis()), new ComponentDao(mock(System2.class))); tester = new WsTester(new SourcesWs(new HashAction(dbClient, userSessionRule))); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java index b93a8a23b3d..462264000ab 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java @@ -28,6 +28,7 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.sonar.api.config.Settings; +import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; import org.sonar.core.component.ComponentDto; import org.sonar.core.persistence.DbSession; @@ -48,6 +49,7 @@ import org.sonar.server.ws.WsTester; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; public class LinesActionTest { @@ -79,7 +81,7 @@ public class LinesActionTest { htmlSourceDecorator = new HtmlSourceDecorator(); sourceLineIndex = new SourceLineIndex(esTester.client()); - componentDao = new ComponentDao(); + componentDao = new ComponentDao(mock(System2.class)); DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), componentDao); session = dbClient.openSession(false); wsTester = new WsTester(new SourcesWs(new LinesAction(dbClient, sourceLineIndex, htmlSourceDecorator, userSessionRule))); diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java index 25de3e5c916..74fae06142c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/ScmActionTest.java @@ -28,6 +28,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.config.Settings; import org.sonar.api.utils.DateUtils; +import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; import org.sonar.core.component.ComponentDto; import org.sonar.core.persistence.DbSession; @@ -43,6 +44,8 @@ import org.sonar.server.source.index.SourceLineIndexDefinition; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsTester; +import static org.mockito.Mockito.mock; + public class ScmActionTest { private static final String FILE_KEY = "FILE_KEY"; @@ -66,7 +69,7 @@ public class ScmActionTest { public void setUp() { dbTester.truncateTables(); esTester.truncateIndices(); - dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new ComponentDao()); + dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new ComponentDao(mock(System2.class))); session = dbClient.openSession(false); tester = new WsTester(new SourcesWs(new ScmAction(dbClient, new SourceLineIndex(esTester.client()), userSessionRule))); diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsListActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsListActionTest.java index 27862aeb2b7..d6901eaccb7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsListActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsListActionTest.java @@ -28,6 +28,7 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.sonar.api.config.Settings; +import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; import org.sonar.core.component.ComponentDto; import org.sonar.core.persistence.DbSession; @@ -43,6 +44,8 @@ import org.sonar.server.test.index.TestIndexDefinition; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsTester; +import static org.mockito.Mockito.mock; + public class TestsListActionTest { DbClient dbClient; DbSession dbSession; @@ -59,7 +62,7 @@ public class TestsListActionTest { @Before public void setUp() { - dbClient = new DbClient(db.database(), db.myBatis(), new ComponentDao()); + dbClient = new DbClient(db.database(), db.myBatis(), new ComponentDao(mock(System2.class))); dbSession = dbClient.openSession(false); db.truncateTables(); es.truncateIndices(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/db/GroupDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/db/GroupDaoTest.java index 744c742b77d..fc2baa3dd1c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/db/GroupDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/db/GroupDaoTest.java @@ -55,7 +55,7 @@ public class GroupDaoTest extends AbstractDaoTestCase { public void select_by_key() { setupData("select_by_key"); - GroupDto group = new GroupDao().getByKey(session, "sonar-users"); + GroupDto group = new GroupDao(system2).getByKey(session, "sonar-users"); assertThat(group).isNotNull(); assertThat(group.getId()).isEqualTo(1L); assertThat(group.getName()).isEqualTo("sonar-users"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java index 407337ab5aa..ee6c1e4b172 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java @@ -84,7 +84,7 @@ public class ChangePasswordActionTest { System2 system2 = new System2(); UserDao userDao = new UserDao(dbTester.myBatis(), system2); UserGroupDao userGroupDao = new UserGroupDao(); - GroupDao groupDao = new GroupDao(); + GroupDao groupDao = new GroupDao(system2); dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), userDao, userGroupDao, groupDao); session = dbClient.openSession(false); groupDao.insert(session, new GroupDto().setName("sonar-users")); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java index aa41c94be68..42a4008c7dd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java @@ -94,7 +94,7 @@ public class CreateActionTest { System2 system2 = new System2(); UserDao userDao = new UserDao(dbTester.myBatis(), system2); UserGroupDao userGroupDao = new UserGroupDao(); - GroupDao groupDao = new GroupDao(); + GroupDao groupDao = new GroupDao(system2); dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), userDao, userGroupDao, groupDao); session = dbClient.openSession(false); groupDao.insert(session, new GroupDto().setName("sonar-users")); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java index 84f19cd13a4..6ed505a8d22 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java @@ -82,7 +82,7 @@ public class UpdateActionTest { System2 system2 = new System2(); UserDao userDao = new UserDao(dbTester.myBatis(), system2); UserGroupDao userGroupDao = new UserGroupDao(); - GroupDao groupDao = new GroupDao(); + GroupDao groupDao = new GroupDao(system2); dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), userDao, userGroupDao, groupDao); session = dbClient.openSession(false); groupDao.insert(session, new GroupDto().setName("sonar-users")); diff --git a/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java index 21db4db9539..ccd5484e713 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexerTest.java @@ -27,6 +27,7 @@ import org.junit.ClassRule; 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.core.persistence.DbTester; import org.sonar.server.component.db.ComponentDao; import org.sonar.server.db.DbClient; @@ -38,6 +39,7 @@ import java.util.Map; import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; @Category(DbTests.class) public class ViewIndexerTest { @@ -54,7 +56,7 @@ public class ViewIndexerTest { public void setUp() { dbTester.truncateTables(); esTester.truncateIndices(); - indexer = new ViewIndexer(new DbClient(dbTester.database(), dbTester.myBatis(), new ComponentDao()), esTester.client()); + indexer = new ViewIndexer(new DbClient(dbTester.database(), dbTester.myBatis(), new ComponentDao(mock(System2.class))), esTester.client()); indexer.setEnabled(true); } diff --git a/sonar-core/src/main/java/org/sonar/core/i18n/DefaultI18n.java b/sonar-core/src/main/java/org/sonar/core/i18n/DefaultI18n.java index 8fbddc73f12..4267fc7c77b 100644 --- a/sonar-core/src/main/java/org/sonar/core/i18n/DefaultI18n.java +++ b/sonar-core/src/main/java/org/sonar/core/i18n/DefaultI18n.java @@ -68,12 +68,7 @@ public class DefaultI18n implements I18n, Startable { private ClassLoader classloader; private Map propertyToBundles; - public DefaultI18n(PluginRepository pluginRepository) { - this(pluginRepository, System2.INSTANCE); - } - - @VisibleForTesting - DefaultI18n(PluginRepository pluginRepository, System2 system2) { + public DefaultI18n(PluginRepository pluginRepository, System2 system2) { this.pluginRepository = pluginRepository; this.system2 = system2; // SONAR-2927