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 33d4ad2db0f086224f29884224125b469466f705 Author: Andrus Adamchik <[email protected]> AuthorDate: Thu May 14 10:40:24 2026 -0400 tests cleanup - unwinding DI --- .../org/apache/cayenne/unit/CayenneTestsEnv.java | 5 ++--- .../unit/RuntimeCaseDataDomainProvider.java | 22 +++++++--------------- 2 files changed, 9 insertions(+), 18 deletions(-) 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 83448fea8..ca545289b 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/CayenneTestsEnv.java @@ -255,8 +255,7 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback { } } - private record TestRuntimeOverridesModule( - UnitDbAdapter unitDbAdapter) implements Module { + private record TestRuntimeOverridesModule(UnitDbAdapter unitDbAdapter) implements Module { @Override public void configure(Binder binder) { @@ -265,7 +264,7 @@ public class CayenneTestsEnv implements BeforeEachCallback, AfterEachCallback { // a fresh DbAdapter per call — RuntimeCaseDbAdapterProvider is unscoped in the test injector binder.bind(DbAdapter.class).toProviderInstance(() -> INJECTOR.getInstance(DbAdapter.class)); - binder.bind(DataDomain.class).toProvider(RuntimeCaseDataDomainProvider.class); + binder.bind(DataDomain.class).toProviderInstance(new RuntimeCaseDataDomainProvider(unitDbAdapter)); binder.bind(DataNodeFactory.class).to(RuntimeCaseDataNodeFactory.class); binder.bind(UnitDbAdapter.class).toInstance(unitDbAdapter); binder.bind(RuntimeCaseDataSourceFactory.class).toInstance(DATA_SOURCE_FACTORY); diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/RuntimeCaseDataDomainProvider.java b/cayenne/src/test/java/org/apache/cayenne/unit/RuntimeCaseDataDomainProvider.java index 8254f7dcf..b56ff33a5 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/RuntimeCaseDataDomainProvider.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/RuntimeCaseDataDomainProvider.java @@ -24,18 +24,19 @@ import org.apache.cayenne.access.UnitTestDomain; import org.apache.cayenne.configuration.DataNodeDescriptor; import org.apache.cayenne.configuration.runtime.DataDomainProvider; import org.apache.cayenne.configuration.runtime.DataNodeFactory; -import org.apache.cayenne.di.Inject; import org.apache.cayenne.map.DataMap; import org.apache.cayenne.map.Procedure; import org.apache.cayenne.unit.dba.UnitDbAdapter; class RuntimeCaseDataDomainProvider extends DataDomainProvider { - @Inject - private UnitDbAdapter unitDbAdapter; + private final UnitDbAdapter unitDbAdapter; - @Inject - protected DataNodeFactory dataNodeFactory; + RuntimeCaseDataDomainProvider(UnitDbAdapter unitDbAdapter) { + this.unitDbAdapter = unitDbAdapter; + + // super fields are initialized via injection + } @Override protected DataDomain createDataDomain(String name) { @@ -47,6 +48,7 @@ class RuntimeCaseDataDomainProvider extends DataDomainProvider { DataDomain domain = super.createAndInitDataDomain(); DataNode node = null; + DataNodeFactory dataNodeFactory = injector.getInstance(DataNodeFactory.class); for (DataMap dataMap : domain.getDataMaps()) { @@ -62,16 +64,6 @@ class RuntimeCaseDataDomainProvider extends DataDomainProvider { unitDbAdapter.tweakProcedure(proc); } - // customizations from SimpleAccessStackAdapter that are not yet - // ported... - // those can be done better now - - // node - // .getAdapter() - // .getExtendedTypes() - // .registerType(new StringET1ExtendedType()); - // - domain.addNode(node); }
