Merge branch 'master' into pr/2686

Author: harawata

README.md

@@ -9,7 +9,7 @@ MyBatis SQL Mapper Framework for Java
 [![Stack Overflow](https://img.shields.io/:stack%20overflow-mybatis-brightgreen.svg)](https://stackoverflow.com/questions/tagged/mybatis)
 [![Project Stats](https://www.openhub.net/p/mybatis/widgets/project_thin_badge.gif)](https://www.openhub.net/p/mybatis)
 
-![mybatis](http://mybatis.github.io/images/mybatis-logo.png)
+![mybatis](https://mybatis.org/images/mybatis-logo.png)
 
 The MyBatis SQL mapper framework makes it easier to use a relational database with object-oriented applications.
 MyBatis couples objects with stored procedures or SQL statements using an XML descriptor or annotations.
@@ -18,6 +18,6 @@ Simplicity is the biggest advantage of the MyBatis data mapper over object relat
 Essentials
 ----------
 
-* [See the docs](http://mybatis.github.io/mybatis-3)
+* [See the docs](https://mybatis.org/mybatis-3)
 * [Download Latest](https://github.com/mybatis/mybatis-3/releases)
 * [Download Snapshot](https://oss.sonatype.org/content/repositories/snapshots/org/mybatis/mybatis/)

pom.xml

@@ -161,7 +161,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.36</version>
+      <version>2.0.0</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -235,13 +235,13 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>4.7.0</version>
+      <version>4.8.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>
-      <version>4.7.0</version>
+      <version>4.8.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -303,7 +303,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.11</version>
+      <version>1.3.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/main/java/org/apache/ibatis/mapping/BoundSql.java

@@ -73,4 +73,8 @@ public void setAdditionalParameter(String name, Object value) {
   public Object getAdditionalParameter(String name) {
     return metaParameters.getValue(name);
   }
+
+  public Map<String, Object> getAdditionalParameters() {
+    return additionalParameters;
+  }
 }

src/site/es/xdoc/configuration.xml

@@ -613,6 +613,7 @@ A continuación se muestra un ejemplo del elemento settings al completo:
         <source><![CDATA[<settings>
   <setting name="cacheEnabled" value="true"/>
   <setting name="lazyLoadingEnabled" value="true"/>
+  <setting name="aggressiveLazyLoading" value="true"/>
   <setting name="multipleResultSetsEnabled" value="true"/>
   <setting name="useColumnLabel" value="true"/>
   <setting name="useGeneratedKeys" value="false"/>
@@ -622,10 +623,21 @@ A continuación se muestra un ejemplo del elemento settings al completo:
   <setting name="defaultStatementTimeout" value="25"/>
   <setting name="defaultFetchSize" value="100"/>
   <setting name="safeRowBoundsEnabled" value="false"/>
+  <setting name="safeResultHandlerEnabled" value="true"/>
   <setting name="mapUnderscoreToCamelCase" value="false"/>
   <setting name="localCacheScope" value="SESSION"/>
   <setting name="jdbcTypeForNull" value="OTHER"/>
   <setting name="lazyLoadTriggerMethods" value="equals,clone,hashCode,toString"/>
+  <setting name="defaultScriptingLanguage" value="org.apache.ibatis.scripting.xmltags.XMLLanguageDriver"/>
+  <setting name="defaultEnumTypeHandler" value="org.apache.ibatis.type.EnumTypeHandler"/>
+  <setting name="callSettersOnNulls" value="false"/>
+  <setting name="returnInstanceForEmptyRow" value="false"/>
+  <setting name="logPrefix" value="exampleLogPreFix_"/>
+  <setting name="logImpl" value="SLF4J | LOG4J | LOG4J2 | JDK_LOGGING | COMMONS_LOGGING | STDOUT_LOGGING | NO_LOGGING"/>
+  <setting name="proxyFactory" value="CGLIB | JAVASSIST"/>
+  <setting name="vfsImpl" value="org.mybatis.example.YourselfVfsImpl"/>
+  <setting name="useActualParamName" value="true"/>
+  <setting name="configurationFactory" value="org.mybatis.example.ConfigurationFactory"/>
 </settings>]]></source>
 
       </subsection>

src/site/es/xdoc/sqlmap-xml.xml

@@ -654,8 +654,8 @@ public class User {
 
         <source><![CDATA[<resultMap id="userResultMap" type="User">
   <id property="id" column="user_id" />
-  <result property="username" column="username"/>
-  <result property="password" column="password"/>
+  <result property="username" column="user_name"/>
+  <result property="password" column="hashed_password"/>
 </resultMap>]]></source>
 
         <p>

src/site/ja/xdoc/configuration.xml

@@ -637,6 +637,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
         <source><![CDATA[<settings>
   <setting name="cacheEnabled" value="true"/>
   <setting name="lazyLoadingEnabled" value="true"/>
+  <setting name="aggressiveLazyLoading" value="true"/>
   <setting name="multipleResultSetsEnabled" value="true"/>
   <setting name="useColumnLabel" value="true"/>
   <setting name="useGeneratedKeys" value="false"/>
@@ -646,10 +647,21 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
   <setting name="defaultStatementTimeout" value="25"/>
   <setting name="defaultFetchSize" value="100"/>
   <setting name="safeRowBoundsEnabled" value="false"/>
+  <setting name="safeResultHandlerEnabled" value="true"/>
   <setting name="mapUnderscoreToCamelCase" value="false"/>
   <setting name="localCacheScope" value="SESSION"/>
   <setting name="jdbcTypeForNull" value="OTHER"/>
   <setting name="lazyLoadTriggerMethods" value="equals,clone,hashCode,toString"/>
+  <setting name="defaultScriptingLanguage" value="org.apache.ibatis.scripting.xmltags.XMLLanguageDriver"/>
+  <setting name="defaultEnumTypeHandler" value="org.apache.ibatis.type.EnumTypeHandler"/>
+  <setting name="callSettersOnNulls" value="false"/>
+  <setting name="returnInstanceForEmptyRow" value="false"/>
+  <setting name="logPrefix" value="exampleLogPreFix_"/>
+  <setting name="logImpl" value="SLF4J | LOG4J | LOG4J2 | JDK_LOGGING | COMMONS_LOGGING | STDOUT_LOGGING | NO_LOGGING"/>
+  <setting name="proxyFactory" value="CGLIB | JAVASSIST"/>
+  <setting name="vfsImpl" value="org.mybatis.example.YourselfVfsImpl"/>
+  <setting name="useActualParamName" value="true"/>
+  <setting name="configurationFactory" value="org.mybatis.example.ConfigurationFactory"/>
 </settings>]]></source>
 
       </subsection>

src/site/ja/xdoc/sqlmap-xml.xml

@@ -739,8 +739,8 @@ public class User {
 
         <source><![CDATA[<resultMap id="userResultMap" type="User">
   <id property="id" column="user_id" />
-  <result property="username" column="username"/>
-  <result property="password" column="password"/>
+  <result property="username" column="user_name"/>
+  <result property="password" column="hashed_password"/>
 </resultMap>]]></source>
 
         <p>

src/site/ko/xdoc/configuration.xml

@@ -312,10 +312,10 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 defaultResultSetType
               </td>
               <td>
-                Specifies a scroll strategy when omit it per statement settings. (Since: 3.5.2)
+                각 구문의 설정을 생략할 때 스크롤 하는 방법을 지정한다. (3.5.2 부터)
               </td>
               <td>
-                FORWARD_ONLY | SCROLL_SENSITIVE | SCROLL_INSENSITIVE | DEFAULT(same behavior with 'Not Set')
+                FORWARD_ONLY | SCROLL_SENSITIVE | SCROLL_INSENSITIVE | DEFAULT(설정하지 않을 때와 동일하게 동작)
               </td>
               <td>
                 Not Set (null)
@@ -589,7 +589,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 nullableOnForEach
               </td>
               <td>
-                Specifies the default value of 'nullable' attribute on 'foreach' tag. (Since 3.5.9)
+                'foreach' 태그에서 'nullable' 속성의 기본값을 지정한다. (3.5.9 부터)
               </td>
               <td>
                 true | false
@@ -603,7 +603,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 argNameBasedConstructorAutoMapping
               </td>
               <td>
-                When applying constructor auto-mapping, argument name is used to search the column to map instead of relying on the column order. (Since 3.5.10)
+                생성자 자동 매핑을 적용할 때 칼럼 순서가 아닌 칼럼 이름과 생성자 인수들의 이름을 기반으로 매핑한다. (3.5.10 부터)
               </td>
               <td>
                 true | false
@@ -618,6 +618,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
         <source><![CDATA[<settings>
   <setting name="cacheEnabled" value="true"/>
   <setting name="lazyLoadingEnabled" value="true"/>
+  <setting name="aggressiveLazyLoading" value="true"/>
   <setting name="multipleResultSetsEnabled" value="true"/>
   <setting name="useColumnLabel" value="true"/>
   <setting name="useGeneratedKeys" value="false"/>
@@ -627,10 +628,21 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
   <setting name="defaultStatementTimeout" value="25"/>
   <setting name="defaultFetchSize" value="100"/>
   <setting name="safeRowBoundsEnabled" value="false"/>
+  <setting name="safeResultHandlerEnabled" value="true"/>
   <setting name="mapUnderscoreToCamelCase" value="false"/>
   <setting name="localCacheScope" value="SESSION"/>
   <setting name="jdbcTypeForNull" value="OTHER"/>
   <setting name="lazyLoadTriggerMethods" value="equals,clone,hashCode,toString"/>
+  <setting name="defaultScriptingLanguage" value="org.apache.ibatis.scripting.xmltags.XMLLanguageDriver"/>
+  <setting name="defaultEnumTypeHandler" value="org.apache.ibatis.type.EnumTypeHandler"/>
+  <setting name="callSettersOnNulls" value="false"/>
+  <setting name="returnInstanceForEmptyRow" value="false"/>
+  <setting name="logPrefix" value="exampleLogPreFix_"/>
+  <setting name="logImpl" value="SLF4J | LOG4J | LOG4J2 | JDK_LOGGING | COMMONS_LOGGING | STDOUT_LOGGING | NO_LOGGING"/>
+  <setting name="proxyFactory" value="CGLIB | JAVASSIST"/>
+  <setting name="vfsImpl" value="org.mybatis.example.YourselfVfsImpl"/>
+  <setting name="useActualParamName" value="true"/>
+  <setting name="configurationFactory" value="org.mybatis.example.ConfigurationFactory"/>
 </settings>]]></source>
 
       </subsection>
@@ -666,8 +678,7 @@ public class Author {
     ...
 }
 ]]></source>
-        <p>공통의 자바타입에 대해서는 내장된 타입 별칭이 있다.
-		이 모두 대소문자를 가린다.</p>
+        <p>공통 자바 타입을 위한 여러 내장 타입 별칭이 존재한다. 이들은 대소문자를 구별하지 않으며, 오버로딩된 이름 때문에 원시형 타입은 특별 취급된다는 것을 주의해라.</p>
         <table>
           <thead>
             <tr>

src/site/ko/xdoc/dynamic-sql.xml

@@ -190,7 +190,7 @@ AND title like ‘someTitle’]]></source>
         <p>XML설정 파일과 XML 매핑 파일에 대해서는 이 정도에서 정리하고 다음 섹션에서는 Java API 에 대해 좀더 상세하게 살펴볼 것이다.</p>
       </subsection>
   <subsection name="script">
-  <p>For using dynamic SQL in annotated mapper class, <em>script</em> element can be used. For example:</p>
+  <p>애노테이션을 사용한 매퍼 클래스에서 동적 SQL을 사용하는 경우 <em>script</em> 태그를 사용할 수 있다. 예를 들어:</p>
   <source><![CDATA[
     @Update({"<script>",
       "update Author",

src/site/ko/xdoc/sqlmap-xml.xml

@@ -512,8 +512,8 @@ ps.setInt(1,id);]]></source>
         <p>여기서 마이바티스는 문자열을 변경하거나 이스케이프 처리하지 않는다.</p>
 
         <p>
-          String Substitution can be very useful when the metadata(i.e. table name or column name) in the sql statement is dynamic,
-          for example, if you want to <code>select</code> from a table by any one of its columns, instead of writing code like:
+          문자열 대체는 SQL 구문의 메타데이터(예를 들어 테이블 이름, 칼럼 이름)가 동적일 때 매우 유용하게 사용할 수 있다.
+          예를 들면, 테이블의 칼럼 중 하나로 테이블의 데이터를 <code>select</code>하고 싶을 때 아래와 같이 작성하는 대신:
           <source><![CDATA[
 @Select("select * from user where id = #{id}")
 User findById(@Param("id") long id);
@@ -526,13 +526,13 @@ User findByEmail(@Param("email") String email);
 
 // and more "findByXxx" method
 ]]></source>
-          you can just write:
+          다음과 같이 작성할 수 있다:
           <source><![CDATA[
 @Select("select * from user where ${column} = #{value}")
 User findByColumn(@Param("column") String column, @Param("value") String value);
 ]]></source>
-          in which the <code>${column}</code> will be substituted directly and the <code>#{value}</code> will be "prepared".
-          Thus you can just do the same work by:
+          여기서 <code>${column}</code>은 지정한 문자열로 직접 대체되고, <code>#{value}</code>는 "prepared" 될 것이므로
+          아래와 같이 사용할 수 있다:
           <source><![CDATA[
 User userOfId1 = userMapper.findByColumn("id", 1L);
 User userOfNameKid = userMapper.findByColumn("name", "kid");
@@ -541,7 +541,7 @@ User userOfEmail = userMapper.findByColumn("email", "[email protected]");
         </p>
 
         <p>
-          This idea can be applied to substitute the table name as well.
+          이 아이디어는 테이블 이름을 대체하는 데에도 적용할 수 있다.
         </p>
 
         <p>
@@ -641,8 +641,8 @@ public class User {
 
         <source><![CDATA[<resultMap id="userResultMap" type="User">
   <id property="id" column="user_id" />
-  <result property="username" column="username"/>
-  <result property="password" column="password"/>
+  <result property="username" column="user_name"/>
+  <result property="password" column="hashed_password"/>
 </resultMap>]]></source>
 
         <p>구문에서는 resultMap속성에 이를 지정하여 참조한다.
@@ -1634,10 +1634,8 @@ public class User {
         </ul>
 
         <p>
-          <span class="label important">NOTE</span> The cache will only apply to statements declared in the mapping file
-          where the cache tag is located. If you are using the Java API in conjunction with the XML mapping files, then
-          statements declared in the companion interface will not be cached by default. You will need to refer to the
-          cache region using the @CacheNamespaceRef annotation.
+          <span class="label important">참고</span> 캐시는 cache 태그를 사용한 매퍼에 선언된 구문에만 적용된다.
+          XML 매퍼와 함께 Java API를 사용하는 경우 Java 매퍼에 작성된 구문을 캐시 적용 대상에 포함시키려면 <code>@CacheNamespaceRef</code>을 사용하여 XML 매퍼의 namespace를 지정해야 한다.
         </p>
 
         <p>모든 프로퍼티는 cache 엘리먼트의 속성을 통해 변경가능하다.