Merge pull request #754 from mybatis/3.x

Merge 3.x into master for releasing 3.0.0

Author: kazuki43zoo

.github/workflows/ci.yaml

@@ -18,8 +18,6 @@ name: Java CI
 
 on:
   push:
-    branches-ignore:
-      - 'compatibility-check-spring6'
   pull_request:
 
 jobs:
@@ -28,7 +26,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        java: [11, 17, 19, 20-ea]
+        java: [17, 19, 20-ea]
         distribution: ['zulu']
       fail-fast: false
       max-parallel: 5

.github/workflows/coveralls.yaml

@@ -18,8 +18,6 @@ name: Coveralls
 
 on:
   push:
-    branches-ignore:
-      - 'compatibility-check-spring6'
   pull_request:
 
 jobs:
@@ -31,7 +29,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: zulu
       - name: Report Coverage to Coveralls for Pull Requests
         if: github.event_name == 'pull_request'

.github/workflows/support.yaml

@@ -27,7 +27,7 @@
   </parent>
 
   <artifactId>mybatis-spring</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>mybatis-spring</name>
@@ -104,14 +104,18 @@
     <gcu.product>Spring</gcu.product>
     <osgi.import>org.springframework.batch.*;resolution:=optional,*</osgi.import>
     <osgi.dynamicImport>*</osgi.dynamicImport>
+    <java.version>17</java.version>
 
     <mybatis.version>3.5.11</mybatis.version>
-    <spring.version>5.3.24</spring.version>
-    <spring-batch.version>4.3.7</spring-batch.version>
+    <spring.version>6.0.2</spring.version>
+    <spring-batch.version>5.0.0</spring-batch.version>
     <module.name>org.mybatis.spring</module.name>
 
     <junit.version>5.9.1</junit.version>
 
+    <!-- Keep this setting until mybatis-parent 37 official released -->
+    <maven.compiler.parameters>true</maven.compiler.parameters>
+
     <!-- Reproducible Builds -->
     <project.build.outputTimestamp>1757561022</project.build.outputTimestamp>
   </properties>
@@ -297,13 +301,13 @@
     <dependency>
       <groupId>jakarta.transaction</groupId>
       <artifactId>jakarta.transaction-api</artifactId>
-      <version>1.3.3</version>
+      <version>2.0.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
-      <version>4.0.4</version>
+      <version>6.0.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -373,6 +377,40 @@
       <name>Sonatype OSS Snapshots Repository</name>
       <url>https://oss.sonatype.org/content/repositories/snapshots</url>
     </repository>
+    <repository>
+      <id>spring-snapshot</id>
+      <name>Spring Snapshots</name>
+      <url>https://repo.spring.io/snapshot</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
+    <repository>
+      <id>spring-milestone</id>
+      <name>Spring Milestone</name>
+      <url>https://repo.spring.io/milestone</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
   </repositories>
 
+  <pluginRepositories>
+    <pluginRepository>
+      <id>spring-snapshot</id>
+      <name>Spring Snapshots</name>
+      <url>https://repo.spring.io/snapshot</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </pluginRepository>
+    <pluginRepository>
+      <id>spring-milestone</id>
+      <name>Spring Milestone</name>
+      <url>https://repo.spring.io/milestone</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
 </project>

pom.xml

@@ -27,6 +27,7 @@
 import org.mybatis.logging.Logger;
 import org.mybatis.logging.LoggerFactory;
 import org.mybatis.spring.SqlSessionTemplate;
+import org.springframework.batch.item.Chunk;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.convert.converter.Converter;
@@ -136,7 +137,7 @@ public void afterPropertiesSet() {
    * {@inheritDoc}
    */
   @Override
-  public void write(final List<? extends T> items) {
+  public void write(final Chunk<? extends T> items) {
 
     if (!items.isEmpty()) {
       LOGGER.debug(() -> "Executing batch with " + items.size() + " items.");
@@ -158,8 +159,8 @@ public void write(final List<? extends T> items) {
         for (int i = 0; i < updateCounts.length; i++) {
           int value = updateCounts[i];
           if (value == 0) {
-            throw new EmptyResultDataAccessException(
-                "Item " + i + " of " + updateCounts.length + " did not update any rows: [" + items.get(i) + "]", 1);
+            throw new EmptyResultDataAccessException("Item " + i + " of " + updateCounts.length
+                + " did not update any rows: [" + items.getItems().get(i) + "]", 1);
           }
         }
       }

src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java

@@ -130,9 +130,4 @@ protected void doReadPage() {
     results.addAll(sqlSessionTemplate.selectList(queryId, parameters));
   }
 
-  @Override
-  protected void doJumpToPage(int itemIndex) {
-    // Not Implemented
-  }
-
 }

src/main/java/org/mybatis/spring/batch/MyBatisPagingItemReader.java

@@ -19,7 +19,6 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.mockrunner.mock.ejb.MockUserTransaction;
 import com.mockrunner.mock.jdbc.MockConnection;
 import com.mockrunner.mock.jdbc.MockDataSource;
 import com.mockrunner.mock.jdbc.MockPreparedStatement;
@@ -32,12 +31,15 @@
 import org.apache.ibatis.transaction.managed.ManagedTransactionFactory;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.TransientDataAccessResourceException;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.jta.JtaTransactionManager;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 
+import jakarta.transaction.UserTransaction;
+
 class MyBatisSpringTest extends AbstractMyBatisSpringTest {
 
   private SqlSession session;
@@ -275,7 +277,7 @@ void testChangeExecutorTypeInTxRequiresNew() throws Exception {
 
   @Test
   void testWithJtaTxManager() {
-    JtaTransactionManager jtaManager = new JtaTransactionManager(new MockUserTransaction());
+    JtaTransactionManager jtaManager = new JtaTransactionManager(Mockito.mock(UserTransaction.class));
 
     DefaultTransactionDefinition txDef = new DefaultTransactionDefinition();
     txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED");
@@ -304,7 +306,7 @@ void testWithJtaTxManagerAndNonSpringTxManager() throws java.sql.SQLException {
     Environment nonSpring = new Environment("non-spring", new ManagedTransactionFactory(), mockDataSource);
     sqlSessionFactory.getConfiguration().setEnvironment(nonSpring);
 
-    JtaTransactionManager jtaManager = new JtaTransactionManager(new MockUserTransaction());
+    JtaTransactionManager jtaManager = new JtaTransactionManager(Mockito.mock(UserTransaction.class));
 
     DefaultTransactionDefinition txDef = new DefaultTransactionDefinition();
     txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED");

src/test/java/org/mybatis/spring/MyBatisSpringTest.java

@@ -22,15 +22,13 @@
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.executor.BatchResult;
 import org.apache.ibatis.session.ExecutorType;
-import org.assertj.core.util.Lists;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
@@ -39,6 +37,7 @@
 import org.mockito.MockitoAnnotations;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.batch.domain.Employee;
+import org.springframework.batch.item.Chunk;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
 
@@ -60,8 +59,8 @@ void setUp() {
 
   @Test
   void testZeroBatchResultShouldThrowException() {
-    List<Employee> employees = Arrays.asList(new Employee(), new Employee());
-    List<BatchResult> batchResults = Lists.emptyList();
+    Chunk<Employee> employees = Chunk.of(new Employee(), new Employee());
+    List<BatchResult> batchResults = Collections.emptyList();
 
     given(mockSqlSessionTemplate.flushStatements()).willReturn(batchResults);
 
@@ -70,7 +69,7 @@ void testZeroBatchResultShouldThrowException() {
 
   @Test
   void testZeroUpdateCountShouldThrowException() {
-    List<Employee> employees = Arrays.asList(new Employee(), new Employee());
+    Chunk<Employee> employees = Chunk.of(new Employee(), new Employee());
 
     BatchResult batchResult = new BatchResult(null, null);
     batchResult.setUpdateCounts(new int[] { 1, 0 });
@@ -87,7 +86,7 @@ void testItemToParameterConverterIsDefault() {
     this.writer.setStatementId("updateEmployee");
 
     Employee employee = new Employee();
-    List<Employee> employees = Collections.singletonList(employee);
+    Chunk<Employee> employees = Chunk.of(employee);
     writer.write(employees);
 
     Mockito.verify(this.mockSqlSessionTemplate).update("updateEmployee", employee);
@@ -105,7 +104,7 @@ void testSetItemToParameterConverter() {
     });
 
     Employee employee = new Employee();
-    List<Employee> employees = Collections.singletonList(employee);
+    Chunk<Employee> employees = Chunk.of(employee);
     writer.write(employees);
 
     Map<String, Object> parameter = new HashMap<>();

src/test/java/org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java

@@ -17,12 +17,10 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.ibatis.session.SqlSession;
 import org.junit.jupiter.api.Test;
 import org.mybatis.spring.batch.domain.Employee;
+import org.springframework.batch.item.Chunk;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -56,7 +54,7 @@ class SpringBatchTest {
   @Test
   @Transactional
   void shouldDuplicateSalaryOfAllEmployees() throws Exception {
-    List<Employee> employees = new ArrayList<>();
+    Chunk<Employee> employees = new Chunk<>();
     Employee employee = pagingNoNestedItemReader.read();
     while (employee != null) {
       employee.setSalary(employee.getSalary() * 2);
@@ -73,7 +71,7 @@ void shouldDuplicateSalaryOfAllEmployees() throws Exception {
   @Transactional
   void checkPagingReadingWithNestedInResultMap() throws Exception {
     // This test is here to show that PagingReader can return wrong result in case of nested result maps
-    List<Employee> employees = new ArrayList<>();
+    Chunk<Employee> employees = new Chunk<>();
     Employee employee = pagingNestedItemReader.read();
     while (employee != null) {
       employee.setSalary(employee.getSalary() * 2);
@@ -91,7 +89,7 @@ void checkPagingReadingWithNestedInResultMap() throws Exception {
   void checkCursorReadingWithoutNestedInResultMap() throws Exception {
     cursorNoNestedItemReader.doOpen();
     try {
-      List<Employee> employees = new ArrayList<>();
+      Chunk<Employee> employees = new Chunk<>();
       Employee employee = cursorNoNestedItemReader.read();
       while (employee != null) {
         employee.setSalary(employee.getSalary() * 2);
@@ -112,7 +110,7 @@ void checkCursorReadingWithoutNestedInResultMap() throws Exception {
   void checkCursorReadingWithNestedInResultMap() throws Exception {
     cursorNestedItemReader.doOpen();
     try {
-      List<Employee> employees = new ArrayList<>();
+      Chunk<Employee> employees = new Chunk<>();
       Employee employee = cursorNestedItemReader.read();
       while (employee != null) {
         employee.setSalary(employee.getSalary() * 2);