Prefer the Singleton to the ApplicationScoped for the sake of simplicity

Author: nakamura-to

deployment/src/main/java/org/seasar/doma/quarkus/deployment/DomaProcessor.java

@@ -24,8 +24,8 @@
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.function.Supplier;
-import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.Default;
+import javax.inject.Singleton;
 import org.jboss.jandex.DotName;
 import org.seasar.doma.DaoImplementation;
 import org.seasar.doma.jdbc.Config;
@@ -147,7 +147,7 @@ void registerBeans(
   private <BEAN> void registerSyntheticBeans(
       List<DomaSettings.DataSourceSettings> dataSourceSettingsList,
       BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
-      Class<?> implClazz,
+      Class<? extends BEAN> implClazz,
       Class<BEAN> typeClazz,
       Function<DomaSettings.DataSourceSettings, Supplier<BEAN>> supplierCreator) {
     dataSourceSettingsList.stream()
@@ -156,7 +156,7 @@ private <BEAN> void registerSyntheticBeans(
               var configurator =
                   SyntheticBeanBuildItem.configure(implClazz)
                       .addType(DotName.createSimple(typeClazz.getName()))
-                      .scope(Dependent.class)
+                      .scope(Singleton.class)
                       .unremovable()
                       .supplier(supplierCreator.apply(dataSourceSettings));
               if (dataSourceSettings.isDefault) {

runtime/src/main/java/org/seasar/doma/quarkus/runtime/DomaLogger.java

@@ -12,10 +12,6 @@ public class DomaLogger extends AbstractJdbcLogger<Logger.Level> {
 
   private final LogPreferences logPreferences;
 
-  DomaLogger() {
-    this(new LogPreferences());
-  }
-
   public DomaLogger(LogPreferences logPreferences) {
     super(Logger.Level.DEBUG);
     this.logPreferences = Objects.requireNonNull(logPreferences);

runtime/src/main/java/org/seasar/doma/quarkus/runtime/DomaProducer.java

@@ -5,7 +5,6 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
-import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Named;
 import javax.inject.Singleton;
 import org.seasar.doma.jdbc.ClassHelper;
@@ -59,43 +58,43 @@ public void setLogPreferences(LogPreferences logPreferences) {
     this.logPreferences = Objects.requireNonNull(logPreferences);
   }
 
-  @ApplicationScoped
+  @Singleton
   @DefaultBean
   SqlFileRepository sqlFileRepository() {
     return Objects.requireNonNull(sqlFileRepository);
   }
 
-  @ApplicationScoped
+  @Singleton
   @DefaultBean
   ScriptFileLoader scriptFileLoader() {
     return Objects.requireNonNull(scriptFileLoader);
   }
 
-  @ApplicationScoped
+  @Singleton
   @DefaultBean
   DomaLogger jdbcLogger(LogPreferences logPreferences) {
     return new DomaLogger(logPreferences);
   }
 
-  @ApplicationScoped
+  @Singleton
   @DefaultBean
   ClassHelper classHelper() {
     return ConfigSupport.defaultClassHelper;
   }
 
-  @ApplicationScoped
+  @Singleton
   @DefaultBean
   CommandImplementors commandImplementors() {
     return ConfigSupport.defaultCommandImplementors;
   }
 
-  @ApplicationScoped
+  @Singleton
   @DefaultBean
   QueryImplementors queryImplementors() {
     return ConfigSupport.defaultQueryImplementors;
   }
 
-  @ApplicationScoped
+  @Singleton
   @DefaultBean
   UnknownColumnHandler unknownColumnHandler() {
     return ConfigSupport.defaultUnknownColumnHandler;
@@ -107,26 +106,26 @@ Naming naming() {
     return Objects.requireNonNull(naming);
   }
 
-  @ApplicationScoped
+  @Singleton
   @DefaultBean
   MapKeyNaming mapKeyNaming() {
     return ConfigSupport.defaultMapKeyNaming;
   }
 
-  @ApplicationScoped
+  @Singleton
   @DefaultBean
   Commenter commenter() {
     return ConfigSupport.defaultCommenter;
   }
 
-  @ApplicationScoped
+  @Singleton
   @DefaultBean
   EntityListenerProvider entityListenerProvider() {
     return ConfigSupport.defaultEntityListenerProvider;
   }
 
   @Singleton
-  @DefaultBean
+  @Named("doma.exceptionSqlLogType")
   SqlLogType exceptionSqlLogType() {
     return Objects.requireNonNull(exceptionSqlLogType);
   }
@@ -138,12 +137,11 @@ public Map<String, String> getNamedSqlLoadScripts() {
   }
 
   @Singleton
-  @DefaultBean
   LogPreferences logPreferences() {
     return Objects.requireNonNull(logPreferences);
   }
 
-  @ApplicationScoped
+  @Singleton
   @DefaultBean
   @Unremovable
   DomaConfig.Core core(
@@ -154,7 +152,7 @@ DomaConfig.Core core(
       ClassHelper classHelper,
       CommandImplementors commandImplementors,
       QueryImplementors queryImplementors,
-      SqlLogType exceptionSqlLogType,
+      @Named("doma.exceptionSqlLogType") SqlLogType exceptionSqlLogType,
       UnknownColumnHandler unknownColumnHandler,
       Naming naming,
       MapKeyNaming mapKeyNaming,

runtime/src/main/java/org/seasar/doma/quarkus/runtime/JtaRequiresNewController.java

@@ -1,11 +1,11 @@
 package org.seasar.doma.quarkus.runtime;
 
 import io.quarkus.arc.DefaultBean;
-import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Singleton;
 import javax.transaction.Transactional;
 import org.seasar.doma.jdbc.RequiresNewController;
 
-@ApplicationScoped
+@Singleton
 @DefaultBean
 public class JtaRequiresNewController implements RequiresNewController {
   @Override

runtime/src/main/java/org/seasar/doma/quarkus/runtime/ScriptExecutor.java

@@ -6,19 +6,19 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
-import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
 import javax.inject.Named;
+import javax.inject.Singleton;
 import javax.sql.DataSource;
 import org.jboss.logging.Logger;
 import org.seasar.doma.internal.util.ResourceUtil;
 
-@ApplicationScoped
+@Singleton
 @DefaultBean
 public class ScriptExecutor {
 
-  private static Logger LOGGER = Logger.getLogger(ScriptExecutor.class.getName());
+  private static final Logger LOGGER = Logger.getLogger(ScriptExecutor.class.getName());
 
   private final Map<String, String> namedSqlLoadScripts;
 

runtime/src/main/java/org/seasar/doma/quarkus/runtime/UnsupportedTransactionManager.java

@@ -2,11 +2,11 @@
 
 import io.quarkus.arc.DefaultBean;
 import java.util.function.Supplier;
-import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Singleton;
 import org.seasar.doma.jdbc.tx.TransactionIsolationLevel;
 import org.seasar.doma.jdbc.tx.TransactionManager;
 
-@ApplicationScoped
+@Singleton
 @DefaultBean
 public class UnsupportedTransactionManager implements TransactionManager {