Simplify the JdbcLogger implimentation

Author: nakamura-to

deployment/src/test/java/org/seasar/doma/quarkus/deployment/ApplicationPropertiesTest.java

@@ -14,6 +14,7 @@
 import org.seasar.doma.jdbc.Config;
 import org.seasar.doma.jdbc.Naming;
 import org.seasar.doma.jdbc.SqlLogType;
+import org.seasar.doma.quarkus.runtime.DomaLogger;
 
 public class ApplicationPropertiesTest {
 
@@ -39,10 +40,14 @@ public class ApplicationPropertiesTest {
                                   + "quarkus.doma.fetch-size=20\n"
                                   + "quarkus.doma.max-rows=30\n"
                                   + "quarkus.doma.query-timeout=40\n"
+                                  + "quarkus.doma.log.sql=true\n"
+                                  + "quarkus.doma.log.dao=true\n"
+                                  + "quarkus.doma.log.closing-failure=true\n"
                                   + "quarkus.log.category.\"org.seasar.doma\".level=DEBUG\n"),
                           "application.properties"));
 
   @Inject Config config;
+  @Inject DomaLogger domaLogger;
 
   @Test
   public void test() {
@@ -56,5 +61,9 @@ public void test() {
     assertEquals(20, config.getFetchSize());
     assertEquals(30, config.getMaxRows());
     assertEquals(40, config.getQueryTimeout());
+
+    assertTrue(domaLogger.getLogPreferences().isSql());
+    assertTrue(domaLogger.getLogPreferences().isDao());
+    assertTrue(domaLogger.getLogPreferences().isClosingFailure());
   }
 }

runtime/src/main/java/org/seasar/doma/quarkus/runtime/JBossJdbcLogger.java renamed to runtime/src/main/java/org/seasar/doma/quarkus/runtime/DomaLogger.java

@@ -1,23 +1,28 @@
 package org.seasar.doma.quarkus.runtime;
 
 import java.sql.SQLException;
+import java.util.Objects;
 import java.util.function.Supplier;
 import org.jboss.logging.Logger;
 import org.seasar.doma.jdbc.AbstractJdbcLogger;
 import org.seasar.doma.jdbc.Sql;
 import org.seasar.doma.jdbc.SqlExecutionSkipCause;
 
-public class JBossJdbcLogger extends AbstractJdbcLogger<Logger.Level> {
+public class DomaLogger extends AbstractJdbcLogger<Logger.Level> {
 
-  private final DomaSettings.LogSettings logSettings;
+  private final LogPreferences logPreferences;
 
-  JBossJdbcLogger() {
-    this(new DomaSettings.LogSettings());
+  DomaLogger() {
+    this(new LogPreferences());
   }
 
-  public JBossJdbcLogger(DomaSettings.LogSettings logSettings) {
+  public DomaLogger(LogPreferences logPreferences) {
     super(Logger.Level.DEBUG);
-    this.logSettings = logSettings;
+    this.logPreferences = Objects.requireNonNull(logPreferences);
+  }
+
+  public LogPreferences getLogPreferences() {
+    return logPreferences;
   }
 
   @Override
@@ -28,7 +33,9 @@ protected void log(
       Throwable throwable,
       Supplier<String> messageSupplier) {
     var logger = Logger.getLogger(callerClassName);
-    logger.log(level, messageSupplier.get(), throwable);
+    if (logger.isEnabled(level)) {
+      logger.log(level, messageSupplier.get(), throwable);
+    }
   }
 
   @Override
@@ -38,7 +45,7 @@ protected void logSql(
       Sql<?> sql,
       Logger.Level level,
       Supplier<String> messageSupplier) {
-    if (logSettings.sql) {
+    if (logPreferences.isSql()) {
       var logger = Logger.getLogger(callerClassName);
       logger.info(messageSupplier.get());
     } else {
@@ -53,7 +60,7 @@ protected void logDaoMethodEntering(
       Object[] args,
       Logger.Level level,
       Supplier<String> messageSupplier) {
-    if (logSettings.dao) {
+    if (logPreferences.isDao()) {
       var logger = Logger.getLogger(callerClassName);
       logger.info(messageSupplier.get());
     } else {
@@ -68,7 +75,7 @@ protected void logDaoMethodExiting(
       Object result,
       Logger.Level level,
       Supplier<String> messageSupplier) {
-    if (logSettings.dao) {
+    if (logPreferences.isDao()) {
       var logger = Logger.getLogger(callerClassName);
       logger.info(messageSupplier.get());
     } else {
@@ -83,7 +90,7 @@ protected void logDaoMethodThrowing(
       RuntimeException e,
       Logger.Level level,
       Supplier<String> messageSupplier) {
-    if (logSettings.dao) {
+    if (logPreferences.isDao()) {
       var logger = Logger.getLogger(callerClassName);
       logger.info(messageSupplier.get(), e);
     } else {
@@ -98,7 +105,7 @@ protected void logSqlExecutionSkipping(
       SqlExecutionSkipCause cause,
       Logger.Level level,
       Supplier<String> messageSupplier) {
-    if (logSettings.dao) {
+    if (logPreferences.isDao()) {
       var logger = Logger.getLogger(callerClassName);
       logger.info(messageSupplier.get());
     } else {
@@ -114,7 +121,7 @@ protected void logConnectionClosingFailure(
       SQLException e,
       Logger.Level level,
       Supplier<String> messageSupplier) {
-    if (logSettings.closingFailure) {
+    if (logPreferences.isClosingFailure()) {
       var logger = Logger.getLogger(callerClassName);
       logger.info(messageSupplier.get(), e);
     } else {
@@ -130,11 +137,10 @@ protected void logStatementClosingFailure(
       SQLException e,
       Logger.Level level,
       Supplier<String> messageSupplier) {
-    if (logSettings.closingFailure) {
+    if (logPreferences.isClosingFailure()) {
       var logger = Logger.getLogger(callerClassName);
       logger.info(messageSupplier.get(), e);
     } else {
-
       super.logStatementClosingFailure(
           callerClassName, callerMethodName, e, level, messageSupplier);
     }
@@ -147,7 +153,7 @@ protected void logResultSetClosingFailure(
       SQLException e,
       Logger.Level level,
       Supplier<String> messageSupplier) {
-    if (logSettings.closingFailure) {
+    if (logPreferences.isClosingFailure()) {
       var logger = Logger.getLogger(callerClassName);
       logger.info(messageSupplier.get(), e);
     } else {

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

@@ -44,7 +44,7 @@ public class DomaProducer {
   private volatile int maxRows;
   private volatile int queryTimeout;
   private volatile String sqlLoadScript;
-  private volatile DomaSettings.LogSettings logSettings;
+  private volatile LogPreferences logPreferences;
 
   public void setSqlFileRepository(SqlFileRepository sqlFileRepository) {
     this.sqlFileRepository = Objects.requireNonNull(sqlFileRepository);
@@ -90,8 +90,8 @@ public void setSqlLoadScript(String sqlLoadScript) {
     this.sqlLoadScript = sqlLoadScript;
   }
 
-  public void setLogSettings(DomaSettings.LogSettings logSettings) {
-    this.logSettings = Objects.requireNonNull(logSettings);
+  public void setLogPreferences(LogPreferences logPreferences) {
+    this.logPreferences = Objects.requireNonNull(logPreferences);
   }
 
   @ApplicationScoped
@@ -114,9 +114,8 @@ ScriptFileLoader scriptFileLoader() {
 
   @ApplicationScoped
   @DefaultBean
-  JdbcLogger jdbcLogger() {
-    Objects.requireNonNull(logSettings);
-    return new JBossJdbcLogger(logSettings);
+  DomaLogger jdbcLogger(LogPreferences logPreferences) {
+    return new DomaLogger(logPreferences);
   }
 
   @ApplicationScoped
@@ -179,6 +178,12 @@ TransactionManager transactionManager() {
     return new UnsupportedTransactionManager();
   }
 
+  @Singleton
+  @DefaultBean
+  LogPreferences logPreferences() {
+    return Objects.requireNonNull(logPreferences);
+  }
+
   @ApplicationScoped
   @DefaultBean
   DomaConfig dbConfig(

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

@@ -42,7 +42,7 @@ public BeanContainerListener configure(DomaSettings domaSettings, LaunchMode lau
       producer.setMaxRows(domaSettings.maxRows);
       producer.setQueryTimeout(domaSettings.queryTimeout);
       producer.setSqlLoadScript(domaSettings.sqlLoadScript);
-      producer.setLogSettings(domaSettings.log);
+      producer.setLogPreferences(domaSettings.log.asLogPreferences());
     };
   }
 }

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

@@ -39,6 +39,10 @@ public LogSettings(boolean sql, boolean dao, boolean closingFailure) {
       this.dao = dao;
       this.closingFailure = closingFailure;
     }
+
+    public LogPreferences asLogPreferences() {
+      return new LogPreferences(sql, dao, closingFailure);
+    }
   }
 
   public enum DialectType {

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

@@ -0,0 +1,30 @@
+package org.seasar.doma.quarkus.runtime;
+
+public class LogPreferences {
+
+  private final boolean sql;
+  private final boolean dao;
+  private final boolean closingFailure;
+
+  public LogPreferences() {
+    this(false, false, false);
+  }
+
+  public LogPreferences(boolean sql, boolean dao, boolean closingFailure) {
+    this.sql = sql;
+    this.dao = dao;
+    this.closingFailure = closingFailure;
+  }
+
+  public boolean isSql() {
+    return sql;
+  }
+
+  public boolean isDao() {
+    return dao;
+  }
+
+  public boolean isClosingFailure() {
+    return closingFailure;
+  }
+}