Replaced DbConfig with SimpleConfig across the project

Author: nakamura-to

common-test/src/main/java/example/common/test/TestEnvironment.java

@@ -1,6 +1,5 @@
 package example.common.test;
 
-import example.common.DbConfig;
 import example.common.dao.ScriptDao;
 import example.common.dao.ScriptDaoImpl;
 import org.junit.jupiter.api.extension.AfterAllCallback;
@@ -10,10 +9,8 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolver;
-import org.seasar.doma.jdbc.JdbcLogger;
-import org.seasar.doma.jdbc.dialect.Dialect;
-import org.seasar.doma.jdbc.dialect.H2Dialect;
-import org.seasar.doma.jdbc.tx.LocalTransactionDataSource;
+import org.seasar.doma.jdbc.Naming;
+import org.seasar.doma.jdbc.SimpleConfig;
 import org.seasar.doma.jdbc.tx.LocalTransactionManager;
 import org.seasar.doma.slf4j.Slf4jJdbcLogger;
 
@@ -25,16 +22,16 @@ public class TestEnvironment
         ParameterResolver {
 
   private final LocalTransactionManager transactionManager;
-  private final DbConfig config;
+  private final SimpleConfig config;
   private final ScriptDao dao;
 
   public TestEnvironment() {
-    Dialect dialect = new H2Dialect();
-    LocalTransactionDataSource dataSource =
-        new LocalTransactionDataSource("jdbc:h2:mem:tutorial;DB_CLOSE_DELAY=-1", "sa", null);
-    JdbcLogger jdbcLogger = new Slf4jJdbcLogger();
-    transactionManager = new LocalTransactionManager(dataSource, jdbcLogger);
-    config = new DbConfig(dialect, dataSource, jdbcLogger, transactionManager);
+    config =
+        SimpleConfig.builder("jdbc:h2:mem:tutorial;DB_CLOSE_DELAY=-1", "sa", null)
+            .jdbcLogger(new Slf4jJdbcLogger())
+            .naming(Naming.SNAKE_LOWER_CASE)
+            .build();
+    transactionManager = config.getLocalTransactionManager();
     dao = new ScriptDaoImpl(config);
   }
 
@@ -60,7 +57,7 @@ public void afterTestExecution(ExtensionContext context) {
 
   public boolean supportsParameter(
       ParameterContext parameterContext, ExtensionContext extensionContext) {
-    return parameterContext.getParameter().getType().isAssignableFrom(DbConfig.class);
+    return parameterContext.getParameter().getType().isAssignableFrom(SimpleConfig.class);
   }
 
   public Object resolveParameter(

common/src/main/java/example/common/DbConfig.java

@@ -9,9 +9,8 @@
 import org.seasar.doma.Id;
 import org.seasar.doma.Metamodel;
 import org.seasar.doma.Version;
-import org.seasar.doma.jdbc.entity.NamingType;
 
-@Entity(metamodel = @Metamodel, naming = NamingType.SNAKE_LOWER_CASE)
+@Entity(metamodel = @Metamodel)
 public class Category {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)

common/src/main/java/example/common/entity/Category.java

@@ -11,9 +11,8 @@
 import org.seasar.doma.Metamodel;
 import org.seasar.doma.Table;
 import org.seasar.doma.Version;
-import org.seasar.doma.jdbc.entity.NamingType;
 
-@Entity(metamodel = @Metamodel, naming = NamingType.SNAKE_LOWER_CASE)
+@Entity(metamodel = @Metamodel)
 @Table(quote = true)
 public class Order {
   @Id

common/src/main/java/example/common/entity/Order.java

@@ -9,9 +9,8 @@
 import org.seasar.doma.Metamodel;
 import org.seasar.doma.Table;
 import org.seasar.doma.Version;
-import org.seasar.doma.jdbc.entity.NamingType;
 
-@Entity(metamodel = @Metamodel, naming = NamingType.SNAKE_LOWER_CASE)
+@Entity(metamodel = @Metamodel)
 @Table(name = "order_item")
 public class OrderItem {
   @Id

common/src/main/java/example/common/entity/OrderItem.java

@@ -9,9 +9,8 @@
 import org.seasar.doma.Id;
 import org.seasar.doma.Metamodel;
 import org.seasar.doma.Version;
-import org.seasar.doma.jdbc.entity.NamingType;
 
-@Entity(metamodel = @Metamodel, naming = NamingType.SNAKE_LOWER_CASE)
+@Entity(metamodel = @Metamodel)
 public class Payment {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)

common/src/main/java/example/common/entity/Payment.java

@@ -11,9 +11,8 @@
 import org.seasar.doma.Id;
 import org.seasar.doma.Metamodel;
 import org.seasar.doma.Version;
-import org.seasar.doma.jdbc.entity.NamingType;
 
-@Entity(metamodel = @Metamodel, naming = NamingType.SNAKE_LOWER_CASE)
+@Entity(metamodel = @Metamodel)
 public class Product {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)

common/src/main/java/example/common/entity/Product.java

@@ -7,9 +7,8 @@
 import org.seasar.doma.Id;
 import org.seasar.doma.Metamodel;
 import org.seasar.doma.Version;
-import org.seasar.doma.jdbc.entity.NamingType;
 
-@Entity(metamodel = @Metamodel, naming = NamingType.SNAKE_LOWER_CASE)
+@Entity(metamodel = @Metamodel)
 public class ProductCategory {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)

common/src/main/java/example/common/entity/ProductCategory.java

@@ -8,9 +8,8 @@
 import org.seasar.doma.Id;
 import org.seasar.doma.Metamodel;
 import org.seasar.doma.Version;
-import org.seasar.doma.jdbc.entity.NamingType;
 
-@Entity(metamodel = @Metamodel, naming = NamingType.SNAKE_LOWER_CASE)
+@Entity(metamodel = @Metamodel)
 public class Review {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)

common/src/main/java/example/common/entity/Review.java

@@ -3,9 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.seasar.doma.*;
-import org.seasar.doma.jdbc.entity.NamingType;
 
-@Entity(metamodel = @Metamodel, naming = NamingType.SNAKE_LOWER_CASE)
+@Entity(metamodel = @Metamodel)
 public class Role {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)