[cayenne] branch master updated: CAY-2707 Modeler: code generation is broken in the DataDomain tab

[ntimofeev]

This is an automated email from the ASF dual-hosted git repository.

ntimofeev 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 54cb1f9  CAY-2707 Modeler: code generation is broken in the DataDomain 
tab
54cb1f9 is described below

commit 54cb1f9be52d19a8627a477dbdcd6900f9058eaa
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Tue Mar 30 12:42:24 2021 +0300

    CAY-2707 Modeler: code generation is broken in the DataDomain tab
---
 RELEASE-NOTES.txt                                             |  1 +
 .../cayenne/modeler/editor/cgen/domain/CgenTabController.java | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 59a1be5..17fa781 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -18,6 +18,7 @@ Bug Fixes:
 CAY-2702 Modeler: Callbacks table has too small default width
 CAY-2705 Performance of callback annotation processing
 CAY-2706 Modeler: object attribute dialog doesn't properly initialized for the 
embeddable type
+CAY-2707 Modeler: code generation is broken in the DataDomain tab
 
 ----------------------------------
 Release: 4.2.M3
diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
index 92a4d6d..5fbd9c7 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
@@ -28,8 +28,6 @@ import java.util.Set;
 import java.util.prefs.Preferences;
 
 import org.apache.cayenne.configuration.xml.DataChannelMetaData;
-import org.apache.cayenne.di.DIBootstrap;
-import org.apache.cayenne.di.spi.ModuleLoader;
 import org.apache.cayenne.gen.CgenConfiguration;
 import org.apache.cayenne.gen.ClassGenerationAction;
 import org.apache.cayenne.gen.ClassGenerationActionFactory;
@@ -40,7 +38,7 @@ import 
org.apache.cayenne.modeler.dialog.pref.GeneralPreferences;
 import org.apache.cayenne.modeler.editor.GeneratorsTabController;
 import org.apache.cayenne.modeler.event.DataMapDisplayEvent;
 import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.cayenne.tools.CayenneToolsModuleProvider;
+import org.apache.cayenne.tools.ToolsInjectorBuilder;
 
 /**
  * @since 4.1
@@ -65,9 +63,10 @@ public class CgenTabController extends 
GeneratorsTabController<CgenConfiguration
                 if(cgenConfiguration == null) {
                     cgenConfiguration = createConfiguration(dataMap);
                 }
-                ClassGenerationAction classGenerationAction = DIBootstrap
-                        .createInjector(new ModuleLoader()
-                                .load(CayenneToolsModuleProvider.class))
+                ClassGenerationAction classGenerationAction = new 
ToolsInjectorBuilder()
+                        .addModule(binder
+                                -> 
binder.bind(DataChannelMetaData.class).toInstance(metaData))
+                        .create()
                         .getInstance(ClassGenerationActionFactory.class)
                         .createAction(cgenConfiguration);
                 classGenerationAction.prepareArtifacts();