You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2026/05/17 16:17:53 UTC

(cayenne) branch master updated (d931ad228 -> 3771c27dc)

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

asf-gitbox-commits pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


    from d931ad228 tests cleanup
     new 0381fd595 Modeler cleanup - uniwinding injection
     new 3771c27dc CAY-2940 Upgrade to SLF4J version 2.0.17

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/cayenne/modeler/Application.java    | 17 ++++--
 .../main/java/org/apache/cayenne/modeler/Main.java |  2 +-
 .../org/apache/cayenne/modeler/ModelerModule.java  |  7 ---
 .../modeler/log/ModelerLogServiceProvider.java     | 66 ++++++++++++++++++++++
 .../modeler/service/action/GlobalActions.java      |  7 +--
 .../validator/ConfigurableProjectValidator.java    |  3 +-
 .../java/org/slf4j/impl/StaticLoggerBinder.java    | 49 ----------------
 .../services/org.slf4j.spi.SLF4JServiceProvider    |  1 +
 .../modeler/CayenneModelerValidationIT.java        |  7 +--
 9 files changed, 88 insertions(+), 71 deletions(-)
 create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/ModelerLogServiceProvider.java
 delete mode 100644 modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
 create mode 100644 modeler/cayenne-modeler/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider


(cayenne) 01/02: Modeler cleanup - uniwinding injection

Posted by aa...@apache.org.
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 0381fd5959ba01026f630236c067455f9fe19e96
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sun May 17 12:12:34 2026 -0400

    Modeler cleanup - uniwinding injection
---
 .../java/org/apache/cayenne/modeler/Application.java    | 17 +++++++++++++----
 .../src/main/java/org/apache/cayenne/modeler/Main.java  |  2 +-
 .../java/org/apache/cayenne/modeler/ModelerModule.java  |  7 -------
 .../cayenne/modeler/service/action/GlobalActions.java   |  7 +++----
 .../service/validator/ConfigurableProjectValidator.java |  3 +--
 .../cayenne/modeler/CayenneModelerValidationIT.java     |  7 +++----
 6 files changed, 21 insertions(+), 22 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 f3d3137e4..594e077c7 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
@@ -19,11 +19,11 @@
 
 package org.apache.cayenne.modeler;
 
+import org.apache.cayenne.configuration.ConfigurationNameMapper;
 import org.apache.cayenne.configuration.DataMapLoader;
 import org.apache.cayenne.configuration.runtime.DbAdapterFactory;
 import org.apache.cayenne.configuration.xml.DataChannelMetaData;
 import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactoryProvider;
-import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.di.Injector;
 import org.apache.cayenne.modeler.dbconnector.DBConnectors;
 import org.apache.cayenne.modeler.log.ModelerLogFactory;
@@ -35,6 +35,7 @@ import org.apache.cayenne.modeler.pref.RecentProjectsPrefs;
 import org.apache.cayenne.modeler.service.action.GlobalActions;
 import org.apache.cayenne.modeler.service.classloader.ModelerClassLoader;
 import org.apache.cayenne.modeler.service.platform.PlatformInitializer;
+import org.apache.cayenne.modeler.service.validator.ConfigurableProjectValidator;
 import org.apache.cayenne.modeler.ui.MainFrame;
 import org.apache.cayenne.modeler.ui.action.OpenProjectAction;
 import org.apache.cayenne.modeler.ui.logconsole.LogConsole;
@@ -65,16 +66,24 @@ public class Application {
 
     private final Injector injector;
     private final String name;
+    private final GlobalActions actionManager;
+    private final ProjectValidator projectValidator;
     private LogConsole logConsole;
     private MainFrame frame;
     private CayenneUndoManager undoManager;
     private DBConnectors dbConnectors;
 
-    public Application(@Inject Injector injector) {
+    public Application(Injector injector) {
         this.injector = injector;
 
         String configuredName = System.getProperty(APPLICATION_NAME_PROPERTY);
         this.name = (configuredName != null) ? configuredName : DEFAULT_APPLICATION_NAME;
+
+        this.actionManager = new GlobalActions(
+                this,
+                injector.getInstance(ConfigurationNameMapper.class),
+                injector.getInstance(ConfigurationNodeParentGetter.class));
+        this.projectValidator = new ConfigurableProjectValidator(this);
     }
 
     public String getName() {
@@ -86,11 +95,11 @@ public class Application {
     }
 
     public GlobalActions getActionManager() {
-        return injector.getInstance(GlobalActions.class);
+        return actionManager;
     }
 
     public ProjectValidator getProjectValidator() {
-        return injector.getInstance(ProjectValidator.class);
+        return projectValidator;
     }
 
     public ProjectSaver getProjectSaver() {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
index aca3cd774..3def30a94 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
@@ -72,7 +72,7 @@ public class Main {
         LOGGER.info("JRE v.{} at {}", System.getProperty("java.version"), System.getProperty("java.home"));
 
         SwingUtilities.invokeLater(() -> {
-            Application application = injector.getInstance(Application.class);
+            Application application = new Application(injector);
             application.startup(initialProjectFromArgs());
         });
 
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 900117158..3bb9c3cda 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
@@ -27,16 +27,13 @@ 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.action.GlobalActions;
 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.ConfigurableProjectValidator;
 import org.apache.cayenne.modeler.service.validator.extension.ValidationExtension;
 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.validation.ProjectValidator;
 import org.xml.sax.XMLReader;
 
 /**
@@ -46,8 +43,6 @@ public class ModelerModule implements Module {
 
     public void configure(Binder binder) {
 
-        binder.bind(Application.class).to(Application.class);
-        binder.bind(GlobalActions.class).to(GlobalActions.class);
         binder.bind(ModelerClassLoader.class).to(ModelerClassLoader.class);
         binder.bind(PlatformInitializer.class).to(DefaultPlatformInitializer.class);
         binder.bind(HandlerFactory.class).to(ExtensionAwareHandlerFactory.class);
@@ -61,7 +56,5 @@ public class ModelerModule implements Module {
                 .addExtension(DbImportExtension.class)
                 .addExtension(CgenExtension.class)
                 .addExtension(ValidationExtension.class);
-
-        binder.bind(ProjectValidator.class).to(ConfigurableProjectValidator.class);
     }
 }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/action/GlobalActions.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/action/GlobalActions.java
index e06abe70a..be2e82ce4 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/action/GlobalActions.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/action/GlobalActions.java
@@ -20,7 +20,6 @@ package org.apache.cayenne.modeler.service.action;
 
 import org.apache.cayenne.configuration.ConfigurationNameMapper;
 import org.apache.cayenne.configuration.ConfigurationNode;
-import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.toolkit.AppAction;
 import org.apache.cayenne.modeler.ui.action.*;
@@ -55,9 +54,9 @@ public class GlobalActions {
     private final ConfigurationNodeParentGetter nodeParentGetter;
 
     public GlobalActions(
-            @Inject Application application,
-            @Inject ConfigurationNameMapper nameMapper,
-            @Inject ConfigurationNodeParentGetter nodeParentGetter) {
+            Application application,
+            ConfigurationNameMapper nameMapper,
+            ConfigurationNodeParentGetter nodeParentGetter) {
 
         this.nodeParentGetter = nodeParentGetter;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/validator/ConfigurableProjectValidator.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/validator/ConfigurableProjectValidator.java
index b25c7bf17..c8f386f29 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/validator/ConfigurableProjectValidator.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/validator/ConfigurableProjectValidator.java
@@ -20,14 +20,13 @@ package org.apache.cayenne.modeler.service.validator;
 
 import org.apache.cayenne.configuration.DataChannelDescriptor;
 import org.apache.cayenne.configuration.xml.DataChannelMetaData;
-import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.project.validation.DefaultProjectValidator;
 import org.apache.cayenne.project.validation.ValidationConfig;
 
 public class ConfigurableProjectValidator extends DefaultProjectValidator {
 
-    public ConfigurableProjectValidator(@Inject Application application) {
+    public ConfigurableProjectValidator(Application application) {
         super(() -> {
             DataChannelMetaData metaData = application.getMetaData();
             DataChannelDescriptor dataChannel = (DataChannelDescriptor) application.getFrame().getProjectSession().project().getRootNode();
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CayenneModelerValidationIT.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CayenneModelerValidationIT.java
index 97fa5555e..40f0e6a2e 100644
--- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CayenneModelerValidationIT.java
+++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CayenneModelerValidationIT.java
@@ -27,7 +27,6 @@ import org.apache.cayenne.project.Project;
 import org.apache.cayenne.project.ProjectLoader;
 import org.apache.cayenne.project.ProjectModule;
 import org.apache.cayenne.project.validation.Inspection;
-import org.apache.cayenne.project.validation.ProjectValidator;
 import org.apache.cayenne.project.validation.ValidationConfig;
 import org.apache.cayenne.resource.URLResource;
 import org.junit.jupiter.api.BeforeAll;
@@ -60,14 +59,14 @@ public class CayenneModelerValidationIT {
 
     @Test
     public void validatorProvided() {
-        ProjectValidator projectValidator = injector.getInstance(ProjectValidator.class);
-        assertTrue(projectValidator instanceof ConfigurableProjectValidator);
+        Application application = new Application(injector);
+        assertTrue(application.getProjectValidator() instanceof ConfigurableProjectValidator);
     }
 
     @Test
     public void configLoaded() {
         URLResource projectResource = new URLResource(getClass().getResource(CAYENNE_CONFIGURED_VALIDATION_PROJECT));
-        Application application = injector.getInstance(Application.class);
+        Application application = new Application(injector);
         ProjectLoader projectLoader = injector.getInstance(ProjectLoader.class);
         Project project = projectLoader.loadProject(projectResource);
 


(cayenne) 02/02: CAY-2940 Upgrade to SLF4J version 2.0.17

Posted by aa...@apache.org.
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 3771c27dcbb8dd91177d7bc707402783330d96d2
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sun May 17 12:17:47 2026 -0400

    CAY-2940 Upgrade to SLF4J version 2.0.17
---
 .../modeler/log/ModelerLogServiceProvider.java     | 66 ++++++++++++++++++++++
 .../java/org/slf4j/impl/StaticLoggerBinder.java    | 49 ----------------
 .../services/org.slf4j.spi.SLF4JServiceProvider    |  1 +
 3 files changed, 67 insertions(+), 49 deletions(-)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/ModelerLogServiceProvider.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/ModelerLogServiceProvider.java
new file mode 100644
index 000000000..281c5214d
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/ModelerLogServiceProvider.java
@@ -0,0 +1,66 @@
+/*****************************************************************
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ ****************************************************************/
+package org.apache.cayenne.modeler.log;
+
+import org.slf4j.ILoggerFactory;
+import org.slf4j.IMarkerFactory;
+import org.slf4j.helpers.BasicMDCAdapter;
+import org.slf4j.helpers.BasicMarkerFactory;
+import org.slf4j.spi.MDCAdapter;
+import org.slf4j.spi.SLF4JServiceProvider;
+
+/**
+ * SLF4J 2.x service provider that routes logging through {@link ModelerLogFactory}.
+ * Discovered via {@code META-INF/services/org.slf4j.spi.SLF4JServiceProvider}.
+ */
+public class ModelerLogServiceProvider implements SLF4JServiceProvider {
+
+    public static final String REQUESTED_API_VERSION = "2.0.99";
+
+    private ILoggerFactory loggerFactory;
+    private IMarkerFactory markerFactory;
+    private MDCAdapter mdcAdapter;
+
+    @Override
+    public ILoggerFactory getLoggerFactory() {
+        return loggerFactory;
+    }
+
+    @Override
+    public IMarkerFactory getMarkerFactory() {
+        return markerFactory;
+    }
+
+    @Override
+    public MDCAdapter getMDCAdapter() {
+        return mdcAdapter;
+    }
+
+    @Override
+    public String getRequestedApiVersion() {
+        return REQUESTED_API_VERSION;
+    }
+
+    @Override
+    public void initialize() {
+        loggerFactory = new ModelerLogFactory();
+        markerFactory = new BasicMarkerFactory();
+        mdcAdapter = new BasicMDCAdapter();
+    }
+}
diff --git a/modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
deleted file mode 100644
index ad3e72a2a..000000000
--- a/modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*****************************************************************
- *   Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- ****************************************************************/
-
-package org.slf4j.impl;
-
-import org.apache.cayenne.modeler.log.ModelerLogFactory;
-import org.slf4j.ILoggerFactory;
-import org.slf4j.spi.LoggerFactoryBinder;
-
-/**
- * StaticLoggerBinder bind and replace standard SLF4J LoggerFactory to ModelerLogFactory.
- * This is used because in Cayenne Modeler we use custom logger implementation (ModelerLogger)
- * for logging in System.err and modeler logger.
- */
-public class StaticLoggerBinder implements LoggerFactoryBinder {
-
-    private final static StaticLoggerBinder SINGLETON = new StaticLoggerBinder();
-    private final static String LOGGER_FACTORY_CLASS_STR = ModelerLogFactory.class.getName();
-
-    private final ILoggerFactory loggerFactory = new ModelerLogFactory();
-
-    public static StaticLoggerBinder getSingleton() {
-        return SINGLETON;
-    }
-
-    public ILoggerFactory getLoggerFactory() {
-        return this.loggerFactory;
-    }
-
-    public String getLoggerFactoryClassStr() {
-        return LOGGER_FACTORY_CLASS_STR;
-    }
-}
diff --git a/modeler/cayenne-modeler/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/modeler/cayenne-modeler/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
new file mode 100644
index 000000000..37c137857
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
@@ -0,0 +1 @@
+org.apache.cayenne.modeler.log.ModelerLogServiceProvider