Merge branch 'master' into pr/3108

Author: harawata

pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2024 the original author or authors.
+       Copyright 2009-2025 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
 
   <groupId>org.mybatis</groupId>
   <artifactId>mybatis</artifactId>
-  <version>3.5.18-SNAPSHOT</version>
+  <version>3.6.0-SNAPSHOT</version>
 
   <name>mybatis</name>
   <description>The MyBatis SQL mapper framework makes it easier to use a relational database with object-oriented
@@ -64,8 +64,8 @@
 
   <properties>
     <!-- Java Usage -->
-    <java.version>8</java.version>
-    <java.release.version>8</java.release.version>
+    <java.version>11</java.version>
+    <java.release.version>11</java.release.version>
 
     <!-- Override impsort comliance to 17 (remove after parent 49 release) -->
     <impsort.compliance>17</impsort.compliance>
@@ -99,7 +99,7 @@
     <argLine>-Xmx2048m -javaagent:${settings.localRepository}/net/bytebuddy/byte-buddy-agent/${byte-buddy.version}/byte-buddy-agent-${byte-buddy.version}.jar</argLine>
 
     <!-- Reproducible Builds -->
-    <project.build.outputTimestamp>1732629483</project.build.outputTimestamp>
+    <project.build.outputTimestamp>1735704225</project.build.outputTimestamp>
   </properties>
 
   <dependencies>

src/main/java/org/apache/ibatis/annotations/CacheNamespace.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -25,27 +25,23 @@
 import org.apache.ibatis.cache.decorators.LruCache;
 import org.apache.ibatis.cache.impl.PerpetualCache;
 
-// @formatter:off
 /**
  * The annotation that specify to use cache on namespace(e.g. mapper interface).
  * <p>
  * <b>How to use:</b>
  *
- * <pre>
- * &#064;CacheNamespace(implementation = CustomCache.class, properties = {
- *   &#064;Property(name = "host", value = "${mybatis.cache.host}"),
- *   &#064;Property(name = "port", value = "${mybatis.cache.port}"),
- *   &#064;Property(name = "name", value = "usersCache")
- * })
+ * <pre>{@code
+ * @CacheNamespace(implementation = CustomCache.class, properties = {
+ *     &#064;Property(name = "host", value = "${mybatis.cache.host}"),
+ *     &#064;Property(name = "port", value = "${mybatis.cache.port}"), &#064;Property(name = "name", value = "usersCache") })
  * public interface UserMapper {
  *   // ...
  * }
- * </pre>
+ * }</pre>
  *
  * @author Clinton Begin
  * @author Kazuki Shimizu
  */
-// @formatter:on
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

src/main/java/org/apache/ibatis/annotations/ConstructorArgs.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -21,27 +21,23 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-// @formatter:off
 /**
  * The annotation that be grouping mapping definitions for constructor.
  * <p>
  * <b>How to use:</b>
  *
- * <pre>
+ * <pre>{@code
  * public interface UserMapper {
- *   &#064;ConstructorArgs({
- *     &#064;Arg(column = "id", javaType = int.class, id = true),
- *     &#064;Arg(column = "name", javaType = String.class),
- *     &#064;Arg(javaType = UserEmail.class, select = "selectUserEmailById", column = "id")
- *   })
+ *   @ConstructorArgs({ &#064;Arg(column = "id", javaType = int.class, id = true),
+ *       &#064;Arg(column = "name", javaType = String.class),
+ *       &#064;Arg(javaType = UserEmail.class, select = "selectUserEmailById", column = "id") })
  *   &#064;Select("SELECT id, name FROM users WHERE id = #{id}")
  *   User selectById(int id);
  * }
- * </pre>
+ * }</pre>
  *
  * @author Clinton Begin
  */
-// @formatter:on
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)

src/main/java/org/apache/ibatis/annotations/DeleteProvider.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -27,10 +27,10 @@
  * <p>
  * <b>How to use:</b>
  *
- * <pre>
+ * <pre>{@code
  * public interface UserMapper {
  *
- *   &#064;DeleteProvider(type = SqlProvider.class, method = "deleteById")
+ *   @DeleteProvider(type = SqlProvider.class, method = "deleteById")
  *   boolean deleteById(int id);
  *
  *   public static class SqlProvider {
@@ -40,7 +40,7 @@
  *   }
  *
  * }
- * </pre>
+ * }</pre>
  *
  * @author Clinton Begin
  */
@@ -65,36 +65,30 @@
    * Specify a type that implements an SQL provider method.
    * <p>
    * This attribute is alias of {@link #value()}.
-   * </p>
    *
    * @return a type that implements an SQL provider method
    *
    * @see #value()
    */
   Class<?> type() default void.class;
 
-  // @formatter:off
   /**
    * Specify a method for providing an SQL.
    * <p>
    * Since 3.5.1, this attribute can omit.
    * <p>
    * If this attribute omit, the MyBatis will call a method that decide by following rules.
    * <ul>
-   *   <li>
-   *     If class that specified the {@link #type()} attribute implements the
-   *     {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver},
-   *     the MyBatis use a method that returned by it
-   *   </li>
-   *   <li>
-   *     If cannot resolve a method by {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver}(= not implement it or it was returned {@code null}),
-   *     the MyBatis will search and use a fallback method that named {@code provideSql} from specified type
-   *   </li>
+   * <li>If class that specified the {@link #type()} attribute implements the
+   * {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver}, the MyBatis use a method that returned by it
+   * </li>
+   * <li>If cannot resolve a method by {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver} (= not
+   * implement it or it was returned <code>null</code>), the MyBatis will search and use a fallback method that named
+   * <code>provideSql</code> from specified type</li>
    * </ul>
    *
    * @return a method name of method for providing an SQL
    */
-  // @formatter:on
   String method() default "";
 
   /**

src/main/java/org/apache/ibatis/annotations/InsertProvider.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -27,10 +27,10 @@
  * <p>
  * <b>How to use:</b>
  *
- * <pre>
+ * <pre>{@code
  * public interface UserMapper {
  *
- *   &#064;InsertProvider(type = SqlProvider.class, method = "insert")
+ *   @InsertProvider(type = SqlProvider.class, method = "insert")
  *   void insert(User user);
  *
  *   public static class SqlProvider {
@@ -40,7 +40,7 @@
  *   }
  *
  * }
- * </pre>
+ * }</pre>
  *
  * @author Clinton Begin
  */
@@ -65,36 +65,30 @@
    * Specify a type that implements an SQL provider method.
    * <p>
    * This attribute is alias of {@link #value()}.
-   * </p>
    *
    * @return a type that implements an SQL provider method
    *
    * @see #value()
    */
   Class<?> type() default void.class;
 
-  // @formatter:off
   /**
    * Specify a method for providing an SQL.
    * <p>
    * Since 3.5.1, this attribute can omit.
    * <p>
    * If this attribute omit, the MyBatis will call a method that decide by following rules.
    * <ul>
-   *   <li>
-   *     If class that specified the {@link #type()} attribute implements the
-   *     {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver},
-   *     the MyBatis use a method that returned by it
-   *   </li>
-   *   <li>
-   *     If cannot resolve a method by {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver}(= not implement it or it was returned {@code null}),
-   *     the MyBatis will search and use a fallback method that named {@code provideSql} from specified type
-   *   </li>
+   * <li>If class that specified the {@link #type()} attribute implements the
+   * {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver}, the MyBatis use a method that returned by it
+   * </li>
+   * <li>If cannot resolve a method by {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver} (= not
+   * implement it or it was returned <code>null</code>), the MyBatis will search and use a fallback method that named
+   * <code>provideSql</code> from specified type</li>
    * </ul>
    *
    * @return a method name of method for providing an SQL
    */
-  // @formatter:on
   String method() default "";
 
   /**

src/main/java/org/apache/ibatis/annotations/Options.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -110,7 +110,6 @@ enum FlushCachePolicy {
    * Returns property names that holds a key value.
    * <p>
    * If you specify multiple property, please separate using comma(',').
-   * </p>
    *
    * @return property names that separate with comma(',')
    */
@@ -120,7 +119,6 @@ enum FlushCachePolicy {
    * Returns column names that retrieves a key value.
    * <p>
    * If you specify multiple column, please separate using comma(',').
-   * </p>
    *
    * @return column names that separate with comma(',')
    */
@@ -130,7 +128,6 @@ enum FlushCachePolicy {
    * Returns result set names.
    * <p>
    * If you specify multiple result set, please separate using comma(',').
-   * </p>
    *
    * @return result set names that separate with comma(',')
    */

src/main/java/org/apache/ibatis/annotations/Select.java

@@ -26,7 +26,6 @@
  * The annotation that specify an SQL for retrieving record(s).
  * <p>
  * <b>How to use:</b>
- * <p>
  * <ul>
  * <li>Simple:
  *

src/main/java/org/apache/ibatis/annotations/SelectKey.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -55,7 +55,6 @@
    * Returns property names that holds a key value.
    * <p>
    * If you specify multiple property, please separate using comma(',').
-   * </p>
    *
    * @return property names that separate with comma(',')
    */
@@ -65,7 +64,6 @@
    * Returns column names that retrieves a key value.
    * <p>
    * If you specify multiple column, please separate using comma(',').
-   * </p>
    *
    * @return column names that separate with comma(',')
    */

src/main/java/org/apache/ibatis/annotations/SelectProvider.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -27,10 +27,10 @@
  * <p>
  * <b>How to use:</b>
  *
- * <pre>
+ * <pre>{@code
  * public interface UserMapper {
  *
- *   &#064;SelectProvider(type = SqlProvider.class, method = "selectById")
+ *   @SelectProvider(type = SqlProvider.class, method = "selectById")
  *   User selectById(int id);
  *
  *   public static class SqlProvider {
@@ -40,7 +40,7 @@
  *   }
  *
  * }
- * </pre>
+ * }</pre>
  *
  * @author Clinton Begin
  */
@@ -72,31 +72,23 @@
    */
   Class<?> type() default void.class;
 
-  // @formatter:off
   /**
    * Specify a method for providing an SQL.
    * <p>
    * Since 3.5.1, this attribute can omit.
    * <p>
    * If this attribute omit, the MyBatis will call a method that decide by following rules.
-   *
    * <ul>
-   *   <li>
-   *     If class that specified the {@link #type()} attribute implements the
-   *     {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver},
-   *     the MyBatis use a method that returned by it.
-   *   </li>
-   *   <li>
-   *     If cannot resolve a method by {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver}
-   *     (= not implement it or it was returned <code>null</code>,
-   *     the MyBatis will search and use a fallback method that named <code>provideSql</code> from
-   *     specified type.
-   *   </li>
+   * <li>If class that specified the {@link #type()} attribute implements the
+   * {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver}, the MyBatis use a method that returned by it.
+   * </li>
+   * <li>If cannot resolve a method by {@link org.apache.ibatis.builder.annotation.ProviderMethodResolver} (= not
+   * implement it or it was returned <code>null</code>), the MyBatis will search and use a fallback method that named
+   * <code>provideSql</code> from specified type.</li>
    * </ul>
    *
    * @return a method name of method for providing an SQL
    */
-  // @formatter:on
   String method() default "";
 
   /**