(cayenne) branch master updated: Modeler cleanup - thinning ModelerModule

[aadamchik]

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


The following commit(s) were added to refs/heads/master by this push:
     new cf03869c1 Modeler cleanup - thinning ModelerModule
cf03869c1 is described below

commit cf03869c1735f81158f0910be4c94682b0f8c098
Author: Andrus Adamchik <and...@objectstyle.com>
AuthorDate: Sun May 17 12:40:11 2026 -0400

    Modeler cleanup - thinning ModelerModule
    
    core Modeler should not have injection at all
---
 .../src/main/java/org/apache/cayenne/modeler/Application.java     | 8 ++++++--
 .../src/main/java/org/apache/cayenne/modeler/ModelerModule.java   | 5 -----
 .../org/apache/cayenne/modeler/pref/PreferencesRepository.java    | 3 +--
 3 files changed, 7 insertions(+), 9 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 594e077c7..9cccf99db 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
@@ -66,6 +66,8 @@ public class Application {
 
     private final Injector injector;
     private final String name;
+    private final ModelerClassLoader classLoader;
+    private final PreferencesRepository preferencesRepository;
     private final GlobalActions actionManager;
     private final ProjectValidator projectValidator;
     private LogConsole logConsole;
@@ -79,6 +81,8 @@ public class Application {
         String configuredName = System.getProperty(APPLICATION_NAME_PROPERTY);
         this.name = (configuredName != null) ? configuredName : 
DEFAULT_APPLICATION_NAME;
 
+        this.classLoader = new ModelerClassLoader();
+        this.preferencesRepository = new 
PreferencesRepository(injector.getInstance(ConfigurationNameMapper.class));
         this.actionManager = new GlobalActions(
                 this,
                 injector.getInstance(ConfigurationNameMapper.class),
@@ -91,7 +95,7 @@ public class Application {
     }
 
     public ModelerClassLoader getClassLoader() {
-        return injector.getInstance(ModelerClassLoader.class);
+        return classLoader;
     }
 
     public GlobalActions getActionManager() {
@@ -193,7 +197,7 @@ public class Application {
     }
 
     public PreferencesRepository getPreferencesRepository() {
-        return injector.getInstance(PreferencesRepository.class);
+        return preferencesRepository;
     }
 
     /**
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 3bb9c3cda..bebd9e39f 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
@@ -26,10 +26,8 @@ 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.modeler.pref.PreferencesRepository;
 import org.apache.cayenne.modeler.service.platform.DefaultPlatformInitializer;
 import org.apache.cayenne.modeler.service.platform.PlatformInitializer;
-import org.apache.cayenne.modeler.service.classloader.ModelerClassLoader;
 import 
org.apache.cayenne.modeler.service.validator.extension.ValidationExtension;
 import org.apache.cayenne.project.ProjectModule;
 import org.apache.cayenne.project.extension.ExtensionAwareHandlerFactory;
@@ -43,14 +41,11 @@ public class ModelerModule implements Module {
 
     public void configure(Binder binder) {
 
-        binder.bind(ModelerClassLoader.class).to(ModelerClassLoader.class);
         
binder.bind(PlatformInitializer.class).to(DefaultPlatformInitializer.class);
         
binder.bind(HandlerFactory.class).to(ExtensionAwareHandlerFactory.class);
         
binder.bind(DataChannelMetaData.class).to(DefaultDataChannelMetaData.class);
         binder.bind(XMLReader.class).toProviderInstance(new 
XMLReaderProvider(true)).withoutScope();
 
-        
binder.bind(PreferencesRepository.class).to(PreferencesRepository.class);
-
         ProjectModule.extend(binder)
                 .addExtension(InfoExtension.class)
                 .addExtension(DbImportExtension.class)
diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesRepository.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesRepository.java
index 984aa9413..6399b1a3a 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesRepository.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesRepository.java
@@ -19,7 +19,6 @@
 package org.apache.cayenne.modeler.pref;
 
 import org.apache.cayenne.configuration.DataChannelDescriptor;
-import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.pref.migration.toV5._1_DbConnectorsMigration;
 import org.apache.cayenne.modeler.pref.migration.toV5._2_ClasspathMigration;
@@ -95,7 +94,7 @@ public class PreferencesRepository {
                 .collect(Collectors.toList());
     }
 
-    public PreferencesRepository(@Inject ConfigurationNameMapper nameMapper) {
+    public PreferencesRepository(ConfigurationNameMapper nameMapper) {
         this.nameMapper = nameMapper;
         this.root = Preferences.userRoot().node(ROOT_PATH);
         this.migrations = toV5Migrations();