Skip to content

Commit 3a991e7

Browse files
committed
Use SimpleConfig to simplify database configuration.
1 parent 12b61af commit 3a991e7

File tree

3 files changed

+12
-71
lines changed

3 files changed

+12
-71
lines changed

java-17/src/main/java/boilerplate/java17/DbConfig.java

-48
This file was deleted.

java-17/src/main/java/boilerplate/java17/Main.java

+5-14
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
import boilerplate.java17.dao.AppDaoImpl;
44
import boilerplate.java17.repository.EmployeeRepository;
5-
import org.seasar.doma.jdbc.Config;
6-
import org.seasar.doma.jdbc.dialect.H2Dialect;
7-
import org.seasar.doma.jdbc.tx.LocalTransactionDataSource;
8-
import org.seasar.doma.jdbc.tx.LocalTransactionManager;
5+
import org.seasar.doma.jdbc.SimpleConfig;
96
import org.seasar.doma.slf4j.Slf4jJdbcLogger;
107

118
public class Main {
129

1310
public static void main(String[] args) {
14-
var config = createConfig();
11+
var config =
12+
SimpleConfig.builder("jdbc:h2:mem:tutorial;DB_CLOSE_DELAY=-1", "sa", null)
13+
.jdbcLogger(new Slf4jJdbcLogger())
14+
.build();
1515
var tm = config.getTransactionManager();
1616

1717
// setup database
@@ -27,13 +27,4 @@ public static void main(String[] args) {
2727
repository.update(employee);
2828
});
2929
}
30-
31-
private static Config createConfig() {
32-
var dialect = new H2Dialect();
33-
var dataSource =
34-
new LocalTransactionDataSource("jdbc:h2:mem:tutorial;DB_CLOSE_DELAY=-1", "sa", null);
35-
var jdbcLogger = new Slf4jJdbcLogger();
36-
var transactionManager = new LocalTransactionManager(dataSource, jdbcLogger);
37-
return new DbConfig(dialect, dataSource, jdbcLogger, transactionManager);
38-
}
3930
}

java-17/src/test/java/boilerplate/java17/TestEnvironment.java

+7-9
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
import org.junit.jupiter.api.extension.ParameterResolutionException;
1212
import org.junit.jupiter.api.extension.ParameterResolver;
1313
import org.seasar.doma.jdbc.Config;
14-
import org.seasar.doma.jdbc.dialect.H2Dialect;
15-
import org.seasar.doma.jdbc.tx.LocalTransactionDataSource;
14+
import org.seasar.doma.jdbc.SimpleConfig;
1615
import org.seasar.doma.jdbc.tx.LocalTransactionManager;
1716
import org.seasar.doma.slf4j.Slf4jJdbcLogger;
1817

@@ -24,16 +23,15 @@ public class TestEnvironment
2423
ParameterResolver {
2524

2625
private final LocalTransactionManager transactionManager;
27-
private final Config config;
26+
private final SimpleConfig config;
2827
private final AppDao appDao;
2928

3029
public TestEnvironment() {
31-
var dialect = new H2Dialect();
32-
var dataSource =
33-
new LocalTransactionDataSource("jdbc:h2:mem:tutorial;DB_CLOSE_DELAY=-1", "sa", null);
34-
var jdbcLogger = new Slf4jJdbcLogger();
35-
transactionManager = new LocalTransactionManager(dataSource, jdbcLogger);
36-
config = new DbConfig(dialect, dataSource, jdbcLogger, transactionManager);
30+
config =
31+
SimpleConfig.builder("jdbc:h2:mem:tutorial;DB_CLOSE_DELAY=-1", "sa", null)
32+
.jdbcLogger(new Slf4jJdbcLogger())
33+
.build();
34+
transactionManager = config.getLocalTransactionManager();
3735
appDao = new AppDaoImpl(config);
3836
}
3937

0 commit comments

Comments
 (0)