From cea0e9a4be612c196fc50765a2d28303027ddf3b Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Tue, 4 Aug 2015 12:08:07 +0200 Subject: [PATCH] Replace some usage of org.sonar.server.db.DbClient by org.sonar.db.DbClient --- .../org/sonar/server/batch/GlobalAction.java | 4 ++-- .../metric/MetricRepositoryImpl.java | 5 +++-- .../step/CustomMeasuresCopyStep.java | 2 +- .../step/PersistDuplicationsStep.java | 2 +- .../sonar/server/startup/RegisterMetrics.java | 2 +- .../sonar/server/batch/GlobalActionTest.java | 6 ++--- .../measure/MeasureRepositoryImplTest.java | 8 ++----- .../metric/MetricRepositoryImplTest.java | 5 ++--- .../step/CustomMeasuresCopyStepTest.java | 5 ++--- .../step/PersistDuplicationsStepTest.java | 11 +++------- .../step/PersistIssuesStepTest.java | 10 +++------ .../server/startup/RegisterMetricsTest.java | 22 ++++++++----------- 12 files changed, 32 insertions(+), 50 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java index 4b6915e7e7d..f528f93ac44 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java @@ -25,13 +25,13 @@ import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.batch.protocol.input.GlobalRepositories; -import org.sonar.db.metric.MetricDto; 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.metric.MetricDto; import org.sonar.db.property.PropertiesDao; import org.sonar.db.property.PropertyDto; -import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.plugins.MimeTypes; import org.sonar.server.user.UserSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepositoryImpl.java index a4dea6f9afb..b9c7c3d8af1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/metric/MetricRepositoryImpl.java @@ -26,14 +26,15 @@ import java.util.Map; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import org.picocontainer.Startable; -import org.sonar.db.metric.MetricDto; +import org.sonar.db.DbClient; import org.sonar.db.DbSession; -import org.sonar.server.db.DbClient; +import org.sonar.db.metric.MetricDto; import static com.google.common.collect.FluentIterable.from; import static java.util.Objects.requireNonNull; public class MetricRepositoryImpl implements MetricRepository, Startable { + private final DbClient dbClient; @CheckForNull private Map metricsByKey; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CustomMeasuresCopyStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/CustomMeasuresCopyStep.java index 87c78862cb2..c3a2454bebb 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CustomMeasuresCopyStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/CustomMeasuresCopyStep.java @@ -22,6 +22,7 @@ package org.sonar.server.computation.step; import com.google.common.annotations.VisibleForTesting; import java.util.List; import org.apache.commons.lang.math.NumberUtils; +import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.MyBatis; import org.sonar.db.measure.custom.CustomMeasureDto; @@ -32,7 +33,6 @@ import org.sonar.server.computation.measure.Measure; import org.sonar.server.computation.measure.MeasureRepository; import org.sonar.server.computation.metric.Metric; import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.db.DbClient; public class CustomMeasuresCopyStep implements ComputationStep { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java index 7788935dff9..32f1205905e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java @@ -25,6 +25,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.sonar.api.measures.CoreMetrics; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.util.CloseableIterator; +import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.MyBatis; import org.sonar.db.measure.MeasureDto; @@ -34,7 +35,6 @@ import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DbIdsRepository; import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor; import org.sonar.server.computation.component.TreeRootHolder; -import org.sonar.server.db.DbClient; import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER; diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java index faa8b3c84b4..ffc0b047bf3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java +++ b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java @@ -32,10 +32,10 @@ import org.sonar.api.measures.Metrics; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.api.utils.log.Profiler; +import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.MyBatis; import org.sonar.db.metric.MetricDto; -import org.sonar.server.db.DbClient; import static com.google.common.collect.FluentIterable.from; import static com.google.common.collect.Iterables.concat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalActionTest.java index 6834adcbd79..31ebee42edf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalActionTest.java @@ -27,14 +27,14 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.sonar.db.metric.MetricDto; import org.sonar.core.permission.GlobalPermissions; +import org.sonar.db.DbClient; import org.sonar.db.DbSession; +import org.sonar.db.metric.MetricDao; +import org.sonar.db.metric.MetricDto; import org.sonar.db.property.PropertiesDao; import org.sonar.db.property.PropertyDto; -import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; -import org.sonar.db.metric.MetricDao; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java index d0ef9cd04da..2ca62106849 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java @@ -38,11 +38,9 @@ import org.junit.runner.RunWith; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.System2; import org.sonar.batch.protocol.output.BatchReport; +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.SnapshotDao; -import org.sonar.db.measure.MeasureDao; import org.sonar.db.measure.MeasureDto; import org.sonar.db.rule.RuleDto; import org.sonar.server.computation.batch.BatchReportReader; @@ -54,8 +52,6 @@ import org.sonar.server.computation.metric.Metric; import org.sonar.server.computation.metric.MetricImpl; import org.sonar.server.computation.metric.MetricRepository; import org.sonar.server.computation.metric.ReportMetricValidator; -import org.sonar.server.db.DbClient; -import org.sonar.db.metric.MetricDao; import static com.google.common.collect.FluentIterable.from; import static java.lang.String.format; @@ -93,7 +89,7 @@ public class MeasureRepositoryImplTest { private ReportMetricValidator reportMetricValidator = mock(ReportMetricValidator.class); - private DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new MeasureDao(), new SnapshotDao(), new MetricDao(), new ComponentDao()); + private DbClient dbClient = dbTester.getDbClient(); private MetricRepository metricRepository = mock(MetricRepository.class); private MeasureRepositoryImpl underTest = new MeasureRepositoryImpl(dbClient, reportReader, metricRepository, reportMetricValidator); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java index bdd86092384..c102949ae36 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/metric/MetricRepositoryImplTest.java @@ -25,9 +25,8 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; 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; import static org.assertj.core.api.Assertions.assertThat; @@ -42,7 +41,7 @@ public class MetricRepositoryImplTest { @Rule public final ExpectedException expectedException = ExpectedException.none(); - private DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new MetricDao()); + private DbClient dbClient = dbTester.getDbClient(); private MetricRepositoryImpl underTest = new MetricRepositoryImpl(dbClient); @Before diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java index 9703827d4b7..ccf2986b5c0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/CustomMeasuresCopyStepTest.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.ArgumentCaptor; import org.sonar.api.utils.System2; +import org.sonar.db.DbClient; import org.sonar.db.DbTester; import org.sonar.db.measure.custom.CustomMeasureDto; import org.sonar.server.computation.batch.BatchReportReaderRule; @@ -36,8 +37,6 @@ import org.sonar.server.computation.measure.MeasureRepository; import org.sonar.server.computation.metric.Metric; import org.sonar.server.computation.metric.MetricImpl; import org.sonar.server.computation.metric.MetricRepository; -import org.sonar.server.db.DbClient; -import org.sonar.db.measure.custom.CustomMeasureDao; import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; @@ -67,7 +66,7 @@ public class CustomMeasuresCopyStepTest { @Before public void setUp() { - DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new CustomMeasureDao()); + DbClient dbClient = dbTester.getDbClient(); underTest = new CustomMeasuresCopyStep(treeRootHolder, dbClient, metricRepository, measureRepository); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java index 8af6d6c4d88..f685c92f4db 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java @@ -29,17 +29,15 @@ import org.junit.experimental.categories.Category; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.utils.System2; import org.sonar.batch.protocol.output.BatchReport; +import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.DbTester; -import org.sonar.db.measure.MeasureDao; -import org.sonar.db.metric.MetricDao; import org.sonar.db.metric.MetricDto; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DbIdsRepository; import org.sonar.server.computation.component.DumbComponent; -import org.sonar.server.db.DbClient; import org.sonar.test.DbTests; import static com.google.common.collect.Lists.newArrayList; @@ -61,18 +59,15 @@ public class PersistDuplicationsStepTest extends BaseStepTest { DbIdsRepository dbIdsRepository = new DbIdsRepository(); - DbSession session; + DbSession session = dbTester.getSession(); - DbClient dbClient; + DbClient dbClient = dbTester.getDbClient(); PersistDuplicationsStep underTest; @Before public void setup() { dbTester.truncateTables(); - session = dbTester.myBatis().openSession(false); - dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new MeasureDao(), new MetricDao()); - underTest = new PersistDuplicationsStep(dbClient, dbIdsRepository, treeRootHolder, reportReader); } 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 dd8402998d7..344e3f0769d 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 @@ -33,16 +33,14 @@ import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.DefaultIssueComment; import org.sonar.core.issue.FieldDiffs; +import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.DbTester; -import org.sonar.db.issue.IssueDao; -import org.sonar.db.rule.RuleDao; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.issue.IssueCache; import org.sonar.server.computation.issue.RuleCacheLoader; import org.sonar.server.computation.issue.RuleRepositoryImpl; import org.sonar.server.computation.issue.UpdateConflictResolver; -import org.sonar.server.db.DbClient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -60,9 +58,9 @@ public class PersistIssuesStepTest extends BaseStepTest { @Rule public BatchReportReaderRule reportReader = new BatchReportReaderRule(); - DbSession session; + DbSession session = dbTester.getSession(); - DbClient dbClient; + DbClient dbClient = dbTester.getDbClient(); System2 system2; @@ -78,8 +76,6 @@ public class PersistIssuesStepTest extends BaseStepTest { @Before 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()); issueCache = new IssueCache(temp.newFile(), System2.INSTANCE); system2 = mock(System2.class); when(system2.now()).thenReturn(NOW); diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java index 5dac3d40396..524c30c6aff 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java @@ -28,10 +28,8 @@ import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Metric; import org.sonar.api.measures.Metrics; import org.sonar.api.utils.System2; +import org.sonar.db.DbClient; import org.sonar.db.DbTester; -import org.sonar.db.qualitygate.QualityGateConditionDao; -import org.sonar.server.db.DbClient; -import org.sonar.db.metric.MetricDao; import org.sonar.test.DbTests; import static java.util.Arrays.asList; @@ -43,6 +41,8 @@ public class RegisterMetricsTest { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); + DbClient dbClient = dbTester.getDbClient(); + /** * Insert new metrics, including custom metrics */ @@ -62,7 +62,7 @@ public class RegisterMetricsTest { .setUserManaged(true) .create(); - RegisterMetrics register = new RegisterMetrics(dbClient()); + RegisterMetrics register = new RegisterMetrics(dbClient); register.register(asList(m1, custom)); dbTester.assertDbUnit(getClass(), "insert_new_metrics-result.xml", "metrics"); } @@ -74,7 +74,7 @@ public class RegisterMetricsTest { public void update_non_custom_metrics() { dbTester.prepareDbUnit(getClass(), "update_non_custom_metrics.xml"); - RegisterMetrics register = new RegisterMetrics(dbClient()); + RegisterMetrics register = new RegisterMetrics(dbClient); Metric m1 = new Metric.Builder("m1", "New name", Metric.ValueType.FLOAT) .setDescription("new description") .setDirection(-1) @@ -96,7 +96,7 @@ public class RegisterMetricsTest { public void disable_undefined_metrics() { dbTester.prepareDbUnit(getClass(), "disable_undefined_metrics.xml"); - RegisterMetrics register = new RegisterMetrics(dbClient()); + RegisterMetrics register = new RegisterMetrics(dbClient); register.register(Collections.emptyList()); dbTester.assertDbUnit(getClass(), "disable_undefined_metrics-result.xml", "metrics"); @@ -106,7 +106,7 @@ public class RegisterMetricsTest { public void insert_core_metrics() { dbTester.truncateTables(); - RegisterMetrics register = new RegisterMetrics(dbClient()); + RegisterMetrics register = new RegisterMetrics(dbClient); register.start(); assertThat(dbTester.countRowsOfTable("metrics")).isEqualTo(CoreMetrics.getMetrics().size()); @@ -117,18 +117,14 @@ public class RegisterMetricsTest { Metrics plugin1 = new TestMetrics(new Metric.Builder("m1", "In first plugin", Metric.ValueType.FLOAT).create()); Metrics plugin2 = new TestMetrics(new Metric.Builder("m1", "In second plugin", Metric.ValueType.FLOAT).create()); - new RegisterMetrics(dbClient(), new Metrics[]{plugin1, plugin2}).start(); + new RegisterMetrics(dbClient, new Metrics[] {plugin1, plugin2}).start(); } @Test(expected = IllegalStateException.class) public void fail_if_plugin_duplicates_core_metric() { Metrics plugin = new TestMetrics(new Metric.Builder("ncloc", "In plugin", Metric.ValueType.FLOAT).create()); - new RegisterMetrics(dbClient(), new Metrics[]{plugin}).start(); - } - - private DbClient dbClient() { - return new DbClient(dbTester.database(), dbTester.myBatis(), new MetricDao(), new QualityGateConditionDao(dbTester.myBatis())); + new RegisterMetrics(dbClient, new Metrics[] {plugin}).start(); } private class TestMetrics implements Metrics { -- 2.39.5