Introduce the DomaSettings class to simplify the architecture

Author: nakamura-to

runtime/src/main/java/org/seasar/doma/quarkus/runtime/DomaConfiguration.java renamed to deployment/src/main/java/org/seasar/doma/quarkus/deployment/DomaBuildTimeConfig.java

@@ -1,48 +1,42 @@
-package org.seasar.doma.quarkus.runtime;
+package org.seasar.doma.quarkus.deployment;
 
+import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigRoot;
 import java.util.Optional;
-import java.util.function.Supplier;
 import org.seasar.doma.jdbc.Config;
-import org.seasar.doma.jdbc.GreedyCacheSqlFileRepository;
-import org.seasar.doma.jdbc.Naming;
-import org.seasar.doma.jdbc.NoCacheSqlFileRepository;
-import org.seasar.doma.jdbc.SqlFileRepository;
 import org.seasar.doma.jdbc.SqlLogType;
-import org.seasar.doma.jdbc.dialect.Dialect;
-import org.seasar.doma.jdbc.dialect.H2Dialect;
-import org.seasar.doma.jdbc.dialect.MssqlDialect;
-import org.seasar.doma.jdbc.dialect.MysqlDialect;
-import org.seasar.doma.jdbc.dialect.PostgresDialect;
-import org.seasar.doma.jdbc.dialect.StandardDialect;
+import org.seasar.doma.quarkus.runtime.DomaSettings;
 
 @ConfigRoot
-public class DomaConfiguration {
+public class DomaBuildTimeConfig {
+
+  public static final String SQL_LOAD_SCRIPT_DEFAULT = "import.sql";
+  public static final String SQL_LOAD_SCRIPT_NO_FILE = "no-file";
 
   /**
    * The SQL dialect.
    *
    * @see Config#getDialect()
    */
   @ConfigItem(defaultValueDocumentation = "depends on 'quarkus.datasource.db-kind'")
-  public Optional<DialectType> dialect;
+  public Optional<DomaSettings.DialectType> dialect;
 
   /**
    * The SQL file repository.
    *
    * @see Config#getSqlFileRepository()
    */
   @ConfigItem(defaultValue = "greedy-cache")
-  public SqlFileRepositoryType sqlFileRepository;
+  public DomaSettings.SqlFileRepositoryType sqlFileRepository;
 
   /**
    * The naming convention controller.
    *
    * @see Config#getNaming()
    */
   @ConfigItem(defaultValue = "none")
-  public NamingType naming;
+  public DomaSettings.NamingType naming;
 
   /**
    * The SQL log type that determines the SQL log format in exceptions.
@@ -107,7 +101,32 @@ public class DomaConfiguration {
   public Optional<String> sqlLoadScript;
 
   /** The log configuration. */
-  @ConfigItem public LogConfiguration log;
+  @ConfigItem public LogBuildTimeConfig log;
+
+  @ConfigGroup
+  public static class LogBuildTimeConfig {
+
+    /** Shows SQL logs. */
+    @ConfigItem public boolean sql;
+
+    /** Shows DAO logs. */
+    @ConfigItem public boolean dao;
+
+    /** Shows the logs of the failure to close JDBC resource. */
+    @ConfigItem public boolean closingFailure;
+
+    @Override
+    public String toString() {
+      return "DomaConfigurationLog{"
+          + "sql="
+          + sql
+          + ", dao="
+          + dao
+          + ", closingFailure="
+          + closingFailure
+          + '}';
+    }
+  }
 
   @Override
   public String toString() {
@@ -134,55 +153,4 @@ public String toString() {
         + log
         + '}';
   }
-
-  public enum DialectType {
-    STANDARD(StandardDialect::new),
-    MSSQL(MssqlDialect::new),
-    MYSQL(MysqlDialect::new),
-    POSTGRES(PostgresDialect::new),
-    H2(H2Dialect::new);
-
-    private final Supplier<Dialect> constructor;
-
-    DialectType(Supplier<Dialect> constructor) {
-      this.constructor = constructor;
-    }
-
-    public Dialect create() {
-      return this.constructor.get();
-    }
-  }
-
-  public enum SqlFileRepositoryType {
-    NO_CACHE(NoCacheSqlFileRepository::new),
-    GREEDY_CACHE(GreedyCacheSqlFileRepository::new);
-
-    private final Supplier<SqlFileRepository> constructor;
-
-    SqlFileRepositoryType(Supplier<SqlFileRepository> constructor) {
-      this.constructor = constructor;
-    }
-
-    public SqlFileRepository create() {
-      return this.constructor.get();
-    }
-  }
-
-  public enum NamingType {
-    NONE(Naming.NONE),
-    LOWER_CASE(Naming.LOWER_CASE),
-    UPPER_CASE(Naming.UPPER_CASE),
-    SNAKE_LOWER_CASE(Naming.SNAKE_LOWER_CASE),
-    SNAKE_UPPER_CASE(Naming.SNAKE_UPPER_CASE);
-
-    private final Naming naming;
-
-    NamingType(Naming naming) {
-      this.naming = naming;
-    }
-
-    public Naming naming() {
-      return this.naming;
-    }
-  }
 }

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

@@ -15,14 +15,12 @@
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
-import io.quarkus.runtime.LaunchMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
 import org.seasar.doma.DaoImplementation;
-import org.seasar.doma.quarkus.runtime.DomaConfiguration;
 import org.seasar.doma.quarkus.runtime.DomaProducer;
 import org.seasar.doma.quarkus.runtime.DomaRecorder;
 import org.seasar.doma.quarkus.runtime.InitialScriptLoader;
@@ -48,39 +46,41 @@ BeanDefiningAnnotationBuildItem beanDefiningAnnotation() {
   }
 
   @BuildStep
-  MergedConfigurationBuildItem mergedConfiguration(
-      DomaConfiguration configuration,
+  DomaSettingsBuildItem domaSettings(
+      DomaBuildTimeConfig buildTimeConfig,
       List<JdbcDataSourceBuildItem> dataSources,
       ApplicationArchivesBuildItem applicationArchives,
       LaunchModeBuildItem launchMode) {
-    DomaConfigurationMerger merger =
-        new DomaConfigurationMerger(configuration, dataSources, applicationArchives, launchMode);
-    merger.merge();
-    return new MergedConfigurationBuildItem(configuration);
+    DomaSettingsFactory factory =
+        new DomaSettingsFactory(buildTimeConfig, dataSources, applicationArchives, launchMode);
+    return new DomaSettingsBuildItem(factory.create());
   }
 
   @BuildStep
   Optional<HotDeploymentWatchedFileBuildItem> hotDeploymentWatchedFile(
-      MergedConfigurationBuildItem mergedConfiguration) {
-    DomaConfiguration configuration = mergedConfiguration.getConfiguration();
-    Optional<String> sqlLoadScript = configuration.sqlLoadScript;
-    return sqlLoadScript.map(HotDeploymentWatchedFileBuildItem::new);
+      DomaSettingsBuildItem settings) {
+    String sqlLoadScript = settings.getSettings().sqlLoadScript;
+    if (sqlLoadScript == null) {
+      return Optional.empty();
+    }
+    return Optional.of(new HotDeploymentWatchedFileBuildItem(sqlLoadScript));
   }
 
   @BuildStep
-  NativeImageResourceBuildItem resources(MergedConfigurationBuildItem mergedConfiguration) {
+  NativeImageResourceBuildItem nativeImageResources(DomaSettingsBuildItem settings) {
     List<String> resources = new ArrayList<>();
-    DomaConfiguration configuration = mergedConfiguration.getConfiguration();
-    Optional<String> sqlLoadScript = configuration.sqlLoadScript;
-    sqlLoadScript.ifPresent(resources::add);
+    String sqlLoadScript = settings.getSettings().sqlLoadScript;
+    if (sqlLoadScript != null) {
+      resources.add(sqlLoadScript);
+    }
     DomaResourceScanner scanner = new DomaResourceScanner();
     List<String> scannedResources = scanner.scan();
     resources.addAll(scannedResources);
     return new NativeImageResourceBuildItem(resources);
   }
 
   @BuildStep
-  ReflectiveClassBuildItem classes(BeanArchiveIndexBuildItem beanArchiveIndex) {
+  ReflectiveClassBuildItem reflectiveClasses(BeanArchiveIndexBuildItem beanArchiveIndex) {
     List<String> classes = new ArrayList<>();
     classes.add(InitialScriptLoader.class.getName());
     IndexView indexView = beanArchiveIndex.getIndex();
@@ -93,11 +93,8 @@ ReflectiveClassBuildItem classes(BeanArchiveIndexBuildItem beanArchiveIndex) {
   @BuildStep
   @Record(STATIC_INIT)
   BeanContainerListenerBuildItem beanContainerListener(
-      DomaRecorder recorder,
-      MergedConfigurationBuildItem mergedConfiguration,
-      LaunchModeBuildItem launchMode) {
-    DomaConfiguration configuration = mergedConfiguration.getConfiguration();
-    boolean isDevMode = launchMode.getLaunchMode() == LaunchMode.DEVELOPMENT;
-    return new BeanContainerListenerBuildItem(recorder.configure(configuration, isDevMode));
+      DomaRecorder recorder, DomaSettingsBuildItem settings, LaunchModeBuildItem launchMode) {
+    return new BeanContainerListenerBuildItem(
+        recorder.configure(settings.getSettings(), launchMode.getLaunchMode()));
   }
 }

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

@@ -0,0 +1,18 @@
+package org.seasar.doma.quarkus.deployment;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+import java.util.Objects;
+import org.seasar.doma.quarkus.runtime.DomaSettings;
+
+public final class DomaSettingsBuildItem extends SimpleBuildItem {
+
+  private final DomaSettings settings;
+
+  public DomaSettingsBuildItem(DomaSettings settings) {
+    this.settings = Objects.requireNonNull(settings);
+  }
+
+  public DomaSettings getSettings() {
+    return settings;
+  }
+}