Merge pull request #387 from domaframework/sql-annotation

Support the Sql annotation officially.

Author: nakamura-to

docs/kotlin-support.rst

@@ -60,7 +60,7 @@ Embeddable classes
 Dao interfaces
 --------------
 
-* Specify a SQL template to ``@org.seasar.doma.experimental.Sql``
+* Specify a SQL template to ``@org.seasar.doma.Sql``
 * Use ``org.seasar.doma.jdbc.Result`` as the return type of ``@Delete``, ``@Insert`` and ``@Update``
 * Use ``org.seasar.doma.jdbc.BatchResult`` as the return type of
   ``@BatchDelete``, ``@BatchInsert`` and ``@BatchUpdate``

docs/sql.rst

@@ -161,11 +161,6 @@ The ``@Sql`` annotation must be combined with following annotations:
 * @BatchUpdate
 * @BatchDelete
 
-.. warning::
-
-  The ``@Sql`` annotation is an experimental feature.
-  The full qualified name of ``@Sql`` is ``@org.seasar.doma.experimental.Sql``.
-
 Directives
 ==========
 

doma-core/src/main/java/org/seasar/doma/experimental/Sql.java renamed to doma-core/src/main/java/org/seasar/doma/Sql.java

@@ -1,4 +1,4 @@
-package org.seasar.doma.experimental;
+package org.seasar.doma;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

doma-core/src/main/java/org/seasar/doma/jdbc/AbstractSqlFileRepository.java

@@ -3,7 +3,7 @@
 import java.lang.reflect.Method;
 import org.seasar.doma.DomaIllegalArgumentException;
 import org.seasar.doma.DomaNullPointerException;
-import org.seasar.doma.experimental.Sql;
+import org.seasar.doma.Sql;
 import org.seasar.doma.internal.Constants;
 import org.seasar.doma.internal.WrapException;
 import org.seasar.doma.internal.jdbc.sql.SqlParser;

doma-core/src/main/java/org/seasar/doma/jdbc/SqlFileRepository.java

@@ -3,6 +3,7 @@
 import java.lang.reflect.Method;
 import org.seasar.doma.DomaIllegalArgumentException;
 import org.seasar.doma.DomaNullPointerException;
+import org.seasar.doma.Sql;
 import org.seasar.doma.jdbc.dialect.Dialect;
 
 /**
@@ -25,9 +26,8 @@ public interface SqlFileRepository {
    * @param dialect the SQL dialect
    * @return the SQL file
    * @throws DomaNullPointerException if any arguments are {@code null}
-   * @throws DomaIllegalArgumentException if the {@code method} is not annotated with {@link
-   *     org.seasar.doma.experimental.Sql} and the {@code path} does not match the Ant-style glob
-   *     pattern "META-INF/**/*.sql"
+   * @throws DomaIllegalArgumentException if the {@code method} is not annotated with {@link Sql}
+   *     and the {@code path} does not match the Ant-style glob pattern "META-INF/**/*.sql"
    * @throws SqlFileNotFoundException if the SQL file is not found
    * @throws JdbcException if an error other than listed above occurs
    */

doma-core/src/main/java/org/seasar/doma/jdbc/query/SqlFileScriptQuery.java

@@ -24,7 +24,7 @@ public class SqlFileScriptQuery extends AbstractQuery implements ScriptQuery {
 
   protected URL scriptFileUrl;
 
-  protected org.seasar.doma.experimental.Sql sqlAnnotation;
+  protected org.seasar.doma.Sql sqlAnnotation;
 
   protected SqlLogType sqlLogType;
 
@@ -48,7 +48,7 @@ public void setSqlLogType(SqlLogType sqlLogType) {
   public void prepare() {
     super.prepare();
     assertNotNull(scriptFilePath, blockDelimiter);
-    sqlAnnotation = method.getAnnotation(org.seasar.doma.experimental.Sql.class);
+    sqlAnnotation = method.getAnnotation(org.seasar.doma.Sql.class);
     if (sqlAnnotation == null) {
       assertTrue(scriptFilePath.startsWith(Constants.SCRIPT_PATH_PREFIX));
       assertTrue(scriptFilePath.endsWith(Constants.SCRIPT_PATH_SUFFIX));

doma-core/src/test/java/org/seasar/doma/jdbc/AbstractSqlFileRepositoryTest.java

@@ -7,7 +7,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 import org.seasar.doma.DomaIllegalArgumentException;
-import org.seasar.doma.experimental.Sql;
+import org.seasar.doma.Sql;
 import org.seasar.doma.jdbc.dialect.Dialect;
 import org.seasar.doma.jdbc.dialect.StandardDialect;
 

doma-core/src/test/java/org/seasar/doma/jdbc/query/SqlFileScriptQueryTest.java

@@ -12,7 +12,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
-import org.seasar.doma.experimental.Sql;
+import org.seasar.doma.Sql;
 import org.seasar.doma.internal.jdbc.mock.MockConfig;
 import org.seasar.doma.jdbc.ScriptFileNotFoundException;
 import org.seasar.doma.jdbc.dialect.Mssql2008Dialect;

doma-processor/src/main/java/org/seasar/doma/internal/apt/annot/Annotations.java

@@ -8,8 +8,8 @@
 import java.util.function.Function;
 import javax.lang.model.element.*;
 import org.seasar.doma.*;
+import org.seasar.doma.Sql;
 import org.seasar.doma.experimental.DataType;
-import org.seasar.doma.experimental.Sql;
 import org.seasar.doma.internal.apt.Context;
 import org.seasar.doma.internal.apt.util.AnnotationValueUtil;
 

doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/dao/experimental/AnnotationConflictDao.java

@@ -2,7 +2,7 @@
 
 import org.seasar.doma.Dao;
 import org.seasar.doma.Function;
-import org.seasar.doma.experimental.Sql;
+import org.seasar.doma.Sql;
 
 @Dao
 public interface AnnotationConflictDao {