This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit aea0f80ce6e9986994d00818bb1b7c454ac3f1ab Author: Andrus Adamchik <[email protected]> AuthorDate: Thu May 14 10:40:24 2026 -0400 tests cleanup - unwinding DI --- .../org/apache/cayenne/dbsync/merge/MergeCase.java | 4 +-- .../dbsync/reverse/dbload/BaseLoaderIT.java | 4 +-- .../cayenne/dbsync/reverse/dbload/DbLoaderIT.java | 4 +-- .../org/apache/cayenne/access/DataContextIT.java | 4 +-- .../cayenne/access/jdbc/SQLTemplateActionIT.java | 4 +-- .../org/apache/cayenne/dba/JdbcPkGeneratorIT.java | 6 ++--- .../org/apache/cayenne/unit/CayenneTestsEnv.java | 31 +++++++++++----------- ...DataSourceFactory.java => TestDataSources.java} | 7 +++-- .../{RuntimeTelemetry.java => TestTelemetry.java} | 6 ++--- ...tryDataNode.java => TestTelemetryDataNode.java} | 4 +-- .../unit/runtime/AllTestsSchemaManager.java | 5 ++-- .../RuntimeCaseSharedDataSourceFactory.java | 5 ++-- .../unit/runtime/UnitDbAdapterProvider.java | 17 +++++------- 13 files changed, 49 insertions(+), 52 deletions(-) diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java index ffb55e014..03bbde400 100644 --- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java +++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java @@ -46,7 +46,7 @@ import org.apache.cayenne.test.jdbc.DbHelper; import org.apache.cayenne.unit.dba.UnitDbAdapter; import org.apache.cayenne.unit.runtime.CayenneProjects; import org.apache.cayenne.unit.CayenneTestsEnv; -import org.apache.cayenne.unit.runtime.RuntimeCaseDataSourceFactory; +import org.apache.cayenne.unit.TestDataSources; import org.slf4j.Logger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; @@ -78,7 +78,7 @@ public abstract class MergeCase { private DbHelper dbHelper; private CayenneRuntime runtime; protected UnitDbAdapter accessStackAdapter; - private RuntimeCaseDataSourceFactory dataSourceFactory; + private TestDataSources dataSourceFactory; @BeforeEach public void setUp() throws Exception { diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/BaseLoaderIT.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/BaseLoaderIT.java index a6f2823d8..46ba42ace 100644 --- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/BaseLoaderIT.java +++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/BaseLoaderIT.java @@ -26,7 +26,7 @@ import org.apache.cayenne.runtime.CayenneRuntime; import org.apache.cayenne.unit.dba.UnitDbAdapter; import org.apache.cayenne.unit.runtime.CayenneProjects; import org.apache.cayenne.unit.CayenneTestsEnv; -import org.apache.cayenne.unit.runtime.RuntimeCaseDataSourceFactory; +import org.apache.cayenne.unit.TestDataSources; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; @@ -44,7 +44,7 @@ public class BaseLoaderIT { protected DbAdapter adapter; protected CayenneRuntime runtime; - protected RuntimeCaseDataSourceFactory dataSourceFactory; + protected TestDataSources dataSourceFactory; protected UnitDbAdapter accessStackAdapter; Connection connection; diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoaderIT.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoaderIT.java index 10b830a04..0028cde50 100644 --- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoaderIT.java +++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoaderIT.java @@ -35,7 +35,7 @@ import org.apache.cayenne.runtime.CayenneRuntime; import org.apache.cayenne.unit.dba.UnitDbAdapter; import org.apache.cayenne.unit.runtime.CayenneProjects; import org.apache.cayenne.unit.CayenneTestsEnv; -import org.apache.cayenne.unit.runtime.RuntimeCaseDataSourceFactory; +import org.apache.cayenne.unit.TestDataSources; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -57,7 +57,7 @@ public class DbLoaderIT { private CayenneRuntime runtime; private DbAdapter adapter; - private RuntimeCaseDataSourceFactory dataSourceFactory; + private TestDataSources dataSourceFactory; private UnitDbAdapter accessStackAdapter; private Connection connection; diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextIT.java index d8d62f5d3..38fcc0a3f 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextIT.java @@ -43,7 +43,7 @@ import org.apache.cayenne.testdo.testmap.ROArtist; import org.apache.cayenne.unit.dba.UnitDbAdapter; import org.apache.cayenne.unit.runtime.CayenneProjects; import org.apache.cayenne.unit.CayenneTestsEnv; -import org.apache.cayenne.unit.runtime.RuntimeCaseDataSourceFactory; +import org.apache.cayenne.unit.TestDataSources; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.Test; @@ -67,7 +67,7 @@ public class DataContextIT { protected DataContext context; protected UnitDbAdapter accessStackAdapter; - protected RuntimeCaseDataSourceFactory dataSourceFactory; + protected TestDataSources dataSourceFactory; protected TableHelper tArtist; protected TableHelper tExhibit; diff --git a/cayenne/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java b/cayenne/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java index e5d1ba266..524baf50d 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java @@ -33,7 +33,7 @@ import org.apache.cayenne.testdo.testmap.Artist; import org.apache.cayenne.unit.dba.UnitDbAdapter; import org.apache.cayenne.unit.runtime.CayenneProjects; import org.apache.cayenne.unit.CayenneTestsEnv; -import org.apache.cayenne.unit.runtime.RuntimeCaseDataSourceFactory; +import org.apache.cayenne.unit.TestDataSources; import org.apache.cayenne.unit.util.SQLTemplateCustomizer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -54,7 +54,7 @@ public class SQLTemplateActionIT { @RegisterExtension static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT); - private RuntimeCaseDataSourceFactory dataSourceFactory; + private TestDataSources dataSourceFactory; private DataNode node; private UnitDbAdapter unitDbAdapter; private ObjectContext context; diff --git a/cayenne/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java b/cayenne/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java index dc9c25e9e..3630ce8fa 100644 --- a/cayenne/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/dba/JdbcPkGeneratorIT.java @@ -45,7 +45,7 @@ public class JdbcPkGeneratorIT { @BeforeEach public void setUp() throws Exception { node = env.dataNode(); - CayenneTestsEnv.SCHEMA_MANAGER.dropPKSupport(); + CayenneTestsEnv.SCHEMAS.dropPKSupport(); } @AfterEach @@ -57,8 +57,8 @@ public class JdbcPkGeneratorIT { pkGenerator.setPkStartValue(JdbcPkGenerator.DEFAULT_PK_START_VALUE); - CayenneTestsEnv.SCHEMA_MANAGER.dropPKSupport(); - CayenneTestsEnv.SCHEMA_MANAGER.createPKSupport(); + CayenneTestsEnv.SCHEMAS.dropPKSupport(); + CayenneTestsEnv.SCHEMAS.createPKSupport(); } } diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java index 53903f993..2c0d9a527 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java @@ -47,7 +47,6 @@ import org.apache.cayenne.unit.dba.UnitDbAdapter; import org.apache.cayenne.unit.runtime.AllTestsSchemaManager; import org.apache.cayenne.unit.runtime.DbCleaner; import org.apache.cayenne.unit.runtime.FlavoredDbHelper; -import org.apache.cayenne.unit.runtime.RuntimeCaseDataSourceFactory; import org.apache.cayenne.unit.runtime.RuntimeCaseModule; import org.apache.cayenne.unit.util.SQLTemplateCustomizer; import org.junit.jupiter.api.extension.AfterEachCallback; @@ -64,21 +63,21 @@ import java.util.stream.Collectors; public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback { private static final Injector INJECTOR; - static final RuntimeCaseDataSourceFactory DATA_SOURCE_FACTORY; - public static final AllTestsSchemaManager SCHEMA_MANAGER; + private static final TestDataSources DATA_SOURCES; + public static final AllTestsSchemaManager SCHEMAS; static { INJECTOR = DIBootstrap.createInjector(new RuntimeCaseModule()); - DATA_SOURCE_FACTORY = new RuntimeCaseDataSourceFactory( + DATA_SOURCES = new TestDataSources( INJECTOR.getInstance(DataSourceDescriptor.class), INJECTOR.getInstance(AdhocObjectFactory.class)); - SCHEMA_MANAGER = new AllTestsSchemaManager( - DATA_SOURCE_FACTORY, + SCHEMAS = new AllTestsSchemaManager( + DATA_SOURCES, INJECTOR.getInstance(UnitDbAdapter.class), INJECTOR.getInstance(DbAdapter.class), INJECTOR.getInstance(JdbcEventLogger.class), INJECTOR.getInstance(DataMapLoader.class)); - SCHEMA_MANAGER.rebuildSchema(); + SCHEMAS.rebuildSchema(); } private final String project; @@ -127,12 +126,12 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback { DataNode node = runtime.getDataDomain().getDataNodes().iterator().next(); DataMap firstMap = context.getEntityResolver().getDataMaps().iterator().next(); this.dbHelper = new FlavoredDbHelper( - DATA_SOURCE_FACTORY.getSharedDataSource(), + DATA_SOURCES.getSharedDataSource(), node.getAdapter().getQuotingStrategy(), firstMap); this.dbCleaner = new DbCleaner( - SCHEMA_MANAGER, + SCHEMAS, dbHelper, context.getEntityResolver().getDataMaps().stream().map(DataMap::getName).collect(Collectors.toSet())); @@ -189,13 +188,13 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback { DataNode lastNode = null; for (DataMap dataMap : domain.getDataMaps()) { - DataNode node = new RuntimeTelemetryDataNode(dataMap.getName()); + DataNode node = new TestTelemetryDataNode(dataMap.getName()); node.setJdbcEventLogger(jdbcEventLogger); node.setRowReaderFactory(rowReaderFactory); node.setBatchTranslatorFactory(batchTranslatorFactory); node.setSelectTranslatorFactory(selectTranslatorFactory); - node.setDataSource(DATA_SOURCE_FACTORY.getDataSource(dataMap.getName())); + node.setDataSource(DATA_SOURCES.getDataSource(dataMap.getName())); node.setAdapter(adapter); node.setSchemaUpdateStrategy(new SkipSchemaUpdateStrategy()); node.setSqlTemplateProcessor(sqlTemplateProcessor); @@ -253,19 +252,19 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback { } public void runWithQueriesBlocked(Runnable task) { - RuntimeTelemetry.runWithQueriesBlocked(runtime, task); + TestTelemetry.runWithQueriesBlocked(runtime, task); } public int runWithQueryCounter(Runnable task) { - return RuntimeTelemetry.runWithQueryCounter(runtime, task); + return TestTelemetry.runWithQueryCounter(runtime, task); } public AdhocObjectFactory adhocObjectFactory() { return runtime.getInjector().getInstance(AdhocObjectFactory.class); } - public RuntimeCaseDataSourceFactory dataSourceFactory() { - return DATA_SOURCE_FACTORY; + public TestDataSources dataSourceFactory() { + return DATA_SOURCES; } public DbCleaner dbCleaner() { @@ -297,7 +296,7 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback { binder.bind(DbAdapter.class).toProviderInstance(() -> INJECTOR.getInstance(DbAdapter.class)); binder.bind(UnitDbAdapter.class).toInstance(INJECTOR.getInstance(UnitDbAdapter.class)); - binder.bind(RuntimeCaseDataSourceFactory.class).toInstance(DATA_SOURCE_FACTORY); + binder.bind(TestDataSources.class).toInstance(DATA_SOURCES); CoreModule.extend(binder) // Soft refs instead of weak — avoids GC-sensitive test flakiness. diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/RuntimeCaseDataSourceFactory.java b/cayenne/src/test/java/org/apache/cayenne/unit/TestDataSources.java similarity index 91% rename from cayenne/src/test/java/org/apache/cayenne/unit/runtime/RuntimeCaseDataSourceFactory.java rename to cayenne/src/test/java/org/apache/cayenne/unit/TestDataSources.java index 0dffa263d..f1370b4f2 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/RuntimeCaseDataSourceFactory.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/TestDataSources.java @@ -16,12 +16,11 @@ * specific language governing permissions and limitations * under the License. ****************************************************************/ -package org.apache.cayenne.unit.runtime; +package org.apache.cayenne.unit; import org.apache.cayenne.configuration.DataSourceDescriptor; import org.apache.cayenne.datasource.DataSourceBuilder; import org.apache.cayenne.di.AdhocObjectFactory; -import org.apache.cayenne.di.Inject; import javax.sql.DataSource; import java.sql.Driver; @@ -31,7 +30,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -public class RuntimeCaseDataSourceFactory { +public class TestDataSources { private final DataSource sharedDataSource; private final DataSourceDescriptor dataSourceInfo; @@ -39,7 +38,7 @@ public class RuntimeCaseDataSourceFactory { private final Set<String> mapsWithDedicatedDataSource; private final AdhocObjectFactory objectFactory; - public RuntimeCaseDataSourceFactory(@Inject DataSourceDescriptor dataSourceInfo, @Inject AdhocObjectFactory objectFactory) { + public TestDataSources(DataSourceDescriptor dataSourceInfo, AdhocObjectFactory objectFactory) { this.objectFactory = objectFactory; this.dataSourceInfo = dataSourceInfo; diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/RuntimeTelemetry.java b/cayenne/src/test/java/org/apache/cayenne/unit/TestTelemetry.java similarity index 89% rename from cayenne/src/test/java/org/apache/cayenne/unit/RuntimeTelemetry.java rename to cayenne/src/test/java/org/apache/cayenne/unit/TestTelemetry.java index 19ab38458..9f5fced10 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/RuntimeTelemetry.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/TestTelemetry.java @@ -23,7 +23,7 @@ import org.apache.cayenne.runtime.CayenneRuntime; import java.util.Collection; -class RuntimeTelemetry { +class TestTelemetry { public static void runWithQueriesBlocked(CayenneRuntime runtime, Runnable task) { @@ -37,7 +37,7 @@ class RuntimeTelemetry { } public static int runWithQueryCounter(CayenneRuntime runtime, Runnable task) { - RuntimeTelemetryDataNode node = (RuntimeTelemetryDataNode) runtime.getDataDomain().getDataNodes().iterator().next(); + TestTelemetryDataNode node = (TestTelemetryDataNode) runtime.getDataDomain().getDataNodes().iterator().next(); int start = node.getQueriesCount(); int end; @@ -51,7 +51,7 @@ class RuntimeTelemetry { private static void setBlockingQueries(Collection<DataNode> nodes, boolean blocking) { for (DataNode node : nodes) { - ((RuntimeTelemetryDataNode) node).setBlockingQueries(blocking); + ((TestTelemetryDataNode) node).setBlockingQueries(blocking); } } } diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/RuntimeTelemetryDataNode.java b/cayenne/src/test/java/org/apache/cayenne/unit/TestTelemetryDataNode.java similarity index 94% rename from cayenne/src/test/java/org/apache/cayenne/unit/RuntimeTelemetryDataNode.java rename to cayenne/src/test/java/org/apache/cayenne/unit/TestTelemetryDataNode.java index 7c58806c7..4ad5d5f6d 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/RuntimeTelemetryDataNode.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/TestTelemetryDataNode.java @@ -26,12 +26,12 @@ import org.junit.jupiter.api.Assertions; import java.util.Collection; import java.util.concurrent.atomic.AtomicInteger; -class RuntimeTelemetryDataNode extends DataNode { +class TestTelemetryDataNode extends DataNode { private final AtomicInteger queryCounter = new AtomicInteger(); private volatile boolean blockingQueries; - public RuntimeTelemetryDataNode(String name) { + public TestTelemetryDataNode(String name) { super(name); } diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/AllTestsSchemaManager.java b/cayenne/src/test/java/org/apache/cayenne/unit/runtime/AllTestsSchemaManager.java index e46df5cf4..7148011ab 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/AllTestsSchemaManager.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/runtime/AllTestsSchemaManager.java @@ -38,6 +38,7 @@ import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.Procedure; import org.apache.cayenne.resource.URLResource; import org.apache.cayenne.testdo.extended_type.StringET1ExtendedType; +import org.apache.cayenne.unit.TestDataSources; import org.apache.cayenne.unit.dba.UnitDbAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -86,13 +87,13 @@ public class AllTestsSchemaManager { private static final Set<String> EXTRA_EXCLUDED_FOR_NO_LOB = Set.of("CLOB_DETAIL"); private static final Set<String> EXTRA_EXCLUDED_FOR_NO_NATIVE_JSON = Set.of("JSON_OTHER"); - private final RuntimeCaseDataSourceFactory dataSourceFactory; + private final TestDataSources dataSourceFactory; private final UnitDbAdapter unitDbAdapter; private final JdbcEventLogger jdbcEventLogger; private final DataDomain domain; public AllTestsSchemaManager( - RuntimeCaseDataSourceFactory dataSourceFactory, + TestDataSources dataSourceFactory, UnitDbAdapter unitDbAdapter, DbAdapter dbAdapter, JdbcEventLogger jdbcEventLogger, diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/RuntimeCaseSharedDataSourceFactory.java b/cayenne/src/test/java/org/apache/cayenne/unit/runtime/RuntimeCaseSharedDataSourceFactory.java index c16456bff..26c17ea31 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/RuntimeCaseSharedDataSourceFactory.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/runtime/RuntimeCaseSharedDataSourceFactory.java @@ -21,14 +21,15 @@ package org.apache.cayenne.unit.runtime; import org.apache.cayenne.configuration.DataNodeDescriptor; import org.apache.cayenne.configuration.runtime.DataSourceFactory; import org.apache.cayenne.di.Inject; +import org.apache.cayenne.unit.TestDataSources; import javax.sql.DataSource; public class RuntimeCaseSharedDataSourceFactory implements DataSourceFactory { - private RuntimeCaseDataSourceFactory factory; + private TestDataSources factory; - public RuntimeCaseSharedDataSourceFactory(@Inject RuntimeCaseDataSourceFactory factory) { + public RuntimeCaseSharedDataSourceFactory(@Inject TestDataSources factory) { this.factory = factory; } diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/UnitDbAdapterProvider.java b/cayenne/src/test/java/org/apache/cayenne/unit/runtime/UnitDbAdapterProvider.java index f75d22ed7..37db3e6d9 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/runtime/UnitDbAdapterProvider.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/runtime/UnitDbAdapterProvider.java @@ -18,12 +18,8 @@ ****************************************************************/ package org.apache.cayenne.unit.runtime; -import java.lang.reflect.Constructor; -import java.util.Map; - import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.ConfigurationException; -import org.apache.cayenne.configuration.DataSourceDescriptor; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.di.Inject; import org.apache.cayenne.di.Injector; @@ -31,20 +27,21 @@ import org.apache.cayenne.di.Provider; import org.apache.cayenne.unit.dba.UnitDbAdapter; import org.apache.cayenne.util.Util; +import java.lang.reflect.Constructor; +import java.util.Map; + public class UnitDbAdapterProvider implements Provider<UnitDbAdapter> { static final String TEST_ADAPTERS_MAP = "org.apache.cayenne.unit.di.server.CayenneResourcesAccessStackAdapterProvider.adapters"; - private Injector injector; - private DbAdapter adapter; - private DataSourceDescriptor dataSourceInfo; - private Map<String, String> adapterTypesMap; + private final Injector injector; + private final DbAdapter adapter; + private final Map<String, String> adapterTypesMap; public UnitDbAdapterProvider( @Inject(TEST_ADAPTERS_MAP) Map<String, String> adapterTypesMap, - @Inject DataSourceDescriptor dataSourceInfo, @Inject DbAdapter adapter, + @Inject DbAdapter adapter, @Inject Injector injector) { - this.dataSourceInfo = dataSourceInfo; this.adapterTypesMap = adapterTypesMap; this.adapter = adapter; this.injector = injector;
