Merge branch 'master' into pr/3108

Author: harawata

pom.xml

@@ -135,12 +135,12 @@
   <properties>
     <clirr.comparisonVersion>3.4.6</clirr.comparisonVersion>
 
-    <byte-buddy.version>1.15.3</byte-buddy.version>
+    <byte-buddy.version>1.15.10</byte-buddy.version>
     <derby.version>10.17.1.0</derby.version>
     <log4j.version>2.24.1</log4j.version>
-    <mockito.version>5.14.1</mockito.version>
+    <mockito.version>5.14.2</mockito.version>
     <mssql-jdbc.version>12.8.1.jre11</mssql-jdbc.version>
-    <testcontainers.version>1.20.2</testcontainers.version>
+    <testcontainers.version>1.20.3</testcontainers.version>
 
     <!-- Add slow test groups here and annotate classes similar to @Tag('groupName'). -->
     <!-- Excluded groups are ran on github ci, to force here, pass -d"excludedGroups=" -->
@@ -190,19 +190,19 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.11.2</version>
+      <version>5.11.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
-      <version>5.11.2</version>
+      <version>5.11.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>2.7.3</version>
+      <version>2.7.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -250,7 +250,7 @@
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity-engine-core</artifactId>
-      <version>2.4</version>
+      <version>2.4.1</version>
       <scope>test</scope>
     </dependency>
     <!-- postgresql driver is required to run the refcursor tests -->
@@ -263,7 +263,7 @@
     <dependency>
       <groupId>com.mysql</groupId>
       <artifactId>mysql-connector-j</artifactId>
-      <version>9.0.0</version>
+      <version>9.1.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -346,7 +346,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.5.8</version>
+      <version>1.5.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/main/java/org/apache/ibatis/mapping/VendorDatabaseIdProvider.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,11 +55,11 @@ public void setProperties(Properties p) {
 
   private String getDatabaseName(DataSource dataSource) throws SQLException {
     String productName = getDatabaseProductName(dataSource);
-    if (this.properties != null) {
-      return properties.entrySet().stream().filter(entry -> productName.contains((String) entry.getKey()))
-          .map(entry -> (String) entry.getValue()).findFirst().orElse(null);
+    if (properties == null || properties.isEmpty()) {
+      return productName;
     }
-    return productName;
+    return properties.entrySet().stream().filter(entry -> productName.contains((String) entry.getKey()))
+        .map(entry -> (String) entry.getValue()).findFirst().orElse(null);
   }
 
   private String getDatabaseProductName(DataSource dataSource) throws SQLException {

src/site/es/markdown/index.md

@@ -7,7 +7,7 @@ author: Clinton Begin, Eduardo Macarron
 
 ### ¿Qué es MyBatis?
 
-MyBatis es un framework de persistencia que soporta SQL, procedimientos almacenados y mapeos avanzados. MyBatis elimina casi todo el código JDBC, el establecimiento manual de parámetros y la obtención de resultados. MyBatis puede configurarse con XML o anotaciones y permite mapear typos de datos primitivos, objetos de tipo Map y POJOs (Plain Old Java Objects) a registros de base de datos.
+MyBatis es un framework de persistencia que soporta SQL, procedimientos almacenados y mapeos avanzados. MyBatis elimina casi todo el código JDBC, el establecimiento manual de parámetros y la obtención de resultados. MyBatis puede configurarse con XML o anotaciones y permite mapear tipos de datos primitivos, objetos de tipo Map y POJOs (Plain Old Java Objects) a registros de base de datos.
 
 ### Colabora para mejorar esta documentación...
 

src/site/ko/xdoc/java-api.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       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.
@@ -23,6 +23,7 @@
     <title>마이바티스 3 | 자바 API</title>
     <author email="[email protected]">Clinton Begin</author>
     <author email="[email protected]">이동국(한국어 번역)</author>
+    <author email="[email protected]">박동민(한국어 번역)</author>
   </properties>
 
   <body>
@@ -269,7 +270,7 @@ int insert(String statement)
 int update(String statement)
 int delete(String statement)]]></source>
 
-  <p>A Cursor offers the same results as a List, except it fetches data lazily using an Iterator.</p>
+  <p>Cursor는 List와 동일한 결과를 보여주지만, 데이터를 반복문을 통해 지연로딩을 한다.</p>
   <source><![CDATA[try (Cursor<MyEntity> entities = session.selectCursor(statement, param)) {
    for (MyEntity entity:entities) {
       // process one entity
@@ -304,11 +305,11 @@ public interface ResultHandler<T> {
 
   <p>ResultContext파라미터는 결과 객체에 접근할 수 있도록 해준다.</p>
 
-  <p>Using a ResultHandler has two limitations that you should be aware of:</p>
+  <p>ResultHandler를 사용할 때 유의해야 할 제약사항이 2개 있다:</p>
 
   <ul>
-  <li>Data got from an method called with a ResultHandler will not be cached.</li>
-  <li>When using advanced resultmaps MyBatis will probably require several rows to build an object. If a ResultHandler is used you may be given an object whose associations or collections are not yet filled.</li>
+    <li>ResultHandler를 사용하여 호출된 메소드의 데이터는 캐싱 되지 않는다.</li>
+    <li>고급 resualtMap을 사용할 경우, 마이바티스는 객체를 완성하기 위해 여러 줄의 코드를 필요로 할 수 있다. ResultHandler를 사용할 때 받는 객체는 associations나 collections가 완전히 채워지지 않은 상태일 수도 있다.</li>
   </ul>
 
   <h5>배치 수정시 flush메소드</h5>
@@ -750,36 +751,37 @@ class UserSqlBuilder {
   }
 }]]></source>
 
-    <p>This example shows usage that share an sql provider class to all mapper methods using global configuration(Available since 3.5.6):</p>
+    <p>이 예제는 모든 매퍼 메소드에 SQL 프로바이더 클래스를 전역 설정으로 공유하는 방법을 보여준다. (3.5.6 버전부터 사용 가능):</p>
     <source><![CDATA[
 Configuration configuration = new Configuration();
-configuration.setDefaultSqlProviderType(TemplateFilePathProvider.class); // Specify an sql provider class for sharing on all mapper methods
+configuration.setDefaultSqlProviderType(TemplateFilePathProvider.class); // 모든 mapper 메소드에 공유할 시, SQL 프로바이더 클래스를 지정한다.
 // ...]]></source>
     <source><![CDATA[
-// Can omit the type/value attribute on sql provider annotation
-// If omit it, the MyBatis apply the class that specified on defaultSqlProviderType.
+// sql provider 애노테이션에서 type/value 속성을 생략할 수 있다.
+// 생략시, 마이바티스는 defaultSqlProviderType으로 지정된 클래스를 적용한다.
 public interface UserMapper {
 
-  @SelectProvider // Same with @SelectProvider(TemplateFilePathProvider.class)
+  @SelectProvider // @SelectProvider(TemplateFilePathProvider.class) 와 동일하다.
   User findUser(int id);
 
-  @InsertProvider // Same with @InsertProvider(TemplateFilePathProvider.class)
+  @InsertProvider // @InsertProvider(TemplateFilePathProvider.class) 와 동일하다.
   void createUser(User user);
 
-  @UpdateProvider // Same with @UpdateProvider(TemplateFilePathProvider.class)
+  @UpdateProvider // @UpdateProvider(TemplateFilePathProvider.class) 와 동일하다.
   void updateUser(User user);
 
-  @DeleteProvider // Same with @DeleteProvider(TemplateFilePathProvider.class)
+  @DeleteProvider // @DeleteProvider(TemplateFilePathProvider.class) 와 동일하다.
   void deleteUser(int id);
 }]]></source>
 
-    <p>This example shows usage the default implementation of <code>ProviderMethodResolver</code>(available since MyBatis 3.5.1 or later):</p>
+    <p>이 예제는 <code>ProviderMethodResolver</code>의 기본 구현 사용법을 보여준다.(MyBatis 3.5.1 버전 이상부터 사용가능):</p>
     <source><![CDATA[@SelectProvider(UserSqlProvider.class)
 List<User> getUsersByName(String name);
 
-// Implements the ProviderMethodResolver on your provider class
+// provider 클래스에서 ProviderMethodResolver 를 구현한다.
 class UserSqlProvider implements ProviderMethodResolver {
   // In default implementation, it will resolve a method that method name is matched with mapper method
+  // 기본 구현에서, 메소드 이름이 mapper 메소드와 일치하는 경우 해당 메소드를 찾는다.
   public static String getUsersByName(final String name) {
     return new SQL(){{
       SELECT("*");
@@ -792,11 +794,11 @@ class UserSqlProvider implements ProviderMethodResolver {
   }
 }]]></source>
 
-    <p>This example shows usage the <code>databaseId</code> attribute on the statement annotation(Available since 3.5.5):</p>
+    <p>이 예제는 statement 애노테이션에서 <code>databaseId</code>  속성이 어떻게 활용되는지를 보여준다(3.5.5 버전부터 사용 가능):</p>
     <source><![CDATA[
-@Select(value = "SELECT SYS_GUID() FROM dual", databaseId = "oracle") // Use this statement if DatabaseIdProvider provide "oracle"
-@Select(value = "SELECT uuid_generate_v4()", databaseId = "postgres") // Use this statement if DatabaseIdProvider provide "postgres"
-@Select("SELECT RANDOM_UUID()") // Use this statement if the DatabaseIdProvider not configured or not matches databaseId
+@Select(value = "SELECT SYS_GUID() FROM dual", databaseId = "oracle") // DatabaseIdProvider가 "oracle"을 제공하면 이 구문을 사용한다.
+@Select(value = "SELECT uuid_generate_v4()", databaseId = "postgres") // DatabaseIdProvider가 "postgres"를 제공하면 이 구문을 사용한다.
+@Select("SELECT RANDOM_UUID()") // DatabaseIdProvider가 설정되지 않았거나 일치하는 databaseId가 없는 경우 이 구문을 사용한다.
 String generateId();
 ]]></source>
 

src/test/java/org/apache/ibatis/mapping/VendorDatabaseIdProviderTest.java

@@ -50,6 +50,13 @@ void shouldProductNameBeReturnedIfPropertiesIsNull() throws Exception {
     assertEquals(PRODUCT_NAME, provider.getDatabaseId(mockDataSource()));
   }
 
+  @Test
+  void shouldProductNameBeReturnedIfPropertiesIsEmpty() throws Exception {
+    VendorDatabaseIdProvider provider = new VendorDatabaseIdProvider();
+    provider.setProperties(new Properties());
+    assertEquals(PRODUCT_NAME, provider.getDatabaseId(mockDataSource()));
+  }
+
   @Test
   void shouldProductNameBeTranslated() throws Exception {
     VendorDatabaseIdProvider provider = new VendorDatabaseIdProvider();

src/test/java/org/apache/ibatis/reflection/property/PropertyTokenizerTest.java

@@ -0,0 +1,78 @@
+/*
+ *    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.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.apache.ibatis.reflection.property;
+
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author <a href="[email protected]">mawen12</a>
+ *
+ * @see PropertyTokenizer
+ */
+class PropertyTokenizerTest {
+
+  @Test
+  void shouldParsePropertySuccessfully() {
+    String fullname = "id";
+    PropertyTokenizer tokenizer = new PropertyTokenizer(fullname);
+
+    assertEquals("id", tokenizer.getIndexedName());
+    assertEquals("id", tokenizer.getName());
+
+    assertNull(tokenizer.getChildren());
+    assertNull(tokenizer.getIndex());
+    assertFalse(tokenizer.hasNext());
+    assertNull(tokenizer.getIndex());
+
+    assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(tokenizer::remove)
+        .withMessage("Remove is not supported, as it has no meaning in the context of properties.");
+  }
+
+  @Test
+  void shouldParsePropertyWhichContainsDelimSuccessfully() {
+    String fullname = "person.id";
+    PropertyTokenizer tokenizer = new PropertyTokenizer(fullname);
+
+    assertEquals("person", tokenizer.getIndexedName());
+    assertEquals("person", tokenizer.getName());
+    assertTrue(tokenizer.hasNext());
+    assertEquals("id", tokenizer.getChildren());
+
+    assertNull(tokenizer.getIndex());
+
+    assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(tokenizer::remove)
+        .withMessage("Remove is not supported, as it has no meaning in the context of properties.");
+  }
+
+  @Test
+  void shouldParsePropertyWhichContainsIndexSuccessfully() {
+    String fullname = "array[0]";
+    PropertyTokenizer tokenizer = new PropertyTokenizer(fullname);
+
+    assertEquals("array[0]", tokenizer.getIndexedName());
+    assertEquals("array", tokenizer.getName());
+    assertEquals("0", tokenizer.getIndex());
+
+    assertFalse(tokenizer.hasNext());
+    assertNull(tokenizer.getChildren());
+
+    assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(tokenizer::remove)
+        .withMessage("Remove is not supported, as it has no meaning in the context of properties.");
+  }
+}