Remove unncessary configuration items

Author: nakamura-to

README.md

@@ -26,23 +26,20 @@ You can write the following configurations in your application.properties file:
 quarkus.doma.datasource-name=default
 quarkus.doma.dialect=h2
 quarkus.doma.sql-file-repository=greedy-cache
-quarkus.doma.naming=default
+quarkus.doma.naming=none
 quarkus.doma.exception-sql-log-type=none
 quarkus.doma.batch-size=0
 quarkus.doma.fetch-size=0
 quarkus.doma.max-rows=0
 quarkus.doma.query-timeout=0
 
-quarkus.doma.log.sql=true
-quarkus.doma.log.dao=true
-quarkus.doma.log.closing-failure=true
+quarkus.doma.log.sql=false
+quarkus.doma.log.dao=false
+quarkus.doma.log.closing-failure=false
 ```
 
 The above properties are all optional.
 
-Our extension infers the `quarkus.doma.datasource-name` and `quarkus.doma.dialect` properties 
-from the `quarkus.datasource` properties.
-
 See [quarkus-doma.adoc](./quarkus-doma.adoc) for more details.
 
 ### Support for native images

quarkus-doma.adoc

@@ -13,16 +13,16 @@ a|icon:lock[title=Fixed at build time] [[quarkus-doma_quarkus.doma.dialect]]`lin
 [.description]
 --
 The SQL dialect.
---|`standard`, `sqlite`, `db2`, `mssql`, `mssql2008`, `mysql`, `postgres`, `oracle`, `h2`, `hsql` 
-|
+--|`standard`, `mssql`, `mysql`, `postgres`, `h2`
+|`depends on 'quarkus.datasource.db-kind'`
 
 
 a|icon:lock[title=Fixed at build time] [[quarkus-doma_quarkus.doma.sql-file-repository]]`link:#quarkus-doma_quarkus.doma.sql-file-repository[quarkus.doma.sql-file-repository]`
 
 [.description]
 --
 The SQL file repository.
---|`no-cache`, `greedy-cache` 
+--|`no-cache`, `greedy-cache`
 |`greedy-cache`
 
 
@@ -31,16 +31,16 @@ a|icon:lock[title=Fixed at build time] [[quarkus-doma_quarkus.doma.naming]]`link
 [.description]
 --
 The naming convention controller.
---|`none`, `lower-case`, `upper-case`, `snake-lower-case`, `snake-upper-case`, `lenient-snake-lower-case`, `lenient-snake-upper-case`, `default` 
-|`default`
+--|`none`, `lower-case`, `upper-case`, `snake-lower-case`, `snake-upper-case`
+|`none`
 
 
 a|icon:lock[title=Fixed at build time] [[quarkus-doma_quarkus.doma.exception-sql-log-type]]`link:#quarkus-doma_quarkus.doma.exception-sql-log-type[quarkus.doma.exception-sql-log-type]`
 
 [.description]
 --
 The SQL log type that determines the SQL log format in exceptions.
---|`raw`, `formatted`, `none` 
+--|`raw`, `formatted`, `none`
 |`none`
 
 
@@ -49,16 +49,16 @@ a|icon:lock[title=Fixed at build time] [[quarkus-doma_quarkus.doma.datasource-na
 [.description]
 --
 The name of the data source.
---|string 
-|
+--|string
+|`depends on 'quarkus.datasource."datasource-name".db-kind'`
 
 
 a|icon:lock[title=Fixed at build time] [[quarkus-doma_quarkus.doma.batch-size]]`link:#quarkus-doma_quarkus.doma.batch-size[quarkus.doma.batch-size]`
 
 [.description]
 --
 The batch size.
---|int 
+--|int
 |`0`
 
 
@@ -67,7 +67,7 @@ a|icon:lock[title=Fixed at build time] [[quarkus-doma_quarkus.doma.fetch-size]]`
 [.description]
 --
 The fetch size.
---|int 
+--|int
 |`0`
 
 
@@ -76,7 +76,7 @@ a|icon:lock[title=Fixed at build time] [[quarkus-doma_quarkus.doma.max-rows]]`li
 [.description]
 --
 The max rows.
---|int 
+--|int
 |`0`
 
 
@@ -85,25 +85,16 @@ a|icon:lock[title=Fixed at build time] [[quarkus-doma_quarkus.doma.query-timeout
 [.description]
 --
 The query timeout limit in seconds.
---|int 
+--|int
 |`0`
 
 
-a|icon:lock[title=Fixed at build time] [[quarkus-doma_quarkus.doma.log.level]]`link:#quarkus-doma_quarkus.doma.log.level[quarkus.doma.log.level]`
-
-[.description]
---
-The level of log.
---|`fatal`, `error`, `warn`, `info`, `debug`, `trace` 
-|`debug`
-
-
 a|icon:lock[title=Fixed at build time] [[quarkus-doma_quarkus.doma.log.sql]]`link:#quarkus-doma_quarkus.doma.log.sql[quarkus.doma.log.sql]`
 
 [.description]
 --
 Shows SQL logs.
---|boolean 
+--|boolean
 |`false`
 
 
@@ -112,7 +103,7 @@ a|icon:lock[title=Fixed at build time] [[quarkus-doma_quarkus.doma.log.dao]]`lin
 [.description]
 --
 Shows DAO logs.
---|boolean 
+--|boolean
 |`false`
 
 
@@ -121,7 +112,7 @@ a|icon:lock[title=Fixed at build time] [[quarkus-doma_quarkus.doma.log.closing-f
 [.description]
 --
 Shows the logs of the failure to close JDBC resource.
---|boolean 
+--|boolean
 |`false`
 
 |===

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

@@ -10,16 +10,11 @@
 import org.seasar.doma.jdbc.NoCacheSqlFileRepository;
 import org.seasar.doma.jdbc.SqlFileRepository;
 import org.seasar.doma.jdbc.SqlLogType;
-import org.seasar.doma.jdbc.dialect.Db2Dialect;
 import org.seasar.doma.jdbc.dialect.Dialect;
 import org.seasar.doma.jdbc.dialect.H2Dialect;
-import org.seasar.doma.jdbc.dialect.HsqldbDialect;
-import org.seasar.doma.jdbc.dialect.Mssql2008Dialect;
 import org.seasar.doma.jdbc.dialect.MssqlDialect;
 import org.seasar.doma.jdbc.dialect.MysqlDialect;
-import org.seasar.doma.jdbc.dialect.OracleDialect;
 import org.seasar.doma.jdbc.dialect.PostgresDialect;
-import org.seasar.doma.jdbc.dialect.SqliteDialect;
 import org.seasar.doma.jdbc.dialect.StandardDialect;
 
 @ConfigRoot
@@ -47,7 +42,7 @@ public class DomaConfiguration {
    *
    * @see Config#getNaming()
    */
-  @ConfigItem(defaultValue = "default")
+  @ConfigItem(defaultValue = "none")
   public NamingType naming;
 
   /**
@@ -130,15 +125,10 @@ public String toString() {
 
   public enum DialectType {
     STANDARD(StandardDialect::new),
-    SQLITE(SqliteDialect::new),
-    DB2(Db2Dialect::new),
     MSSQL(MssqlDialect::new),
-    MSSQL2008(Mssql2008Dialect::new),
     MYSQL(MysqlDialect::new),
     POSTGRES(PostgresDialect::new),
-    ORACLE(OracleDialect::new),
-    H2(H2Dialect::new),
-    HSQL(HsqldbDialect::new);
+    H2(H2Dialect::new);
 
     private final Supplier<Dialect> constructor;
 
@@ -171,10 +161,7 @@ public enum NamingType {
     LOWER_CASE(Naming.LOWER_CASE),
     UPPER_CASE(Naming.UPPER_CASE),
     SNAKE_LOWER_CASE(Naming.SNAKE_LOWER_CASE),
-    SNAKE_UPPER_CASE(Naming.SNAKE_UPPER_CASE),
-    LENIENT_SNAKE_LOWER_CASE(Naming.LENIENT_SNAKE_LOWER_CASE),
-    LENIENT_SNAKE_UPPER_CASE(Naming.LENIENT_SNAKE_UPPER_CASE),
-    DEFAULT(Naming.DEFAULT);
+    SNAKE_UPPER_CASE(Naming.SNAKE_UPPER_CASE);
 
     private final Naming naming;
 

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

@@ -17,7 +17,7 @@ public class JBossJdbcLogger extends AbstractJdbcLogger<Logger.Level> {
   }
 
   public JBossJdbcLogger(LogConfiguration logConfiguration) {
-    super(logConfiguration.level);
+    super(Logger.Level.DEBUG);
     this.logConfiguration = logConfiguration;
   }
 

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

@@ -2,15 +2,10 @@
 
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
-import org.jboss.logging.Logger;
 
 @ConfigGroup
 public class LogConfiguration {
 
-  /** The level of log. */
-  @ConfigItem(defaultValue = "DEBUG")
-  public Logger.Level level = Logger.Level.DEBUG;
-
   /** Shows SQL logs. */
   @ConfigItem public boolean sql;