Deprecate the config element of the Dao annotation

docs/basic.rst

@@ -104,7 +104,7 @@ Using in DAO interface
 
 .. code-block:: java
 
-  @Dao(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
 
       @Select

docs/config.rst

@@ -230,6 +230,8 @@ All JDBC drivers are loaded automatically by the `service provider <service prov
   For example, when you use Apache Tomcat, you will find the case.
   See also: `DriverManager, the service provider mechanism and memory leaks <tomcat driver_>`_
 
+.. _config-configuration-definition:
+
 Configuration definition
 ========================
 
@@ -243,7 +245,6 @@ The simple definition is appropriate in following cases:
 
 .. code-block:: java
 
-  @SingletonConfig
   public class AppConfig implements Config {
 
       private static final AppConfig CONFIG = new AppConfig();
@@ -282,22 +283,23 @@ The simple definition is appropriate in following cases:
       }
   }
 
-.. note::
+You can use the above ``AppConfig`` class as follows:
+
+.. code-block:: java
 
-  Remember to annotate the class with ``@SingletonConfig``
+  EmployeeDao dao = new EmployeeDaoImpl(AppConfig.singleton());
 
-Specify the above class to the config element of ``@Dao``.
+The above ``EmployeeDao`` interface must be annotated with the ``@Dao`` annotation as follows:
 
 .. code-block:: java
 
-  @Dao(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
 
       @Select
       Employee selectById(Integer id);
   }
 
-
 Advanced definition
 -------------------
 

docs/dao.rst

@@ -33,7 +33,7 @@ You can get ``Config`` instance associated dao instance if you call ``Config.get
 
 .. code-block:: java
 
-  @Dao(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
 
       default int count() {
@@ -81,7 +81,7 @@ One dao interface can handle more than one entity classes.
 
 .. code-block:: java
 
-  @Dao(config = AppConfig.class)
+  @Dao
   public interface MyDao {
 
       @Select

docs/domain.rst

@@ -328,7 +328,7 @@ The Domain classes showed above are used as follows:
 
 .. code-block:: java
 
-  @Dao(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
 
       @Select

docs/kotlin-support.rst

@@ -76,7 +76,7 @@ Dao interfaces
 
 .. code-block:: java
 
-  @Dao(config = AppConfig::class)
+  @Dao
   interface PersonDao {
     @Sql("""
     select * from person where id = /*id*/0

docs/query/batch-delete.rst

@@ -9,7 +9,7 @@ Annotate with ``@BatchDelete`` to Dao method for execute batch delete.
 
 .. code-block:: java
 
-  @Config(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
       @BatchDelete
       int[] delete(List<Employee> employees);

docs/query/batch-insert.rst

@@ -9,7 +9,7 @@ Annotate with ``@BatchInsert`` to Dao method for execute batch insert.
 
 .. code-block:: java
 
-  @Config(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
       @BatchInsert
       int[] insert(List<Employee> employees);

docs/query/batch-update.rst

@@ -9,7 +9,7 @@ Annotate with ``@BatchUpdate`` to Dao method for execute batch update.
 
 .. code-block:: java
 
-  @Config(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
       @BatchUpdate
       int[] update(List<Employee> employees);

docs/query/delete.rst

@@ -9,7 +9,7 @@ Annotate with ``@Delete`` to Dao method for execute delete.
 
 .. code-block:: java
 
-  @Config(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
       @Delete
       int delete(Employee employee);

docs/query/function.rst

@@ -9,7 +9,7 @@ To call stored functions, you must annotate DAO methods with the ``@Function`` a
 
 .. code-block:: java
 
-  @Config(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
       @Function
       Integer execute(@In Integer id, @InOut Reference<BigDecimal> salary);

docs/query/insert.rst

@@ -9,7 +9,7 @@ Annotate with ``@Insert`` to Dao method for execute insert.
 
 .. code-block:: java
 
-  @Config(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
       @Insert
       int insert(Employee employee);

docs/query/procedure.rst

@@ -9,7 +9,7 @@ To call stored procedures, you must annotate DAO methods with the ``@Procedure``
 
 .. code-block:: java
 
-  @Config(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
       @Procedure
       void execute(@In Integer id, @InOut Reference<BigDecimal> salary);

docs/query/script.rst

@@ -10,7 +10,7 @@ annotate DAO methods with ``@Script``:
 
 .. code-block:: java
 
-  @Config(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
       @Script
       void createTable();
@@ -71,7 +71,7 @@ You can specify scripts to DAO methods with the ``@Sql`` annotation:
 
 .. code-block:: java
 
-  @Config(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
       @Sql("create table employee (id integer, name varchar(200))")
       @Script

docs/query/select.rst

@@ -9,7 +9,7 @@ Annotate with ``@Select`` to Dao method for execute search.
 
 .. code-block:: java
 
-  @Config(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
       @Select
       List<Employee> selectByDepartmentName(String departmentName);
@@ -289,7 +289,7 @@ You define ``SelectOptions`` as Dao method parameter.
 
 .. code-block:: java
 
-  @Config(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
       @Select
       List<Employee> selectByDepartmentName(String departmentName, SelectOptions options);

docs/query/sql-processor.rst

@@ -10,7 +10,7 @@ To mark a DAO method as an SQL processor, annotate the method with ``@SqlProcess
 
 .. code-block:: java
 
-  @Config(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
       @SqlProcessor
       <R> R process(Integer id, BiFunction<Config, PreparedSql, R> handler);

docs/query/update.rst

@@ -9,7 +9,7 @@ Annotate with ``@Update`` to Dao method for execute update.
 
 .. code-block:: java
 
-  @Config(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
       @Update
       int update(Employee employee);

docs/transaction.rst

@@ -11,6 +11,8 @@ This document explains how to configure and use the local transaction.
 If you want to use global transaction, use frameworks or application servers
 which support JTA (Java Transaction API).
 
+See also :ref:`config-configuration-definition` .
+
 Configuration
 =============
 
@@ -28,7 +30,6 @@ Here is an example:
 
 .. code-block:: java
 
-  @SingletonConfig
   public class AppConfig implements Config {
 
       private static final AppConfig CONFIG = new AppConfig();
@@ -67,24 +68,26 @@ Here is an example:
       }
   }
 
-.. note::
-
-  The ``@SingletonConfig`` shows that this class is a singleton class.
-
 Usage
 ======
 
-Let's see examples on the condition that we use the following Dao interface annotated with
-the ``AppConfig`` class which we saw in the `Configuration`_.
+We use the following DAO interface in example code:
 
 .. code-block:: java
 
-  @Dao(config = AppConfig.class)
+  @Dao
   public interface EmployeeDao {
-      ...
+      @Sql("select /*%expand*/* from employee where id = /*id*/0")
+      @Select
+      Employee selectById(Integer id);
+
+      @Update
+      int update(Employee employee);
+
+      @Delete
+      int delete(Employee employee);
   }
 
-The ``dao`` used in the code examples below are instances of this class.
 
 Start and finish transactions
 -----------------------------
@@ -100,6 +103,7 @@ Use a lambda expression to write a process which you want to run in a transactio
 .. code-block:: java
 
   TransactionManager tm = AppConfig.singleton().getTransactionManager();
+  EmployeeDao dao = new EmployeeDaoImpl(AppConfig.singleton());
 
   tm.required(() -> {
       Employee employee = dao.selectById(1);
@@ -119,6 +123,7 @@ Besides throwing an exception, you can use ``setRollbackOnly`` method to rollbac
 .. code-block:: java
 
   TransactionManager tm = AppConfig.singleton().getTransactionManager();
+  EmployeeDao dao = new EmployeeDaoImpl(AppConfig.singleton());
 
   tm.required(() -> {
       Employee employee = dao.selectById(1);
@@ -137,6 +142,7 @@ With a savepoint, you can cancel specific changes in a transaction.
 .. code-block:: java
 
   TransactionManager tm = AppConfig.singleton().getTransactionManager();
+  EmployeeDao dao = new EmployeeDaoImpl(AppConfig.singleton());
 
   tm.required(() -> {
       // Search and update

doma-core/src/main/java/org/seasar/doma/AnnotateWith.java

@@ -50,6 +50,7 @@
  * }
  * </pre>
  */
+@SuppressWarnings("deprecation")
 @Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface AnnotateWith {

doma-core/src/main/java/org/seasar/doma/ArrayFactory.java

@@ -14,7 +14,7 @@
  * <p>The annotated method must be a member of a {@link Dao} annotated interface.
  *
  * <pre>
- * &#064;Dao(config = AppConfig.class)
+ * &#064;Dao
  * public interface EmployeeDao {
  *
  *     &#064;ArrayFactory(typeName = &quot;integer&quot;)

doma-core/src/main/java/org/seasar/doma/BatchDelete.java

@@ -23,7 +23,7 @@
  *     ...
  * }
  *
- * @Dao(config = AppConfig.class)
+ * @Dao
  * public interface EmployeeDao {
  *
  *     @BatchDelete

doma-core/src/main/java/org/seasar/doma/BatchInsert.java

@@ -23,7 +23,7 @@
  *     ...
  * }
  *
- * @Dao(config = AppConfig.class)
+ * @Dao
  * public interface EmployeeDao {
  *
  *     @BatchInsert

doma-core/src/main/java/org/seasar/doma/BatchUpdate.java

@@ -24,7 +24,7 @@
  *     ...
  * }
  *
- * @Dao(config = AppConfig.class)
+ * @Dao
  * public interface EmployeeDao {
  *
  *     @BatchUpdate

doma-core/src/main/java/org/seasar/doma/BlobFactory.java

@@ -14,7 +14,7 @@
  * <p>The annotated method must be a member of a {@link Dao} annotated interface.
  *
  * <pre>
- * &#064;Dao(config = AppConfig.class)
+ * &#064;Dao
  * public interface EmployeeDao {
  *
  *     &#064;BlobFactory

doma-core/src/main/java/org/seasar/doma/ClobFactory.java

@@ -14,7 +14,7 @@
  * <p>The annotated method must be a member of a {@link Dao} annotated interface.
  *
  * <pre>
- * &#064;Dao(config = AppConfig.class)
+ * &#064;Dao
  * public interface EmployeeDao {
  *
  *     &#064;ClobFactory

doma-core/src/main/java/org/seasar/doma/Dao.java

@@ -12,7 +12,7 @@
  * <p>The annotated interface must be a top level interface.
  *
  * <pre>
- * &#064;Dao(config = AppConfig.class)
+ * &#064;Dao
  * public interface EmployeeDao {
  *
  *     &#064;Insert
@@ -23,7 +23,7 @@
  * <p>The interface can extend another DAO interface:
  *
  * <pre>
- * &#064;Dao(config = AppConfig.class)
+ * &#064;Dao
  * public interface WorkerDao {
  *
  *     &#064;Insert
@@ -32,7 +32,7 @@
  * </pre>
  *
  * <pre>
- * &#064;Dao(config = AppConfig.class)
+ * &#064;Dao
  * public interface EmployeeDao extends WorkerDao {
  *
  *     &#064;Insert
@@ -71,7 +71,10 @@
    * instance can be injected by using {@link AnnotateWith}.
    *
    * @return the configuration
+   * @deprecated always pass a {@link Config} instance to the constructor of DAO implementation
+   *     class
    */
+  @Deprecated
   Class<? extends Config> config() default Config.class;
 
   /** @return the access level of the DAO implementation class. */

doma-core/src/main/java/org/seasar/doma/Delete.java

@@ -22,7 +22,7 @@
  *     ...
  * }
  *
- * @Dao(config = AppConfig.class)
+ * @Dao
  * public interface EmployeeDao {
  *
  *     @Delete