Use delegation instead of inheritance in Dao implementations.

Now the simplified constructor injection works fine.
https://quarkus.io/guides/cdi-reference#simplified-constructor-injection

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/AbstractDao.java renamed to doma-core/src/main/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupport.java

@@ -15,23 +15,19 @@
 import org.seasar.doma.jdbc.DaoMethodNotFoundException;
 import org.seasar.doma.jdbc.QueryImplementors;
 
-public abstract class AbstractDao implements ConfigProvider {
+public class DaoImplSupport implements ConfigProvider {
 
-  protected final Config __config;
+  private final Config __config;
 
-  protected AbstractDao() {
-    __config = null;
-  }
-
-  protected AbstractDao(Config config) {
+  public DaoImplSupport(Config config) {
     if (config == null) {
       throw new DomaNullPointerException("config");
     }
     validateConfig(config, null);
     this.__config = new RuntimeConfig(config, config.getDataSource());
   }
 
-  protected AbstractDao(Config config, Connection connection) {
+  public DaoImplSupport(Config config, Connection connection) {
     if (config == null) {
       throw new DomaNullPointerException("config");
     }
@@ -48,7 +44,7 @@ protected AbstractDao(Config config, Connection connection) {
     this.__config = new RuntimeConfig(config, dataSource);
   }
 
-  protected AbstractDao(Config config, DataSource dataSource) {
+  public DaoImplSupport(Config config, DataSource dataSource) {
     if (config == null) {
       throw new DomaNullPointerException("config");
     }
@@ -108,27 +104,27 @@ public Config getConfig() {
     return __config;
   }
 
-  protected DataSource getDataSource() {
+  public DataSource getDataSource() {
     return __config.getDataSource();
   }
 
-  protected CommandImplementors getCommandImplementors() {
+  public CommandImplementors getCommandImplementors() {
     return __config.getCommandImplementors();
   }
 
-  protected QueryImplementors getQueryImplementors() {
+  public QueryImplementors getQueryImplementors() {
     return __config.getQueryImplementors();
   }
 
-  protected void entering(String callerClassName, String callerMethodName, Object... args) {
+  public void entering(String callerClassName, String callerMethodName, Object... args) {
     __config.getJdbcLogger().logDaoMethodEntering(callerClassName, callerMethodName, args);
   }
 
-  protected void exiting(String callerClassName, String callerMethodName, Object result) {
+  public void exiting(String callerClassName, String callerMethodName, Object result) {
     __config.getJdbcLogger().logDaoMethodExiting(callerClassName, callerMethodName, result);
   }
 
-  protected void throwing(String callerClassName, String callerMethodName, RuntimeException e) {
+  public void throwing(String callerClassName, String callerMethodName, RuntimeException e) {
     __config.getJdbcLogger().logDaoMethodThrowing(callerClassName, callerMethodName, e);
   }
 

doma-core/src/test/java/example/dao/EmpDaoImpl.java

@@ -13,8 +13,10 @@
 import org.seasar.doma.internal.jdbc.command.EntityResultListHandler;
 import org.seasar.doma.internal.jdbc.command.EntitySingleResultHandler;
 import org.seasar.doma.internal.jdbc.command.EntityStreamHandler;
-import org.seasar.doma.internal.jdbc.dao.AbstractDao;
+import org.seasar.doma.internal.jdbc.dao.DaoImplSupport;
 import org.seasar.doma.internal.jdbc.util.SqlFileUtil;
+import org.seasar.doma.jdbc.Config;
+import org.seasar.doma.jdbc.ConfigProvider;
 import org.seasar.doma.jdbc.IterationCallback;
 import org.seasar.doma.jdbc.SelectOptions;
 import org.seasar.doma.jdbc.command.DeleteCommand;
@@ -29,65 +31,78 @@
 import org.seasar.doma.jdbc.query.SqlFileSelectQuery;
 
 @Generated("")
-public class EmpDaoImpl extends AbstractDao implements EmpDao {
+public class EmpDaoImpl implements EmpDao, ConfigProvider {
 
   private static Method method0 =
-      getDeclaredMethod(EmpDaoImpl.class, "selectById", Integer.class, SelectOptions.class);
+      DaoImplSupport.getDeclaredMethod(
+          EmpDaoImpl.class, "selectById", Integer.class, SelectOptions.class);
 
   private static Method method1 =
-      getDeclaredMethod(
+      DaoImplSupport.getDeclaredMethod(
           EmpDaoImpl.class,
           "selectByNameAndSalary",
           String.class,
           BigDecimal.class,
           SelectOptions.class);
 
-  private static Method method2 = getDeclaredMethod(EmpDaoImpl.class, "selectByExample", Emp.class);
+  private static Method method2 =
+      DaoImplSupport.getDeclaredMethod(EmpDaoImpl.class, "selectByExample", Emp.class);
 
-  private static Method method3 = getDeclaredMethod(EmpDaoImpl.class, "insert", Emp.class);
+  private static Method method3 =
+      DaoImplSupport.getDeclaredMethod(EmpDaoImpl.class, "insert", Emp.class);
 
-  private static Method method4 = getDeclaredMethod(EmpDaoImpl.class, "update", Emp.class);
+  private static Method method4 =
+      DaoImplSupport.getDeclaredMethod(EmpDaoImpl.class, "update", Emp.class);
 
-  private static Method method5 = getDeclaredMethod(EmpDaoImpl.class, "delete", Emp.class);
+  private static Method method5 =
+      DaoImplSupport.getDeclaredMethod(EmpDaoImpl.class, "delete", Emp.class);
 
   private static Method method6 =
-      getDeclaredMethod(EmpDaoImpl.class, "iterate", IterationCallback.class);
+      DaoImplSupport.getDeclaredMethod(EmpDaoImpl.class, "iterate", IterationCallback.class);
 
-  private static Method method7 = getDeclaredMethod(EmpDaoImpl.class, "execute");
+  private static Method method7 = DaoImplSupport.getDeclaredMethod(EmpDaoImpl.class, "execute");
+
+  private final DaoImplSupport __support;
 
   public EmpDaoImpl() {
-    super(new ExampleConfig());
+    __support = new DaoImplSupport(new ExampleConfig());
   }
 
   public EmpDaoImpl(Connection connection) {
-    super(new ExampleConfig(), connection);
+    __support = new DaoImplSupport(new ExampleConfig(), connection);
   }
 
   public EmpDaoImpl(DataSource dataSource) {
-    super(new ExampleConfig(), dataSource);
+    __support = new DaoImplSupport(new ExampleConfig(), dataSource);
+  }
+
+  @Override
+  public Config getConfig() {
+    return __support.getConfig();
   }
 
   @Override
   public Emp selectById(Integer id, SelectOptions option) {
-    SqlFileSelectQuery query = getQueryImplementors().createSqlFileSelectQuery(method0);
-    query.setConfig(__config);
+    SqlFileSelectQuery query = __support.getQueryImplementors().createSqlFileSelectQuery(method0);
+    query.setConfig(__support.getConfig());
     query.setSqlFilePath(SqlFileUtil.buildPath("example.dao.EmpDao", "selectById"));
     query.addParameter("id", Integer.class, id);
     query.setOptions(option);
     query.setCallerClassName("example.dao.EmpDao");
     query.setCallerMethodName("selectById");
     query.prepare();
     SelectCommand<Emp> command =
-        getCommandImplementors()
+        __support
+            .getCommandImplementors()
             .createSelectCommand(
                 method0, query, new EntitySingleResultHandler<Emp>(_Emp.getSingletonInternal()));
     return command.execute();
   }
 
   @Override
   public List<Emp> selectByNameAndSalary(String name, BigDecimal salary, SelectOptions option) {
-    SqlFileSelectQuery query = getQueryImplementors().createSqlFileSelectQuery(method1);
-    query.setConfig(__config);
+    SqlFileSelectQuery query = __support.getQueryImplementors().createSqlFileSelectQuery(method1);
+    query.setConfig(__support.getConfig());
     query.setSqlFilePath(SqlFileUtil.buildPath("example.dao.EmpDao", "selectByNameAndSalary"));
     query.addParameter("name", String.class, name);
     query.addParameter("salary", BigDecimal.class, salary);
@@ -96,23 +111,25 @@ public List<Emp> selectByNameAndSalary(String name, BigDecimal salary, SelectOpt
     query.setCallerMethodName("selectByNameAndSalary");
     query.prepare();
     SelectCommand<List<Emp>> command =
-        getCommandImplementors()
+        __support
+            .getCommandImplementors()
             .createSelectCommand(
                 method1, query, new EntityResultListHandler<Emp>(_Emp.getSingletonInternal()));
     return command.execute();
   }
 
   @Override
   public List<Emp> selectByExample(Emp emp) {
-    SqlFileSelectQuery query = getQueryImplementors().createSqlFileSelectQuery(method2);
-    query.setConfig(__config);
+    SqlFileSelectQuery query = __support.getQueryImplementors().createSqlFileSelectQuery(method2);
+    query.setConfig(__support.getConfig());
     query.setSqlFilePath(SqlFileUtil.buildPath("example.dao.EmpDao", "selectByNameAndSalary"));
     query.addParameter("emp", Emp.class, emp);
     query.setCallerClassName("example.dao.EmpDao");
     query.setCallerMethodName("selectByNameAndSalary");
     query.prepare();
     SelectCommand<List<Emp>> command =
-        getCommandImplementors()
+        __support
+            .getCommandImplementors()
             .createSelectCommand(
                 method2, query, new EntityResultListHandler<Emp>(_Emp.getSingletonInternal()));
     return command.execute();
@@ -121,52 +138,59 @@ public List<Emp> selectByExample(Emp emp) {
   @Override
   public int insert(Emp entity) {
     AutoInsertQuery<Emp> query =
-        getQueryImplementors().createAutoInsertQuery(method3, _Emp.getSingletonInternal());
-    query.setConfig(__config);
+        __support
+            .getQueryImplementors()
+            .createAutoInsertQuery(method3, _Emp.getSingletonInternal());
+    query.setConfig(__support.getConfig());
     query.setEntity(entity);
     query.setCallerClassName("example.dao.EmpDao");
     query.setCallerMethodName("insert");
     query.prepare();
-    InsertCommand command = getCommandImplementors().createInsertCommand(method3, query);
+    InsertCommand command = __support.getCommandImplementors().createInsertCommand(method3, query);
     return command.execute();
   }
 
   @Override
   public int update(Emp entity) {
     AutoUpdateQuery<Emp> query =
-        getQueryImplementors().createAutoUpdateQuery(method4, _Emp.getSingletonInternal());
-    query.setConfig(__config);
+        __support
+            .getQueryImplementors()
+            .createAutoUpdateQuery(method4, _Emp.getSingletonInternal());
+    query.setConfig(__support.getConfig());
     query.setEntity(entity);
     query.setCallerClassName("example.dao.EmpDao");
     query.setCallerMethodName("update");
     query.prepare();
-    UpdateCommand command = getCommandImplementors().createUpdateCommand(method4, query);
+    UpdateCommand command = __support.getCommandImplementors().createUpdateCommand(method4, query);
     return command.execute();
   }
 
   @Override
   public int delete(Emp entity) {
     AutoDeleteQuery<Emp> query =
-        getQueryImplementors().createAutoDeleteQuery(method5, _Emp.getSingletonInternal());
-    query.setConfig(__config);
+        __support
+            .getQueryImplementors()
+            .createAutoDeleteQuery(method5, _Emp.getSingletonInternal());
+    query.setConfig(__support.getConfig());
     query.setEntity(entity);
     query.setCallerClassName("example.dao.EmpDao");
     query.setCallerMethodName("delete");
     query.prepare();
-    DeleteCommand command = getCommandImplementors().createDeleteCommand(method5, query);
+    DeleteCommand command = __support.getCommandImplementors().createDeleteCommand(method5, query);
     return command.execute();
   }
 
   @Override
   public Integer stream(Function<Stream<Emp>, Integer> mapper) {
-    SqlFileSelectQuery query = getQueryImplementors().createSqlFileSelectQuery(method6);
-    query.setConfig(__config);
+    SqlFileSelectQuery query = __support.getQueryImplementors().createSqlFileSelectQuery(method6);
+    query.setConfig(__support.getConfig());
     query.setSqlFilePath(SqlFileUtil.buildPath("example.dao.EmpDao", "iterate"));
     query.setCallerClassName("example.dao.EmpDao");
     query.setCallerMethodName("iterate");
     query.prepare();
     SelectCommand<Integer> command =
-        getCommandImplementors()
+        __support
+            .getCommandImplementors()
             .createSelectCommand(
                 method6,
                 query,
@@ -176,13 +200,13 @@ public Integer stream(Function<Stream<Emp>, Integer> mapper) {
 
   @Override
   public void execute() {
-    SqlFileScriptQuery query = getQueryImplementors().createSqlFileScriptQuery(method7);
-    query.setConfig(__config);
+    SqlFileScriptQuery query = __support.getQueryImplementors().createSqlFileScriptQuery(method7);
+    query.setConfig(__support.getConfig());
     query.setScriptFilePath(SqlFileUtil.buildPath("example.dao.EmpDao", "execute"));
     query.setCallerClassName("example.dao.EmpDao");
     query.setCallerMethodName("execute");
     query.prepare();
-    ScriptCommand command = getCommandImplementors().createScriptCommand(method7, query);
+    ScriptCommand command = __support.getCommandImplementors().createScriptCommand(method7, query);
     command.execute();
   }
 }

doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/AbstractDaoTest.java renamed to doma-core/src/test/java/org/seasar/doma/internal/jdbc/dao/DaoImplSupportTest.java

@@ -13,13 +13,13 @@
 import org.seasar.doma.jdbc.Config;
 
 /** @author backpaper0 */
-public class AbstractDaoTest {
+public class DaoImplSupportTest {
 
   @Test
   public void testConstructorParameter1() throws Exception {
     Config config = null;
     try {
-      new AbstractDao(config) {};
+      new DaoImplSupport(config) {};
       fail();
     } catch (DomaNullPointerException expected) {
       assertEquals("config", expected.getParameterName());
@@ -31,7 +31,7 @@ public void testConstructorParameter2() throws Exception {
     Config config = null;
     Connection connection = mock(Connection.class);
     try {
-      new AbstractDao(config, connection) {};
+      new DaoImplSupport(config, connection) {};
       fail();
     } catch (DomaNullPointerException expected) {
       assertEquals("config", expected.getParameterName());
@@ -43,7 +43,7 @@ public void testConstructorParameter3() throws Exception {
     Config config = mock(Config.class);
     Connection connection = null;
     try {
-      new AbstractDao(config, connection) {};
+      new DaoImplSupport(config, connection) {};
       fail();
     } catch (DomaNullPointerException expected) {
       assertEquals("connection", expected.getParameterName());
@@ -55,7 +55,7 @@ public void testConstructorParameter4() throws Exception {
     Config config = null;
     DataSource dataSource = mock(DataSource.class);
     try {
-      new AbstractDao(config, dataSource) {};
+      new DaoImplSupport(config, dataSource) {};
       fail();
     } catch (DomaNullPointerException expected) {
       assertEquals("config", expected.getParameterName());
@@ -67,7 +67,7 @@ public void testConstructorParameter5() throws Exception {
     Config config = mock(Config.class);
     DataSource dataSource = null;
     try {
-      new AbstractDao(config, dataSource) {};
+      new DaoImplSupport(config, dataSource) {};
       fail();
     } catch (DomaNullPointerException expected) {
       assertEquals("dataSource", expected.getParameterName());