Change to a simple configuration with only one data source management.

src/main/java/sample/ApplicationDbConfig.java

@@ -1,89 +1,23 @@
 package sample;
 
-import javax.sql.DataSource;
-
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 
-import jakarta.persistence.EntityManagerFactory;
 import sample.context.DomainHelper;
 import sample.context.orm.OrmInterceptor;
 import sample.context.orm.OrmRepository;
-import sample.context.orm.repository.DefaultRepository;
-import sample.context.orm.repository.SystemRepository;
 
 /**
  * Represents a database connection definition for an application.
  */
 @Configuration
 public class ApplicationDbConfig {
 
-    /** Represents a connection definition to a standard schema. */
-    @Configuration
-    static class DefaultDbConfig {
-
-        @Bean
-        @Primary
-        OrmRepository defaultRepository(DomainHelper dh, OrmInterceptor interceptor) {
-            return DefaultRepository.of(dh, interceptor);
-        }
-
-        @Bean(name = DefaultRepository.BeanNameDs, destroyMethod = "close")
-        @Primary
-        DataSource dataSource(ApplicationProperties props) {
-            return props.getDatasource().getApp().dataSource();
-        }
-
-        @Bean(name = DefaultRepository.BeanNameEmf)
-        @Primary
-        LocalContainerEntityManagerFactoryBean entityManagerFactoryBean(
-                ApplicationProperties props,
-                @Qualifier(DefaultRepository.BeanNameDs) final DataSource dataSource) {
-            return props.getDatasource().getApp().entityManagerFactoryBean(dataSource);
-        }
-
-        @Bean(name = DefaultRepository.BeanNameTx)
-        @Primary
-        JpaTransactionManager transactionManager(
-                ApplicationProperties props,
-                @Qualifier(DefaultRepository.BeanNameEmf) final EntityManagerFactory emf) {
-            return props.getDatasource().getApp().transactionManager(emf);
-        }
-
-    }
-
-    /** Represents a connection definition to the system schema. */
-    @Configuration
-    static class SystemDbConfig {
-
-        @Bean
-        SystemRepository systemRepository(DomainHelper dh, OrmInterceptor interceptor) {
-            return SystemRepository.of(dh, interceptor);
-        }
-
-        @Bean(name = SystemRepository.BeanNameDs, destroyMethod = "close")
-        DataSource systemDataSource(ApplicationProperties props) {
-            return props.getDatasource().getSystem().dataSource();
-        }
-
-        @Bean(name = SystemRepository.BeanNameEmf)
-        LocalContainerEntityManagerFactoryBean systemEntityManagerFactoryBean(
-                ApplicationProperties props,
-                @Qualifier(SystemRepository.BeanNameDs) final DataSource dataSource) {
-            return props.getDatasource().getSystem().entityManagerFactoryBean(dataSource);
-        }
-
-        @Bean(name = SystemRepository.BeanNameTx)
-        JpaTransactionManager systemTransactionManager(
-                ApplicationProperties props,
-                @Qualifier(SystemRepository.BeanNameEmf) final EntityManagerFactory emf) {
-            return props.getDatasource().getSystem().transactionManager(emf);
-        }
-
+    @Bean
+    @Primary
+    OrmRepository defaultRepository(DomainHelper dh, OrmInterceptor interceptor) {
+        return OrmRepository.of(dh, interceptor);
     }
 
 }

src/main/java/sample/ApplicationProperties.java

@@ -3,8 +3,6 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 import lombok.Data;
-import sample.context.orm.repository.DefaultRepository.DefaultDataSourceProperties;
-import sample.context.orm.repository.SystemRepository.SystemDataSourceProperties;
 
 /**
  * Represents the property concept of the application.
@@ -13,15 +11,8 @@
 @Data
 public class ApplicationProperties {
     private boolean cors;
-    private DatasourceProps datasource = new DatasourceProps();
     private MailProps mail;
 
-    @Data
-    public static class DatasourceProps {
-        private DefaultDataSourceProperties app = new DefaultDataSourceProperties();
-        private SystemDataSourceProperties system = new SystemDataSourceProperties();
-    }
-
     @Data
     public static class MailProps {
         private boolean enabled;

src/main/java/sample/context/audit/AuditHandler.java

@@ -8,7 +8,6 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.MessageSource;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -23,8 +22,8 @@
 import sample.context.actor.ActorSession;
 import sample.context.audit.AuditActor.RegAuditActor;
 import sample.context.audit.AuditEvent.RegAuditEvent;
+import sample.context.orm.OrmRepository;
 import sample.context.orm.TxTemplate;
-import sample.context.orm.repository.SystemRepository;
 
 /**
  * this component handle user audits and system audits (regular jobs, daily
@@ -220,8 +219,7 @@ public <T> T callEvent(String category, String message, Supplier<T> callable) {
     @Component
     @RequiredArgsConstructor(staticName = "of")
     public static class AuditPersister {
-        private final SystemRepository rep;
-        @Qualifier(SystemRepository.BeanNameTx)
+        private final OrmRepository rep;
         private final PlatformTransactionManager txm;
 
         public AuditActor start(final RegAuditActor p) {

src/main/java/sample/context/orm/OrmRepository.java

@@ -6,6 +6,7 @@
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityNotFoundException;
 import jakarta.persistence.LockModeType;
+import jakarta.persistence.PersistenceContext;
 import lombok.RequiredArgsConstructor;
 import sample.context.DomainEntity;
 import sample.context.DomainHelper;
@@ -163,4 +164,28 @@ public OrmRepository flushAndClear() {
         return this;
     }
 
+    public static OrmRepository of(DomainHelper dh, OrmInterceptor interceptor) {
+        return new DefaultRepository(dh, interceptor);
+    }
+
+    /** Repository of the standard schema. */
+    public static class DefaultRepository extends OrmRepository {
+
+        @PersistenceContext
+        private EntityManager em;
+
+        public DefaultRepository(DomainHelper dh, OrmInterceptor interceptor) {
+            super(dh, interceptor);
+        }
+
+        @Override
+        public EntityManager em() {
+            return em;
+        }
+
+        @Override
+        public void em(EntityManager em) {
+            this.em = em;
+        }
+    }
 }