This is an automated email from the ASF dual-hosted git repository. stariy95 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 82867a80a57c4d2f7ac6482093c1b1de9c6e4af4 Author: ntimofeev <[email protected]> AuthorDate: Thu Aug 20 17:08:50 2026 +0300 Fix and cleanup Modeler app-level Injector --- .../src/main/java/org/apache/cayenne/modeler/Application.java | 8 +++----- .../main/java/org/apache/cayenne/modeler/ModelerModule.java | 11 ----------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java index 662475db5..26c6b696b 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java @@ -21,8 +21,8 @@ package org.apache.cayenne.modeler; import org.apache.cayenne.configuration.ConfigurationNameMapper; import org.apache.cayenne.configuration.DataMapLoader; -import org.apache.cayenne.configuration.runtime.CoreModule; import org.apache.cayenne.dbsync.reverse.configuration.DbAdapterFactory; +import org.apache.cayenne.dbsync.reverse.configuration.ToolsModule; import org.apache.cayenne.configuration.xml.DataChannelMetaData; import org.apache.cayenne.dbsync.DbSyncModule; import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactoryProvider; @@ -55,7 +55,7 @@ import org.apache.cayenne.project.validation.ProjectValidator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.*; +import javax.swing.SwingUtilities; import java.awt.Component; import java.io.File; import java.util.List; @@ -77,12 +77,10 @@ public class Application { LOGGER.info("Starting CayenneModeler."); LOGGER.info("JRE v.{} at {}", System.getProperty("java.version"), System.getProperty("java.home")); - // TODO: this is dirty... CoreModule is out of place inside the Modeler... - // If we need CayenneRuntime for certain operations, those should start their own stack... Injector injector = DIBootstrap.createInjector( - new CoreModule(), new ProjectModule(), new DbSyncModule(), + new ToolsModule(LOGGER), new ModelerModule()); SwingUtilities.invokeLater(() -> diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerModule.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerModule.java index c3258e3dd..a3cb8a30d 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerModule.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerModule.java @@ -18,19 +18,13 @@ ****************************************************************/ package org.apache.cayenne.modeler; -import org.apache.cayenne.configuration.xml.DataChannelMetaData; -import org.apache.cayenne.configuration.xml.DefaultDataChannelMetaData; -import org.apache.cayenne.configuration.xml.HandlerFactory; -import org.apache.cayenne.configuration.xml.XMLReaderProvider; import org.apache.cayenne.dbsync.xml.DbImportExtension; import org.apache.cayenne.di.Binder; import org.apache.cayenne.di.Module; import org.apache.cayenne.gen.xml.CgenExtension; import org.apache.cayenne.project.ProjectModule; -import org.apache.cayenne.project.extension.ExtensionAwareHandlerFactory; import org.apache.cayenne.project.extension.info.InfoExtension; import org.apache.cayenne.project.extension.validation.ValidationExtension; -import org.xml.sax.XMLReader; /** * A DI module for bootstrapping CayenneModeler services. @@ -38,11 +32,6 @@ import org.xml.sax.XMLReader; public class ModelerModule implements Module { public void configure(Binder binder) { - - binder.bind(HandlerFactory.class).to(ExtensionAwareHandlerFactory.class); - binder.bind(DataChannelMetaData.class).to(DefaultDataChannelMetaData.class); - binder.bind(XMLReader.class).toProviderInstance(new XMLReaderProvider(true)).withoutScope(); - ProjectModule.extend(binder) .addExtension(InfoExtension.class) .addExtension(DbImportExtension.class)
