From 5847bb0259f2cf6684e49c4ebd40249b71e92fd5 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sun, 11 Sep 2022 16:56:42 +0900 Subject: [PATCH 001/383] Update version to 3.0.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ff4397539..4bed180cf9 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ mybatis-spring - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT jar mybatis-spring From 7e37765876ac421540d5d5f7a859a536b74bebcb Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sun, 11 Sep 2022 17:47:13 +0900 Subject: [PATCH 002/383] Apply Spring 6, Spring Batch 5 and more * Change MyBatisBatchItemWriter * Apply jakarta.transaction-api 2.0.1 * Apply jakarta.servlet-api 6.0.0 * Fix error on tests Fixes gh-715 gh-716 --- pom.xml | 42 +++++++++++++++++-- .../spring/batch/MyBatisBatchItemWriter.java | 7 ++-- .../org/mybatis/spring/MyBatisSpringTest.java | 8 ++-- .../batch/MyBatisBatchItemWriterTest.java | 13 +++--- .../mybatis/spring/batch/SpringBatchTest.java | 12 +++--- .../MyBatisBatchItemWriterBuilderTest.java | 37 ++++++++-------- .../spring/sample/AbstractSampleJobTest.java | 7 +++- .../spring/sample/config/SampleJobConfig.java | 2 +- .../spring/submitted/xa/UserServiceTest.java | 6 ++- 9 files changed, 87 insertions(+), 47 deletions(-) diff --git a/pom.xml b/pom.xml index 4bed180cf9..544b3c0d2d 100644 --- a/pom.xml +++ b/pom.xml @@ -106,8 +106,8 @@ * 3.5.10 - 5.3.22 - 4.3.6 + 6.0.0-SNAPSHOT + 5.0.0-SNAPSHOT org.mybatis.spring 5.9.0 @@ -295,13 +295,13 @@ jakarta.transaction jakarta.transaction-api - 1.3.3 + 2.0.1 test jakarta.servlet jakarta.servlet-api - 4.0.4 + 6.0.0 test @@ -371,6 +371,40 @@ Sonatype OSS Snapshots Repository https://oss.sonatype.org/content/repositories/snapshots + + spring-snapshot + Spring Snapshots + https://repo.spring.io/snapshot + + false + + + + spring-milestone + Spring Milestone + https://repo.spring.io/milestone + + false + + + + + spring-snapshot + Spring Snapshots + https://repo.spring.io/snapshot + + false + + + + spring-milestone + Spring Milestone + https://repo.spring.io/milestone + + false + + + diff --git a/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java b/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java index 8eeca0d7a8..42118df358 100644 --- a/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java +++ b/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java @@ -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 items) { + public void write(final Chunk items) { if (!items.isEmpty()) { LOGGER.debug(() -> "Executing batch with " + items.size() + " items."); @@ -158,8 +159,8 @@ public void write(final List 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); } } } diff --git a/src/test/java/org/mybatis/spring/MyBatisSpringTest.java b/src/test/java/org/mybatis/spring/MyBatisSpringTest.java index b43bd579f0..2b5f43f5d5 100644 --- a/src/test/java/org/mybatis/spring/MyBatisSpringTest.java +++ b/src/test/java/org/mybatis/spring/MyBatisSpringTest.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"); diff --git a/src/test/java/org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java b/src/test/java/org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java index a3a5366f33..ad11afbc09 100644 --- a/src/test/java/org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java +++ b/src/test/java/org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java @@ -22,7 +22,6 @@ 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; @@ -30,7 +29,6 @@ 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 employees = Arrays.asList(new Employee(), new Employee()); - List batchResults = Lists.emptyList(); + Chunk employees = Chunk.of(new Employee(), new Employee()); + List batchResults = Collections.emptyList(); given(mockSqlSessionTemplate.flushStatements()).willReturn(batchResults); @@ -70,7 +69,7 @@ void testZeroBatchResultShouldThrowException() { @Test void testZeroUpdateCountShouldThrowException() { - List employees = Arrays.asList(new Employee(), new Employee()); + Chunk 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 employees = Collections.singletonList(employee); + Chunk 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 employees = Collections.singletonList(employee); + Chunk employees = Chunk.of(employee); writer.write(employees); Map parameter = new HashMap<>(); diff --git a/src/test/java/org/mybatis/spring/batch/SpringBatchTest.java b/src/test/java/org/mybatis/spring/batch/SpringBatchTest.java index 5096c84623..c934a9b5d8 100644 --- a/src/test/java/org/mybatis/spring/batch/SpringBatchTest.java +++ b/src/test/java/org/mybatis/spring/batch/SpringBatchTest.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 employees = new ArrayList<>(); + Chunk 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 employees = new ArrayList<>(); + Chunk 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 employees = new ArrayList<>(); + Chunk 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 employees = new ArrayList<>(); + Chunk employees = new Chunk<>(); Employee employee = cursorNestedItemReader.read(); while (employee != null) { employee.setSalary(employee.getSalary() * 2); diff --git a/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java b/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java index f36c8678c4..e410c88931 100644 --- a/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java +++ b/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java @@ -37,6 +37,7 @@ import org.mockito.MockitoAnnotations; import org.mybatis.spring.SqlSessionTemplate; import org.mybatis.spring.batch.MyBatisBatchItemWriter; +import org.springframework.batch.item.Chunk; /** * Tests for {@link MyBatisBatchItemWriterBuilder}. @@ -84,13 +85,13 @@ void testConfigurationUsingSqlSessionFactory() { // @formatter:on itemWriter.afterPropertiesSet(); - List foos = getFoos(); + Chunk foos = getFoos(); itemWriter.write(foos); - Mockito.verify(this.sqlSession).update("updateFoo", foos.get(0)); - Mockito.verify(this.sqlSession).update("updateFoo", foos.get(1)); - Mockito.verify(this.sqlSession).update("updateFoo", foos.get(2)); + Mockito.verify(this.sqlSession).update("updateFoo", foos.getItems().get(0)); + Mockito.verify(this.sqlSession).update("updateFoo", foos.getItems().get(1)); + Mockito.verify(this.sqlSession).update("updateFoo", foos.getItems().get(2)); } @@ -105,13 +106,13 @@ void testConfigurationUsingSqlSessionTemplate() { // @formatter:on itemWriter.afterPropertiesSet(); - List foos = getFoos(); + Chunk foos = getFoos(); itemWriter.write(foos); - Mockito.verify(this.sqlSession).update("updateFoo", foos.get(0)); - Mockito.verify(this.sqlSession).update("updateFoo", foos.get(1)); - Mockito.verify(this.sqlSession).update("updateFoo", foos.get(2)); + Mockito.verify(this.sqlSession).update("updateFoo", foos.getItems().get(0)); + Mockito.verify(this.sqlSession).update("updateFoo", foos.getItems().get(1)); + Mockito.verify(this.sqlSession).update("updateFoo", foos.getItems().get(2)); } @@ -129,13 +130,13 @@ void testConfigurationAssertUpdatesIsFalse() { // @formatter:on itemWriter.afterPropertiesSet(); - List foos = getFoos(); + Chunk foos = getFoos(); itemWriter.write(foos); - Mockito.verify(this.sqlSession).update("updateFoo", foos.get(0)); - Mockito.verify(this.sqlSession).update("updateFoo", foos.get(1)); - Mockito.verify(this.sqlSession).update("updateFoo", foos.get(2)); + Mockito.verify(this.sqlSession).update("updateFoo", foos.getItems().get(0)); + Mockito.verify(this.sqlSession).update("updateFoo", foos.getItems().get(1)); + Mockito.verify(this.sqlSession).update("updateFoo", foos.getItems().get(2)); } @@ -156,22 +157,22 @@ void testConfigurationSetItemToParameterConverter() { // @formatter:on itemWriter.afterPropertiesSet(); - List foos = getFoos(); + Chunk foos = getFoos(); itemWriter.write(foos); Map parameter = new HashMap<>(); parameter.put("now", LocalDateTime.now(Clock.fixed(Instant.ofEpochMilli(0), ZoneId.systemDefault()))); - parameter.put("item", foos.get(0)); + parameter.put("item", foos.getItems().get(0)); Mockito.verify(this.sqlSession).update("updateFoo", parameter); - parameter.put("item", foos.get(1)); + parameter.put("item", foos.getItems().get(1)); Mockito.verify(this.sqlSession).update("updateFoo", parameter); - parameter.put("item", foos.get(2)); + parameter.put("item", foos.getItems().get(2)); Mockito.verify(this.sqlSession).update("updateFoo", parameter); } - private List getFoos() { - return Arrays.asList(new Foo("foo1"), new Foo("foo2"), new Foo("foo3")); + private Chunk getFoos() { + return Chunk.of(new Foo("foo1"), new Foo("foo2"), new Foo("foo3")); } private static class Foo { diff --git a/src/test/java/org/mybatis/spring/sample/AbstractSampleJobTest.java b/src/test/java/org/mybatis/spring/sample/AbstractSampleJobTest.java index 389d0a6ede..8f17d16183 100644 --- a/src/test/java/org/mybatis/spring/sample/AbstractSampleJobTest.java +++ b/src/test/java/org/mybatis/spring/sample/AbstractSampleJobTest.java @@ -22,6 +22,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -97,8 +98,10 @@ void testJob() throws Exception { @Configuration static class LocalContext { @Bean - JobLauncherTestUtils jobLauncherTestUtils() { - return new JobLauncherTestUtils(); + JobLauncherTestUtils jobLauncherTestUtils(Job job) { + JobLauncherTestUtils utils = new JobLauncherTestUtils(); + utils.setJob(job); + return utils; } @Bean diff --git a/src/test/java/org/mybatis/spring/sample/config/SampleJobConfig.java b/src/test/java/org/mybatis/spring/sample/config/SampleJobConfig.java index 282c034c57..4a0e26e386 100644 --- a/src/test/java/org/mybatis/spring/sample/config/SampleJobConfig.java +++ b/src/test/java/org/mybatis/spring/sample/config/SampleJobConfig.java @@ -133,11 +133,11 @@ public Job importUserJob() throws Exception { public Step step1() throws Exception { // @formatter:off return stepBuilderFactory.get("step1") - .transactionManager(transactionalManager()) .chunk(10) .reader(reader()) .processor(processor()) .writer(writer()) + .transactionManager(transactionalManager()) .build(); // @formatter:on } diff --git a/src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java b/src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java index 06e7c6e1f2..0aeeac48b7 100644 --- a/src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java +++ b/src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java @@ -17,14 +17,16 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.transaction.UserTransaction; - +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import jakarta.transaction.UserTransaction; + +@Disabled("Yet not found OSS implementation that supported Jakarta EE 9+ APIs") @ExtendWith(SpringExtension.class) @SpringJUnitConfig(locations = "classpath:org/mybatis/spring/submitted/xa/applicationContext.xml") class UserServiceTest { From a193c0388d13b25c547a28897276fc672f5054d3 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sun, 11 Sep 2022 18:15:10 +0900 Subject: [PATCH 003/383] Ignore Maven Enforcer Plugin on 3.x See gh-715 gh-716 --- .github/workflows/ci.yaml | 4 +- .../compatibility-check-spring6.yaml | 57 ------------------- .github/workflows/coveralls.yaml | 6 +- .github/workflows/sonar.yaml | 4 +- .github/workflows/sonatype.yaml | 4 +- .github/workflows/support.yaml | 47 --------------- 6 files changed, 7 insertions(+), 115 deletions(-) delete mode 100644 .github/workflows/compatibility-check-spring6.yaml delete mode 100644 .github/workflows/support.yaml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 243038d58c..6d607a022f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,8 +18,6 @@ name: Java CI on: push: - branches-ignore: - - 'compatibility-check-spring6' pull_request: jobs: @@ -42,4 +40,4 @@ jobs: java-version: ${{ matrix.java }} distribution: ${{ matrix.distribution }} - name: Test with Maven - run: ./mvnw test -B -D"license.skip=true" + run: ./mvnw test -B -D"license.skip=true" -D"enforcer.skip=true" diff --git a/.github/workflows/compatibility-check-spring6.yaml b/.github/workflows/compatibility-check-spring6.yaml deleted file mode 100644 index 028729f0d6..0000000000 --- a/.github/workflows/compatibility-check-spring6.yaml +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright 2010-2022 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 -# -# http://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. -# - -name: Compatibility with Spring 6/Spring Batch 5 - -on: - push: - pull_request: - schedule: - - cron: "0 0 * * *" - -jobs: - test: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] - java: [17, 18, 19-ea] - distribution: ['zulu'] - fail-fast: false - max-parallel: 3 - name: Test JDK ${{ matrix.java }}, ${{ matrix.os }} - - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Set up JDK - uses: actions/setup-java@v3 - with: - java-version: ${{ matrix.java }} - distribution: ${{ matrix.distribution }} - - name: Git config - run: | - git config --local user.email "action@github.com" - git config --local user.name "GitHub Action" - - name: Checkout to local - run: git checkout -b compatibility-check-spring6-head - - name: Checkout compatibility check brach - run: git checkout compatibility-check-spring6 - - name: Merge to compatibility check brach - run: git merge --no-edit compatibility-check-spring6-head - - name: Test with Spring 6 / Spring Batch 5 support - run: ./mvnw -U test -D"license.skip=true" -D"animal.sniffer.skip=true" -D"spring.version=6.0.0-SNAPSHOT" -D"spring-batch.version=5.0.0-SNAPSHOT" diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index b898488c1f..9e9cc59df5 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -18,8 +18,6 @@ name: Coveralls on: push: - branches-ignore: - - 'compatibility-check-spring6' pull_request: jobs: @@ -35,12 +33,12 @@ jobs: distribution: zulu - name: Report Coverage to Coveralls for Pull Requests if: github.event_name == 'pull_request' - run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER + run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -Denforcer.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PR_NUMBER: ${{ github.event.number }} - name: Report Coverage to Coveralls for General Push if: github.event_name == 'push' - run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github + run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -Denforcer.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index eda5f33114..40c6300f32 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -19,7 +19,7 @@ name: SonarCloud on: push: branches: - - master + - 3.x jobs: build: @@ -36,7 +36,7 @@ jobs: java-version: 17 distribution: zulu - name: Analyze with SonarCloud - run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_spring -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true + run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_spring -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true -Denforcer.skip=true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index 008954a7f3..88bcd02e70 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -19,7 +19,7 @@ name: Sonatype on: push: branches: - - master + - 3.x jobs: build: @@ -33,7 +33,7 @@ jobs: java-version: 17 distribution: zulu - name: Deploy to Sonatype - run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml -Dlicense.skip=true + run: ./mvnw deploy -DskipTests -Denforcer.skip=true -B --settings ./.mvn/settings.xml -Dlicense.skip=true env: CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} diff --git a/.github/workflows/support.yaml b/.github/workflows/support.yaml deleted file mode 100644 index 5be3956bd3..0000000000 --- a/.github/workflows/support.yaml +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright 2010-2022 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 -# -# http://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. -# - -name: Spring/Spring Batch Support - -on: - push: - branches-ignore: - - 'compatibility-check-spring6' - pull_request: - -jobs: - test: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, macOS-latest] - java: [11] - distribution: ['zulu'] - fail-fast: false - max-parallel: 2 - name: Test JDK ${{ matrix.java }}, ${{ matrix.os }} - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK - uses: actions/setup-java@v3 - with: - java-version: ${{ matrix.java }} - distribution: ${{ matrix.distribution }} - - name: Test with Spring 5.2 / Spring Batch 4.2 support - run: ./mvnw test -Dspring.version=$(./scripts/get_latest_version.sh spring-core 5.2) -Dspring-batch.version=$(./scripts/get_latest_version.sh batch/spring-batch-core 4.2) - - name: Test with Spring 5.1 / Spring Batch 4.1 support - run: ./mvnw test -Dspring.version=$(./scripts/get_latest_version.sh spring-core 5.1) -Dspring-batch.version=$(./scripts/get_latest_version.sh batch/spring-batch-core 4.1) From 5e6cb83ddf13fbed05f8b43da0f1110a57568ea3 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sun, 11 Sep 2022 18:35:12 +0900 Subject: [PATCH 004/383] Change supporing Java version on 3.x CI See gh-715 gh-716 --- .github/workflows/ci.yaml | 2 +- .github/workflows/coveralls.yaml | 2 +- pom.xml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6d607a022f..1966d99a75 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,7 +26,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - java: [11, 17, 18, 19-ea] + java: [17, 18, 19-ea] distribution: ['zulu'] fail-fast: false max-parallel: 5 diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index 9e9cc59df5..df3ec31ab0 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -29,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' diff --git a/pom.xml b/pom.xml index 544b3c0d2d..b2886d76db 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,7 @@ 5.9.0 1645112687 + From 46ced34268545fdb4a9492b024dab0e06ad1b084 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sun, 11 Sep 2022 18:50:59 +0900 Subject: [PATCH 005/383] Support cron job for Java CI on 3.x --- .github/workflows/ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1966d99a75..dba82c0e24 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,6 +19,8 @@ name: Java CI on: push: pull_request: + schedule: + - cron: "0 0 * * *" jobs: test: From a91ad817c9496f951462a57cf40f09176f8a0b65 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sun, 25 Sep 2022 15:06:33 +0900 Subject: [PATCH 006/383] Apply some specification changes of Spring Batch 5 on 3.x tests --- .../spring/sample/config/SampleJobConfig.java | 51 +++++++++---------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/src/test/java/org/mybatis/spring/sample/config/SampleJobConfig.java b/src/test/java/org/mybatis/spring/sample/config/SampleJobConfig.java index 4a0e26e386..d951605dc9 100644 --- a/src/test/java/org/mybatis/spring/sample/config/SampleJobConfig.java +++ b/src/test/java/org/mybatis/spring/sample/config/SampleJobConfig.java @@ -34,9 +34,12 @@ import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; -import org.springframework.batch.core.configuration.annotation.JobBuilderFactory; -import org.springframework.batch.core.configuration.annotation.StepBuilderFactory; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.batch.core.job.builder.JobBuilder; +import org.springframework.batch.core.repository.JobRepository; +import org.springframework.batch.core.step.builder.StepBuilder; +import org.springframework.batch.item.ItemProcessor; +import org.springframework.batch.item.ItemReader; +import org.springframework.batch.item.ItemWriter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; @@ -50,12 +53,6 @@ @EnableBatchProcessing public class SampleJobConfig { - @Autowired - private JobBuilderFactory jobBuilderFactory; - - @Autowired - private StepBuilderFactory stepBuilderFactory; - @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL) @@ -66,15 +63,15 @@ public DataSource dataSource() { } @Bean - public PlatformTransactionManager transactionalManager() { - return new DataSourceTransactionManager(dataSource()); + public PlatformTransactionManager transactionManager(DataSource dataSource) { + return new DataSourceTransactionManager(dataSource); } @Bean - public SqlSessionFactory sqlSessionFactory() throws Exception { + public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception { PathMatchingResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver(); SqlSessionFactoryBean ss = new SqlSessionFactoryBean(); - ss.setDataSource(dataSource()); + ss.setDataSource(dataSource); ss.setMapperLocations(resourcePatternResolver.getResources("org/mybatis/spring/sample/mapper/*.xml")); org.apache.ibatis.session.Configuration configuration = new org.apache.ibatis.session.Configuration(); configuration.setDefaultExecutorType(ExecutorType.BATCH); @@ -83,10 +80,10 @@ public SqlSessionFactory sqlSessionFactory() throws Exception { } @Bean - public MyBatisCursorItemReader reader() throws Exception { + public MyBatisCursorItemReader reader(SqlSessionFactory sqlSessionFactory) { // @formatter:off return new MyBatisCursorItemReaderBuilder() - .sqlSessionFactory(sqlSessionFactory()) + .sqlSessionFactory(sqlSessionFactory) .queryId("org.mybatis.spring.sample.mapper.UserMapper.getUsers") .build(); // @formatter:on @@ -98,10 +95,10 @@ public UserToPersonItemProcessor processor() { } @Bean - public MyBatisBatchItemWriter writer() throws Exception { + public MyBatisBatchItemWriter writer(SqlSessionFactory sqlSessionFactory) { // @formatter:off return new MyBatisBatchItemWriterBuilder() - .sqlSessionFactory(sqlSessionFactory()) + .sqlSessionFactory(sqlSessionFactory) .statementId("org.mybatis.spring.sample.mapper.PersonMapper.createPerson") .itemToParameterConverter(createItemToParameterMapConverter("batch_java_config_user", LocalDateTime.now())) .build(); @@ -120,24 +117,24 @@ public static Converter> createItemToParameterMapConv } @Bean - public Job importUserJob() throws Exception { + public Job importUserJob(JobRepository jobRepository, Step step1) { // @formatter:off - return jobBuilderFactory.get("importUserJob") - .flow(step1()) + return new JobBuilder("importUserJob", jobRepository) + .flow(step1) .end() .build(); // @formatter:on } @Bean - public Step step1() throws Exception { + public Step step1(JobRepository jobRepository, PlatformTransactionManager transactionManager, ItemReader reader, + ItemProcessor processor, ItemWriter writer) { // @formatter:off - return stepBuilderFactory.get("step1") - .chunk(10) - .reader(reader()) - .processor(processor()) - .writer(writer()) - .transactionManager(transactionalManager()) + return new StepBuilder("step1", jobRepository) + .chunk(10, transactionManager) + .reader(reader) + .processor(processor) + .writer(writer) .build(); // @formatter:on } From dc152067598ab7f840efb68482ff8bdcf07207cb Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Wed, 23 Nov 2022 11:56:17 +0900 Subject: [PATCH 007/383] Remove doJumpToPage method on MyBatisPagingItemReader Fixes gh-739 --- .../org/mybatis/spring/batch/MyBatisPagingItemReader.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/org/mybatis/spring/batch/MyBatisPagingItemReader.java b/src/main/java/org/mybatis/spring/batch/MyBatisPagingItemReader.java index 6c96b345dc..c459c39c59 100644 --- a/src/main/java/org/mybatis/spring/batch/MyBatisPagingItemReader.java +++ b/src/main/java/org/mybatis/spring/batch/MyBatisPagingItemReader.java @@ -130,9 +130,4 @@ protected void doReadPage() { results.addAll(sqlSessionTemplate.selectList(queryId, parameters)); } - @Override - protected void doJumpToPage(int itemIndex) { - // Not Implemented - } - } From b77435bf4a6160cb550db202f0f5793cd76f878c Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Wed, 23 Nov 2022 11:57:38 +0900 Subject: [PATCH 008/383] Add @SpringBatchTest on spring batch integration tests Fixes gh-740 --- .../java/org/mybatis/spring/sample/SampleJobJavaConfigTest.java | 2 ++ .../java/org/mybatis/spring/sample/SampleJobXmlConfigTest.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/test/java/org/mybatis/spring/sample/SampleJobJavaConfigTest.java b/src/test/java/org/mybatis/spring/sample/SampleJobJavaConfigTest.java index 759d7a2d92..7f6c32c699 100644 --- a/src/test/java/org/mybatis/spring/sample/SampleJobJavaConfigTest.java +++ b/src/test/java/org/mybatis/spring/sample/SampleJobJavaConfigTest.java @@ -16,9 +16,11 @@ package org.mybatis.spring.sample; import org.mybatis.spring.sample.config.SampleJobConfig; +import org.springframework.batch.test.context.SpringBatchTest; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; @SpringJUnitConfig({ SampleJobConfig.class, AbstractSampleJobTest.LocalContext.class }) +@SpringBatchTest class SampleJobJavaConfigTest extends AbstractSampleJobTest { @Override protected String getExpectedOperationBy() { diff --git a/src/test/java/org/mybatis/spring/sample/SampleJobXmlConfigTest.java b/src/test/java/org/mybatis/spring/sample/SampleJobXmlConfigTest.java index 461e9bf3c1..7dfe2f3691 100644 --- a/src/test/java/org/mybatis/spring/sample/SampleJobXmlConfigTest.java +++ b/src/test/java/org/mybatis/spring/sample/SampleJobXmlConfigTest.java @@ -15,11 +15,13 @@ */ package org.mybatis.spring.sample; +import org.springframework.batch.test.context.SpringBatchTest; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; @SpringJUnitConfig({ AbstractSampleJobTest.LocalContext.class, SampleJobXmlConfigTest.LocalContext.class }) +@SpringBatchTest class SampleJobXmlConfigTest extends AbstractSampleJobTest { @Override From e915e1f5b33a130e0c862dd786d2336a87f9c2b4 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Thu, 24 Nov 2022 02:27:50 +0900 Subject: [PATCH 009/383] Compile with -parameters option Closes gh-742 --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index f0eeec7855..28d1742951 100644 --- a/pom.xml +++ b/pom.xml @@ -311,6 +311,13 @@ + + maven-compiler-plugin + + -parameters + -parameters + + org.apache.maven.plugins maven-surefire-plugin From 39602b1fc25d8ddd3fe0b1dde696f157c928a7e7 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Thu, 24 Nov 2022 09:33:58 +0900 Subject: [PATCH 010/383] Change to use maven.compiler.parameters See gh-742 --- pom.xml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 28d1742951..3d3933d147 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,9 @@ 5.9.1 + + true + 1757561022 @@ -311,13 +314,6 @@ - - maven-compiler-plugin - - -parameters - -parameters - - org.apache.maven.plugins maven-surefire-plugin From 367cd5a3bd6fb34fcb4ea5874e60a6d56b02ac08 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Thu, 24 Nov 2022 23:19:06 +0900 Subject: [PATCH 011/383] Update to spring-framework 6.0.1 Closes gh-747 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d3933d147..529597c411 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ * 3.5.11 - 6.0.0-SNAPSHOT + 6.0.1 5.0.0-SNAPSHOT org.mybatis.spring From 19ce87558eea5ff281130a5c0193c5a909c947bd Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Thu, 24 Nov 2022 23:19:27 +0900 Subject: [PATCH 012/383] Update to spring-batch 5.0.0 Closes gh-747 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 529597c411..60d59e0dbe 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ 3.5.11 6.0.1 - 5.0.0-SNAPSHOT + 5.0.0 org.mybatis.spring 5.9.1 From a1c328de17cd025341f407bbbd6e5fbcb9768df6 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Fri, 25 Nov 2022 08:02:09 +0900 Subject: [PATCH 013/383] Add java.version=17 on 3.x --- .github/workflows/ci.yaml | 2 +- .github/workflows/coveralls.yaml | 2 +- .github/workflows/sonar.yaml | 2 +- .github/workflows/sonatype.yaml | 2 +- pom.xml | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index dba82c0e24..8a1e48a857 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,4 +42,4 @@ jobs: java-version: ${{ matrix.java }} distribution: ${{ matrix.distribution }} - name: Test with Maven - run: ./mvnw test -B -D"license.skip=true" -D"enforcer.skip=true" + run: ./mvnw test -B -D"license.skip=true" diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index df3ec31ab0..92953b4640 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -33,7 +33,7 @@ jobs: distribution: zulu - name: Report Coverage to Coveralls for Pull Requests if: github.event_name == 'pull_request' - run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -Denforcer.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER + run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PR_NUMBER: ${{ github.event.number }} diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 40c6300f32..15d005a80b 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -36,7 +36,7 @@ jobs: java-version: 17 distribution: zulu - name: Analyze with SonarCloud - run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_spring -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true -Denforcer.skip=true + run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_spring -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index 88bcd02e70..07ba21fde2 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -33,7 +33,7 @@ jobs: java-version: 17 distribution: zulu - name: Deploy to Sonatype - run: ./mvnw deploy -DskipTests -Denforcer.skip=true -B --settings ./.mvn/settings.xml -Dlicense.skip=true + run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml -Dlicense.skip=true env: CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} diff --git a/pom.xml b/pom.xml index 60d59e0dbe..d14d7f729e 100644 --- a/pom.xml +++ b/pom.xml @@ -104,6 +104,7 @@ Spring org.springframework.batch.*;resolution:=optional,* * + 17 3.5.11 6.0.1 From 74a474b61dc61ec2f0872fbeb07e0439536f66c4 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Fri, 25 Nov 2022 08:19:54 +0900 Subject: [PATCH 014/383] Update to spring-framework 6.0.2 Closes gh-750 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d14d7f729e..aa9e9830e5 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ 17 3.5.11 - 6.0.1 + 6.0.2 5.0.0 org.mybatis.spring From 0e9d32e68b6566b7227803a96071095a503daa41 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Fri, 25 Nov 2022 08:53:20 +0900 Subject: [PATCH 015/383] Drop enforcer.skip --- .github/workflows/coveralls.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index 92953b4640..ac387747b0 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -39,6 +39,6 @@ jobs: PR_NUMBER: ${{ github.event.number }} - name: Report Coverage to Coveralls for General Push if: github.event_name == 'push' - run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -Denforcer.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github + run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 6ce7d21f14d7941fdfcb0099887bf425ebd36cc5 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Fri, 25 Nov 2022 12:29:15 +0900 Subject: [PATCH 016/383] Prepare to merge to master for release 3.0.0 --- .github/workflows/ci.yaml | 2 -- .github/workflows/sonar.yaml | 2 +- .github/workflows/sonatype.yaml | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 957480d17f..ed83d5edd7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,8 +19,6 @@ name: Java CI on: push: pull_request: - schedule: - - cron: "0 0 * * *" jobs: test: diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 15d005a80b..eda5f33114 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -19,7 +19,7 @@ name: SonarCloud on: push: branches: - - 3.x + - master jobs: build: diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index 07ba21fde2..008954a7f3 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -19,7 +19,7 @@ name: Sonatype on: push: branches: - - 3.x + - master jobs: build: From 3150039ddedfbf0dacd45945b235265a7a232707 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Fri, 25 Nov 2022 20:58:58 +0900 Subject: [PATCH 017/383] Update README --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f6df7c6962..e4ec694397 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,8 @@ MyBatis-Spring adapter is an easy-to-use Spring bridge for MyBatis sql mapping f Supported Versions ------------------ -- 3.x - Support for Spring 6 and Spring Batch 5 (**not release yet**) -- master (2.1.x) - Enhance and maintenance for Spring 5 and Spring Batch 4 (**not release yet**) -- 2.0.x - Support for Java 8, Spring 5, and Junit 5 plus other java 8 requirements +- master - Support for Spring 6 and Spring Batch 5 +- 2.1.x - Enhance and maintenance for Spring 5 and Spring Batch 4 - 1.3.x - Continued support for Java 6 and 7 Essentials From e357e06e634829c832a515dddc95b219aa8a0972 Mon Sep 17 00:00:00 2001 From: Iwao AVE! Date: Fri, 25 Nov 2022 21:51:15 +0900 Subject: [PATCH 018/383] [maven-release-plugin] prepare release mybatis-spring-3.0.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index aa9e9830e5..58085c6efc 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ mybatis-spring - 3.0.0-SNAPSHOT + 3.0.0 jar mybatis-spring @@ -80,7 +80,7 @@ http://github.com/mybatis/spring scm:git:ssh://github.com/mybatis/spring.git scm:git:ssh://git@github.com/mybatis/spring.git - HEAD + mybatis-spring-3.0.0 GitHub Issue Management @@ -117,7 +117,7 @@ true - 1757561022 + 1669380647 From 64196e05e4e4fbb830e892f57239633e49076c7a Mon Sep 17 00:00:00 2001 From: Iwao AVE! Date: Fri, 25 Nov 2022 21:51:20 +0900 Subject: [PATCH 019/383] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 58085c6efc..1cd8f9eec9 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ mybatis-spring - 3.0.0 + 3.0.1-SNAPSHOT jar mybatis-spring @@ -80,7 +80,7 @@ http://github.com/mybatis/spring scm:git:ssh://github.com/mybatis/spring.git scm:git:ssh://git@github.com/mybatis/spring.git - mybatis-spring-3.0.0 + HEAD GitHub Issue Management @@ -117,7 +117,7 @@ true - 1669380647 + 1669380680 From c9148ceae772796f52c74d620a8a56bfdaeacd60 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 25 Nov 2022 14:20:33 +0000 Subject: [PATCH 020/383] Update dependency org.slf4j:slf4j-simple to v2.0.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1cd8f9eec9..00f15f1118 100644 --- a/pom.xml +++ b/pom.xml @@ -223,7 +223,7 @@ org.slf4j slf4j-simple - 2.0.4 + 2.0.5 test From e6ea1350b1e4e4f0b83e9960a5af1148ebcbb484 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sat, 26 Nov 2022 12:12:48 +0900 Subject: [PATCH 021/383] Fix javadoc error on MyBatisBatchItemWriter --- .../java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java b/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java index 42118df358..1da81f0547 100644 --- a/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java +++ b/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java @@ -42,7 +42,7 @@ *

* The user must provide a MyBatis statement id that points to the SQL statement defined in the MyBatis. *

- * It is expected that {@link #write(List)} is called inside a transaction. If it is not each statement call will be + * It is expected that {@link #write(Chunk)} is called inside a transaction. If it is not each statement call will be * autocommitted and flushStatements will return no results. *

* The writer is thread safe after its properties are set (normal singleton behavior), so it can be used to write in From 42aad517003d3d5ce9f924068d2338b4dae9adc2 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sun, 27 Nov 2022 19:59:39 +0900 Subject: [PATCH 022/383] MapperScannerConfigurer#includeAnnotationConfig set to false in native image Fixes gh-757 --- .../java/org/mybatis/spring/mapper/ClassPathMapperScanner.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java index 7268202265..79686eb5b0 100644 --- a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java +++ b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java @@ -36,6 +36,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.annotation.ClassPathBeanDefinitionScanner; +import org.springframework.core.NativeDetector; import org.springframework.core.type.filter.AnnotationTypeFilter; import org.springframework.core.type.filter.AssignableTypeFilter; import org.springframework.util.StringUtils; @@ -84,6 +85,7 @@ public class ClassPathMapperScanner extends ClassPathBeanDefinitionScanner { public ClassPathMapperScanner(BeanDefinitionRegistry registry) { super(registry, false); + setIncludeAnnotationConfig(!NativeDetector.inNativeImage()); } public void setAddToConfig(boolean addToConfig) { From b4b5ed65e14cc2a04f7d16651c5a019368aab314 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Mon, 28 Nov 2022 08:54:35 +0900 Subject: [PATCH 023/383] Add a new option whether print warning log if not found mappers that matches conditions on ClassPathMapperScanner Fixes gh-761 --- .../spring/mapper/ClassPathMapperScanner.java | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java index 79686eb5b0..617095f7f8 100644 --- a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java +++ b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java @@ -67,6 +67,8 @@ public class ClassPathMapperScanner extends ClassPathBeanDefinitionScanner { private boolean lazyInitialization; + private boolean printWarnLogIfNotFoundMappers = true; + private SqlSessionFactory sqlSessionFactory; private SqlSessionTemplate sqlSessionTemplate; @@ -86,6 +88,7 @@ public class ClassPathMapperScanner extends ClassPathBeanDefinitionScanner { public ClassPathMapperScanner(BeanDefinitionRegistry registry) { super(registry, false); setIncludeAnnotationConfig(!NativeDetector.inNativeImage()); + setPrintWarnLogIfNotFoundMappers(!NativeDetector.inNativeImage()); } public void setAddToConfig(boolean addToConfig) { @@ -111,6 +114,21 @@ public void setLazyInitialization(boolean lazyInitialization) { this.lazyInitialization = lazyInitialization; } + /** + * Set whether print warning log if not found mappers that matches conditions. + *

+ * Default is {@code true}. But {@code false} when running in native image. + *

+ * + * @param printWarnLogIfNotFoundMappers + * Set the @{code true} to print + * + * @since 3.0.1 + */ + public void setPrintWarnLogIfNotFoundMappers(boolean printWarnLogIfNotFoundMappers) { + this.printWarnLogIfNotFoundMappers = printWarnLogIfNotFoundMappers; + } + public void setMarkerInterface(Class markerInterface) { this.markerInterface = markerInterface; } @@ -211,8 +229,10 @@ public Set doScan(String... basePackages) { Set beanDefinitions = super.doScan(basePackages); if (beanDefinitions.isEmpty()) { - LOGGER.warn(() -> "No MyBatis mapper was found in '" + Arrays.toString(basePackages) - + "' package. Please check your configuration."); + if (printWarnLogIfNotFoundMappers) { + LOGGER.warn(() -> "No MyBatis mapper was found in '" + Arrays.toString(basePackages) + + "' package. Please check your configuration."); + } } else { processBeanDefinitions(beanDefinitions); } From 517cabad29e3a972cb24768da60507c96cbba4d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Sat, 3 Dec 2022 17:47:02 +0100 Subject: [PATCH 024/383] filter site content without hijacking main resources fixes #759 --- pom.xml | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 00f15f1118..42512c568e 100644 --- a/pom.xml +++ b/pom.xml @@ -331,14 +331,35 @@ + + org.apache.maven.plugins + maven-resources-plugin + + + filter-site + pre-site + + copy-resources + + + ${project.build.directory}/site-src + + + src/site + true + + + + + + org.apache.maven.plugins maven-site-plugin en,es,zh_CN,ja,ko - ${project.build.directory}/site-src - + @@ -354,12 +375,6 @@ ${project.basedir}/src/main/resources - - - ${project.basedir}/src/site - ${project.build.directory}/site-src - true - From 29b25913b43ca3f207f1bf539b99c1310b09b7a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 00:16:36 +0000 Subject: [PATCH 025/383] Update dependency org.apache.derby:derby to v10.16.1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 00f15f1118..f3363daa1e 100644 --- a/pom.xml +++ b/pom.xml @@ -161,7 +161,7 @@ org.apache.derby derby - 10.14.2.0 + 10.16.1.1 test From 9ead0cd78ca1d5c192efc6519be0c117e016f661 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 4 Dec 2022 19:42:33 -0500 Subject: [PATCH 026/383] [pom] Move comment so its not trailing --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d9f32eecef..743518c933 100644 --- a/pom.xml +++ b/pom.xml @@ -331,10 +331,11 @@ - + org.apache.maven.plugins maven-resources-plugin + filter-site pre-site From 6f6fd1799d06ced6e1ac9f11a58fa9cd5a19efbb Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 5 Dec 2022 08:56:37 -0500 Subject: [PATCH 027/383] [pom] Fix java release version: must be 17 was mixing meta data with source/target at 17 but release at 8, surprising it worked to compile... --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 743518c933..064728939e 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,10 @@ Spring org.springframework.batch.*;resolution:=optional,* * + + 17 + 17 3.5.11 6.0.2 From 5653a6b9fba6590e41912c824f0755cfb8ad95f2 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 8 Dec 2022 19:30:43 -0500 Subject: [PATCH 028/383] [maven-release-plugin] prepare release mybatis-spring-3.0.1 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 064728939e..9c5d1d1d96 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ mybatis-spring - 3.0.1-SNAPSHOT + 3.0.1 jar mybatis-spring @@ -80,7 +80,7 @@ http://github.com/mybatis/spring scm:git:ssh://github.com/mybatis/spring.git scm:git:ssh://git@github.com/mybatis/spring.git - HEAD + mybatis-spring-3.0.1 GitHub Issue Management @@ -120,7 +120,7 @@ true - 1669380680 + 1670545799 From 4879017fca4ef6f5d24ed9a6a29f31f9efcf934b Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 8 Dec 2022 19:30:46 -0500 Subject: [PATCH 029/383] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 9c5d1d1d96..4138e9e4f6 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ mybatis-spring - 3.0.1 + 3.0.2-SNAPSHOT jar mybatis-spring @@ -80,7 +80,7 @@ http://github.com/mybatis/spring scm:git:ssh://github.com/mybatis/spring.git scm:git:ssh://git@github.com/mybatis/spring.git - mybatis-spring-3.0.1 + HEAD GitHub Issue Management @@ -120,7 +120,7 @@ true - 1670545799 + 1670545846 From ec9c46b3296ac9c6f6bdcaa9b7434f93001caa3e Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 8 Dec 2022 19:31:31 -0500 Subject: [PATCH 030/383] [git] add release files to ignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 8a1aa32238..001d888176 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ *.iml /.idea .mvn/wrapper/maven-wrapper.jar +release.properties +*.releaseBackup From a54274266a184efbeb6fdab3282c53ce8b1320af Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 8 Dec 2022 19:40:31 -0500 Subject: [PATCH 031/383] [pom] Add java.sql to modules for javadocs due to known issue with maven plugin incorrectly determining modular usage, let it be modular there so the build works. --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 4138e9e4f6..4e51983d6b 100644 --- a/pom.xml +++ b/pom.xml @@ -365,6 +365,17 @@ ${project.build.directory}/site-src + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + + + + From 36154e12d07bec69d3491a973a01b5df5508db9a Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 8 Dec 2022 19:44:20 -0500 Subject: [PATCH 032/383] [pom] Add java.xml module as well for dom --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 4e51983d6b..dc96a92787 100644 --- a/pom.xml +++ b/pom.xml @@ -373,6 +373,8 @@ + + From 7133b5b71e98b7f436b6aa88f3e94bcadfdd3b25 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 8 Dec 2022 19:46:01 -0500 Subject: [PATCH 033/383] [maven-release-plugin] prepare release mybatis-spring-3.0.1 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index dc96a92787..d741dc34c3 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ mybatis-spring - 3.0.2-SNAPSHOT + 3.0.1 jar mybatis-spring @@ -80,7 +80,7 @@ http://github.com/mybatis/spring scm:git:ssh://github.com/mybatis/spring.git scm:git:ssh://git@github.com/mybatis/spring.git - HEAD + mybatis-spring-3.0.1 GitHub Issue Management @@ -120,7 +120,7 @@ true - 1670545846 + 1670546724 From d5581502d4ac6398929a14adaf0455553748eddc Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 8 Dec 2022 19:46:04 -0500 Subject: [PATCH 034/383] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d741dc34c3..7127f81eba 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ mybatis-spring - 3.0.1 + 3.0.2-SNAPSHOT jar mybatis-spring @@ -80,7 +80,7 @@ http://github.com/mybatis/spring scm:git:ssh://github.com/mybatis/spring.git scm:git:ssh://git@github.com/mybatis/spring.git - mybatis-spring-3.0.1 + HEAD GitHub Issue Management @@ -120,7 +120,7 @@ true - 1670546724 + 1670546764 From 3395b1e5fd915958138f08ee4cdcdd65e5b96ef1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 22:18:44 +0000 Subject: [PATCH 035/383] Update dependency org.slf4j:slf4j-simple to v2.0.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7127f81eba..43aa82a863 100644 --- a/pom.xml +++ b/pom.xml @@ -226,7 +226,7 @@ org.slf4j slf4j-simple - 2.0.5 + 2.0.6 test From b550b1c0110894c292bf27bffd3b5f78db4b4bc9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Dec 2022 10:57:49 +0000 Subject: [PATCH 036/383] Update spring core to v6.0.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 43aa82a863..0edfd0a6d0 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 17 3.5.11 - 6.0.2 + 6.0.3 5.0.0 org.mybatis.spring From 30e62869a3f9e7ffa9b04b5040b97e504e471b52 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 30 Dec 2022 23:27:06 +0000 Subject: [PATCH 037/383] Update dependency org.mybatis:mybatis-parent to v37 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0edfd0a6d0..55bf87666c 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.mybatis mybatis-parent - 36 + 37 From 1b8bef021f378b8148c6e7498369cda636780873 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 6 Jan 2023 17:42:38 +0000 Subject: [PATCH 038/383] Update dependency org.assertj:assertj-core to v3.24.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 55bf87666c..972f933562 100644 --- a/pom.xml +++ b/pom.xml @@ -240,7 +240,7 @@ org.assertj assertj-core - 3.23.1 + 3.24.1 test From 9dbdcbbb69a7c05753d47185e9fa055a9247a018 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 Jan 2023 15:42:16 +0000 Subject: [PATCH 039/383] Update dependency org.junit.jupiter:junit-jupiter-engine to v5.9.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 972f933562..6d1061cb2b 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 5.0.0 org.mybatis.spring - 5.9.1 + 5.9.2 true From 34eee7e5c0f4b38d56581094c69cad5245d29113 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Jan 2023 14:54:12 +0000 Subject: [PATCH 040/383] Update spring core to v6.0.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d1061cb2b..24fded18fa 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 17 3.5.11 - 6.0.3 + 6.0.4 5.0.0 org.mybatis.spring From ae8a9baff3392a00bb8f4536af8afca39908ecf2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 17 Jan 2023 00:33:58 +0000 Subject: [PATCH 041/383] Update dependency org.assertj:assertj-core to v3.24.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 24fded18fa..0180f41e9f 100644 --- a/pom.xml +++ b/pom.xml @@ -240,7 +240,7 @@ org.assertj assertj-core - 3.24.1 + 3.24.2 test From b0353f9b5422d2e8a8b4d94e6772578c98c3c6d8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 24 Jan 2023 06:41:26 +0000 Subject: [PATCH 042/383] Update dependency maven to v3.8.7 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index dc3affce3d..ca5ab4bab1 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar From 278e72f036907433a06b8685844fdd23633c4ef6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 6 Feb 2023 13:08:47 +0000 Subject: [PATCH 043/383] Update dependency maven to v3.9.0 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index ca5ab4bab1..6686a643d7 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar From b954be1c76fe03923451545da32c8cab90e7ae48 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 19:20:25 +0000 Subject: [PATCH 044/383] Update spring core to v6.0.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0180f41e9f..39a4d7403b 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 17 3.5.11 - 6.0.4 + 6.0.5 5.0.0 org.mybatis.spring From a219149de6f3e9bdcfb904f818f32a409076b721 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 00:59:32 +0000 Subject: [PATCH 045/383] Update spring batch to v5.0.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 39a4d7403b..6bfbe9e929 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ 3.5.11 6.0.5 - 5.0.0 + 5.0.1 org.mybatis.spring 5.9.2 From c651766d6ae4348da8687ea187c5b0861b0e0876 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 05:14:15 +0000 Subject: [PATCH 046/383] Update dependency org.mybatis:mybatis to v3.5.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6bfbe9e929..84cd09fc01 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ 17 17 - 3.5.11 + 3.5.12 6.0.5 5.0.1 org.mybatis.spring From 8facc32f4b0dac3273bbeb242a19db71afcfdd73 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 21:09:08 +0000 Subject: [PATCH 047/383] Update spring core to v6.0.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 84cd09fc01..f910678b1e 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 17 3.5.12 - 6.0.5 + 6.0.6 5.0.1 org.mybatis.spring From 52916d5c32cd1862277a4e7bbff22ead9cc2480a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Mar 2023 12:01:41 +0000 Subject: [PATCH 048/383] Update dependency org.mybatis:mybatis to v3.5.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f910678b1e..3460880f30 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ 17 17 - 3.5.12 + 3.5.13 6.0.6 5.0.1 org.mybatis.spring From e3a0e56d2ca18fa75701049ea044760c7fc8a095 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 18:03:01 +0000 Subject: [PATCH 049/383] Update dependency maven-wrapper to v3.2.0 --- .mvn/wrapper/maven-wrapper.properties | 4 +- mvnw | 218 +++++++++++++------------- mvnw.cmd | 31 +++- 3 files changed, 131 insertions(+), 122 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 6686a643d7..08ea486aa5 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -6,7 +6,7 @@ # "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 +# http://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 @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/mvnw b/mvnw index 5643201c7d..8d937f4c14 100755 --- a/mvnw +++ b/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Maven Start Up Batch script +# Apache Maven Wrapper startup batch script, version 3.2.0 # # Required ENV vars: # ------------------ @@ -27,7 +27,6 @@ # # Optional ENV vars # ----------------- -# M2_HOME - location of maven2's installed home dir # MAVEN_OPTS - parameters passed to the Java VM when running Maven # e.g. to debug Maven itself, use # set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 @@ -54,7 +53,7 @@ fi cygwin=false; darwin=false; mingw=false -case "`uname`" in +case "$(uname)" in CYGWIN*) cygwin=true ;; MINGW*) mingw=true;; Darwin*) darwin=true @@ -62,9 +61,9 @@ case "`uname`" in # See https://developer.apple.com/library/mac/qa/qa1170/_index.html if [ -z "$JAVA_HOME" ]; then if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME else - export JAVA_HOME="/Library/Java/Home" + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME fi fi ;; @@ -72,68 +71,38 @@ esac if [ -z "$JAVA_HOME" ] ; then if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` + JAVA_HOME=$(java-config --jre-home) fi fi -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - # For Cygwin, ensure paths are in UNIX format before anything is touched if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + JAVA_HOME=$(cygpath --unix "$JAVA_HOME") [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` + CLASSPATH=$(cygpath --path --unix "$CLASSPATH") fi # For Mingw, ensure paths are in UNIX format before anything is touched if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" fi if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + readLink=$(which readlink) + if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + javaHome="$(dirname "\"$javaExecutable\"")" + javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" else - javaExecutable="`readlink -f \"$javaExecutable\"`" + javaExecutable="$(readlink -f "\"$javaExecutable\"")" fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` + javaHome="$(dirname "\"$javaExecutable\"")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') JAVA_HOME="$javaHome" export JAVA_HOME fi @@ -149,7 +118,7 @@ if [ -z "$JAVACMD" ] ; then JAVACMD="$JAVA_HOME/bin/java" fi else - JAVACMD="`\\unset -f command; \\command -v java`" + JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" fi fi @@ -163,12 +132,9 @@ if [ -z "$JAVA_HOME" ] ; then echo "Warning: JAVA_HOME environment variable is not set." fi -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - # traverses directory structure from process work directory to filesystem root # first directory with .mvn subdirectory is considered project base directory find_maven_basedir() { - if [ -z "$1" ] then echo "Path not specified to find_maven_basedir" @@ -184,96 +150,99 @@ find_maven_basedir() { fi # workaround for JBEAP-8937 (on Solaris 10/Sparc) if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` + wdir=$(cd "$wdir/.." || exit 1; pwd) fi # end of workaround done - echo "${basedir}" + printf '%s' "$(cd "$basedir" || exit 1; pwd)" } # concatenates all lines of a file concat_lines() { if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" fi } -BASE_DIR=`find_maven_basedir "$(pwd)"` +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") if [ -z "$BASE_DIR" ]; then exit 1; fi +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + ########################################################################################## # Extension to allow automatically downloading the maven-wrapper.jar from Maven-central # This allows using the maven wrapper in projects that prohibit checking in binary data. ########################################################################################## -if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found .mvn/wrapper/maven-wrapper.jar" - fi +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." - fi + log "Couldn't find $wrapperJarPath, downloading it ..." + if [ -n "$MVNW_REPOURL" ]; then - jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" else - jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" fi - while IFS="=" read key value; do - case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; esac - done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" - if [ "$MVNW_VERBOSE" = true ]; then - echo "Downloading from: $jarUrl" - fi - wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + if $cygwin; then - wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") fi if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" fi elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl -o "$wrapperJarPath" "$jarUrl" -f + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" else - curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" fi - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" # For Cygwin, switch paths to Windows format before running javac if $cygwin; then - javaClass=`cygpath --path --windows "$javaClass"` + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") fi - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Compiling MavenWrapperDownloader.java ..." - fi - # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - # Running the downloader - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Running MavenWrapperDownloader.java ..." - fi - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" fi fi fi @@ -282,35 +251,58 @@ fi # End of extension ########################################################################################## -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi fi + MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" # For Cygwin, switch paths to Windows format before running java if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + CLASSPATH=$(cygpath --path --windows "$CLASSPATH") [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` + MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") fi # Provide a "standardized" way to retrieve the CLI args that will # work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" export MAVEN_CMD_LINE_ARGS WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain +# shellcheck disable=SC2086 # safe args exec "$JAVACMD" \ $MAVEN_OPTS \ $MAVEN_DEBUG_OPTS \ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" \ "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd index 8a15b7f311..c4586b564e 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -18,13 +18,12 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Maven Start Up Batch script +@REM Apache Maven Wrapper startup batch script, version 3.2.0 @REM @REM Required ENV vars: @REM JAVA_HOME - location of a JDK home dir @REM @REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir @REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands @REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending @REM MAVEN_OPTS - parameters passed to the Java VM when running Maven @@ -120,10 +119,10 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain -set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B ) @REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central @@ -134,11 +133,11 @@ if exist %WRAPPER_JAR% ( ) ) else ( if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" ) if "%MVNW_VERBOSE%" == "true" ( echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% + echo Downloading from: %WRAPPER_URL% ) powershell -Command "&{"^ @@ -146,7 +145,7 @@ if exist %WRAPPER_JAR% ( "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ "}" if "%MVNW_VERBOSE%" == "true" ( echo Finished downloading %WRAPPER_JAR% @@ -154,6 +153,24 @@ if exist %WRAPPER_JAR% ( ) @REM End of extension +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + @REM Provide a "standardized" way to retrieve the CLI args that will @REM work with both Windows and non-Windows executions. set MAVEN_CMD_LINE_ARGS=%* From 380055d539d8e754396ea71de2990c01d33acb13 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 Mar 2023 21:12:36 +0000 Subject: [PATCH 050/383] Update dependency org.slf4j:slf4j-simple to v2.0.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3460880f30..af80ab8e96 100644 --- a/pom.xml +++ b/pom.xml @@ -226,7 +226,7 @@ org.slf4j slf4j-simple - 2.0.6 + 2.0.7 test From 9b273cf6b4545b4850754351f344d7c278f00632 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Mar 2023 11:30:17 +0000 Subject: [PATCH 051/383] Update dependency maven to v3.9.1 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 08ea486aa5..d8b2495a1e 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar From 100136570bdfa55f90a3620c688a13dad2956d39 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 14:23:37 +0000 Subject: [PATCH 052/383] Update spring core to v6.0.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index af80ab8e96..951340b102 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 17 3.5.13 - 6.0.6 + 6.0.7 5.0.1 org.mybatis.spring From e8a2a571db8c6d0adbae1d919863b5328e8e8477 Mon Sep 17 00:00:00 2001 From: "sky.yann" Date: Tue, 28 Mar 2023 23:26:14 +0800 Subject: [PATCH 053/383] fix: change the event type that SqlSessionFactory is listening to --- .../java/org/mybatis/spring/SqlSessionFactoryBean.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java index c64328ec51..2103aea282 100644 --- a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java +++ b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java @@ -54,7 +54,6 @@ import org.mybatis.spring.transaction.SpringManagedTransactionFactory; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; -import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.event.ContextRefreshedEvent; @@ -87,7 +86,7 @@ * @see #setDataSource */ public class SqlSessionFactoryBean - implements FactoryBean, InitializingBean, ApplicationListener { + implements FactoryBean, InitializingBean, ApplicationListener { private static final Logger LOGGER = LoggerFactory.getLogger(SqlSessionFactoryBean.class); @@ -658,8 +657,8 @@ public boolean isSingleton() { * {@inheritDoc} */ @Override - public void onApplicationEvent(ApplicationEvent event) { - if (failFast && event instanceof ContextRefreshedEvent) { + public void onApplicationEvent(ContextRefreshedEvent event) { + if (failFast) { // fail-fast -> check all statements are completed this.sqlSessionFactory.getConfiguration().getMappedStatementNames(); } From 04a962c934812c195e9b1479dca03e2089881a21 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 25 Jan 2023 16:42:42 -0500 Subject: [PATCH 054/383] [ci] import sorting --- src/test/java/org/mybatis/spring/MyBatisSpringTest.java | 6 +++--- .../org/mybatis/spring/submitted/xa/UserServiceTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/mybatis/spring/MyBatisSpringTest.java b/src/test/java/org/mybatis/spring/MyBatisSpringTest.java index 2b5f43f5d5..01d980929c 100644 --- a/src/test/java/org/mybatis/spring/MyBatisSpringTest.java +++ b/src/test/java/org/mybatis/spring/MyBatisSpringTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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,8 @@ import com.mockrunner.mock.jdbc.MockDataSource; import com.mockrunner.mock.jdbc.MockPreparedStatement; +import jakarta.transaction.UserTransaction; + import org.apache.ibatis.exceptions.PersistenceException; import org.apache.ibatis.mapping.Environment; import org.apache.ibatis.session.ExecutorType; @@ -38,8 +40,6 @@ import org.springframework.transaction.jta.JtaTransactionManager; import org.springframework.transaction.support.DefaultTransactionDefinition; -import jakarta.transaction.UserTransaction; - class MyBatisSpringTest extends AbstractMyBatisSpringTest { private SqlSession session; diff --git a/src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java b/src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java index 0aeeac48b7..60a59ab50e 100644 --- a/src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java +++ b/src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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. @@ -17,6 +17,8 @@ import static org.assertj.core.api.Assertions.assertThat; +import jakarta.transaction.UserTransaction; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -24,8 +26,6 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import jakarta.transaction.UserTransaction; - @Disabled("Yet not found OSS implementation that supported Jakarta EE 9+ APIs") @ExtendWith(SpringExtension.class) @SpringJUnitConfig(locations = "classpath:org/mybatis/spring/submitted/xa/applicationContext.xml") From 6610a6a5d9364bd5c7d9691ef223f7e697826d60 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 25 Jan 2023 16:42:58 -0500 Subject: [PATCH 055/383] [tests] Bump mockito to 5.2.0 and continue using mockito subclass mocking --- pom.xml | 10 ++++++++-- .../mybatis/spring/sample/SampleSqlSessionTest.java | 2 +- .../mockito-extensions/org.mockito.plugins.MockMaker | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/pom.xml b/pom.xml index 951340b102..d1ff20b5ad 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ - true - 1670546764 From 1da1624030b2e18452a87715a014f4c9d2827419 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 6 Apr 2023 20:43:51 -0400 Subject: [PATCH 069/383] [pom] Override jacoco to 0.8.9 --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 11dbf0aefa..50502b9f2e 100644 --- a/pom.xml +++ b/pom.xml @@ -118,6 +118,9 @@ 1670546764 + + + 0.8.9 From c9284672f733cba195f772ff86c7e2c5e104030d Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 6 Apr 2023 20:51:10 -0400 Subject: [PATCH 070/383] [test] Remove mockito extension as it did not work --- pom.xml | 6 ------ .../org/mybatis/spring/sample/SampleSqlSessionTest.java | 3 --- 2 files changed, 9 deletions(-) diff --git a/pom.xml b/pom.xml index 50502b9f2e..5925c45579 100644 --- a/pom.xml +++ b/pom.xml @@ -236,12 +236,6 @@ 5.2.0 test - - org.mockito - mockito-junit-jupiter - 5.2.0 - test - org.assertj diff --git a/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java b/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java index 69f330cf93..c8750d6cc9 100644 --- a/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java +++ b/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java @@ -18,8 +18,6 @@ import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.junit.jupiter.MockitoExtension; import org.mybatis.spring.sample.domain.User; import org.mybatis.spring.sample.service.BarService; import org.springframework.beans.factory.annotation.Autowired; @@ -30,7 +28,6 @@ * Example of basic MyBatis-Spring integration usage with a manual DAO implementation that subclasses * SqlSessionDaoSupport. */ -@ExtendWith(MockitoExtension.class) @DirtiesContext @SpringJUnitConfig(locations = { "classpath:org/mybatis/spring/sample/config/applicationContext-sqlsession.xml" }) class SampleSqlSessionTest { From 97904b5729feb7fe2394031a40e57a8ab5f099e1 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 6 Apr 2023 20:59:42 -0400 Subject: [PATCH 071/383] [test] Remove dirties context annotation mockito seems to trip on this with its auto mocking since 4.10.0. Trying to see if this is really necessary on this test... --- .../java/org/mybatis/spring/sample/SampleSqlSessionTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java b/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java index c8750d6cc9..8f2a8a02a0 100644 --- a/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java +++ b/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java @@ -21,14 +21,12 @@ import org.mybatis.spring.sample.domain.User; import org.mybatis.spring.sample.service.BarService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; /** * Example of basic MyBatis-Spring integration usage with a manual DAO implementation that subclasses * SqlSessionDaoSupport. */ -@DirtiesContext @SpringJUnitConfig(locations = { "classpath:org/mybatis/spring/sample/config/applicationContext-sqlsession.xml" }) class SampleSqlSessionTest { From 828e6a5731ee1c4637fbb2c7e8a69a9f6fa81be1 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 6 Apr 2023 21:08:50 -0400 Subject: [PATCH 072/383] [cleanup] Delete really old changes.xml we don't use --- src/changes/changes.xml | 201 ---------------------------------------- 1 file changed, 201 deletions(-) delete mode 100644 src/changes/changes.xml diff --git a/src/changes/changes.xml b/src/changes/changes.xml deleted file mode 100644 index 9af855ece9..0000000000 --- a/src/changes/changes.xml +++ /dev/null @@ -1,201 +0,0 @@ - - - - - The MyBatis Team - Changes - - - - - - mybatis-spring OSGi imports - Spring batch should be optional - - - org.mybatis.spring.transaction.SpringManagedTransaction.logger should be static - - - - - Build a namespace for MyBatis - - - mybatis-spring OSGi imports - Spring batch should be optional - - - Allow setting the super type for domain classes when scanning for type aliases via Spring - - - MapperScannerConfigurer can't work with AnnotationConfigApplicationContext - - - Remove finals in SqlSessionDaoSupport to enable adding Qualifiers - - - Proxy message by istantiating Objects with Spring - - - SqlSessionFactoryBean: add setters for Object[Wrapper]Factory - - - MapperScannerConfigurer should allow setting a BeanNameGenerator - - - - - 2nd level cache consistency with MyBatis-Spring - - - Overriding sqlSessionTemplate in MapperFactoryBean not working in certain circumstances - - - MapperScannerConfigurer causes app initialization problems - - - - - Prevent class loading / add zero-method mappers while scanning for mappers - - - Lazy loads do not execute within Spring-managed transactions - - - MapperScannerConfigurer does not work with PropertyPlaceholderConfigurer - - - - - Add SqlSession.flushStatements() - - - configurationProperties not applied in mappings - - - SqlSessionTemplate throws NullPointerException if ExceptionTranslator cannot translate - exception - - - Replace BeanPostProcessor with BeanDefinitionRegistryPostProcessor - - - - - Added a fail fast checking to ensure that all statements are fully loaded - - - SqlSessionFactoryBean should allow sql fragments to be shared across multiple mapper - files - - - Spring MapperScannerConfigurer does not work properly in OSGi - - - Enable typehandler and alias registration in mybatis-spring - - - - - Support multiple character sets (parse XML from InputStream vs. Reader) - - - Reset error context after calling XMLConfigBuilder or XMLMapperBuilder - - - SqlSession rolls back with no Spring Tx + autocommit=false + dirty=true (an - update was executed) - - - setTransactionFactoryProperties property in SqlSessionFactory has been removed - - - setTransactionFactoryClass property in SqlSessionFactory has been replaced by - setTransactionFactory - - - Improved logging - - - Doesn't propagate exceptions up the stack when using batch mode - - - - - - getSqlSessionTemplate() method in SqlSessionDaoSupport has been replaced by getSqlSession() - - - MapperFactoryBean has been moved to org.mybatis.spring.mapper.MapperFactoryBean - - - MapperScannerPostProcessor has been moved to org.mybatis.spring.mapper.MapperScannerConfigurer - - - Removed @Mapper annotation - - - Mapper scanning should not rely on proprietary @Mapper annotation - - - Avoid one Proxy creation when using injected mappers - - - Add new selectMap methods to SqlSessionTemplate - - - - - - Improved documentation manual. - - - Add operation select(String, ResultHandler) - - - Component Scan for Mappers - - - SqlSessionCallback.doInSqlSession should not throw SqlException - - - getExceptionTranslator() may not be called in mybatis-spring - - - Setting a specific datasource for one mapper does not work - - - should not let changing the executor type during a tx - - - mapperLocations does not work for xml files inside JARs - - - Use a reference to SqlSessionFactory in MapperScanner - - - - - - First RC release. - - - - - From 67417b3546b063ae72a7a5108948d33af4dcb0d7 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 6 Apr 2023 21:13:33 -0400 Subject: [PATCH 073/383] [tests] Figured mockito out, was hidden in xml (wasn't expecting that) --- .../spring/sample/config/applicationContext-sqlsession.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/mybatis/spring/sample/config/applicationContext-sqlsession.xml b/src/test/java/org/mybatis/spring/sample/config/applicationContext-sqlsession.xml index a547d15585..ea8ee39c57 100644 --- a/src/test/java/org/mybatis/spring/sample/config/applicationContext-sqlsession.xml +++ b/src/test/java/org/mybatis/spring/sample/config/applicationContext-sqlsession.xml @@ -1,7 +1,7 @@ - - - + From d520290b9869b3dde2328a6221f885f03238f49d Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 6 Apr 2023 21:13:41 -0400 Subject: [PATCH 074/383] Revert "[test] Remove dirties context annotation" This reverts commit 97904b5729feb7fe2394031a40e57a8ab5f099e1. --- .../java/org/mybatis/spring/sample/SampleSqlSessionTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java b/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java index 8f2a8a02a0..c8750d6cc9 100644 --- a/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java +++ b/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java @@ -21,12 +21,14 @@ import org.mybatis.spring.sample.domain.User; import org.mybatis.spring.sample.service.BarService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; /** * Example of basic MyBatis-Spring integration usage with a manual DAO implementation that subclasses * SqlSessionDaoSupport. */ +@DirtiesContext @SpringJUnitConfig(locations = { "classpath:org/mybatis/spring/sample/config/applicationContext-sqlsession.xml" }) class SampleSqlSessionTest { From 56f90bad5dea21e74a67782b957a287cdc52b525 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 6 Apr 2023 21:35:23 -0400 Subject: [PATCH 075/383] Revert "[tests] Figured mockito out, was hidden in xml (wasn't expecting that)" This reverts commit 67417b3546b063ae72a7a5108948d33af4dcb0d7. --- .../spring/sample/config/applicationContext-sqlsession.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/mybatis/spring/sample/config/applicationContext-sqlsession.xml b/src/test/java/org/mybatis/spring/sample/config/applicationContext-sqlsession.xml index ea8ee39c57..a547d15585 100644 --- a/src/test/java/org/mybatis/spring/sample/config/applicationContext-sqlsession.xml +++ b/src/test/java/org/mybatis/spring/sample/config/applicationContext-sqlsession.xml @@ -1,7 +1,7 @@ - + + + From eac0433ca99dd8c8c8a66116132671f8fa77b6cb Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 6 Apr 2023 21:56:21 -0400 Subject: [PATCH 076/383] [test] Per https://github.com/mockito/mockito/pull/2779, fixed test case --- .../sample/config/applicationContext-sqlsession.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/mybatis/spring/sample/config/applicationContext-sqlsession.xml b/src/test/java/org/mybatis/spring/sample/config/applicationContext-sqlsession.xml index a547d15585..8c14c7d1a6 100644 --- a/src/test/java/org/mybatis/spring/sample/config/applicationContext-sqlsession.xml +++ b/src/test/java/org/mybatis/spring/sample/config/applicationContext-sqlsession.xml @@ -1,7 +1,7 @@ - - + + + org.mybatis.spring.sample.mapper.UserMapper + From 528bf8decb0b7ef9371e644b1743ff9698122525 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 6 Apr 2023 22:09:55 -0400 Subject: [PATCH 077/383] [pom] Try to set byte buddy experimental --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 5925c45579..de7e1c502f 100644 --- a/pom.xml +++ b/pom.xml @@ -121,6 +121,9 @@ 0.8.9 + + + true From cbdaf82cc73a5d7d9895d790ccffe934f5626fed Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 6 Apr 2023 22:12:18 -0400 Subject: [PATCH 078/383] [pom] Bump byte buddy to 1.14.4 to get newer asm --- pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml index de7e1c502f..15f38570a1 100644 --- a/pom.xml +++ b/pom.xml @@ -317,6 +317,18 @@ test + + net.bytebuddy + byte-buddy + 1.14.4 + test + + + net.bytebuddy + byte-buddy-agent + 1.14.4 + test + From 0771973313945f7ede4c73b96a221c1df7d50c2e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 21:45:41 +0000 Subject: [PATCH 079/383] Update dependency org.mockito:mockito-core to v5.3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 15f38570a1..58f4403942 100644 --- a/pom.xml +++ b/pom.xml @@ -236,7 +236,7 @@ org.mockito mockito-core - 5.2.0 + 5.3.0 test From 7e8d584bae137060317c21d5bb2033cdebd0988f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 13 Apr 2023 13:12:00 +0000 Subject: [PATCH 080/383] Update spring core to v6.0.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 58f4403942..bca5979d62 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 17 3.5.13 - 6.0.7 + 6.0.8 5.0.1 org.mybatis.spring From 63eb86aae5efc8f57a730beca49a29be83a1be56 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 13 Apr 2023 18:53:44 +0000 Subject: [PATCH 081/383] Update dependency org.jboss.byteman:byteman-bmunit to v4.0.21 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 58f4403942..1b06f04e1b 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,7 @@ org.jboss.byteman byteman-bmunit - 4.0.20 + 4.0.21 test From e25bf49e1cf1cf95bd187af7d8baee621701aba5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 21:06:51 +0000 Subject: [PATCH 082/383] Update dependency org.mockito:mockito-core to v5.3.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e3ec347bb4..7d4d1e0c0d 100644 --- a/pom.xml +++ b/pom.xml @@ -236,7 +236,7 @@ org.mockito mockito-core - 5.3.0 + 5.3.1 test From 7e4904fb2ab06c34a9bbeefc866226724e11de37 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 26 Apr 2023 09:08:04 +0000 Subject: [PATCH 083/383] Update dependency org.junit.jupiter:junit-jupiter-engine to v5.9.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7d4d1e0c0d..8b48f44d6f 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 5.0.1 org.mybatis.spring - 5.9.2 + 5.9.3 1670546764 From aa599ce83cbb4c295f0eb7d533d504a79de637bf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 5 May 2023 15:27:42 +0000 Subject: [PATCH 084/383] Update dependency com.atomikos:transactions-jdbc to v6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8b48f44d6f..e6b00849c0 100644 --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ com.atomikos transactions-jdbc - 5.0.9 + 6.0.0 test From 9005cbac8ed44fda51d0e1a6a7b82edde21960c0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 07:36:58 +0000 Subject: [PATCH 085/383] Update dependency maven to v3.9.2 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index d8b2495a1e..3c6fda8c6e 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar From 444bf9019323ef93fcc426fee9033b52a23e2c57 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 14:14:31 +0000 Subject: [PATCH 086/383] Update spring core to v6.0.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e6b00849c0..537bee6f95 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 17 3.5.13 - 6.0.8 + 6.0.9 5.0.1 org.mybatis.spring From 6200535da5f2cf39709ff76ded2b472c855e18cd Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sat, 13 May 2023 11:10:31 +0900 Subject: [PATCH 087/383] Update license header --- src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java index 2103aea282..0255a7075c 100644 --- a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java +++ b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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. From e50be2717c13b29d9750e43eb4c5521c2aa3692a Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sat, 13 May 2023 12:12:49 +0900 Subject: [PATCH 088/383] Drop support 1.3.x and 2.0.x Fixes gh-814 --- README.md | 1 - src/site/es/markdown/index.md | 4 ++-- src/site/ja/markdown/index.md | 4 ++-- src/site/ko/markdown/index.md | 4 ++-- src/site/markdown/index.md | 12 ++++++------ src/site/zh/markdown/index.md | 4 ++-- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index e4ec694397..1bfbf7082d 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,6 @@ Supported Versions - master - Support for Spring 6 and Spring Batch 5 - 2.1.x - Enhance and maintenance for Spring 5 and Spring Batch 4 -- 1.3.x - Continued support for Java 6 and 7 Essentials ---------- diff --git a/src/site/es/markdown/index.md b/src/site/es/markdown/index.md index b79bcb62ff..52a789bfd8 100644 --- a/src/site/es/markdown/index.md +++ b/src/site/es/markdown/index.md @@ -24,8 +24,8 @@ MyBatis-Spring requires following versions: |----------------| --- |------------------|--------------| --- | | **3.0** | 3.5+ | 6.0+ | 5.0+ | Java 17+ | | **2.1** | 3.5+ | 5.x | 4.x | Java 8+ | -| **2.0** | 3.5+ | 5.x | 4.x | Java 8+ | -| **1.3** | 3.4+ | 3.2.2+ | 2.1+ | Java 6+ | +| ~~**2.0**~~ | ~~3.5+~~ | ~~5.x~~ | ~~4.x~~ | ~~Java 8+~~ | +| ~~**1.3**~~ | ~~3.4+~~ | ~~3.2.2+~~ | ~~2.1+~~ | ~~Java 6+~~ | ## Agradecimientos diff --git a/src/site/ja/markdown/index.md b/src/site/ja/markdown/index.md index 3a11e460d9..1bd7b7408b 100644 --- a/src/site/ja/markdown/index.md +++ b/src/site/ja/markdown/index.md @@ -19,8 +19,8 @@ MyBatis-Spring はäģĨ下ぎバãƒŧジョãƒŗをåŋ…čĻã¨ã—ぞす。 |----------------| --- |------------------|--------------| --- | | **3.0** | 3.5+ | 6.0+ | 5.0+ | Java 17+ | | **2.1** | 3.5+ | 5.x | 4.x | Java 8+ | -| **2.0** | 3.5+ | 5.x | 4.x | Java 8+ | -| **1.3** | 3.4+ | 3.2.2+ | 2.1+ | Java 6+ | +| ~~**2.0**~~ | ~~3.5+~~ | ~~5.x~~ | ~~4.x~~ | ~~Java 8+~~ | +| ~~**1.3**~~ | ~~3.4+~~ | ~~3.2.2+~~ | ~~2.1+~~ | ~~Java 6+~~ | ## čŦčžž diff --git a/src/site/ko/markdown/index.md b/src/site/ko/markdown/index.md index 210c2becd9..83e5567550 100644 --- a/src/site/ko/markdown/index.md +++ b/src/site/ko/markdown/index.md @@ -22,8 +22,8 @@ MyBatis-Spring requires following versions: |----------------| --- |------------------|--------------| --- | | **3.0** | 3.5+ | 6.0+ | 5.0+ | Java 17+ | | **2.1** | 3.5+ | 5.x | 4.x | Java 8+ | -| **2.0** | 3.5+ | 5.x | 4.x | Java 8+ | -| **1.3** | 3.4+ | 3.2.2+ | 2.1+ | Java 6+ | +| ~~**2.0**~~ | ~~3.5+~~ | ~~5.x~~ | ~~4.x~~ | ~~Java 8+~~ | +| ~~**1.3**~~ | ~~3.4+~~ | ~~3.2.2+~~ | ~~2.1+~~ | ~~Java 6+~~ | ## 감ė‚Ŧ ė¸ė‚Ŧ diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index 2826d01602..b6afdff316 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -19,12 +19,12 @@ This document does not attempt to provide background information or basic setup MyBatis-Spring requires following versions: -| MyBatis-Spring | MyBatis | Spring Framework | Spring Batch | Java | -|----------------| --- |------------------|--------------|----------| -| **3.0** | 3.5+ | 6.0+ | 5.0+ | Java 17+ | -| **2.1** | 3.5+ | 5.x | 4.x | Java 8+ | -| **2.0** | 3.5+ | 5.x | 4.x | Java 8+ | -| **1.3** | 3.4+ | 3.2.2+ | 2.1+ | Java 6+ | +| MyBatis-Spring | MyBatis | Spring Framework | Spring Batch | Java | +|----------------| --- |------------------|--------------|-------------| +| **3.0** | 3.5+ | 6.0+ | 5.0+ | Java 17+ | +| **2.1** | 3.5+ | 5.x | 4.x | Java 8+ | +| ~~**2.0**~~ | ~~3.5+~~ | ~~5.x~~ | ~~4.x~~ | ~~Java 8+~~ | +| ~~**1.3**~~ | ~~3.4+~~ | ~~3.2.2+~~ | ~~2.1+~~ | ~~Java 6+~~ | ## Acknowledgements diff --git a/src/site/zh/markdown/index.md b/src/site/zh/markdown/index.md index 3239fe84ce..3ffbbaaa03 100644 --- a/src/site/zh/markdown/index.md +++ b/src/site/zh/markdown/index.md @@ -21,8 +21,8 @@ MyBatis-Spring 需čĻäģĨ下į‰ˆæœŦīŧš |----------------| --- |------------------|--------------| --- | | **3.0** | 3.5+ | 6.0+ | 5.0+ | Java 17+ | | **2.1** | 3.5+ | 5.x | 4.x | Java 8+ | -| **2.0** | 3.5+ | 5.x | 4.x | Java 8+ | -| **1.3** | 3.4+ | 3.2.2+ | 2.1+ | Java 6+ | +| ~~**2.0**~~ | ~~3.5+~~ | ~~5.x~~ | ~~4.x~~ | ~~Java 8+~~ | +| ~~**1.3**~~ | ~~3.4+~~ | ~~3.2.2+~~ | ~~2.1+~~ | ~~Java 6+~~ | ## 致č°ĸ From f206e7e669a59edc5f2ef333c094f3c752d74a08 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sat, 13 May 2023 16:29:46 +0900 Subject: [PATCH 089/383] Support appendable method on SqlSessionFactoryBean Fixes gh-787 * addMapperLocations * addTypeHandlers * addScriptingLanguageDrivers * addPlugins * addTypeAliases --- .../mybatis/spring/SqlSessionFactoryBean.java | 86 +++++++++ .../spring/SqlSessionFactoryBeanTest.java | 163 +++++++++++++++++- .../java/org/mybatis/spring/TestMapper2.xml | 28 +++ .../java/org/mybatis/spring/TestMapper3.xml | 28 +++ 4 files changed, 304 insertions(+), 1 deletion(-) create mode 100644 src/test/java/org/mybatis/spring/TestMapper2.xml create mode 100644 src/test/java/org/mybatis/spring/TestMapper3.xml diff --git a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java index 0255a7075c..c4032f142c 100644 --- a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java +++ b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java @@ -24,10 +24,14 @@ import java.io.IOException; import java.lang.reflect.Modifier; import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; +import java.util.List; import java.util.Optional; import java.util.Properties; import java.util.Set; +import java.util.function.IntFunction; import java.util.stream.Stream; import javax.sql.DataSource; @@ -478,6 +482,88 @@ public void setDefaultScriptingLanguageDriver(Class de this.defaultScriptingLanguageDriver = defaultScriptingLanguageDriver; } + /** + * Add locations of MyBatis mapper files that are going to be merged into the {@code SqlSessionFactory} configuration + * at runtime. + *

+ * This is an alternative to specifying "<sqlmapper>" entries in an MyBatis config file. This property being + * based on Spring's resource abstraction also allows for specifying resource patterns here: e.g. + * "classpath*:sqlmap/*-mapper.xml". + * + * @param mapperLocations + * location of MyBatis mapper files + * + * @see #setMapperLocations(Resource...) + * + * @since 3.0.2 + */ + public void addMapperLocations(Resource... mapperLocations) { + setMapperLocations(appendArrays(this.mapperLocations, mapperLocations, Resource[]::new)); + } + + /** + * Add type handlers. + * + * @param typeHandlers + * Type handler list + * + * @since 3.0.2 + */ + public void addTypeHandlers(TypeHandler... typeHandlers) { + setTypeHandlers(appendArrays(this.typeHandlers, typeHandlers, TypeHandler[]::new)); + } + + /** + * Add scripting language drivers. + * + * @param scriptingLanguageDrivers + * scripting language drivers + * + * @since 3.0.2 + */ + public void addScriptingLanguageDrivers(LanguageDriver... scriptingLanguageDrivers) { + setScriptingLanguageDrivers( + appendArrays(this.scriptingLanguageDrivers, scriptingLanguageDrivers, LanguageDriver[]::new)); + } + + /** + * Add Mybatis plugins. + * + * @param plugins + * list of plugins + * + * @since 3.0.2 + */ + public void addPlugins(Interceptor... plugins) { + setPlugins(appendArrays(this.plugins, plugins, Interceptor[]::new)); + } + + /** + * Add type aliases. + * + * @param typeAliases + * Type aliases list + * + * @since 3.0.2 + */ + public void addTypeAliases(Class... typeAliases) { + setTypeAliases(appendArrays(this.typeAliases, typeAliases, Class[]::new)); + } + + private T[] appendArrays(T[] oldArrays, T[] newArrays, IntFunction generator) { + if (oldArrays == null) { + return newArrays; + } else { + if (newArrays == null) { + return oldArrays; + } else { + List newList = new ArrayList<>(Arrays.asList(oldArrays)); + newList.addAll(Arrays.asList(newArrays)); + return newList.toArray(generator.apply(0)); + } + } + } + /** * {@inheritDoc} */ diff --git a/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java b/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java index 7ada0e4164..90fda72eb8 100644 --- a/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java +++ b/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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. @@ -22,13 +22,24 @@ import java.math.BigDecimal; import java.math.BigInteger; +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.Properties; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; +import java.util.stream.Collectors; import org.apache.ibatis.cache.impl.PerpetualCache; +import org.apache.ibatis.executor.Executor; import org.apache.ibatis.io.JBoss6VFS; +import org.apache.ibatis.mapping.MappedStatement; +import org.apache.ibatis.plugin.Interceptor; +import org.apache.ibatis.plugin.Intercepts; +import org.apache.ibatis.plugin.Invocation; +import org.apache.ibatis.plugin.Signature; import org.apache.ibatis.reflection.factory.DefaultObjectFactory; import org.apache.ibatis.reflection.factory.ObjectFactory; import org.apache.ibatis.reflection.wrapper.DefaultObjectWrapperFactory; @@ -41,9 +52,12 @@ import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.transaction.TransactionFactory; import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory; +import org.apache.ibatis.type.BaseTypeHandler; import org.apache.ibatis.type.EnumOrdinalTypeHandler; +import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.TypeAliasRegistry; import org.apache.ibatis.type.TypeException; +import org.apache.ibatis.type.TypeHandler; import org.apache.ibatis.type.TypeHandlerRegistry; import org.junit.jupiter.api.Test; import org.mybatis.core.jdk.type.AtomicNumberTypeHandler; @@ -492,6 +506,88 @@ void testScriptingLanguageDriverWithDefault() throws Exception { assertThat(registry.getDriver(RawLanguageDriver.class)).isNotNull(); } + @Test + void testAppendableMethod() throws Exception { + setupFactoryBean(); + // add values + this.factoryBean.addScriptingLanguageDrivers(new MyLanguageDriver1()); + this.factoryBean.addScriptingLanguageDrivers(new MyLanguageDriver2()); + this.factoryBean.addPlugins(new MyPlugin1(), new MyPlugin2()); + this.factoryBean.addPlugins(new MyPlugin3()); + this.factoryBean.addTypeHandlers(new MyTypeHandler1()); + this.factoryBean.addTypeHandlers(new MyTypeHandler2(), new MyTypeHandler3()); + this.factoryBean.addTypeAliases(MyTypeHandler1.class, MyTypeHandler2.class, MyTypeHandler3.class); + this.factoryBean.addTypeAliases(MyPlugin1.class); + this.factoryBean.addMapperLocations(new ClassPathResource("org/mybatis/spring/TestMapper.xml"), + new ClassPathResource("org/mybatis/spring/TestMapper2.xml")); + this.factoryBean.addMapperLocations(new ClassPathResource("org/mybatis/spring/TestMapper3.xml")); + // ignore null value + this.factoryBean.addScriptingLanguageDrivers(null); + this.factoryBean.addPlugins(null); + this.factoryBean.addTypeHandlers(null); + this.factoryBean.addTypeAliases(null); + this.factoryBean.addMapperLocations(null); + SqlSessionFactory factory = this.factoryBean.getObject(); + LanguageDriverRegistry languageDriverRegistry = factory.getConfiguration().getLanguageRegistry(); + TypeHandlerRegistry typeHandlerRegistry = factory.getConfiguration().getTypeHandlerRegistry(); + TypeAliasRegistry typeAliasRegistry = factory.getConfiguration().getTypeAliasRegistry(); + assertThat(languageDriverRegistry.getDriver(MyLanguageDriver1.class)).isNotNull(); + assertThat(languageDriverRegistry.getDriver(MyLanguageDriver2.class)).isNotNull(); + assertThat(typeHandlerRegistry.getTypeHandlers().stream().map(TypeHandler::getClass).map(Class::getSimpleName) + .collect(Collectors.toSet())).contains(MyTypeHandler1.class.getSimpleName(), + MyTypeHandler2.class.getSimpleName(), MyTypeHandler3.class.getSimpleName()); + assertThat(typeAliasRegistry.getTypeAliases()).containsKeys(MyTypeHandler1.class.getSimpleName().toLowerCase(), + MyTypeHandler2.class.getSimpleName().toLowerCase(), MyTypeHandler3.class.getSimpleName().toLowerCase(), + MyPlugin1.class.getSimpleName().toLowerCase()); + assertThat(factory.getConfiguration().getMappedStatement("org.mybatis.spring.TestMapper.findFail")).isNotNull(); + assertThat(factory.getConfiguration().getMappedStatement("org.mybatis.spring.TestMapper2.selectOne")).isNotNull(); + assertThat(factory.getConfiguration().getMappedStatement("org.mybatis.spring.TestMapper3.selectOne")).isNotNull(); + assertThat( + factory.getConfiguration().getInterceptors().stream().map(Interceptor::getClass).map(Class::getSimpleName)) + .contains(MyPlugin1.class.getSimpleName(), MyPlugin2.class.getSimpleName(), + MyPlugin3.class.getSimpleName()); + } + + @Test + void testAppendableMethodWithEmpty() throws Exception { + setupFactoryBean(); + this.factoryBean.addScriptingLanguageDrivers(); + this.factoryBean.addPlugins(); + this.factoryBean.addTypeHandlers(); + this.factoryBean.addTypeAliases(); + this.factoryBean.addMapperLocations(); + SqlSessionFactory factory = this.factoryBean.getObject(); + LanguageDriverRegistry languageDriverRegistry = factory.getConfiguration().getLanguageRegistry(); + TypeHandlerRegistry typeHandlerRegistry = factory.getConfiguration().getTypeHandlerRegistry(); + TypeAliasRegistry typeAliasRegistry = factory.getConfiguration().getTypeAliasRegistry(); + assertThat(languageDriverRegistry.getDriver(MyLanguageDriver1.class)).isNull(); + assertThat(languageDriverRegistry.getDriver(MyLanguageDriver2.class)).isNull(); + assertThat(typeHandlerRegistry.getTypeHandlers()).hasSize(40); + assertThat(typeAliasRegistry.getTypeAliases()).hasSize(80); + assertThat(factory.getConfiguration().getMappedStatementNames()).isEmpty(); + assertThat(factory.getConfiguration().getInterceptors()).isEmpty(); + } + + @Test + void testAppendableMethodWithNull() throws Exception { + setupFactoryBean(); + this.factoryBean.addScriptingLanguageDrivers(null); + this.factoryBean.addPlugins(null); + this.factoryBean.addTypeHandlers(null); + this.factoryBean.addTypeAliases(null); + this.factoryBean.addMapperLocations(null); + SqlSessionFactory factory = this.factoryBean.getObject(); + LanguageDriverRegistry languageDriverRegistry = factory.getConfiguration().getLanguageRegistry(); + TypeHandlerRegistry typeHandlerRegistry = factory.getConfiguration().getTypeHandlerRegistry(); + TypeAliasRegistry typeAliasRegistry = factory.getConfiguration().getTypeAliasRegistry(); + assertThat(languageDriverRegistry.getDriver(MyLanguageDriver1.class)).isNull(); + assertThat(languageDriverRegistry.getDriver(MyLanguageDriver2.class)).isNull(); + assertThat(typeHandlerRegistry.getTypeHandlers()).hasSize(40); + assertThat(typeAliasRegistry.getTypeAliases()).hasSize(80); + assertThat(factory.getConfiguration().getMappedStatementNames()).isEmpty(); + assertThat(factory.getConfiguration().getInterceptors()).isEmpty(); + } + private void assertDefaultConfig(SqlSessionFactory factory) { assertConfig(factory, SqlSessionFactoryBean.class.getSimpleName(), org.mybatis.spring.transaction.SpringManagedTransactionFactory.class); @@ -522,6 +618,71 @@ private static class MyLanguageDriver1 extends RawLanguageDriver { private static class MyLanguageDriver2 extends RawLanguageDriver { } + private static class MyBasePlugin implements Interceptor { + + @Override + public Object intercept(Invocation invocation) throws Throwable { + return null; + } + + @Override + public Object plugin(Object target) { + return Interceptor.super.plugin(target); + } + + @Override + public void setProperties(Properties properties) { + Interceptor.super.setProperties(properties); + } + } + + @Intercepts({ @Signature(type = Executor.class, method = "update", args = { MappedStatement.class, Object.class }) }) + private static class MyPlugin1 extends MyBasePlugin { + + } + + @Intercepts({ @Signature(type = Executor.class, method = "update", args = { MappedStatement.class, Object.class }) }) + private static class MyPlugin2 extends MyBasePlugin { + + } + + @Intercepts({ @Signature(type = Executor.class, method = "update", args = { MappedStatement.class, Object.class }) }) + private static class MyPlugin3 extends MyBasePlugin { + + } + + private static class MyBaseTypeHandler extends BaseTypeHandler { + + @Override + public void setNonNullParameter(PreparedStatement ps, int i, String parameter, JdbcType jdbcType) + throws SQLException { + } + + @Override + public String getNullableResult(ResultSet rs, String columnName) throws SQLException { + return null; + } + + @Override + public String getNullableResult(ResultSet rs, int columnIndex) throws SQLException { + return null; + } + + @Override + public String getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { + return null; + } + } + + private static class MyTypeHandler1 extends MyBaseTypeHandler { + } + + private static class MyTypeHandler2 extends MyBaseTypeHandler { + } + + private static class MyTypeHandler3 extends MyBaseTypeHandler { + } + private static enum MyEnum { } diff --git a/src/test/java/org/mybatis/spring/TestMapper2.xml b/src/test/java/org/mybatis/spring/TestMapper2.xml new file mode 100644 index 0000000000..89f5a09b92 --- /dev/null +++ b/src/test/java/org/mybatis/spring/TestMapper2.xml @@ -0,0 +1,28 @@ + + + + + + + + diff --git a/src/test/java/org/mybatis/spring/TestMapper3.xml b/src/test/java/org/mybatis/spring/TestMapper3.xml new file mode 100644 index 0000000000..36278e655d --- /dev/null +++ b/src/test/java/org/mybatis/spring/TestMapper3.xml @@ -0,0 +1,28 @@ + + + + + + + + From 76c1766c8d3a9ef4e55664ce9f47963da277ff2c Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sat, 13 May 2023 21:52:45 +0900 Subject: [PATCH 090/383] Support spring.aot.enabled=true Fixes gh-780 Fix to use the AotDetector#useGeneratedArtifacts() instead of NativeDetector.inNativeImage() for set the includeAnnotationConfig to false on the ClassPathMapperScanner --- .../org/mybatis/spring/mapper/ClassPathMapperScanner.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java index 617095f7f8..626cba9985 100644 --- a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java +++ b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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,6 +27,7 @@ import org.mybatis.spring.SqlSessionTemplate; import org.springframework.aop.scope.ScopedProxyFactoryBean; import org.springframework.aop.scope.ScopedProxyUtils; +import org.springframework.aot.AotDetector; import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinitionHolder; @@ -87,7 +88,7 @@ public class ClassPathMapperScanner extends ClassPathBeanDefinitionScanner { public ClassPathMapperScanner(BeanDefinitionRegistry registry) { super(registry, false); - setIncludeAnnotationConfig(!NativeDetector.inNativeImage()); + setIncludeAnnotationConfig(!AotDetector.useGeneratedArtifacts()); setPrintWarnLogIfNotFoundMappers(!NativeDetector.inNativeImage()); } From 894b7a39ef0505c34fcb57cdbcb91d534b74d330 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sun, 14 May 2023 22:52:13 +0900 Subject: [PATCH 091/383] Use the TransactionSynchronization instead of TransactionSynchronizationAdapter TransactionSynchronizationAdapter is deprecated already --- src/main/java/org/mybatis/spring/SqlSessionUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/mybatis/spring/SqlSessionUtils.java b/src/main/java/org/mybatis/spring/SqlSessionUtils.java index 819d062e4f..f36272f0d2 100644 --- a/src/main/java/org/mybatis/spring/SqlSessionUtils.java +++ b/src/main/java/org/mybatis/spring/SqlSessionUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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 @@ import org.springframework.dao.TransientDataAccessResourceException; import org.springframework.dao.support.PersistenceExceptionTranslator; import org.springframework.jdbc.datasource.DataSourceUtils; -import org.springframework.transaction.support.TransactionSynchronizationAdapter; +import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationManager; /** @@ -225,7 +225,7 @@ public static boolean isSqlSessionTransactional(SqlSession session, SqlSessionFa * {@code SqlSession}. It assumes that {@code Connection} life cycle will be managed by * {@code DataSourceTransactionManager} or {@code JtaTransactionManager} */ - private static final class SqlSessionSynchronization extends TransactionSynchronizationAdapter { + private static final class SqlSessionSynchronization implements TransactionSynchronization { private final SqlSessionHolder holder; From a32bf4ed82300b76b2bf0cc1fc0208a41cb602dd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 May 2023 13:14:08 +0000 Subject: [PATCH 092/383] Update spring batch to v5.0.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 537bee6f95..699aac5f7f 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ 3.5.13 6.0.9 - 5.0.1 + 5.0.2 org.mybatis.spring 5.9.3 From a73af23bf144ccaddb1369740cefa6f734b5f9ef Mon Sep 17 00:00:00 2001 From: Iwao AVE! Date: Sat, 20 May 2023 01:41:20 +0900 Subject: [PATCH 093/383] [maven-release-plugin] prepare release mybatis-spring-3.0.2 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 699aac5f7f..33a9653693 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ mybatis-spring - 3.0.2-SNAPSHOT + 3.0.2 jar mybatis-spring @@ -80,7 +80,7 @@ http://github.com/mybatis/spring scm:git:ssh://github.com/mybatis/spring.git scm:git:ssh://git@github.com/mybatis/spring.git - HEAD + mybatis-spring-3.0.2 GitHub Issue Management @@ -117,7 +117,7 @@ 5.9.3 - 1670546764 + 1684514453 0.8.9 From 0f4709c5557dae65ca38ba310abbc62205a4f6c3 Mon Sep 17 00:00:00 2001 From: Iwao AVE! Date: Sat, 20 May 2023 01:41:25 +0900 Subject: [PATCH 094/383] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 33a9653693..55670ac4c3 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ mybatis-spring - 3.0.2 + 3.0.3-SNAPSHOT jar mybatis-spring @@ -80,7 +80,7 @@ http://github.com/mybatis/spring scm:git:ssh://github.com/mybatis/spring.git scm:git:ssh://git@github.com/mybatis/spring.git - mybatis-spring-3.0.2 + HEAD GitHub Issue Management @@ -117,7 +117,7 @@ 5.9.3 - 1684514453 + 1684514485 0.8.9 From 7388abbba2c2485eb8f94795507db41e7ddb0fcf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 30 May 2023 01:08:24 +0000 Subject: [PATCH 095/383] Update dependency org.mybatis:mybatis-parent to v38 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 55670ac4c3..c2d77ebff7 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.mybatis mybatis-parent - 37 + 38 From 9e5674264122e0d2bd7c3d0b62eebba003b52a04 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 31 May 2023 03:44:07 +0000 Subject: [PATCH 096/383] Update dependency org.hsqldb:hsqldb to v2.7.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c2d77ebff7..d96ac2fa00 100644 --- a/pom.xml +++ b/pom.xml @@ -222,7 +222,7 @@ org.hsqldb hsqldb - 2.7.1 + 2.7.2 test From 9db03e5be5691467c7308e8b734d787d254b0efc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Jun 2023 17:31:34 +0000 Subject: [PATCH 097/383] Update dependency net.bytebuddy:byte-buddy to v1.14.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d96ac2fa00..eefacc0115 100644 --- a/pom.xml +++ b/pom.xml @@ -320,7 +320,7 @@ net.bytebuddy byte-buddy - 1.14.4 + 1.14.5 test From 67d79bb86c63266804905cf93945e5cbf407f989 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Jun 2023 17:31:38 +0000 Subject: [PATCH 098/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.14.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d96ac2fa00..466d69d27c 100644 --- a/pom.xml +++ b/pom.xml @@ -326,7 +326,7 @@ net.bytebuddy byte-buddy-agent - 1.14.4 + 1.14.5 test From 3fa2a0ed6aaa2a755c107cff1f9a12f022fb3275 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Jun 2023 12:27:38 +0000 Subject: [PATCH 099/383] Update spring core to v6.0.10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d31840250c..0a34ee2311 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 17 3.5.13 - 6.0.9 + 6.0.10 5.0.2 org.mybatis.spring From 63a6600c03d59e646dd4a5404bf5258772459ea5 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sat, 17 Jun 2023 11:09:33 +0900 Subject: [PATCH 100/383] Optimize source * Update license header * Remove wildcard import * Apply formatter --- src/site/es/markdown/boot.md | 2 +- src/site/es/markdown/mappers.md | 2 +- src/site/es/markdown/sqlsession.md | 2 +- src/site/es/markdown/transactions.md | 2 +- src/site/ja/markdown/getting-started.md | 2 +- src/site/ko/markdown/getting-started.md | 2 +- src/site/markdown/factorybean.md | 2 +- src/site/markdown/index.md | 2 +- src/site/markdown/mappers.md | 2 +- src/site/markdown/sqlsession.md | 2 +- src/site/markdown/transactions.md | 2 +- src/test/java/org/mybatis/spring/MyBatisSpringTest.java | 2 +- .../java/org/mybatis/spring/SqlSessionFactoryBeanTest.java | 2 +- .../java/org/mybatis/spring/SqlSessionTemplateTest.java | 4 ++-- .../mybatis/spring/batch/MyBatisBatchItemWriterTest.java | 4 ++-- src/test/java/org/mybatis/spring/batch/SpringBatchTest.java | 4 ++-- .../batch/builder/MyBatisBatchItemWriterBuilderTest.java | 6 ++++-- .../org/mybatis/spring/mapper/MapperFactoryBeanTest.java | 4 ++-- .../java/org/mybatis/spring/sample/AbstractSampleTest.java | 4 ++-- 19 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/site/es/markdown/boot.md b/src/site/es/markdown/boot.md index cda8eb3a3d..678db5d753 100644 --- a/src/site/es/markdown/boot.md +++ b/src/site/es/markdown/boot.md @@ -1,4 +1,4 @@ # Using Spring Boot - + Please see the [MyBatis Spring-boot-starter](http://www.mybatis.org/spring-boot-starter/mybatis-spring-boot-autoconfigure) sub project docs for details. diff --git a/src/site/es/markdown/mappers.md b/src/site/es/markdown/mappers.md index 51dd4293d8..5b10210fa8 100644 --- a/src/site/es/markdown/mappers.md +++ b/src/site/es/markdown/mappers.md @@ -85,7 +85,7 @@ The motivation for adding this option is supporting a lazy initialization contro The default of this option is `false` (= not use lazy initialization). If developer want to use lazy initialization for mapper bean, it should be set to the `true` expressly. -IMPORTANT +IMPORTANT If use the lazy initialization feature, the developer need to understand following limitations. If any of following conditions are matches, usually the lazy initialization feature cannot use on your application. diff --git a/src/site/es/markdown/sqlsession.md b/src/site/es/markdown/sqlsession.md index 19fd43b1c3..1615d88896 100644 --- a/src/site/es/markdown/sqlsession.md +++ b/src/site/es/markdown/sqlsession.md @@ -86,7 +86,7 @@ Ahora todos tus statements se ejecutarÃĄn en batch de forma que puedes programar ```java public class UserService { - private final SqlSession sqlSession; + private final SqlSession sqlSession; public UserService(SqlSession sqlSession) { this.sqlSession = sqlSession; } diff --git a/src/site/es/markdown/transactions.md b/src/site/es/markdown/transactions.md index 227477ac56..54b9dae328 100644 --- a/src/site/es/markdown/transactions.md +++ b/src/site/es/markdown/transactions.md @@ -73,7 +73,7 @@ Fijate que si quieres usar transacciones CMT pero **no** quieres utilizar la ges ```java @Configuration -public class MyBatisConfig { +public class MyBatisConfig { @Bean public SqlSessionFactory sqlSessionFactory() { SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean(); diff --git a/src/site/ja/markdown/getting-started.md b/src/site/ja/markdown/getting-started.md index d1ed42e4c1..0fd4ba6b8c 100644 --- a/src/site/ja/markdown/getting-started.md +++ b/src/site/ja/markdown/getting-started.md @@ -1,6 +1,6 @@ # ã‚šã‚ŋãƒŧトã‚Ŧイド - + こぎįĢ ã§ã¯ã€MyBatis-Spring ぎイãƒŗ゚トãƒŧãƒĢãƒģč¨­åŽšæ‰‹é †ã¨ã€ãƒˆãƒŠãƒŗã‚ļã‚¯ã‚ˇãƒ§ãƒŗå‡Ļį†ã‚’åĢã‚€ã‚ˇãƒŗプãƒĢãĒã‚ĸプãƒĒã‚ąãƒŧã‚ˇãƒ§ãƒŗぎ構į¯‰ã™ã‚‹æ–šæŗ•ãĢついãĻčĒŦ明しぞす。 ## イãƒŗ゚トãƒŧãƒĢ diff --git a/src/site/ko/markdown/getting-started.md b/src/site/ko/markdown/getting-started.md index f04bde22cc..9547c6f39a 100644 --- a/src/site/ko/markdown/getting-started.md +++ b/src/site/ko/markdown/getting-started.md @@ -19,7 +19,7 @@ ## ëš ëĨ¸ ė„¤ė • -마ė´ë°”í‹°ėŠ¤ëĨŧ ėŠ¤í”„링ęŗŧ 함ęģ˜ ė‚ŦėšŠí•˜ë ¤ëŠ´ ėŠ¤í”„링ė˜ ė• í”ŒëĻŦėŧ€ė´ė…˜ ėģ¨í…ėŠ¤íŠ¸ė— ė ė–´ë„ 두개ëĨŧ ė •ė˜í•´ė¤„ 필ėš”ę°€ ėžˆë‹¤. +마ė´ë°”í‹°ėŠ¤ëĨŧ ėŠ¤í”„링ęŗŧ 함ęģ˜ ė‚ŦėšŠí•˜ë ¤ëŠ´ ėŠ¤í”„링ė˜ ė• í”ŒëĻŦėŧ€ė´ė…˜ ėģ¨í…ėŠ¤íŠ¸ė— ė ė–´ë„ 두개ëĨŧ ė •ė˜í•´ė¤„ 필ėš”ę°€ ėžˆë‹¤. 두가ė§€ëŠ” `SqlSessionFactory`ė™€ 한개 ė´ėƒė˜ 매íŧ ė¸í„°íŽ˜ė´ėŠ¤ė´ë‹¤. 마ė´ë°”í‹°ėŠ¤ ėŠ¤í”„링 ė—°ë™ëĒ¨ë“ˆė—ė„œ, `SqlSessionFactoryBean`ė€ `SqlSessionFactory`ëĨŧ 만들기 ėœ„í•´ ė‚ŦėšŠëœë‹¤. 팩토ëĻŦ 뚈ė„ ė„¤ė •í•˜ę¸° ėœ„í•´, ėŠ¤í”„링 ė„¤ė •íŒŒėŧė— 다ėŒ ė„¤ė •ė„ ėļ”ę°€í•˜ėž. diff --git a/src/site/markdown/factorybean.md b/src/site/markdown/factorybean.md index cf403649f8..9253e3f6e5 100644 --- a/src/site/markdown/factorybean.md +++ b/src/site/markdown/factorybean.md @@ -13,7 +13,7 @@ To create the factory bean, put the following in the Spring XML configuration fi ``` Note that `SqlSessionFactoryBean` implements Spring's `FactoryBean` interface see [the Spring documentation(Core Technologies -Customizing instantiation logic with a FactoryBean-)](https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#beans-factory-extension-factorybean)). -This means that the bean Spring ultimately creates is **not** the `SqlSessionFactoryBean` itself, but what the factory returns as a result of the `getObject()` call on the factory. +This means that the bean Spring ultimately creates is **not** the `SqlSessionFactoryBean` itself, but what the factory returns as a result of the `getObject()` call on the factory. In this case, Spring will build an `SqlSessionFactory` for you at application startup and store it with the name `sqlSessionFactory`. In Java, the equivalent code would be: diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index b6afdff316..bdfcad162f 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -53,4 +53,4 @@ Users can read about MyBatis-Spring in the following translations: Do you want to read about MyBatis in your own native language? Fill an issue providing patches with your mother tongue documentation! - + diff --git a/src/site/markdown/mappers.md b/src/site/markdown/mappers.md index b6cfec037d..ad365ff92f 100644 --- a/src/site/markdown/mappers.md +++ b/src/site/markdown/mappers.md @@ -25,7 +25,7 @@ public class FooServiceImpl implements FooService { } } ``` - + Notice that there are no `SqlSession` or MyBatis references in this code. Nor is there any need to create, open or close the session, MyBatis-Spring will take care of that. diff --git a/src/site/markdown/sqlsession.md b/src/site/markdown/sqlsession.md index 0d970bf514..38ea215015 100644 --- a/src/site/markdown/sqlsession.md +++ b/src/site/markdown/sqlsession.md @@ -82,7 +82,7 @@ Now all your statements will be batched so the following could be coded in a DAO ```java public class UserService { - private final SqlSession sqlSession; + private final SqlSession sqlSession; public UserService(SqlSession sqlSession) { this.sqlSession = sqlSession; } diff --git a/src/site/markdown/transactions.md b/src/site/markdown/transactions.md index 5eff852cab..580480ee57 100644 --- a/src/site/markdown/transactions.md +++ b/src/site/markdown/transactions.md @@ -3,7 +3,7 @@ One of the primary reasons for using MyBatis-Spring is that it allows MyBatis to participate in Spring transactions. Rather than create a new transaction manager specific to MyBatis, MyBatis-Spring leverages the existing `DataSourceTransactionManager` in Spring. - + Once a Spring transaction manager is configured, you can configure transactions in Spring as you normally would. Both `@Transactional` annotations and AOP style configurations are supported. A single `SqlSession` object will be created and used for the duration of the transaction. This session will be committed or rolled back as appropriate when then transaction completes. diff --git a/src/test/java/org/mybatis/spring/MyBatisSpringTest.java b/src/test/java/org/mybatis/spring/MyBatisSpringTest.java index 01d980929c..fda8ebf659 100644 --- a/src/test/java/org/mybatis/spring/MyBatisSpringTest.java +++ b/src/test/java/org/mybatis/spring/MyBatisSpringTest.java @@ -15,7 +15,7 @@ */ package org.mybatis.spring; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; diff --git a/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java b/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java index 90fda72eb8..4f5f88e224 100644 --- a/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java +++ b/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java @@ -16,7 +16,7 @@ package org.mybatis.spring; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertThrows; import com.mockrunner.mock.jdbc.MockDataSource; diff --git a/src/test/java/org/mybatis/spring/SqlSessionTemplateTest.java b/src/test/java/org/mybatis/spring/SqlSessionTemplateTest.java index 1fbe09d180..59cabcd7c3 100644 --- a/src/test/java/org/mybatis/spring/SqlSessionTemplateTest.java +++ b/src/test/java/org/mybatis/spring/SqlSessionTemplateTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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. @@ -15,7 +15,7 @@ */ package org.mybatis.spring; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; diff --git a/src/test/java/org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java b/src/test/java/org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java index ad11afbc09..827328bbc9 100644 --- a/src/test/java/org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java +++ b/src/test/java/org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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. @@ -16,7 +16,7 @@ package org.mybatis.spring.batch; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.BDDMockito.*; +import static org.mockito.BDDMockito.given; import java.time.Clock; import java.time.Instant; diff --git a/src/test/java/org/mybatis/spring/batch/SpringBatchTest.java b/src/test/java/org/mybatis/spring/batch/SpringBatchTest.java index c934a9b5d8..a27f0ad3a1 100644 --- a/src/test/java/org/mybatis/spring/batch/SpringBatchTest.java +++ b/src/test/java/org/mybatis/spring/batch/SpringBatchTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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. @@ -15,7 +15,7 @@ */ package org.mybatis.spring.batch; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; import org.apache.ibatis.session.SqlSession; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java b/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java index e410c88931..4b8fe68203 100644 --- a/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java +++ b/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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. @@ -19,7 +19,9 @@ import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import javax.sql.DataSource; diff --git a/src/test/java/org/mybatis/spring/mapper/MapperFactoryBeanTest.java b/src/test/java/org/mybatis/spring/mapper/MapperFactoryBeanTest.java index b28a67c947..25aa1e7759 100644 --- a/src/test/java/org/mybatis/spring/mapper/MapperFactoryBeanTest.java +++ b/src/test/java/org/mybatis/spring/mapper/MapperFactoryBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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. @@ -15,7 +15,7 @@ */ package org.mybatis.spring.mapper; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; diff --git a/src/test/java/org/mybatis/spring/sample/AbstractSampleTest.java b/src/test/java/org/mybatis/spring/sample/AbstractSampleTest.java index 60b3c004a5..577f555305 100644 --- a/src/test/java/org/mybatis/spring/sample/AbstractSampleTest.java +++ b/src/test/java/org/mybatis/spring/sample/AbstractSampleTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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. @@ -15,7 +15,7 @@ */ package org.mybatis.spring.sample; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; import org.mybatis.spring.sample.domain.User; From 76e8bae48771da0d765c28a84eed442e9640f382 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sat, 17 Jun 2023 22:00:28 +0900 Subject: [PATCH 101/383] Support processPropertyPlaceHolders option in mapper:scan and @MapperScan Fixes gh-829 --- .../mybatis/spring/annotation/MapperScan.java | 13 +++- .../annotation/MapperScannerRegistrar.java | 4 +- .../MapperScannerBeanDefinitionParser.java | 7 +- .../mybatis/spring/config/mybatis-spring.xsd | 12 ++- .../spring/annotation/MapperScanTest.java | 76 ++++++++++++++++++- .../org/mybatis/spring/annotation/MyBean.java | 37 +++++++++ .../spring/annotation/override.properties | 17 +++++ .../spring/annotation/placeholders.properties | 17 +++++ .../org/mybatis/spring/config/MyBean.java | 37 +++++++++ .../mybatis/spring/config/MyFactoryBean.java | 30 ++++++++ .../mybatis/spring/config/NamespaceTest.java | 33 +++++++- .../mybatis/spring/config/override.properties | 17 +++++ .../spring/config/placeholders.properties | 17 +++++ .../process-property-placeholders-false.xml | 35 +++++++++ .../process-property-placeholders-true.xml | 36 +++++++++ 15 files changed, 380 insertions(+), 8 deletions(-) create mode 100644 src/test/java/org/mybatis/spring/annotation/MyBean.java create mode 100644 src/test/java/org/mybatis/spring/annotation/override.properties create mode 100644 src/test/java/org/mybatis/spring/annotation/placeholders.properties create mode 100644 src/test/java/org/mybatis/spring/config/MyBean.java create mode 100644 src/test/java/org/mybatis/spring/config/MyFactoryBean.java create mode 100644 src/test/java/org/mybatis/spring/config/override.properties create mode 100644 src/test/java/org/mybatis/spring/config/placeholders.properties create mode 100644 src/test/java/org/mybatis/spring/config/process-property-placeholders-false.xml create mode 100644 src/test/java/org/mybatis/spring/config/process-property-placeholders-true.xml diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScan.java b/src/main/java/org/mybatis/spring/annotation/MapperScan.java index 78c0d9b0bf..9d51b7ce42 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScan.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScan.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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. @@ -185,4 +185,15 @@ */ String defaultScope() default AbstractBeanDefinition.SCOPE_DEFAULT; + /** + * Specifies a flag that whether execute a property placeholder processing or not. + *

+ * The default is {@literal true}. This means that a property placeholder processing execute. + * + * @since 3.0.3 + * + * @return a flag that whether execute a property placeholder processing or not + */ + boolean processPropertyPlaceHolders() default true; + } diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java index cde801d739..fb8f1f94f6 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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. @@ -82,7 +82,7 @@ void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes a BeanDefinitionRegistry registry, String beanName) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MapperScannerConfigurer.class); - builder.addPropertyValue("processPropertyPlaceHolders", true); + builder.addPropertyValue("processPropertyPlaceHolders", annoAttrs.getBoolean("processPropertyPlaceHolders")); Class annotationClass = annoAttrs.getClass("annotationClass"); if (!Annotation.class.equals(annotationClass)) { diff --git a/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java b/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java index d0e40c5777..927cd627d6 100644 --- a/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java +++ b/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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. @@ -56,6 +56,7 @@ public class MapperScannerBeanDefinitionParser extends AbstractBeanDefinitionPar private static final String ATTRIBUTE_MAPPER_FACTORY_BEAN_CLASS = "mapper-factory-bean-class"; private static final String ATTRIBUTE_LAZY_INITIALIZATION = "lazy-initialization"; private static final String ATTRIBUTE_DEFAULT_SCOPE = "default-scope"; + private static final String ATTRIBUTE_PROCESS_PROPERTY_PLACEHOLDERS = "process-property-placeholders"; /** * {@inheritDoc} @@ -68,7 +69,9 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa ClassLoader classLoader = ClassUtils.getDefaultClassLoader(); - builder.addPropertyValue("processPropertyPlaceHolders", true); + String processPropertyPlaceHolders = element.getAttribute(ATTRIBUTE_PROCESS_PROPERTY_PLACEHOLDERS); + builder.addPropertyValue("processPropertyPlaceHolders", + !StringUtils.hasText(processPropertyPlaceHolders) || Boolean.parseBoolean(processPropertyPlaceHolders)); try { String annotationClassName = element.getAttribute(ATTRIBUTE_ANNOTATION); if (StringUtils.hasText(annotationClassName)) { diff --git a/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd b/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd index 1a3d5df381..5366717e4d 100644 --- a/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd +++ b/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd @@ -1,7 +1,7 @@ + + + + + + + + + + + + diff --git a/src/test/java/org/mybatis/spring/config/process-property-placeholders-true.xml b/src/test/java/org/mybatis/spring/config/process-property-placeholders-true.xml new file mode 100644 index 0000000000..d10857c242 --- /dev/null +++ b/src/test/java/org/mybatis/spring/config/process-property-placeholders-true.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + From 11707f2a5ad21696f2504e193c7273f100e4be3a Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sun, 18 Jun 2023 00:13:44 +0900 Subject: [PATCH 102/383] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1bfbf7082d..00df4dc767 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ MyBatis Spring Adapter ![mybatis-spring](https://mybatis.org/images/mybatis-logo.png) -MyBatis-Spring adapter is an easy-to-use Spring bridge for MyBatis sql mapping framework. +MyBatis-Spring adapter is an easy-to-use [Spring Framework](https://github.com/spring-projects/spring-framework) bridge for [MyBatis](https://github.com/mybatis/mybatis-3) sql mapping framework. Supported Versions ------------------ From 6bdd62e4d32d341e50e405b83fff733b95ff799b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 18 Jun 2023 12:53:04 +0000 Subject: [PATCH 103/383] Update dependency org.mockito:mockito-core to v5.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0a34ee2311..0250c1e0e2 100644 --- a/pom.xml +++ b/pom.xml @@ -236,7 +236,7 @@ org.mockito mockito-core - 5.3.1 + 5.4.0 test From f938a619bce0a1e5a2def0ead5df9bc68857cbd7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 12:36:01 +0000 Subject: [PATCH 104/383] Update dependency maven to v3.9.3 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 3c6fda8c6e..6d3a56651d 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar From 7f7ef3d5c932edc0ca263b811cdf0f88347ac575 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 6 Jul 2023 15:37:18 +0800 Subject: [PATCH 105/383] fix issue 548. add ComponentScan.Filter[] excludeFilters() to @MapperScan,people can use excludeFilters to customized mapper excludeFilters. --- pom.xml | 6 ++ .../mybatis/spring/annotation/MapperScan.java | 7 ++ .../annotation/MapperScannerRegistrar.java | 53 ++++++++++ .../spring/mapper/ClassPathMapperScanner.java | 14 +++ .../mapper/MapperScannerConfigurer.java | 10 ++ .../spring/scan/filter/ScanFilterTest.java | 99 +++++++++++++++++++ .../spring/scan/filter/config/AppConfig.java | 46 +++++++++ .../filter/customfilter/AnnoTypeFilter.java | 9 ++ .../filter/customfilter/CustomTypeFilter.java | 14 +++ .../filter/customfilter/ExcludeMaker.java | 5 + .../commonsource/AnnoExcludeMapper.java | 8 ++ .../commonsource/AssignableMapper.java | 7 ++ .../commonsource/CommonDataSourceMapper.java | 6 ++ .../datasource1/DataSource1Mapper.java | 6 ++ .../datasource2/DataSource2Mapper.java | 6 ++ 15 files changed, 296 insertions(+) create mode 100644 src/test/java/org/mybatis/spring/scan/filter/ScanFilterTest.java create mode 100644 src/test/java/org/mybatis/spring/scan/filter/config/AppConfig.java create mode 100644 src/test/java/org/mybatis/spring/scan/filter/customfilter/AnnoTypeFilter.java create mode 100644 src/test/java/org/mybatis/spring/scan/filter/customfilter/CustomTypeFilter.java create mode 100644 src/test/java/org/mybatis/spring/scan/filter/customfilter/ExcludeMaker.java create mode 100644 src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AnnoExcludeMapper.java create mode 100644 src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AssignableMapper.java create mode 100644 src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/CommonDataSourceMapper.java create mode 100644 src/test/java/org/mybatis/spring/scan/filter/datasource/datasource1/DataSource1Mapper.java create mode 100644 src/test/java/org/mybatis/spring/scan/filter/datasource/datasource2/DataSource2Mapper.java diff --git a/pom.xml b/pom.xml index f910678b1e..b2766c3ea3 100644 --- a/pom.xml +++ b/pom.xml @@ -313,6 +313,12 @@ 6.0.0 test + + org.aspectj + aspectjweaver + 1.9.19 + true + diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScan.java b/src/main/java/org/mybatis/spring/annotation/MapperScan.java index 78c0d9b0bf..4be73792a6 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScan.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScan.java @@ -27,6 +27,7 @@ import org.mybatis.spring.mapper.MapperScannerConfigurer; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanNameGenerator; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; import org.springframework.core.annotation.AliasFor; @@ -185,4 +186,10 @@ */ String defaultScope() default AbstractBeanDefinition.SCOPE_DEFAULT; + /** + * Specifies which types are not eligible for mapper scanning. + */ + ComponentScan.Filter[] excludeFilters() default {}; + + } diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java index cde801d739..1f7d4a5f7b 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java @@ -19,6 +19,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.regex.Pattern; import java.util.stream.Collectors; import org.mybatis.spring.mapper.ClassPathMapperScanner; @@ -31,10 +32,13 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanNameGenerator; import org.springframework.context.ResourceLoaderAware; +import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.core.io.ResourceLoader; import org.springframework.core.type.AnnotationMetadata; +import org.springframework.core.type.filter.*; +import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; @@ -54,6 +58,7 @@ */ public class MapperScannerRegistrar implements ImportBeanDefinitionRegistrar, ResourceLoaderAware { + private ResourceLoader resourceLoader; /** * {@inheritDoc} * @@ -63,6 +68,7 @@ public class MapperScannerRegistrar implements ImportBeanDefinitionRegistrar, Re @Deprecated public void setResourceLoader(ResourceLoader resourceLoader) { // NOP + this.resourceLoader = resourceLoader; } /** @@ -126,6 +132,11 @@ void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes a basePackages.add(getDefaultBasePackage(annoMeta)); } + AnnotationAttributes[] excludeFilterArray = annoAttrs.getAnnotationArray("excludeFilters"); + for (AnnotationAttributes excludeFilters : excludeFilterArray) { + builder.addPropertyValue("excludeFilters", typeFiltersFor(excludeFilters)); + } + String lazyInitialization = annoAttrs.getString("lazyInitialization"); if (StringUtils.hasText(lazyInitialization)) { builder.addPropertyValue("lazyInitialization", lazyInitialization); @@ -145,6 +156,48 @@ void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes a } + private List typeFiltersFor(AnnotationAttributes filterAttributes) { + + List typeFilters = new ArrayList<>(); + FilterType filterType = filterAttributes.getEnum("type"); + + for (Class filterClass : filterAttributes.getClassArray("value")) { + switch (filterType) { + case ANNOTATION: + Assert.isAssignable(Annotation.class, filterClass, + "An error occured when processing a @ComponentScan " + "ANNOTATION type filter: "); + @SuppressWarnings("unchecked") + Class annoClass = (Class) filterClass; + typeFilters.add(new AnnotationTypeFilter(annoClass)); + break; + case ASSIGNABLE_TYPE: + typeFilters.add(new AssignableTypeFilter(filterClass)); + break; + case CUSTOM: + Assert.isAssignable(TypeFilter.class, filterClass, + "An error occured when processing a @ComponentScan " + "CUSTOM type filter: "); + typeFilters.add(BeanUtils.instantiateClass(filterClass, TypeFilter.class)); + break; + default: + throw new IllegalArgumentException("Unknown filter type " + filterType); + } + } + + String[] expressionArray = filterAttributes.getStringArray("pattern"); + for (String expression : expressionArray) { + String rawName = filterType.toString(); + if ("REGEX".equals(rawName)) { + typeFilters.add(new RegexPatternTypeFilter(Pattern.compile(expression))); + } else if ("ASPECTJ".equals(rawName)) { + typeFilters.add(new AspectJTypeFilter(expression, this.resourceLoader.getClassLoader())); + } else { + throw new IllegalArgumentException("Unknown filter type " + filterType); + } + } + return typeFilters; + } + + private static String generateBaseBeanName(AnnotationMetadata importingClassMetadata, int index) { return importingClassMetadata.getClassName() + "#" + MapperScannerRegistrar.class.getSimpleName() + "#" + index; } diff --git a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java index 617095f7f8..5956b5bb3b 100644 --- a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java +++ b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java @@ -17,6 +17,7 @@ import java.lang.annotation.Annotation; import java.util.Arrays; +import java.util.List; import java.util.Optional; import java.util.Set; @@ -39,6 +40,7 @@ import org.springframework.core.NativeDetector; import org.springframework.core.type.filter.AnnotationTypeFilter; import org.springframework.core.type.filter.AssignableTypeFilter; +import org.springframework.core.type.filter.TypeFilter; import org.springframework.util.StringUtils; /** @@ -84,6 +86,7 @@ public class ClassPathMapperScanner extends ClassPathBeanDefinitionScanner { private Class mapperFactoryBeanClass = MapperFactoryBean.class; private String defaultScope; + private List excludeFilters; public ClassPathMapperScanner(BeanDefinitionRegistry registry) { super(registry, false); @@ -133,6 +136,10 @@ public void setMarkerInterface(Class markerInterface) { this.markerInterface = markerInterface; } + public void setExcludeFilters(List excludeFilters) { + this.excludeFilters = excludeFilters; + } + public void setSqlSessionFactory(SqlSessionFactory sqlSessionFactory) { this.sqlSessionFactory = sqlSessionFactory; } @@ -218,6 +225,13 @@ protected boolean matchClassName(String className) { String className = metadataReader.getClassMetadata().getClassName(); return className.endsWith("package-info"); }); + + // exclude types declared by MapperScan.excludeFilters + if (excludeFilters != null && excludeFilters.size() > 0) { + for (TypeFilter excludeFilter : excludeFilters) { + addExcludeFilter(excludeFilter); + } + } } /** diff --git a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java index 5b10b71192..30b7724863 100644 --- a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java +++ b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java @@ -18,6 +18,7 @@ import static org.springframework.util.Assert.notNull; import java.lang.annotation.Annotation; +import java.util.List; import java.util.Map; import java.util.Optional; @@ -39,6 +40,7 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.Environment; +import org.springframework.core.type.filter.TypeFilter; import org.springframework.util.StringUtils; /** @@ -109,6 +111,9 @@ public class MapperScannerConfigurer private Class markerInterface; + + private List excludeFilters; + private Class mapperFactoryBeanClass; private ApplicationContext applicationContext; @@ -191,6 +196,10 @@ public void setMarkerInterface(Class superClass) { this.markerInterface = superClass; } + public void setExcludeFilters(List excludeFilters) { + this.excludeFilters = excludeFilters; + } + /** * Specifies which {@code SqlSessionTemplate} to use in the case that there is more than one in the spring context. * Usually this is only needed when you have more than one datasource. @@ -364,6 +373,7 @@ public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) { scanner.setAddToConfig(this.addToConfig); scanner.setAnnotationClass(this.annotationClass); scanner.setMarkerInterface(this.markerInterface); + scanner.setExcludeFilters(this.excludeFilters); scanner.setSqlSessionFactory(this.sqlSessionFactory); scanner.setSqlSessionTemplate(this.sqlSessionTemplate); scanner.setSqlSessionFactoryBeanName(this.sqlSessionFactoryBeanName); diff --git a/src/test/java/org/mybatis/spring/scan/filter/ScanFilterTest.java b/src/test/java/org/mybatis/spring/scan/filter/ScanFilterTest.java new file mode 100644 index 0000000000..cf6fe0fd67 --- /dev/null +++ b/src/test/java/org/mybatis/spring/scan/filter/ScanFilterTest.java @@ -0,0 +1,99 @@ +package org.mybatis.spring.scan.filter; + +import com.mockrunner.mock.jdbc.MockDataSource; +import org.junit.jupiter.api.Test; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.scan.filter.config.AppConfig; +import org.springframework.beans.factory.support.GenericBeanDefinition; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; + +import static org.assertj.core.api.Assertions.assertThat; + +// test the function of excludeFilters in @MapperScan +public class ScanFilterTest { + + private AnnotationConfigApplicationContext applicationContext; + + + @Test + void testCustomScanFilter() { + startContext(AppConfig.CustomFilterConfig.class); + // use org.mybatis.spring.scan.filter.datasource as basePackages and exclude package datasource2 by MapperScan.excludeFilters + // mapper in package datasource2 will not be registered to beanFactory + assertThat(applicationContext.containsBean("dataSource2Mapper")).isEqualTo(false); + + // mapper in package datasource except datasource2 will be registered to beanFactory correctly. + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isEqualTo(true); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isEqualTo(true); + } + + @Test + void testAnnoScanFilter() { + startContext(AppConfig.AnnoFilterConfig.class); + + // use @AnnoTypeFilter to exclude mapper + assertThat(applicationContext.containsBean("annoExcludeMapper")).isEqualTo(false); + + // mapper in package datasource except datasource2 will be registered to beanFactory correctly. + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isEqualTo(true); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isEqualTo(true); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isEqualTo(true); + } + + + @Test + void testAssignableScanFilter() { + startContext(AppConfig.AssignableFilterConfig.class); + + // exclude AssignableMapper by AssignableFilter + assertThat(applicationContext.containsBean("assignableMapper")).isEqualTo(false); + + // mapper in package datasource except datasource2 will be registered to beanFactory correctly. + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isEqualTo(true); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isEqualTo(true); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isEqualTo(true); + } + + @Test + void testRegexScanFilter() { + startContext(AppConfig.RegexFilterConfig.class); + + // exclude package datasource1 by Regex + assertThat(applicationContext.containsBean("dataSource1Mapper")).isEqualTo(false); + + // mapper in package datasource except datasource1 will be registered to beanFactory correctly. + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isEqualTo(true); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isEqualTo(true); + } + + @Test + void testAspectJScanFilter() { + + startContext(AppConfig.AspectJFilterConfig.class); + + // exclude dataSource1Mapper by AspectJ + assertThat(applicationContext.containsBean("dataSource1Mapper")).isEqualTo(false); + + // mapper in package datasource except datasource1 will be registered to beanFactory correctly. + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isEqualTo(true); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isEqualTo(true); + } + + + private void startContext(Class config) { + applicationContext = new AnnotationConfigApplicationContext(); + // use @MapperScan with excludeFilters in AppConfig.class + applicationContext.register(config); + setupSqlSessionFactory("sqlSessionFactory"); + applicationContext.refresh(); + applicationContext.start(); + } + + + private void setupSqlSessionFactory(String name) { + GenericBeanDefinition definition = new GenericBeanDefinition(); + definition.setBeanClass(SqlSessionFactoryBean.class); + definition.getPropertyValues().add("dataSource", new MockDataSource()); + applicationContext.registerBeanDefinition(name, definition); + } +} diff --git a/src/test/java/org/mybatis/spring/scan/filter/config/AppConfig.java b/src/test/java/org/mybatis/spring/scan/filter/config/AppConfig.java new file mode 100644 index 0000000000..c0c3bd1458 --- /dev/null +++ b/src/test/java/org/mybatis/spring/scan/filter/config/AppConfig.java @@ -0,0 +1,46 @@ +package org.mybatis.spring.scan.filter.config; + +import org.mybatis.spring.annotation.MapperScan; +import org.mybatis.spring.scan.filter.customfilter.AnnoTypeFilter; +import org.mybatis.spring.scan.filter.customfilter.ExcludeMaker; +import org.mybatis.spring.scan.filter.customfilter.CustomTypeFilter; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.FilterType; + + +public class AppConfig { + + + @MapperScan(basePackages = "org.mybatis.spring.scan.filter.datasource", + excludeFilters = {@ComponentScan.Filter(type = FilterType.CUSTOM, classes = CustomTypeFilter.class)}) + public static class CustomFilterConfig { + + } + + @MapperScan(basePackages = "org.mybatis.spring.scan.filter.datasource", + excludeFilters = {@ComponentScan.Filter(type = FilterType.ANNOTATION, classes = AnnoTypeFilter.class)}) + public static class AnnoFilterConfig { + + } + + @MapperScan(basePackages = "org.mybatis.spring.scan.filter.datasource", + excludeFilters = {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = ExcludeMaker.class)}) + public static class AssignableFilterConfig { + + } + + @MapperScan(basePackages = "org.mybatis.spring.scan.filter.datasource", + excludeFilters = {@ComponentScan.Filter(type = FilterType.REGEX, + pattern = "org\\.mybatis\\.spring\\.scan\\.filter\\.datasource\\.datasource1\\..*")}) + public static class RegexFilterConfig { + + } + + @MapperScan(basePackages = "org.mybatis.spring.scan.filter.datasource", + excludeFilters = {@ComponentScan.Filter(type = FilterType.ASPECTJ, + pattern = "*..DataSource1Mapper")}) + public static class AspectJFilterConfig { + + } +} + diff --git a/src/test/java/org/mybatis/spring/scan/filter/customfilter/AnnoTypeFilter.java b/src/test/java/org/mybatis/spring/scan/filter/customfilter/AnnoTypeFilter.java new file mode 100644 index 0000000000..63e174db9f --- /dev/null +++ b/src/test/java/org/mybatis/spring/scan/filter/customfilter/AnnoTypeFilter.java @@ -0,0 +1,9 @@ +package org.mybatis.spring.scan.filter.customfilter; + +import java.lang.annotation.*; + +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +@Documented +public @interface AnnoTypeFilter { +} diff --git a/src/test/java/org/mybatis/spring/scan/filter/customfilter/CustomTypeFilter.java b/src/test/java/org/mybatis/spring/scan/filter/customfilter/CustomTypeFilter.java new file mode 100644 index 0000000000..64c70fc8d0 --- /dev/null +++ b/src/test/java/org/mybatis/spring/scan/filter/customfilter/CustomTypeFilter.java @@ -0,0 +1,14 @@ +package org.mybatis.spring.scan.filter.customfilter; + +import org.springframework.core.type.classreading.MetadataReader; +import org.springframework.core.type.classreading.MetadataReaderFactory; +import org.springframework.core.type.filter.TypeFilter; + +import java.io.IOException; + +public class CustomTypeFilter implements TypeFilter { + @Override + public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) throws IOException { + return metadataReader.getClassMetadata().getClassName().contains("datasource2"); + } +} diff --git a/src/test/java/org/mybatis/spring/scan/filter/customfilter/ExcludeMaker.java b/src/test/java/org/mybatis/spring/scan/filter/customfilter/ExcludeMaker.java new file mode 100644 index 0000000000..b4d871e7da --- /dev/null +++ b/src/test/java/org/mybatis/spring/scan/filter/customfilter/ExcludeMaker.java @@ -0,0 +1,5 @@ +package org.mybatis.spring.scan.filter.customfilter; + + +public interface ExcludeMaker { +} diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AnnoExcludeMapper.java b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AnnoExcludeMapper.java new file mode 100644 index 0000000000..a47480f5c7 --- /dev/null +++ b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AnnoExcludeMapper.java @@ -0,0 +1,8 @@ +package org.mybatis.spring.scan.filter.datasource.commonsource; + +import org.apache.ibatis.annotations.Mapper; +import org.mybatis.spring.scan.filter.customfilter.AnnoTypeFilter; + +@AnnoTypeFilter +public interface AnnoExcludeMapper extends Mapper { +} diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AssignableMapper.java b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AssignableMapper.java new file mode 100644 index 0000000000..8a41645467 --- /dev/null +++ b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AssignableMapper.java @@ -0,0 +1,7 @@ +package org.mybatis.spring.scan.filter.datasource.commonsource; + +import org.apache.ibatis.annotations.Mapper; +import org.mybatis.spring.scan.filter.customfilter.ExcludeMaker; + +public interface AssignableMapper extends ExcludeMaker,Mapper { +} diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/CommonDataSourceMapper.java b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/CommonDataSourceMapper.java new file mode 100644 index 0000000000..048c706d53 --- /dev/null +++ b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/CommonDataSourceMapper.java @@ -0,0 +1,6 @@ +package org.mybatis.spring.scan.filter.datasource.commonsource; + +import org.apache.ibatis.annotations.Mapper; + +public interface CommonDataSourceMapper extends Mapper { +} diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource1/DataSource1Mapper.java b/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource1/DataSource1Mapper.java new file mode 100644 index 0000000000..79c47e8e9f --- /dev/null +++ b/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource1/DataSource1Mapper.java @@ -0,0 +1,6 @@ +package org.mybatis.spring.scan.filter.datasource.datasource1; + +import org.apache.ibatis.annotations.Mapper; + +public interface DataSource1Mapper extends Mapper { +} diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource2/DataSource2Mapper.java b/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource2/DataSource2Mapper.java new file mode 100644 index 0000000000..154fe3fe32 --- /dev/null +++ b/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource2/DataSource2Mapper.java @@ -0,0 +1,6 @@ +package org.mybatis.spring.scan.filter.datasource.datasource2; + +import org.apache.ibatis.annotations.Mapper; + +public interface DataSource2Mapper extends Mapper { +} From cc31d4a4843055e8df6bcd31d0c616f6f5eb3e93 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sat, 8 Jul 2023 17:39:40 +0800 Subject: [PATCH 106/383] optimize imports --- .../filter/datasource/commonsource/AnnoExcludeMapper.java | 3 +-- .../scan/filter/datasource/commonsource/AssignableMapper.java | 3 +-- .../datasource/commonsource/CommonDataSourceMapper.java | 3 +-- .../scan/filter/datasource/datasource1/DataSource1Mapper.java | 4 +--- .../scan/filter/datasource/datasource2/DataSource2Mapper.java | 4 +--- 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AnnoExcludeMapper.java b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AnnoExcludeMapper.java index a47480f5c7..64cc3ba15c 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AnnoExcludeMapper.java +++ b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AnnoExcludeMapper.java @@ -1,8 +1,7 @@ package org.mybatis.spring.scan.filter.datasource.commonsource; -import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.scan.filter.customfilter.AnnoTypeFilter; @AnnoTypeFilter -public interface AnnoExcludeMapper extends Mapper { +public interface AnnoExcludeMapper { } diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AssignableMapper.java b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AssignableMapper.java index 8a41645467..cc2cc05870 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AssignableMapper.java +++ b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AssignableMapper.java @@ -1,7 +1,6 @@ package org.mybatis.spring.scan.filter.datasource.commonsource; -import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.scan.filter.customfilter.ExcludeMaker; -public interface AssignableMapper extends ExcludeMaker,Mapper { +public interface AssignableMapper extends ExcludeMaker { } diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/CommonDataSourceMapper.java b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/CommonDataSourceMapper.java index 048c706d53..c132943f38 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/CommonDataSourceMapper.java +++ b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/CommonDataSourceMapper.java @@ -1,6 +1,5 @@ package org.mybatis.spring.scan.filter.datasource.commonsource; -import org.apache.ibatis.annotations.Mapper; -public interface CommonDataSourceMapper extends Mapper { +public interface CommonDataSourceMapper { } diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource1/DataSource1Mapper.java b/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource1/DataSource1Mapper.java index 79c47e8e9f..b89298dba5 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource1/DataSource1Mapper.java +++ b/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource1/DataSource1Mapper.java @@ -1,6 +1,4 @@ package org.mybatis.spring.scan.filter.datasource.datasource1; -import org.apache.ibatis.annotations.Mapper; - -public interface DataSource1Mapper extends Mapper { +public interface DataSource1Mapper { } diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource2/DataSource2Mapper.java b/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource2/DataSource2Mapper.java index 154fe3fe32..6a18893bfa 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource2/DataSource2Mapper.java +++ b/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource2/DataSource2Mapper.java @@ -1,6 +1,4 @@ package org.mybatis.spring.scan.filter.datasource.datasource2; -import org.apache.ibatis.annotations.Mapper; - -public interface DataSource2Mapper extends Mapper { +public interface DataSource2Mapper { } From c711ce48b98df43d4cd58ff1e8ca3e0b832ffa8c Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sun, 9 Jul 2023 15:16:03 +0800 Subject: [PATCH 107/383] 1.remove @Deprecated on method setResourceLoader. 2.add comment. --- .../annotation/MapperScannerRegistrar.java | 4 ---- .../mapper/MapperScannerConfigurer.java | 9 ++++++++- .../spring/scan/filter/ScanFilterTest.java | 19 ++++++++++++++++++- .../spring/scan/filter/config/AppConfig.java | 15 +++++++++++++++ .../filter/customfilter/AnnoTypeFilter.java | 15 +++++++++++++++ .../filter/customfilter/CustomTypeFilter.java | 15 +++++++++++++++ .../filter/customfilter/ExcludeMaker.java | 15 +++++++++++++++ .../commonsource/AnnoExcludeMapper.java | 15 +++++++++++++++ .../commonsource/AssignableMapper.java | 15 +++++++++++++++ .../commonsource/CommonDataSourceMapper.java | 15 +++++++++++++++ .../datasource1/DataSource1Mapper.java | 15 +++++++++++++++ .../datasource2/DataSource2Mapper.java | 15 +++++++++++++++ 12 files changed, 161 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java index 6f4ee1aefb..a7f194c6a6 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java @@ -61,13 +61,9 @@ public class MapperScannerRegistrar implements ImportBeanDefinitionRegistrar, Re private ResourceLoader resourceLoader; /** * {@inheritDoc} - * - * @deprecated Since 2.0.2, this method not used never. */ @Override - @Deprecated public void setResourceLoader(ResourceLoader resourceLoader) { - // NOP this.resourceLoader = resourceLoader; } diff --git a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java index 30b7724863..bfef6ed6b3 100644 --- a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java +++ b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java @@ -111,7 +111,6 @@ public class MapperScannerConfigurer private Class markerInterface; - private List excludeFilters; private Class mapperFactoryBeanClass; @@ -196,6 +195,14 @@ public void setMarkerInterface(Class superClass) { this.markerInterface = superClass; } + /** + * Specifies which types are not eligible for the mapper scanner. + *

+ * The scanner will exclude types that define with excludeFilters. + * + * @param excludeFilters + * list of TypeFilter + */ public void setExcludeFilters(List excludeFilters) { this.excludeFilters = excludeFilters; } diff --git a/src/test/java/org/mybatis/spring/scan/filter/ScanFilterTest.java b/src/test/java/org/mybatis/spring/scan/filter/ScanFilterTest.java index cf6fe0fd67..9f8cba64d7 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/ScanFilterTest.java +++ b/src/test/java/org/mybatis/spring/scan/filter/ScanFilterTest.java @@ -1,3 +1,18 @@ +/* + * Copyright 2010-2023 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.mybatis.spring.scan.filter; import com.mockrunner.mock.jdbc.MockDataSource; @@ -9,7 +24,9 @@ import static org.assertj.core.api.Assertions.assertThat; -// test the function of excludeFilters in @MapperScan +/** + * test the function of excludeFilters in @MapperScan + */ public class ScanFilterTest { private AnnotationConfigApplicationContext applicationContext; diff --git a/src/test/java/org/mybatis/spring/scan/filter/config/AppConfig.java b/src/test/java/org/mybatis/spring/scan/filter/config/AppConfig.java index c0c3bd1458..1143bf6684 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/config/AppConfig.java +++ b/src/test/java/org/mybatis/spring/scan/filter/config/AppConfig.java @@ -1,3 +1,18 @@ +/* + * Copyright 2010-2023 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.mybatis.spring.scan.filter.config; import org.mybatis.spring.annotation.MapperScan; diff --git a/src/test/java/org/mybatis/spring/scan/filter/customfilter/AnnoTypeFilter.java b/src/test/java/org/mybatis/spring/scan/filter/customfilter/AnnoTypeFilter.java index 63e174db9f..d833d5895c 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/customfilter/AnnoTypeFilter.java +++ b/src/test/java/org/mybatis/spring/scan/filter/customfilter/AnnoTypeFilter.java @@ -1,3 +1,18 @@ +/* + * Copyright 2010-2023 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.mybatis.spring.scan.filter.customfilter; import java.lang.annotation.*; diff --git a/src/test/java/org/mybatis/spring/scan/filter/customfilter/CustomTypeFilter.java b/src/test/java/org/mybatis/spring/scan/filter/customfilter/CustomTypeFilter.java index 64c70fc8d0..3cdf9e0ab4 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/customfilter/CustomTypeFilter.java +++ b/src/test/java/org/mybatis/spring/scan/filter/customfilter/CustomTypeFilter.java @@ -1,3 +1,18 @@ +/* + * Copyright 2010-2023 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.mybatis.spring.scan.filter.customfilter; import org.springframework.core.type.classreading.MetadataReader; diff --git a/src/test/java/org/mybatis/spring/scan/filter/customfilter/ExcludeMaker.java b/src/test/java/org/mybatis/spring/scan/filter/customfilter/ExcludeMaker.java index b4d871e7da..307f654930 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/customfilter/ExcludeMaker.java +++ b/src/test/java/org/mybatis/spring/scan/filter/customfilter/ExcludeMaker.java @@ -1,3 +1,18 @@ +/* + * Copyright 2010-2023 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.mybatis.spring.scan.filter.customfilter; diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AnnoExcludeMapper.java b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AnnoExcludeMapper.java index 64cc3ba15c..a0349afaac 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AnnoExcludeMapper.java +++ b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AnnoExcludeMapper.java @@ -1,3 +1,18 @@ +/* + * Copyright 2010-2023 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.mybatis.spring.scan.filter.datasource.commonsource; import org.mybatis.spring.scan.filter.customfilter.AnnoTypeFilter; diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AssignableMapper.java b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AssignableMapper.java index cc2cc05870..86e7048815 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AssignableMapper.java +++ b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AssignableMapper.java @@ -1,3 +1,18 @@ +/* + * Copyright 2010-2023 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.mybatis.spring.scan.filter.datasource.commonsource; import org.mybatis.spring.scan.filter.customfilter.ExcludeMaker; diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/CommonDataSourceMapper.java b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/CommonDataSourceMapper.java index c132943f38..9eda4f5991 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/CommonDataSourceMapper.java +++ b/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/CommonDataSourceMapper.java @@ -1,3 +1,18 @@ +/* + * Copyright 2010-2023 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.mybatis.spring.scan.filter.datasource.commonsource; diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource1/DataSource1Mapper.java b/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource1/DataSource1Mapper.java index b89298dba5..733bc9e51c 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource1/DataSource1Mapper.java +++ b/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource1/DataSource1Mapper.java @@ -1,3 +1,18 @@ +/* + * Copyright 2010-2023 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.mybatis.spring.scan.filter.datasource.datasource1; public interface DataSource1Mapper { diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource2/DataSource2Mapper.java b/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource2/DataSource2Mapper.java index 6a18893bfa..b1427d2d23 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource2/DataSource2Mapper.java +++ b/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource2/DataSource2Mapper.java @@ -1,3 +1,18 @@ +/* + * Copyright 2010-2023 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.mybatis.spring.scan.filter.datasource.datasource2; public interface DataSource2Mapper { From 789a8e32331358fcfbcfe2195f8b3367f800751f Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 11 Jul 2023 18:57:40 +0800 Subject: [PATCH 108/383] replace start import and format code --- .../mybatis/spring/annotation/MapperScannerRegistrar.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java index a7f194c6a6..446ca568f9 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java @@ -37,7 +37,11 @@ import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.core.io.ResourceLoader; import org.springframework.core.type.AnnotationMetadata; -import org.springframework.core.type.filter.*; +import org.springframework.core.type.filter.AnnotationTypeFilter; +import org.springframework.core.type.filter.AspectJTypeFilter; +import org.springframework.core.type.filter.AssignableTypeFilter; +import org.springframework.core.type.filter.RegexPatternTypeFilter; +import org.springframework.core.type.filter.TypeFilter; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; @@ -59,6 +63,7 @@ public class MapperScannerRegistrar implements ImportBeanDefinitionRegistrar, ResourceLoaderAware { private ResourceLoader resourceLoader; + /** * {@inheritDoc} */ From eb9e79e9af759f9d3e0e35cbc9dfb7ea60314f59 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 12 Jul 2023 13:17:37 +0800 Subject: [PATCH 109/383] move package 'filter' from org.mybatis.spring.scan to org.mybatis.spring --- .../{scan => }/filter/ScanFilterTest.java | 4 ++-- .../{scan => }/filter/config/AppConfig.java | 20 +++++++++---------- .../filter/customfilter/AnnoTypeFilter.java | 2 +- .../filter/customfilter/CustomTypeFilter.java | 2 +- .../filter/customfilter/ExcludeMaker.java | 2 +- .../commonsource/AnnoExcludeMapper.java | 4 ++-- .../commonsource/AssignableMapper.java | 4 ++-- .../commonsource/CommonDataSourceMapper.java | 2 +- .../datasource1/DataSource1Mapper.java | 2 +- .../datasource2/DataSource2Mapper.java | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) rename src/test/java/org/mybatis/spring/{scan => }/filter/ScanFilterTest.java (97%) rename src/test/java/org/mybatis/spring/{scan => }/filter/config/AppConfig.java (68%) rename src/test/java/org/mybatis/spring/{scan => }/filter/customfilter/AnnoTypeFilter.java (93%) rename src/test/java/org/mybatis/spring/{scan => }/filter/customfilter/CustomTypeFilter.java (95%) rename src/test/java/org/mybatis/spring/{scan => }/filter/customfilter/ExcludeMaker.java (92%) rename src/test/java/org/mybatis/spring/{scan => }/filter/datasource/commonsource/AnnoExcludeMapper.java (83%) rename src/test/java/org/mybatis/spring/{scan => }/filter/datasource/commonsource/AssignableMapper.java (84%) rename src/test/java/org/mybatis/spring/{scan => }/filter/datasource/commonsource/CommonDataSourceMapper.java (91%) rename src/test/java/org/mybatis/spring/{scan => }/filter/datasource/datasource1/DataSource1Mapper.java (91%) rename src/test/java/org/mybatis/spring/{scan => }/filter/datasource/datasource2/DataSource2Mapper.java (91%) diff --git a/src/test/java/org/mybatis/spring/scan/filter/ScanFilterTest.java b/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java similarity index 97% rename from src/test/java/org/mybatis/spring/scan/filter/ScanFilterTest.java rename to src/test/java/org/mybatis/spring/filter/ScanFilterTest.java index 9f8cba64d7..249c25c68f 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/ScanFilterTest.java +++ b/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mybatis.spring.scan.filter; +package org.mybatis.spring.filter; import com.mockrunner.mock.jdbc.MockDataSource; import org.junit.jupiter.api.Test; import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.scan.filter.config.AppConfig; +import org.mybatis.spring.filter.config.AppConfig; import org.springframework.beans.factory.support.GenericBeanDefinition; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/src/test/java/org/mybatis/spring/scan/filter/config/AppConfig.java b/src/test/java/org/mybatis/spring/filter/config/AppConfig.java similarity index 68% rename from src/test/java/org/mybatis/spring/scan/filter/config/AppConfig.java rename to src/test/java/org/mybatis/spring/filter/config/AppConfig.java index 1143bf6684..98548f1596 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/config/AppConfig.java +++ b/src/test/java/org/mybatis/spring/filter/config/AppConfig.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mybatis.spring.scan.filter.config; +package org.mybatis.spring.filter.config; import org.mybatis.spring.annotation.MapperScan; -import org.mybatis.spring.scan.filter.customfilter.AnnoTypeFilter; -import org.mybatis.spring.scan.filter.customfilter.ExcludeMaker; -import org.mybatis.spring.scan.filter.customfilter.CustomTypeFilter; +import org.mybatis.spring.filter.customfilter.ExcludeMaker; +import org.mybatis.spring.filter.customfilter.AnnoTypeFilter; +import org.mybatis.spring.filter.customfilter.CustomTypeFilter; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.FilterType; @@ -26,32 +26,32 @@ public class AppConfig { - @MapperScan(basePackages = "org.mybatis.spring.scan.filter.datasource", + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = {@ComponentScan.Filter(type = FilterType.CUSTOM, classes = CustomTypeFilter.class)}) public static class CustomFilterConfig { } - @MapperScan(basePackages = "org.mybatis.spring.scan.filter.datasource", + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = {@ComponentScan.Filter(type = FilterType.ANNOTATION, classes = AnnoTypeFilter.class)}) public static class AnnoFilterConfig { } - @MapperScan(basePackages = "org.mybatis.spring.scan.filter.datasource", + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = ExcludeMaker.class)}) public static class AssignableFilterConfig { } - @MapperScan(basePackages = "org.mybatis.spring.scan.filter.datasource", + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = {@ComponentScan.Filter(type = FilterType.REGEX, - pattern = "org\\.mybatis\\.spring\\.scan\\.filter\\.datasource\\.datasource1\\..*")}) + pattern = "org\\.mybatis\\.spring\\.filter\\.datasource\\.datasource1\\..*")}) public static class RegexFilterConfig { } - @MapperScan(basePackages = "org.mybatis.spring.scan.filter.datasource", + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = {@ComponentScan.Filter(type = FilterType.ASPECTJ, pattern = "*..DataSource1Mapper")}) public static class AspectJFilterConfig { diff --git a/src/test/java/org/mybatis/spring/scan/filter/customfilter/AnnoTypeFilter.java b/src/test/java/org/mybatis/spring/filter/customfilter/AnnoTypeFilter.java similarity index 93% rename from src/test/java/org/mybatis/spring/scan/filter/customfilter/AnnoTypeFilter.java rename to src/test/java/org/mybatis/spring/filter/customfilter/AnnoTypeFilter.java index d833d5895c..c07e9056e8 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/customfilter/AnnoTypeFilter.java +++ b/src/test/java/org/mybatis/spring/filter/customfilter/AnnoTypeFilter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mybatis.spring.scan.filter.customfilter; +package org.mybatis.spring.filter.customfilter; import java.lang.annotation.*; diff --git a/src/test/java/org/mybatis/spring/scan/filter/customfilter/CustomTypeFilter.java b/src/test/java/org/mybatis/spring/filter/customfilter/CustomTypeFilter.java similarity index 95% rename from src/test/java/org/mybatis/spring/scan/filter/customfilter/CustomTypeFilter.java rename to src/test/java/org/mybatis/spring/filter/customfilter/CustomTypeFilter.java index 3cdf9e0ab4..4808b677a8 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/customfilter/CustomTypeFilter.java +++ b/src/test/java/org/mybatis/spring/filter/customfilter/CustomTypeFilter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mybatis.spring.scan.filter.customfilter; +package org.mybatis.spring.filter.customfilter; import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; diff --git a/src/test/java/org/mybatis/spring/scan/filter/customfilter/ExcludeMaker.java b/src/test/java/org/mybatis/spring/filter/customfilter/ExcludeMaker.java similarity index 92% rename from src/test/java/org/mybatis/spring/scan/filter/customfilter/ExcludeMaker.java rename to src/test/java/org/mybatis/spring/filter/customfilter/ExcludeMaker.java index 307f654930..1699dd5f62 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/customfilter/ExcludeMaker.java +++ b/src/test/java/org/mybatis/spring/filter/customfilter/ExcludeMaker.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mybatis.spring.scan.filter.customfilter; +package org.mybatis.spring.filter.customfilter; public interface ExcludeMaker { diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AnnoExcludeMapper.java b/src/test/java/org/mybatis/spring/filter/datasource/commonsource/AnnoExcludeMapper.java similarity index 83% rename from src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AnnoExcludeMapper.java rename to src/test/java/org/mybatis/spring/filter/datasource/commonsource/AnnoExcludeMapper.java index a0349afaac..bb6db54c4a 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AnnoExcludeMapper.java +++ b/src/test/java/org/mybatis/spring/filter/datasource/commonsource/AnnoExcludeMapper.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mybatis.spring.scan.filter.datasource.commonsource; +package org.mybatis.spring.filter.datasource.commonsource; -import org.mybatis.spring.scan.filter.customfilter.AnnoTypeFilter; +import org.mybatis.spring.filter.customfilter.AnnoTypeFilter; @AnnoTypeFilter public interface AnnoExcludeMapper { diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AssignableMapper.java b/src/test/java/org/mybatis/spring/filter/datasource/commonsource/AssignableMapper.java similarity index 84% rename from src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AssignableMapper.java rename to src/test/java/org/mybatis/spring/filter/datasource/commonsource/AssignableMapper.java index 86e7048815..7a8398f287 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/AssignableMapper.java +++ b/src/test/java/org/mybatis/spring/filter/datasource/commonsource/AssignableMapper.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mybatis.spring.scan.filter.datasource.commonsource; +package org.mybatis.spring.filter.datasource.commonsource; -import org.mybatis.spring.scan.filter.customfilter.ExcludeMaker; +import org.mybatis.spring.filter.customfilter.ExcludeMaker; public interface AssignableMapper extends ExcludeMaker { } diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/CommonDataSourceMapper.java b/src/test/java/org/mybatis/spring/filter/datasource/commonsource/CommonDataSourceMapper.java similarity index 91% rename from src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/CommonDataSourceMapper.java rename to src/test/java/org/mybatis/spring/filter/datasource/commonsource/CommonDataSourceMapper.java index 9eda4f5991..33cd4bcbb0 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/datasource/commonsource/CommonDataSourceMapper.java +++ b/src/test/java/org/mybatis/spring/filter/datasource/commonsource/CommonDataSourceMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mybatis.spring.scan.filter.datasource.commonsource; +package org.mybatis.spring.filter.datasource.commonsource; public interface CommonDataSourceMapper { diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource1/DataSource1Mapper.java b/src/test/java/org/mybatis/spring/filter/datasource/datasource1/DataSource1Mapper.java similarity index 91% rename from src/test/java/org/mybatis/spring/scan/filter/datasource/datasource1/DataSource1Mapper.java rename to src/test/java/org/mybatis/spring/filter/datasource/datasource1/DataSource1Mapper.java index 733bc9e51c..2249c92e23 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource1/DataSource1Mapper.java +++ b/src/test/java/org/mybatis/spring/filter/datasource/datasource1/DataSource1Mapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mybatis.spring.scan.filter.datasource.datasource1; +package org.mybatis.spring.filter.datasource.datasource1; public interface DataSource1Mapper { } diff --git a/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource2/DataSource2Mapper.java b/src/test/java/org/mybatis/spring/filter/datasource/datasource2/DataSource2Mapper.java similarity index 91% rename from src/test/java/org/mybatis/spring/scan/filter/datasource/datasource2/DataSource2Mapper.java rename to src/test/java/org/mybatis/spring/filter/datasource/datasource2/DataSource2Mapper.java index b1427d2d23..5f94c5b89d 100644 --- a/src/test/java/org/mybatis/spring/scan/filter/datasource/datasource2/DataSource2Mapper.java +++ b/src/test/java/org/mybatis/spring/filter/datasource/datasource2/DataSource2Mapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.mybatis.spring.scan.filter.datasource.datasource2; +package org.mybatis.spring.filter.datasource.datasource2; public interface DataSource2Mapper { } From e550bff958a0a35243f225cde4a597776a2a1e9e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 10:40:31 +0000 Subject: [PATCH 110/383] Update spring core to v6.0.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0250c1e0e2..63b7d36020 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 17 3.5.13 - 6.0.10 + 6.0.11 5.0.2 org.mybatis.spring From f3344d717239af39a8c2dc546a2a240d49d63f13 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sat, 15 Jul 2023 16:02:43 +0800 Subject: [PATCH 111/383] fix combined exclude filter and add combined filter test --- .../mybatis/spring/annotation/MapperScan.java | 4 +- .../annotation/MapperScannerRegistrar.java | 8 +++- .../mapper/MapperScannerConfigurer.java | 2 + .../mybatis/spring/filter/ScanFilterTest.java | 46 +++++++++++++++++++ .../spring/filter/config/AppConfig.java | 25 ++++++++++ .../datasource1/MapperWithAnnoFilter.java | 22 +++++++++ .../datasource2/DataSource2Mapper1.java | 19 ++++++++ 7 files changed, 123 insertions(+), 3 deletions(-) create mode 100644 src/test/java/org/mybatis/spring/filter/datasource/datasource1/MapperWithAnnoFilter.java create mode 100644 src/test/java/org/mybatis/spring/filter/datasource/datasource2/DataSource2Mapper1.java diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScan.java b/src/main/java/org/mybatis/spring/annotation/MapperScan.java index fee540804f..402dd54058 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScan.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScan.java @@ -196,9 +196,11 @@ * @return a flag that whether execute a property placeholder processing or not */ boolean processPropertyPlaceHolders() default true; - + /** * Specifies which types are not eligible for mapper scanning. + * + * @since 3.0.3 */ ComponentScan.Filter[] excludeFilters() default {}; diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java index 446ca568f9..8603b61c11 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java @@ -134,8 +134,12 @@ void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes a } AnnotationAttributes[] excludeFilterArray = annoAttrs.getAnnotationArray("excludeFilters"); - for (AnnotationAttributes excludeFilters : excludeFilterArray) { - builder.addPropertyValue("excludeFilters", typeFiltersFor(excludeFilters)); + if (excludeFilterArray.length > 0) { + List typeFilters = new ArrayList<>(); + for (AnnotationAttributes excludeFilters : excludeFilterArray) { + typeFilters.addAll(typeFiltersFor(excludeFilters)); + } + builder.addPropertyValue("excludeFilters", typeFilters); } String lazyInitialization = annoAttrs.getString("lazyInitialization"); diff --git a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java index bfef6ed6b3..8cebdb74c9 100644 --- a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java +++ b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java @@ -200,6 +200,8 @@ public void setMarkerInterface(Class superClass) { *

* The scanner will exclude types that define with excludeFilters. * + * @since 3.0.3 + * * @param excludeFilters * list of TypeFilter */ diff --git a/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java b/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java index 249c25c68f..7206fb729e 100644 --- a/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java +++ b/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java @@ -97,6 +97,52 @@ void testAspectJScanFilter() { } + @Test + void combinedScanFilter() { + // combined filter with Custom and Annotation + startContext(AppConfig.CombinedFilterConfig.class); + + // exclude datasource2.DataSource2Mapper by CustomTypeFilter + assertThat(applicationContext.containsBean("dataSource2Mapper")).isEqualTo(false); + // exclude datasource1.MapperWithAnnoFilter by AnnoTypeFilter + assertThat(applicationContext.containsBean("mapperWithAnnoFilter")).isEqualTo(false); + + // other mapper could be registered to beanFactory correctly. + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isEqualTo(true); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isEqualTo(true); + } + + + @Test + void multiPatternRegexScanFilter() { + // multi pattern regex filter + startContext(AppConfig.MultiPatternRegexFilterConfig.class); + + // exclude datasource1 by pattern[0] + assertThat(applicationContext.containsBean("dataSource1Mapper")).isEqualTo(false); + // exclude datasource2 by pattern[1] + assertThat(applicationContext.containsBean("dataSource2Mapper")).isEqualTo(false); + + // other mapper could be registered to beanFactory correctly. + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isEqualTo(true); + } + + @Test + void multiPatternAspectJScanFilter() { + // multi pattern regex filter + startContext(AppConfig.MultiPatternAspectJFilterConfig.class); + + // exclude datasource1 by pattern[0] + assertThat(applicationContext.containsBean("dataSource1Mapper")).isEqualTo(false); + // exclude datasource2 by pattern[1] + assertThat(applicationContext.containsBean("dataSource2Mapper")).isEqualTo(false); + + // other mapper could be registered to beanFactory correctly. + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isEqualTo(true); + assertThat(applicationContext.containsBean("dataSource2Mapper1")).isEqualTo(true); + } + + private void startContext(Class config) { applicationContext = new AnnotationConfigApplicationContext(); // use @MapperScan with excludeFilters in AppConfig.class diff --git a/src/test/java/org/mybatis/spring/filter/config/AppConfig.java b/src/test/java/org/mybatis/spring/filter/config/AppConfig.java index 98548f1596..36e437d07b 100644 --- a/src/test/java/org/mybatis/spring/filter/config/AppConfig.java +++ b/src/test/java/org/mybatis/spring/filter/config/AppConfig.java @@ -57,5 +57,30 @@ public static class RegexFilterConfig { public static class AspectJFilterConfig { } + + + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", + excludeFilters = {@ComponentScan.Filter(type = FilterType.CUSTOM, classes = CustomTypeFilter.class), + @ComponentScan.Filter(type = FilterType.ANNOTATION, classes = AnnoTypeFilter.class)}) + public static class CombinedFilterConfig { + + } + + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", + excludeFilters = {@ComponentScan.Filter(type = FilterType.REGEX, + pattern = {"org\\.mybatis\\.spring\\.filter\\.datasource\\.datasource1\\..*", + "org\\.mybatis\\.spring\\.filter\\.datasource\\.datasource2\\..*"})}) + public static class MultiPatternRegexFilterConfig { + + } + + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", + excludeFilters = {@ComponentScan.Filter(type = FilterType.ASPECTJ, + pattern = {"*..DataSource1Mapper", + "*..DataSource2Mapper"})}) + public static class MultiPatternAspectJFilterConfig { + + } + } diff --git a/src/test/java/org/mybatis/spring/filter/datasource/datasource1/MapperWithAnnoFilter.java b/src/test/java/org/mybatis/spring/filter/datasource/datasource1/MapperWithAnnoFilter.java new file mode 100644 index 0000000000..e7b93138e0 --- /dev/null +++ b/src/test/java/org/mybatis/spring/filter/datasource/datasource1/MapperWithAnnoFilter.java @@ -0,0 +1,22 @@ +/* + * Copyright 2010-2023 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.mybatis.spring.filter.datasource.datasource1; + +import org.mybatis.spring.filter.customfilter.AnnoTypeFilter; + +@AnnoTypeFilter +public interface MapperWithAnnoFilter { +} diff --git a/src/test/java/org/mybatis/spring/filter/datasource/datasource2/DataSource2Mapper1.java b/src/test/java/org/mybatis/spring/filter/datasource/datasource2/DataSource2Mapper1.java new file mode 100644 index 0000000000..4df89b6b1f --- /dev/null +++ b/src/test/java/org/mybatis/spring/filter/datasource/datasource2/DataSource2Mapper1.java @@ -0,0 +1,19 @@ +/* + * Copyright 2010-2023 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.mybatis.spring.filter.datasource.datasource2; + +public interface DataSource2Mapper1 { +} From 7fefb72ee38384d4e2a851ee3fcd00a4df27d028 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sat, 15 Jul 2023 17:26:18 +0800 Subject: [PATCH 112/383] modify exception prompt message and add exception test code --- .../annotation/MapperScannerRegistrar.java | 20 ++++++++++-------- .../mybatis/spring/filter/ScanFilterTest.java | 21 +++++++++++++++++++ .../spring/filter/config/AppConfig.java | 18 ++++++++++++++++ 3 files changed, 50 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java index 8603b61c11..fab9705bfd 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java @@ -170,7 +170,7 @@ private List typeFiltersFor(AnnotationAttributes filterAttributes) { switch (filterType) { case ANNOTATION: Assert.isAssignable(Annotation.class, filterClass, - "An error occured when processing a @ComponentScan " + "ANNOTATION type filter: "); + "Specified an unsupported type in 'ANNOTATION' exclude filter of @MapperScan"); @SuppressWarnings("unchecked") Class annoClass = (Class) filterClass; typeFilters.add(new AnnotationTypeFilter(annoClass)); @@ -184,19 +184,21 @@ private List typeFiltersFor(AnnotationAttributes filterAttributes) { typeFilters.add(BeanUtils.instantiateClass(filterClass, TypeFilter.class)); break; default: - throw new IllegalArgumentException("Unknown filter type " + filterType); + throw new IllegalArgumentException("Cannot specify the 'value' or 'classes' attribute if use the " + filterType + " FilterType in exclude filter of @MapperScan"); } } String[] expressionArray = filterAttributes.getStringArray("pattern"); for (String expression : expressionArray) { - String rawName = filterType.toString(); - if ("REGEX".equals(rawName)) { - typeFilters.add(new RegexPatternTypeFilter(Pattern.compile(expression))); - } else if ("ASPECTJ".equals(rawName)) { - typeFilters.add(new AspectJTypeFilter(expression, this.resourceLoader.getClassLoader())); - } else { - throw new IllegalArgumentException("Unknown filter type " + filterType); + switch (filterType) { + case REGEX: + typeFilters.add(new RegexPatternTypeFilter(Pattern.compile(expression))); + break; + case ASPECTJ: + typeFilters.add(new AspectJTypeFilter(expression, this.resourceLoader.getClassLoader())); + break; + default: + throw new IllegalArgumentException("Cannot specify the 'pattern' attribute if use the " + filterType + " FilterType in exclude filter of @MapperScan"); } } return typeFilters; diff --git a/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java b/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java index 7206fb729e..01f257884d 100644 --- a/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java +++ b/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java @@ -23,6 +23,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * test the function of excludeFilters in @MapperScan @@ -143,6 +144,26 @@ void multiPatternAspectJScanFilter() { } + @Test + void invalidTypeFilter() { + // invalid value using Annotation type filter + assertThrows(IllegalArgumentException.class, + () -> startContext(AppConfig.InvalidFilterTypeConfig.class)); + } + + @Test + void invalidPropertyPattern() { + assertThrows(IllegalArgumentException.class, + () -> startContext(AppConfig.AnnoTypeWithPatternPropertyConfig.class)); + } + + @Test + void invalidPropertyClasses() { + assertThrows(IllegalArgumentException.class, + () -> startContext(AppConfig.RegexTypeWithClassesPropertyConfig.class)); + } + + private void startContext(Class config) { applicationContext = new AnnotationConfigApplicationContext(); // use @MapperScan with excludeFilters in AppConfig.class diff --git a/src/test/java/org/mybatis/spring/filter/config/AppConfig.java b/src/test/java/org/mybatis/spring/filter/config/AppConfig.java index 36e437d07b..c519520e3a 100644 --- a/src/test/java/org/mybatis/spring/filter/config/AppConfig.java +++ b/src/test/java/org/mybatis/spring/filter/config/AppConfig.java @@ -82,5 +82,23 @@ public static class MultiPatternAspectJFilterConfig { } + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", + excludeFilters = {@ComponentScan.Filter(type = FilterType.ANNOTATION, value = ExcludeMaker.class)}) + public static class InvalidFilterTypeConfig { + + } + + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", + excludeFilters = {@ComponentScan.Filter(type = FilterType.ANNOTATION, + pattern = {"org\\.mybatis\\.spring\\.filter\\.datasource\\.datasource1\\..*"})}) + public static class AnnoTypeWithPatternPropertyConfig { + + } + + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", + excludeFilters = {@ComponentScan.Filter(type = FilterType.REGEX, value = AnnoTypeFilter.class)}) + public static class RegexTypeWithClassesPropertyConfig { + + } } From f449b4c17fdeb22789e5384e4efdc962e5e56a15 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sat, 15 Jul 2023 20:21:52 +0800 Subject: [PATCH 113/383] code format --- .../annotation/MapperScannerRegistrar.java | 11 ++-- .../mapper/MapperScannerConfigurer.java | 2 +- .../spring/filter/config/AppConfig.java | 62 ++++++++----------- .../filter/customfilter/AnnoTypeFilter.java | 2 +- .../filter/customfilter/CustomTypeFilter.java | 4 +- .../filter/customfilter/ExcludeMaker.java | 1 - .../commonsource/CommonDataSourceMapper.java | 1 - 7 files changed, 37 insertions(+), 46 deletions(-) diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java index fab9705bfd..a3c98e603e 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java @@ -170,7 +170,7 @@ private List typeFiltersFor(AnnotationAttributes filterAttributes) { switch (filterType) { case ANNOTATION: Assert.isAssignable(Annotation.class, filterClass, - "Specified an unsupported type in 'ANNOTATION' exclude filter of @MapperScan"); + "Specified an unsupported type in 'ANNOTATION' exclude filter of @MapperScan"); @SuppressWarnings("unchecked") Class annoClass = (Class) filterClass; typeFilters.add(new AnnotationTypeFilter(annoClass)); @@ -180,11 +180,12 @@ private List typeFiltersFor(AnnotationAttributes filterAttributes) { break; case CUSTOM: Assert.isAssignable(TypeFilter.class, filterClass, - "An error occured when processing a @ComponentScan " + "CUSTOM type filter: "); + "An error occured when processing a @ComponentScan " + "CUSTOM type filter: "); typeFilters.add(BeanUtils.instantiateClass(filterClass, TypeFilter.class)); break; default: - throw new IllegalArgumentException("Cannot specify the 'value' or 'classes' attribute if use the " + filterType + " FilterType in exclude filter of @MapperScan"); + throw new IllegalArgumentException("Cannot specify the 'value' or 'classes' attribute if use the " + + filterType + " FilterType in exclude filter of @MapperScan"); } } @@ -198,13 +199,13 @@ private List typeFiltersFor(AnnotationAttributes filterAttributes) { typeFilters.add(new AspectJTypeFilter(expression, this.resourceLoader.getClassLoader())); break; default: - throw new IllegalArgumentException("Cannot specify the 'pattern' attribute if use the " + filterType + " FilterType in exclude filter of @MapperScan"); + throw new IllegalArgumentException("Cannot specify the 'pattern' attribute if use the " + filterType + + " FilterType in exclude filter of @MapperScan"); } } return typeFilters; } - private static String generateBaseBeanName(AnnotationMetadata importingClassMetadata, int index) { return importingClassMetadata.getClassName() + "#" + MapperScannerRegistrar.class.getSimpleName() + "#" + index; } diff --git a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java index 8cebdb74c9..07455682ad 100644 --- a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java +++ b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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. diff --git a/src/test/java/org/mybatis/spring/filter/config/AppConfig.java b/src/test/java/org/mybatis/spring/filter/config/AppConfig.java index c519520e3a..a040e8d359 100644 --- a/src/test/java/org/mybatis/spring/filter/config/AppConfig.java +++ b/src/test/java/org/mybatis/spring/filter/config/AppConfig.java @@ -16,89 +16,81 @@ package org.mybatis.spring.filter.config; import org.mybatis.spring.annotation.MapperScan; -import org.mybatis.spring.filter.customfilter.ExcludeMaker; import org.mybatis.spring.filter.customfilter.AnnoTypeFilter; import org.mybatis.spring.filter.customfilter.CustomTypeFilter; +import org.mybatis.spring.filter.customfilter.ExcludeMaker; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.FilterType; - public class AppConfig { - - @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", - excludeFilters = {@ComponentScan.Filter(type = FilterType.CUSTOM, classes = CustomTypeFilter.class)}) + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = { + @ComponentScan.Filter(type = FilterType.CUSTOM, classes = CustomTypeFilter.class) }) public static class CustomFilterConfig { } - @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", - excludeFilters = {@ComponentScan.Filter(type = FilterType.ANNOTATION, classes = AnnoTypeFilter.class)}) + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = { + @ComponentScan.Filter(type = FilterType.ANNOTATION, classes = AnnoTypeFilter.class) }) public static class AnnoFilterConfig { } - @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", - excludeFilters = {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = ExcludeMaker.class)}) + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = { + @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = ExcludeMaker.class) }) public static class AssignableFilterConfig { } - @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", - excludeFilters = {@ComponentScan.Filter(type = FilterType.REGEX, - pattern = "org\\.mybatis\\.spring\\.filter\\.datasource\\.datasource1\\..*")}) + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = { + @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org\\.mybatis\\.spring\\.filter\\.datasource\\.datasource1\\..*") }) public static class RegexFilterConfig { } - @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", - excludeFilters = {@ComponentScan.Filter(type = FilterType.ASPECTJ, - pattern = "*..DataSource1Mapper")}) + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = { + @ComponentScan.Filter(type = FilterType.ASPECTJ, pattern = "*..DataSource1Mapper") }) public static class AspectJFilterConfig { } - - @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", - excludeFilters = {@ComponentScan.Filter(type = FilterType.CUSTOM, classes = CustomTypeFilter.class), - @ComponentScan.Filter(type = FilterType.ANNOTATION, classes = AnnoTypeFilter.class)}) + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = { + @ComponentScan.Filter(type = FilterType.CUSTOM, classes = CustomTypeFilter.class), + @ComponentScan.Filter(type = FilterType.ANNOTATION, classes = AnnoTypeFilter.class) }) public static class CombinedFilterConfig { } - @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", - excludeFilters = {@ComponentScan.Filter(type = FilterType.REGEX, - pattern = {"org\\.mybatis\\.spring\\.filter\\.datasource\\.datasource1\\..*", - "org\\.mybatis\\.spring\\.filter\\.datasource\\.datasource2\\..*"})}) + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = { + @ComponentScan.Filter(type = FilterType.REGEX, pattern = { + "org\\.mybatis\\.spring\\.filter\\.datasource\\.datasource1\\..*", + "org\\.mybatis\\.spring\\.filter\\.datasource\\.datasource2\\..*" }) }) public static class MultiPatternRegexFilterConfig { } - @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", - excludeFilters = {@ComponentScan.Filter(type = FilterType.ASPECTJ, - pattern = {"*..DataSource1Mapper", - "*..DataSource2Mapper"})}) + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = { + @ComponentScan.Filter(type = FilterType.ASPECTJ, pattern = { "*..DataSource1Mapper", "*..DataSource2Mapper" }) }) public static class MultiPatternAspectJFilterConfig { } - @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", - excludeFilters = {@ComponentScan.Filter(type = FilterType.ANNOTATION, value = ExcludeMaker.class)}) + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = { + @ComponentScan.Filter(type = FilterType.ANNOTATION, value = ExcludeMaker.class) }) public static class InvalidFilterTypeConfig { } - @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", - excludeFilters = {@ComponentScan.Filter(type = FilterType.ANNOTATION, - pattern = {"org\\.mybatis\\.spring\\.filter\\.datasource\\.datasource1\\..*"})}) + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = { + @ComponentScan.Filter(type = FilterType.ANNOTATION, pattern = { + "org\\.mybatis\\.spring\\.filter\\.datasource\\.datasource1\\..*" }) }) public static class AnnoTypeWithPatternPropertyConfig { } - @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", - excludeFilters = {@ComponentScan.Filter(type = FilterType.REGEX, value = AnnoTypeFilter.class)}) + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = { + @ComponentScan.Filter(type = FilterType.REGEX, value = AnnoTypeFilter.class) }) public static class RegexTypeWithClassesPropertyConfig { } } - diff --git a/src/test/java/org/mybatis/spring/filter/customfilter/AnnoTypeFilter.java b/src/test/java/org/mybatis/spring/filter/customfilter/AnnoTypeFilter.java index c07e9056e8..e32715a1c7 100644 --- a/src/test/java/org/mybatis/spring/filter/customfilter/AnnoTypeFilter.java +++ b/src/test/java/org/mybatis/spring/filter/customfilter/AnnoTypeFilter.java @@ -18,7 +18,7 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE}) +@Target({ ElementType.TYPE }) @Documented public @interface AnnoTypeFilter { } diff --git a/src/test/java/org/mybatis/spring/filter/customfilter/CustomTypeFilter.java b/src/test/java/org/mybatis/spring/filter/customfilter/CustomTypeFilter.java index 4808b677a8..52f8e05875 100644 --- a/src/test/java/org/mybatis/spring/filter/customfilter/CustomTypeFilter.java +++ b/src/test/java/org/mybatis/spring/filter/customfilter/CustomTypeFilter.java @@ -15,12 +15,12 @@ */ package org.mybatis.spring.filter.customfilter; +import java.io.IOException; + import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.core.type.filter.TypeFilter; -import java.io.IOException; - public class CustomTypeFilter implements TypeFilter { @Override public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) throws IOException { diff --git a/src/test/java/org/mybatis/spring/filter/customfilter/ExcludeMaker.java b/src/test/java/org/mybatis/spring/filter/customfilter/ExcludeMaker.java index 1699dd5f62..155235af99 100644 --- a/src/test/java/org/mybatis/spring/filter/customfilter/ExcludeMaker.java +++ b/src/test/java/org/mybatis/spring/filter/customfilter/ExcludeMaker.java @@ -15,6 +15,5 @@ */ package org.mybatis.spring.filter.customfilter; - public interface ExcludeMaker { } diff --git a/src/test/java/org/mybatis/spring/filter/datasource/commonsource/CommonDataSourceMapper.java b/src/test/java/org/mybatis/spring/filter/datasource/commonsource/CommonDataSourceMapper.java index 33cd4bcbb0..1c6446904f 100644 --- a/src/test/java/org/mybatis/spring/filter/datasource/commonsource/CommonDataSourceMapper.java +++ b/src/test/java/org/mybatis/spring/filter/datasource/commonsource/CommonDataSourceMapper.java @@ -15,6 +15,5 @@ */ package org.mybatis.spring.filter.datasource.commonsource; - public interface CommonDataSourceMapper { } From 756531a4f65c1ed3d300abe29e0f04c8b93d1bc3 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sun, 16 Jul 2023 16:51:29 +0800 Subject: [PATCH 114/383] support exclude filter on mapper scan with xml --- .../MapperScannerBeanDefinitionParser.java | 74 ++++++++++ .../mybatis/spring/config/mybatis-spring.xsd | 45 +++++++ .../mybatis/spring/filter/ScanFilterTest.java | 81 +++++------ .../spring/filter/xml/XmlScanFilterTest.java | 126 ++++++++++++++++++ .../filter/xml/appContextAnnoFilter.xml | 45 +++++++ .../filter/xml/appContextAspectJFilter.xml | 45 +++++++ .../filter/xml/appContextAssignFilter.xml | 45 +++++++ .../filter/xml/appContextCombinedFilter.xml | 49 +++++++ .../filter/xml/appContextCustFilter.xml | 45 +++++++ .../filter/xml/appContextInvalidFilter.xml | 45 +++++++ .../filter/xml/appContextInvalidFilter1.xml | 45 +++++++ .../filter/xml/appContextRegexFilter.xml | 45 +++++++ 12 files changed, 646 insertions(+), 44 deletions(-) create mode 100644 src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java create mode 100644 src/test/java/org/mybatis/spring/filter/xml/appContextAnnoFilter.xml create mode 100644 src/test/java/org/mybatis/spring/filter/xml/appContextAspectJFilter.xml create mode 100644 src/test/java/org/mybatis/spring/filter/xml/appContextAssignFilter.xml create mode 100644 src/test/java/org/mybatis/spring/filter/xml/appContextCombinedFilter.xml create mode 100644 src/test/java/org/mybatis/spring/filter/xml/appContextCustFilter.xml create mode 100644 src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter.xml create mode 100644 src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter1.xml create mode 100644 src/test/java/org/mybatis/spring/filter/xml/appContextRegexFilter.xml diff --git a/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java b/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java index 927cd627d6..4a2a1b9aea 100644 --- a/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java +++ b/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java @@ -16,6 +16,9 @@ package org.mybatis.spring.config; import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; import org.mybatis.spring.mapper.ClassPathMapperScanner; import org.mybatis.spring.mapper.MapperFactoryBean; @@ -28,9 +31,17 @@ import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.beans.factory.xml.XmlReaderContext; +import org.springframework.core.type.filter.AnnotationTypeFilter; +import org.springframework.core.type.filter.AspectJTypeFilter; +import org.springframework.core.type.filter.AssignableTypeFilter; +import org.springframework.core.type.filter.RegexPatternTypeFilter; +import org.springframework.core.type.filter.TypeFilter; +import org.springframework.lang.Nullable; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * A {#code BeanDefinitionParser} that handles the element scan of the MyBatis. namespace @@ -57,6 +68,7 @@ public class MapperScannerBeanDefinitionParser extends AbstractBeanDefinitionPar private static final String ATTRIBUTE_LAZY_INITIALIZATION = "lazy-initialization"; private static final String ATTRIBUTE_DEFAULT_SCOPE = "default-scope"; private static final String ATTRIBUTE_PROCESS_PROPERTY_PLACEHOLDERS = "process-property-placeholders"; + private static final String ATTRIBUTE_EXCLUDE_FILTER = "exclude-filter"; /** * {@inheritDoc} @@ -98,6 +110,12 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa .loadClass(mapperFactoryBeanClassName); builder.addPropertyValue("mapperFactoryBeanClass", mapperFactoryBeanClass); } + + // parse exclude-filter + List typeFilters = parseTypeFilters(element, parserContext, classLoader); + if (!typeFilters.isEmpty()) { + builder.addPropertyValue("excludeFilters", typeFilters); + } } catch (Exception ex) { XmlReaderContext readerContext = parserContext.getReaderContext(); readerContext.error(ex.getMessage(), readerContext.extractSource(element), ex.getCause()); @@ -115,6 +133,62 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa return builder.getBeanDefinition(); } + private List parseTypeFilters(Element element, ParserContext parserContext, ClassLoader classLoader) { + // Parse exclude filter elements. + List typeFilters = new ArrayList<>(); + NodeList nodeList = element.getChildNodes(); + for (int i = 0; i < nodeList.getLength(); i++) { + Node node = nodeList.item(i); + if (Node.ELEMENT_NODE == node.getNodeType()) { + String localName = parserContext.getDelegate().getLocalName(node); + try { + if (ATTRIBUTE_EXCLUDE_FILTER.equals(localName)) { + TypeFilter typeFilter = createTypeFilter((Element) node, classLoader, parserContext); + typeFilters.add(typeFilter); + } + } catch (ClassNotFoundException ex) { + parserContext.getReaderContext().warning("Ignoring non-present type filter class: " + ex, + parserContext.extractSource(element)); + } catch (Exception ex) { + parserContext.getReaderContext().error(ex.getMessage(), parserContext.extractSource(element), ex.getCause()); + } + } + } + return typeFilters; + } + + @SuppressWarnings("unchecked") + private TypeFilter createTypeFilter(Element element, @Nullable ClassLoader classLoader, ParserContext parserContext) + throws ClassNotFoundException { + String filterType = element.getAttribute("type"); + String expression = element.getAttribute("expression"); + expression = parserContext.getReaderContext().getEnvironment().resolvePlaceholders(expression); + switch (filterType) { + case "annotation": + Class filterAnno = ClassUtils.forName(expression, classLoader); + if(!Annotation.class.isAssignableFrom(filterAnno)){ + throw new IllegalArgumentException( + "Class is not assignable to [" + Annotation.class.getName() + "]: " + expression); + } + return new AnnotationTypeFilter((Class) filterAnno); + case "custom": + Class filterClass = ClassUtils.forName(expression, classLoader); + if (!TypeFilter.class.isAssignableFrom(filterClass)) { + throw new IllegalArgumentException( + "Class is not assignable to [" + TypeFilter.class.getName() + "]: " + expression); + } + return (TypeFilter) BeanUtils.instantiateClass(filterClass); + case "assignable": + return new AssignableTypeFilter(ClassUtils.forName(expression, classLoader)); + case "regex": + return new RegexPatternTypeFilter(Pattern.compile(expression)); + case "aspectj": + return new AspectJTypeFilter(expression, classLoader); + default: + throw new IllegalArgumentException("Unsupported filter type: " + filterType); + } + } + /** * {@inheritDoc} * diff --git a/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd b/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd index 5366717e4d..dcf4caae77 100644 --- a/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd +++ b/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd @@ -33,6 +33,16 @@ + + + + + + + @@ -160,4 +170,39 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java b/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java index 01f257884d..f8f99ae37a 100644 --- a/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java +++ b/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java @@ -15,16 +15,17 @@ */ package org.mybatis.spring.filter; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; + import com.mockrunner.mock.jdbc.MockDataSource; + import org.junit.jupiter.api.Test; import org.mybatis.spring.SqlSessionFactoryBean; import org.mybatis.spring.filter.config.AppConfig; import org.springframework.beans.factory.support.GenericBeanDefinition; import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; - /** * test the function of excludeFilters in @MapperScan */ @@ -32,17 +33,17 @@ public class ScanFilterTest { private AnnotationConfigApplicationContext applicationContext; - @Test void testCustomScanFilter() { startContext(AppConfig.CustomFilterConfig.class); - // use org.mybatis.spring.scan.filter.datasource as basePackages and exclude package datasource2 by MapperScan.excludeFilters + // use org.mybatis.spring.scan.filter.datasource as basePackages and exclude package datasource2 by + // MapperScan.excludeFilters // mapper in package datasource2 will not be registered to beanFactory - assertThat(applicationContext.containsBean("dataSource2Mapper")).isEqualTo(false); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isFalse(); // mapper in package datasource except datasource2 will be registered to beanFactory correctly. - assertThat(applicationContext.containsBean("commonDataSourceMapper")).isEqualTo(true); - assertThat(applicationContext.containsBean("dataSource1Mapper")).isEqualTo(true); + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isTrue(); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isTrue(); } @Test @@ -50,26 +51,25 @@ void testAnnoScanFilter() { startContext(AppConfig.AnnoFilterConfig.class); // use @AnnoTypeFilter to exclude mapper - assertThat(applicationContext.containsBean("annoExcludeMapper")).isEqualTo(false); + assertThat(applicationContext.containsBean("annoExcludeMapper")).isFalse(); // mapper in package datasource except datasource2 will be registered to beanFactory correctly. - assertThat(applicationContext.containsBean("commonDataSourceMapper")).isEqualTo(true); - assertThat(applicationContext.containsBean("dataSource1Mapper")).isEqualTo(true); - assertThat(applicationContext.containsBean("dataSource2Mapper")).isEqualTo(true); + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isTrue(); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isTrue(); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isTrue(); } - @Test void testAssignableScanFilter() { startContext(AppConfig.AssignableFilterConfig.class); // exclude AssignableMapper by AssignableFilter - assertThat(applicationContext.containsBean("assignableMapper")).isEqualTo(false); + assertThat(applicationContext.containsBean("assignableMapper")).isFalse(); // mapper in package datasource except datasource2 will be registered to beanFactory correctly. - assertThat(applicationContext.containsBean("commonDataSourceMapper")).isEqualTo(true); - assertThat(applicationContext.containsBean("dataSource1Mapper")).isEqualTo(true); - assertThat(applicationContext.containsBean("dataSource2Mapper")).isEqualTo(true); + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isTrue(); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isTrue(); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isTrue(); } @Test @@ -77,11 +77,11 @@ void testRegexScanFilter() { startContext(AppConfig.RegexFilterConfig.class); // exclude package datasource1 by Regex - assertThat(applicationContext.containsBean("dataSource1Mapper")).isEqualTo(false); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isFalse(); // mapper in package datasource except datasource1 will be registered to beanFactory correctly. - assertThat(applicationContext.containsBean("commonDataSourceMapper")).isEqualTo(true); - assertThat(applicationContext.containsBean("dataSource2Mapper")).isEqualTo(true); + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isTrue(); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isTrue(); } @Test @@ -90,42 +90,40 @@ void testAspectJScanFilter() { startContext(AppConfig.AspectJFilterConfig.class); // exclude dataSource1Mapper by AspectJ - assertThat(applicationContext.containsBean("dataSource1Mapper")).isEqualTo(false); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isFalse(); // mapper in package datasource except datasource1 will be registered to beanFactory correctly. - assertThat(applicationContext.containsBean("commonDataSourceMapper")).isEqualTo(true); - assertThat(applicationContext.containsBean("dataSource2Mapper")).isEqualTo(true); + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isTrue(); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isTrue(); } - @Test void combinedScanFilter() { // combined filter with Custom and Annotation startContext(AppConfig.CombinedFilterConfig.class); // exclude datasource2.DataSource2Mapper by CustomTypeFilter - assertThat(applicationContext.containsBean("dataSource2Mapper")).isEqualTo(false); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isFalse(); // exclude datasource1.MapperWithAnnoFilter by AnnoTypeFilter - assertThat(applicationContext.containsBean("mapperWithAnnoFilter")).isEqualTo(false); + assertThat(applicationContext.containsBean("mapperWithAnnoFilter")).isFalse(); // other mapper could be registered to beanFactory correctly. - assertThat(applicationContext.containsBean("commonDataSourceMapper")).isEqualTo(true); - assertThat(applicationContext.containsBean("dataSource1Mapper")).isEqualTo(true); + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isTrue(); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isTrue(); } - @Test void multiPatternRegexScanFilter() { // multi pattern regex filter startContext(AppConfig.MultiPatternRegexFilterConfig.class); // exclude datasource1 by pattern[0] - assertThat(applicationContext.containsBean("dataSource1Mapper")).isEqualTo(false); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isFalse(); // exclude datasource2 by pattern[1] - assertThat(applicationContext.containsBean("dataSource2Mapper")).isEqualTo(false); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isFalse(); // other mapper could be registered to beanFactory correctly. - assertThat(applicationContext.containsBean("commonDataSourceMapper")).isEqualTo(true); + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isTrue(); } @Test @@ -134,36 +132,32 @@ void multiPatternAspectJScanFilter() { startContext(AppConfig.MultiPatternAspectJFilterConfig.class); // exclude datasource1 by pattern[0] - assertThat(applicationContext.containsBean("dataSource1Mapper")).isEqualTo(false); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isFalse(); // exclude datasource2 by pattern[1] - assertThat(applicationContext.containsBean("dataSource2Mapper")).isEqualTo(false); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isFalse(); // other mapper could be registered to beanFactory correctly. - assertThat(applicationContext.containsBean("commonDataSourceMapper")).isEqualTo(true); - assertThat(applicationContext.containsBean("dataSource2Mapper1")).isEqualTo(true); + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isTrue(); + assertThat(applicationContext.containsBean("dataSource2Mapper1")).isTrue(); } - @Test void invalidTypeFilter() { // invalid value using Annotation type filter - assertThrows(IllegalArgumentException.class, - () -> startContext(AppConfig.InvalidFilterTypeConfig.class)); + assertThrows(IllegalArgumentException.class, () -> startContext(AppConfig.InvalidFilterTypeConfig.class)); } @Test void invalidPropertyPattern() { - assertThrows(IllegalArgumentException.class, - () -> startContext(AppConfig.AnnoTypeWithPatternPropertyConfig.class)); + assertThrows(IllegalArgumentException.class, () -> startContext(AppConfig.AnnoTypeWithPatternPropertyConfig.class)); } @Test void invalidPropertyClasses() { assertThrows(IllegalArgumentException.class, - () -> startContext(AppConfig.RegexTypeWithClassesPropertyConfig.class)); + () -> startContext(AppConfig.RegexTypeWithClassesPropertyConfig.class)); } - private void startContext(Class config) { applicationContext = new AnnotationConfigApplicationContext(); // use @MapperScan with excludeFilters in AppConfig.class @@ -173,7 +167,6 @@ private void startContext(Class config) { applicationContext.start(); } - private void setupSqlSessionFactory(String name) { GenericBeanDefinition definition = new GenericBeanDefinition(); definition.setBeanClass(SqlSessionFactoryBean.class); diff --git a/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java b/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java new file mode 100644 index 0000000000..9f3228556f --- /dev/null +++ b/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java @@ -0,0 +1,126 @@ +/* + * Copyright 2010-2023 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.mybatis.spring.filter.xml; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +/** + * test the function of excludeFilters in + */ +public class XmlScanFilterTest { + + private ClassPathXmlApplicationContext applicationContext; + + @Test + void testCustomScanFilter() { + // exclude datasource2 by CustomTypeFilter + startContext("org/mybatis/spring/filter/xml/appContextCustFilter.xml"); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isFalse(); + assertThat(applicationContext.containsBean("mapperWithAnnoFilter")).isTrue(); + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isTrue(); + closeContext(); + } + + @Test + void testAnnoScanFilter() { + // exclude mappers which has @AnnoTypeFilter + startContext("org/mybatis/spring/filter/xml/appContextAnnoFilter.xml"); + assertThat(applicationContext.containsBean("mapperWithAnnoFilter")).isFalse(); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isTrue(); + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isTrue(); + closeContext(); + } + + @Test + void testAssignScanFilter() { + // exclude mappers which can assignable to ExcludeMaker + startContext("org/mybatis/spring/filter/xml/appContextAssignFilter.xml"); + assertThat(applicationContext.containsBean("assignableMapper")).isFalse(); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isTrue(); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isTrue(); + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isTrue(); + closeContext(); + } + + @Test + void testRegexScanFilter() { + // exclude datasource1 by regex + startContext("org/mybatis/spring/filter/xml/appContextRegexFilter.xml"); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isFalse(); + assertThat(applicationContext.containsBean("mapperWithAnnoFilter")).isFalse(); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isTrue(); + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isTrue(); + closeContext(); + } + + @Test + void testAspectJScanFilter() { + // exclude mappers which class name start with DataSource + startContext("org/mybatis/spring/filter/xml/appContextAspectJFilter.xml"); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isFalse(); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isFalse(); + assertThat(applicationContext.containsBean("mapperWithAnnoFilter")).isTrue(); + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isTrue(); + closeContext(); + } + + @Test + void testCombinedScanFilter() { + // exclude filters combined with Annotation Custom and Assignable + startContext("org/mybatis/spring/filter/xml/appContextCombinedFilter.xml"); + assertThat(applicationContext.containsBean("mapperWithAnnoFilter")).isFalse(); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isFalse(); + assertThat(applicationContext.containsBean("assignableMapper")).isFalse(); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isTrue(); + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isTrue(); + closeContext(); + } + + @Test + void invalidPatternFilter() { + try { + startContext("org/mybatis/spring/filter/xml/appContextInvalidFilter.xml"); + } catch (BeanDefinitionParsingException ex) { + assertThat(ex.getMessage()).contains("Class is not assignable to [java.lang.annotation.Annotation]"); + } finally { + closeContext(); + } + } + + @Test + void invalidPropertyPattern() { + assertThrows(BeanDefinitionParsingException.class, + () -> startContext("org/mybatis/spring/filter/xml/appContextInvalidFilter1.xml")); + closeContext(); + } + + + private void startContext(String config) { + applicationContext = new ClassPathXmlApplicationContext(config); + applicationContext.refresh(); + applicationContext.start(); + } + + private void closeContext() { + if (null != applicationContext) + applicationContext.close(); + } +} diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextAnnoFilter.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextAnnoFilter.xml new file mode 100644 index 0000000000..67d1db1e37 --- /dev/null +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextAnnoFilter.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextAspectJFilter.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextAspectJFilter.xml new file mode 100644 index 0000000000..952f381415 --- /dev/null +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextAspectJFilter.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextAssignFilter.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextAssignFilter.xml new file mode 100644 index 0000000000..afddfa1898 --- /dev/null +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextAssignFilter.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextCombinedFilter.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextCombinedFilter.xml new file mode 100644 index 0000000000..60ba0132ec --- /dev/null +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextCombinedFilter.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextCustFilter.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextCustFilter.xml new file mode 100644 index 0000000000..8d5aa2dd72 --- /dev/null +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextCustFilter.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter.xml new file mode 100644 index 0000000000..dd3ee9281d --- /dev/null +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter1.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter1.xml new file mode 100644 index 0000000000..49c126b478 --- /dev/null +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter1.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextRegexFilter.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextRegexFilter.xml new file mode 100644 index 0000000000..6bd23fb252 --- /dev/null +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextRegexFilter.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + From 564c1086fa709d7125418535e4f1b6904ee3ba87 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sun, 16 Jul 2023 17:17:36 +0800 Subject: [PATCH 115/383] add more test --- .../spring/filter/xml/XmlScanFilterTest.java | 11 +++++ .../filter/xml/appContextPlaceHolder.xml | 47 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 src/test/java/org/mybatis/spring/filter/xml/appContextPlaceHolder.xml diff --git a/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java b/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java index 9f3228556f..ac6af5f929 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java +++ b/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java @@ -49,6 +49,17 @@ void testAnnoScanFilter() { closeContext(); } + @Test + void testAnnoScanWithPlaceHolderFilter() { + // exclude mappers which has @AnnoTypeFilter + System.getProperties().put("annoFilter","org.mybatis.spring.filter.customfilter.AnnoTypeFilter"); + startContext("org/mybatis/spring/filter/xml/appContextPlaceHolder.xml"); + assertThat(applicationContext.containsBean("mapperWithAnnoFilter")).isFalse(); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isTrue(); + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isTrue(); + closeContext(); + } + @Test void testAssignScanFilter() { // exclude mappers which can assignable to ExcludeMaker diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextPlaceHolder.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextPlaceHolder.xml new file mode 100644 index 0000000000..75398c62e5 --- /dev/null +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextPlaceHolder.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + From 3e67f256c501a96d894182aeb8c10187185b22d1 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 18 Jul 2023 18:08:52 +0800 Subject: [PATCH 116/383] Optimized process to parse excludeFilters --- .../mybatis/spring/annotation/MapperScan.java | 2 + .../annotation/MapperScannerRegistrar.java | 67 ++++++++++---- .../MapperScannerBeanDefinitionParser.java | 70 +++------------ .../mapper/MapperScannerConfigurer.java | 89 +++++++++++++++++++ .../mybatis/spring/config/mybatis-spring.xsd | 8 +- .../mybatis/spring/filter/ScanFilterTest.java | 57 +++++++++--- .../spring/filter/config/AppConfig.java | 32 ++++++- .../filter/config/application.properties | 18 ++++ .../spring/filter/xml/XmlScanFilterTest.java | 42 ++++++--- .../filter/xml/appContextCombinedFilter.xml | 7 +- .../filter/xml/appContextInvalidFilter2.xml | 45 ++++++++++ .../filter/xml/appContextPlaceHolder1.xml | 49 ++++++++++ .../spring/filter/xml/default.properties | 18 ++++ 13 files changed, 395 insertions(+), 109 deletions(-) create mode 100644 src/test/java/org/mybatis/spring/filter/config/application.properties create mode 100644 src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter2.xml create mode 100644 src/test/java/org/mybatis/spring/filter/xml/appContextPlaceHolder1.xml create mode 100644 src/test/java/org/mybatis/spring/filter/xml/default.properties diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScan.java b/src/main/java/org/mybatis/spring/annotation/MapperScan.java index 402dd54058..e533833492 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScan.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScan.java @@ -201,6 +201,8 @@ * Specifies which types are not eligible for mapper scanning. * * @since 3.0.3 + * + * @return array of customized mapper excludeFilter */ ComponentScan.Filter[] excludeFilters() default {}; diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java index a3c98e603e..88155e15e0 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java @@ -18,8 +18,9 @@ import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; -import java.util.regex.Pattern; +import java.util.Map; import java.util.stream.Collectors; import org.mybatis.spring.mapper.ClassPathMapperScanner; @@ -38,9 +39,7 @@ import org.springframework.core.io.ResourceLoader; import org.springframework.core.type.AnnotationMetadata; import org.springframework.core.type.filter.AnnotationTypeFilter; -import org.springframework.core.type.filter.AspectJTypeFilter; import org.springframework.core.type.filter.AssignableTypeFilter; -import org.springframework.core.type.filter.RegexPatternTypeFilter; import org.springframework.core.type.filter.TypeFilter; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; @@ -136,10 +135,17 @@ void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes a AnnotationAttributes[] excludeFilterArray = annoAttrs.getAnnotationArray("excludeFilters"); if (excludeFilterArray.length > 0) { List typeFilters = new ArrayList<>(); + List> rawTypeFilters = new ArrayList<>(); for (AnnotationAttributes excludeFilters : excludeFilterArray) { - typeFilters.addAll(typeFiltersFor(excludeFilters)); + if (excludeFilters.getStringArray("pattern").length > 0) { + // in oder to apply placeholder resolver + rawTypeFilters.addAll(parseFiltersHasPatterns(excludeFilters)); + } else { + typeFilters.addAll(typeFiltersFor(excludeFilters)); + } } builder.addPropertyValue("excludeFilters", typeFilters); + builder.addPropertyValue("rawExcludeFilters", rawTypeFilters); } String lazyInitialization = annoAttrs.getString("lazyInitialization"); @@ -161,6 +167,44 @@ void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes a } + /** + * Parse excludeFilters which FilterType is REGEX or ASPECTJ + * + * @param filterAttributes + * AnnotationAttributes of excludeFilters + * + * @since 3.0.3 + */ + private List> parseFiltersHasPatterns(AnnotationAttributes filterAttributes) { + + List> rawTypeFilters = new ArrayList<>(); + FilterType filterType = filterAttributes.getEnum("type"); + String[] expressionArray = filterAttributes.getStringArray("pattern"); + for (String expression : expressionArray) { + switch (filterType) { + case REGEX: + case ASPECTJ: + Map typeFilter = new HashMap<>(16); + typeFilter.put("type", filterType.name().toLowerCase()); + typeFilter.put("expression", expression); + rawTypeFilters.add(typeFilter); + break; + default: + throw new IllegalArgumentException("Cannot specify the 'pattern' attribute if use the " + filterType + + " FilterType in exclude filter of @MapperScan"); + } + } + return rawTypeFilters; + } + + /** + * Parse excludeFilters which FilterType is ANNOTATION ASSIGNABLE or CUSTOM + * + * @param filterAttributes + * AnnotationAttributes of excludeFilters + * + * @since 3.0.3 + */ private List typeFiltersFor(AnnotationAttributes filterAttributes) { List typeFilters = new ArrayList<>(); @@ -188,21 +232,6 @@ private List typeFiltersFor(AnnotationAttributes filterAttributes) { + filterType + " FilterType in exclude filter of @MapperScan"); } } - - String[] expressionArray = filterAttributes.getStringArray("pattern"); - for (String expression : expressionArray) { - switch (filterType) { - case REGEX: - typeFilters.add(new RegexPatternTypeFilter(Pattern.compile(expression))); - break; - case ASPECTJ: - typeFilters.add(new AspectJTypeFilter(expression, this.resourceLoader.getClassLoader())); - break; - default: - throw new IllegalArgumentException("Cannot specify the 'pattern' attribute if use the " + filterType - + " FilterType in exclude filter of @MapperScan"); - } - } return typeFilters; } diff --git a/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java b/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java index 4a2a1b9aea..5858a2e3b6 100644 --- a/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java +++ b/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java @@ -17,8 +17,9 @@ import java.lang.annotation.Annotation; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.regex.Pattern; +import java.util.Map; import org.mybatis.spring.mapper.ClassPathMapperScanner; import org.mybatis.spring.mapper.MapperFactoryBean; @@ -31,12 +32,6 @@ import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.beans.factory.xml.XmlReaderContext; -import org.springframework.core.type.filter.AnnotationTypeFilter; -import org.springframework.core.type.filter.AspectJTypeFilter; -import org.springframework.core.type.filter.AssignableTypeFilter; -import org.springframework.core.type.filter.RegexPatternTypeFilter; -import org.springframework.core.type.filter.TypeFilter; -import org.springframework.lang.Nullable; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; import org.w3c.dom.Element; @@ -111,11 +106,12 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa builder.addPropertyValue("mapperFactoryBeanClass", mapperFactoryBeanClass); } - // parse exclude-filter - List typeFilters = parseTypeFilters(element, parserContext, classLoader); - if (!typeFilters.isEmpty()) { - builder.addPropertyValue("excludeFilters", typeFilters); + // parse raw exclude-filter in + List> rawExcludeFilters = parseScanTypeFilters(element, parserContext); + if (!rawExcludeFilters.isEmpty()) { + builder.addPropertyValue("rawExcludeFilters", rawExcludeFilters); } + } catch (Exception ex) { XmlReaderContext readerContext = parserContext.getReaderContext(); readerContext.error(ex.getMessage(), readerContext.extractSource(element), ex.getCause()); @@ -133,62 +129,24 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa return builder.getBeanDefinition(); } - private List parseTypeFilters(Element element, ParserContext parserContext, ClassLoader classLoader) { - // Parse exclude filter elements. - List typeFilters = new ArrayList<>(); + private List> parseScanTypeFilters(Element element, ParserContext parserContext) { + List> typeFilters = new ArrayList<>(); NodeList nodeList = element.getChildNodes(); for (int i = 0; i < nodeList.getLength(); i++) { Node node = nodeList.item(i); if (Node.ELEMENT_NODE == node.getNodeType()) { String localName = parserContext.getDelegate().getLocalName(node); - try { - if (ATTRIBUTE_EXCLUDE_FILTER.equals(localName)) { - TypeFilter typeFilter = createTypeFilter((Element) node, classLoader, parserContext); - typeFilters.add(typeFilter); - } - } catch (ClassNotFoundException ex) { - parserContext.getReaderContext().warning("Ignoring non-present type filter class: " + ex, - parserContext.extractSource(element)); - } catch (Exception ex) { - parserContext.getReaderContext().error(ex.getMessage(), parserContext.extractSource(element), ex.getCause()); + if (ATTRIBUTE_EXCLUDE_FILTER.equals(localName)) { + Map filter = new HashMap<>(16); + filter.put("type", ((Element) node).getAttribute("type")); + filter.put("expression", ((Element) node).getAttribute("expression")); + typeFilters.add(filter); } } } return typeFilters; } - @SuppressWarnings("unchecked") - private TypeFilter createTypeFilter(Element element, @Nullable ClassLoader classLoader, ParserContext parserContext) - throws ClassNotFoundException { - String filterType = element.getAttribute("type"); - String expression = element.getAttribute("expression"); - expression = parserContext.getReaderContext().getEnvironment().resolvePlaceholders(expression); - switch (filterType) { - case "annotation": - Class filterAnno = ClassUtils.forName(expression, classLoader); - if(!Annotation.class.isAssignableFrom(filterAnno)){ - throw new IllegalArgumentException( - "Class is not assignable to [" + Annotation.class.getName() + "]: " + expression); - } - return new AnnotationTypeFilter((Class) filterAnno); - case "custom": - Class filterClass = ClassUtils.forName(expression, classLoader); - if (!TypeFilter.class.isAssignableFrom(filterClass)) { - throw new IllegalArgumentException( - "Class is not assignable to [" + TypeFilter.class.getName() + "]: " + expression); - } - return (TypeFilter) BeanUtils.instantiateClass(filterClass); - case "assignable": - return new AssignableTypeFilter(ClassUtils.forName(expression, classLoader)); - case "regex": - return new RegexPatternTypeFilter(Pattern.compile(expression)); - case "aspectj": - return new AspectJTypeFilter(expression, classLoader); - default: - throw new IllegalArgumentException("Unsupported filter type: " + filterType); - } - } - /** * {@inheritDoc} * diff --git a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java index 07455682ad..9525f41869 100644 --- a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java +++ b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java @@ -18,12 +18,15 @@ import static org.springframework.util.Assert.notNull; import java.lang.annotation.Annotation; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.regex.Pattern; import org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.spring.SqlSessionTemplate; +import org.springframework.beans.BeanUtils; import org.springframework.beans.PropertyValue; import org.springframework.beans.PropertyValues; import org.springframework.beans.factory.BeanNameAware; @@ -40,7 +43,13 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.Environment; +import org.springframework.core.type.filter.AnnotationTypeFilter; +import org.springframework.core.type.filter.AspectJTypeFilter; +import org.springframework.core.type.filter.AssignableTypeFilter; +import org.springframework.core.type.filter.RegexPatternTypeFilter; import org.springframework.core.type.filter.TypeFilter; +import org.springframework.lang.Nullable; +import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; /** @@ -113,6 +122,8 @@ public class MapperScannerConfigurer private List excludeFilters; + private List> rawExcludeFilters; + private Class mapperFactoryBeanClass; private ApplicationContext applicationContext; @@ -209,6 +220,20 @@ public void setExcludeFilters(List excludeFilters) { this.excludeFilters = excludeFilters; } + /** + * In order to support process PropertyPlaceHolders. + *

+ * After parsed, it will be added to excludeFilters. + * + * @since 3.0.3 + * + * @param rawExcludeFilters + * list of rawExcludeFilter + */ + public void setRawExcludeFilters(List> rawExcludeFilters) { + this.rawExcludeFilters = rawExcludeFilters; + } + /** * Specifies which {@code SqlSessionTemplate} to use in the case that there is more than one in the spring context. * Usually this is only needed when you have more than one datasource. @@ -432,6 +457,7 @@ private void processPropertyPlaceHolders() { this.sqlSessionTemplateBeanName = getPropertyValue("sqlSessionTemplateBeanName", values); this.lazyInitialization = getPropertyValue("lazyInitialization", values); this.defaultScope = getPropertyValue("defaultScope", values); + this.rawExcludeFilters = getPropertyValueForTypeFilter("rawExcludeFilters", values); } this.basePackage = Optional.ofNullable(this.basePackage).map(getEnvironment()::resolvePlaceholders).orElse(null); this.sqlSessionFactoryBeanName = Optional.ofNullable(this.sqlSessionFactoryBeanName) @@ -441,6 +467,7 @@ private void processPropertyPlaceHolders() { this.lazyInitialization = Optional.ofNullable(this.lazyInitialization).map(getEnvironment()::resolvePlaceholders) .orElse(null); this.defaultScope = Optional.ofNullable(this.defaultScope).map(getEnvironment()::resolvePlaceholders).orElse(null); + this.excludeFilters = mergeExcludeFilters(); } private Environment getEnvironment() { @@ -467,4 +494,66 @@ private String getPropertyValue(String propertyName, PropertyValues values) { } } + @SuppressWarnings("unchecked") + private List> getPropertyValueForTypeFilter(String propertyName, PropertyValues values) { + PropertyValue property = values.getPropertyValue(propertyName); + Object value; + if (property == null || (value = property.getValue()) == null || !(value instanceof List)) { + return null; + } + return (List>) value; + } + + private List mergeExcludeFilters() { + List typeFilters = new ArrayList<>(); + if (this.rawExcludeFilters == null || this.rawExcludeFilters.isEmpty()) { + return this.excludeFilters; + } + if (this.excludeFilters != null && !this.excludeFilters.isEmpty()) { + typeFilters.addAll(this.excludeFilters); + } + try { + for (Map typeFilter : this.rawExcludeFilters) { + typeFilters.add( + createTypeFilter(typeFilter.get("type"), typeFilter.get("expression"), this.getClass().getClassLoader())); + } + } catch (ClassNotFoundException exception) { + throw new RuntimeException("ClassNotFoundException occur when to load the Specified excludeFilter classes.", + exception); + } + return typeFilters; + } + + @SuppressWarnings("unchecked") + private TypeFilter createTypeFilter(String filterType, String expression, @Nullable ClassLoader classLoader) + throws ClassNotFoundException { + + expression = this.getEnvironment().resolvePlaceholders(expression); + + switch (filterType) { + case "annotation": + Class filterAnno = ClassUtils.forName(expression, classLoader); + if (!Annotation.class.isAssignableFrom(filterAnno)) { + throw new IllegalArgumentException( + "Class is not assignable to [" + Annotation.class.getName() + "]: " + expression); + } + return new AnnotationTypeFilter((Class) filterAnno); + case "custom": + Class filterClass = ClassUtils.forName(expression, classLoader); + if (!TypeFilter.class.isAssignableFrom(filterClass)) { + throw new IllegalArgumentException( + "Class is not assignable to [" + TypeFilter.class.getName() + "]: " + expression); + } + return (TypeFilter) BeanUtils.instantiateClass(filterClass); + case "assignable": + return new AssignableTypeFilter(ClassUtils.forName(expression, classLoader)); + case "regex": + return new RegexPatternTypeFilter(Pattern.compile(expression)); + case "aspectj": + return new AspectJTypeFilter(expression, classLoader); + default: + throw new IllegalArgumentException("Unsupported filter type: " + filterType); + } + } + } diff --git a/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd b/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd index dcf4caae77..196a6fe35b 100644 --- a/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd +++ b/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd @@ -177,10 +177,10 @@ startContext(AppConfig.InvalidFilterTypeConfig.class)); } @Test void invalidPropertyPattern() { + // illegal mixed use type Annotation and pattern assertThrows(IllegalArgumentException.class, () -> startContext(AppConfig.AnnoTypeWithPatternPropertyConfig.class)); } @Test void invalidPropertyClasses() { + // illegal mixed use type REGEX and value assertThrows(IllegalArgumentException.class, () -> startContext(AppConfig.RegexTypeWithClassesPropertyConfig.class)); } diff --git a/src/test/java/org/mybatis/spring/filter/config/AppConfig.java b/src/test/java/org/mybatis/spring/filter/config/AppConfig.java index a040e8d359..aede81c9a2 100644 --- a/src/test/java/org/mybatis/spring/filter/config/AppConfig.java +++ b/src/test/java/org/mybatis/spring/filter/config/AppConfig.java @@ -19,8 +19,11 @@ import org.mybatis.spring.filter.customfilter.AnnoTypeFilter; import org.mybatis.spring.filter.customfilter.CustomTypeFilter; import org.mybatis.spring.filter.customfilter.ExcludeMaker; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.FilterType; +import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; +import org.springframework.core.io.ClassPathResource; public class AppConfig { @@ -56,9 +59,16 @@ public static class AspectJFilterConfig { @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = { @ComponentScan.Filter(type = FilterType.CUSTOM, classes = CustomTypeFilter.class), - @ComponentScan.Filter(type = FilterType.ANNOTATION, classes = AnnoTypeFilter.class) }) + @ComponentScan.Filter(type = FilterType.ANNOTATION, classes = AnnoTypeFilter.class), + @ComponentScan.Filter(type = FilterType.ASPECTJ, pattern = { "*..DataSource1Mapper", + "${exclude-filters.aspectj}" }) }) public static class CombinedFilterConfig { - + @Bean + static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { + PropertySourcesPlaceholderConfigurer configurer = new PropertySourcesPlaceholderConfigurer(); + configurer.setLocation(new ClassPathResource("/org/mybatis/spring/filter/config/application.properties")); + return configurer; + } } @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = { @@ -93,4 +103,22 @@ public static class AnnoTypeWithPatternPropertyConfig { public static class RegexTypeWithClassesPropertyConfig { } + + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = { + @ComponentScan.Filter(type = FilterType.REGEX, pattern = "${excludeFilter.regex}") }) + public static class RegexFilterWithPlaceHolderConfig { + + } + + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", excludeFilters = { + @ComponentScan.Filter(type = FilterType.REGEX, pattern = "${exclude-filters.regex}") }) + public static class RegexFilterWithPlaceHolderConfig1 { + @Bean + static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { + PropertySourcesPlaceholderConfigurer configurer = new PropertySourcesPlaceholderConfigurer(); + configurer.setLocation(new ClassPathResource("/org/mybatis/spring/filter/config/application.properties")); + return configurer; + } + + } } diff --git a/src/test/java/org/mybatis/spring/filter/config/application.properties b/src/test/java/org/mybatis/spring/filter/config/application.properties new file mode 100644 index 0000000000..32576e93d0 --- /dev/null +++ b/src/test/java/org/mybatis/spring/filter/config/application.properties @@ -0,0 +1,18 @@ +# +# Copyright 2010-2023 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. +# + +exclude-filters.regex=org\.mybatis\.spring\.filter\.datasource\.datasource1\..* +exclude-filters.aspectj=*..CommonDataSourceMapper \ No newline at end of file diff --git a/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java b/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java index ac6af5f929..59c94c1eca 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java +++ b/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java @@ -19,7 +19,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.ClassPathXmlApplicationContext; /** @@ -50,9 +49,9 @@ void testAnnoScanFilter() { } @Test - void testAnnoScanWithPlaceHolderFilter() { + void testScanWithPlaceHolderFilter() { // exclude mappers which has @AnnoTypeFilter - System.getProperties().put("annoFilter","org.mybatis.spring.filter.customfilter.AnnoTypeFilter"); + System.getProperties().put("annoFilter", "org.mybatis.spring.filter.customfilter.AnnoTypeFilter"); startContext("org/mybatis/spring/filter/xml/appContextPlaceHolder.xml"); assertThat(applicationContext.containsBean("mapperWithAnnoFilter")).isFalse(); assertThat(applicationContext.containsBean("dataSource1Mapper")).isTrue(); @@ -60,6 +59,18 @@ void testAnnoScanWithPlaceHolderFilter() { closeContext(); } + @Test + void testScanWithPlaceHolderFilter1() { + // exclude datasource2 mappers by CustomTypeFilter + startContext("org/mybatis/spring/filter/xml/appContextPlaceHolder1.xml"); + assertThat(applicationContext.containsBean("dataSource2Mapper")).isFalse(); + assertThat(applicationContext.containsBean("dataSource2Mapper1")).isFalse(); + assertThat(applicationContext.containsBean("mapperWithAnnoFilter")).isTrue(); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isTrue(); + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isTrue(); + closeContext(); + } + @Test void testAssignScanFilter() { // exclude mappers which can assignable to ExcludeMaker @@ -95,34 +106,37 @@ void testAspectJScanFilter() { @Test void testCombinedScanFilter() { - // exclude filters combined with Annotation Custom and Assignable + // exclude filters combined with Annotation Custom Assignable and aspectj expression startContext("org/mybatis/spring/filter/xml/appContextCombinedFilter.xml"); assertThat(applicationContext.containsBean("mapperWithAnnoFilter")).isFalse(); assertThat(applicationContext.containsBean("dataSource2Mapper")).isFalse(); assertThat(applicationContext.containsBean("assignableMapper")).isFalse(); + assertThat(applicationContext.containsBean("commonDataSourceMapper")).isFalse(); + assertThat(applicationContext.containsBean("dataSource1Mapper")).isTrue(); - assertThat(applicationContext.containsBean("commonDataSourceMapper")).isTrue(); closeContext(); } @Test void invalidPatternFilter() { - try { - startContext("org/mybatis/spring/filter/xml/appContextInvalidFilter.xml"); - } catch (BeanDefinitionParsingException ex) { - assertThat(ex.getMessage()).contains("Class is not assignable to [java.lang.annotation.Annotation]"); - } finally { - closeContext(); - } + assertThrows(IllegalArgumentException.class, + () -> startContext("org/mybatis/spring/filter/xml/appContextInvalidFilter.xml")); + closeContext(); } @Test void invalidPropertyPattern() { - assertThrows(BeanDefinitionParsingException.class, - () -> startContext("org/mybatis/spring/filter/xml/appContextInvalidFilter1.xml")); + assertThrows(IllegalArgumentException.class, + () -> startContext("org/mybatis/spring/filter/xml/appContextInvalidFilter1.xml")); closeContext(); } + @Test + void warpedClassNotFoundException() { + assertThrows(RuntimeException.class, + () -> startContext("org/mybatis/spring/filter/xml/appContextInvalidFilter2.xml")); + closeContext(); + } private void startContext(String config) { applicationContext = new ClassPathXmlApplicationContext(config); diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextCombinedFilter.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextCombinedFilter.xml index 60ba0132ec..b882eacb27 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/appContextCombinedFilter.xml +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextCombinedFilter.xml @@ -22,8 +22,9 @@ + http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd http://mybatis.org/schema/mybatis-spring http://mybatis.org/schema/mybatis-spring.xsd http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd"> @@ -37,6 +38,8 @@ + + @@ -44,6 +47,8 @@ expression="org.mybatis.spring.filter.customfilter.CustomTypeFilter"/> + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter2.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter2.xml new file mode 100644 index 0000000000..a38d81c527 --- /dev/null +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter2.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextPlaceHolder1.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextPlaceHolder1.xml new file mode 100644 index 0000000000..a4a1e2b951 --- /dev/null +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextPlaceHolder1.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/default.properties b/src/test/java/org/mybatis/spring/filter/xml/default.properties new file mode 100644 index 0000000000..69057dc48e --- /dev/null +++ b/src/test/java/org/mybatis/spring/filter/xml/default.properties @@ -0,0 +1,18 @@ +# +# Copyright 2010-2023 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. +# + +filter.custom=org.mybatis.spring.filter.customfilter.CustomTypeFilter +filter.aspectj=*..CommonDataSourceMapper \ No newline at end of file From 82ef68fa8d646b057a8af5f5ff1a72891d271d40 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 19 Jul 2023 09:38:46 +0800 Subject: [PATCH 117/383] Optimized process to parse excludeFilters and add 'processPropertyPlaceHolders' turn off test --- .../mapper/MapperScannerConfigurer.java | 7 +-- .../mybatis/spring/filter/ScanFilterTest.java | 15 ++++++ .../spring/filter/config/AppConfig.java | 17 +++++++ .../spring/filter/xml/XmlScanFilterTest.java | 10 ++++ .../xml/appContextProcessPlaceHolderOff.xml | 48 +++++++++++++++++++ .../spring/filter/xml/default.properties | 3 +- 6 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 src/test/java/org/mybatis/spring/filter/xml/appContextProcessPlaceHolderOff.xml diff --git a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java index 9525f41869..e436513abd 100644 --- a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java +++ b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java @@ -407,7 +407,7 @@ public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) { scanner.setAddToConfig(this.addToConfig); scanner.setAnnotationClass(this.annotationClass); scanner.setMarkerInterface(this.markerInterface); - scanner.setExcludeFilters(this.excludeFilters); + scanner.setExcludeFilters(this.excludeFilters = mergeExcludeFilters()); scanner.setSqlSessionFactory(this.sqlSessionFactory); scanner.setSqlSessionTemplate(this.sqlSessionTemplate); scanner.setSqlSessionFactoryBeanName(this.sqlSessionFactoryBeanName); @@ -467,7 +467,6 @@ private void processPropertyPlaceHolders() { this.lazyInitialization = Optional.ofNullable(this.lazyInitialization).map(getEnvironment()::resolvePlaceholders) .orElse(null); this.defaultScope = Optional.ofNullable(this.defaultScope).map(getEnvironment()::resolvePlaceholders).orElse(null); - this.excludeFilters = mergeExcludeFilters(); } private Environment getEnvironment() { @@ -528,7 +527,9 @@ private List mergeExcludeFilters() { private TypeFilter createTypeFilter(String filterType, String expression, @Nullable ClassLoader classLoader) throws ClassNotFoundException { - expression = this.getEnvironment().resolvePlaceholders(expression); + if (this.processPropertyPlaceHolders) { + expression = this.getEnvironment().resolvePlaceholders(expression); + } switch (filterType) { case "annotation": diff --git a/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java b/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java index 14a0e17dd3..76a96a7baf 100644 --- a/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java +++ b/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java @@ -20,6 +20,8 @@ import com.mockrunner.mock.jdbc.MockDataSource; +import java.util.regex.PatternSyntaxException; + import org.junit.jupiter.api.Test; import org.mybatis.spring.SqlSessionFactoryBean; import org.mybatis.spring.filter.config.AppConfig; @@ -189,6 +191,19 @@ void invalidPropertyClasses() { () -> startContext(AppConfig.RegexTypeWithClassesPropertyConfig.class)); } + @Test + void processPropertyPlaceHoldersSwitchTest() { + // if processPropertyPlaceHolders turn off regex compile will fail + assertThrows(PatternSyntaxException.class, + () -> startContext(AppConfig.ProcessPropertyPlaceHoldersOffConfig.class)); + } + + @Test + void processPropertyPlaceHoldersSwitchTest1() { + // processPropertyPlaceHolders turn off has no effect to FilterType which don't use pattern property + startContext(AppConfig.AnnoFilterWithProcessPlaceHolderOffConfig.class); + } + private void startContext(Class config) { applicationContext = new AnnotationConfigApplicationContext(); // use @MapperScan with excludeFilters in AppConfig.class diff --git a/src/test/java/org/mybatis/spring/filter/config/AppConfig.java b/src/test/java/org/mybatis/spring/filter/config/AppConfig.java index aede81c9a2..f331e2d8ce 100644 --- a/src/test/java/org/mybatis/spring/filter/config/AppConfig.java +++ b/src/test/java/org/mybatis/spring/filter/config/AppConfig.java @@ -121,4 +121,21 @@ static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer } } + + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", processPropertyPlaceHolders = false, excludeFilters = { + @ComponentScan.Filter(type = FilterType.REGEX, pattern = "${exclude-filters.regex}") }) + public static class ProcessPropertyPlaceHoldersOffConfig { + @Bean + static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { + PropertySourcesPlaceholderConfigurer configurer = new PropertySourcesPlaceholderConfigurer(); + configurer.setLocation(new ClassPathResource("/org/mybatis/spring/filter/config/application.properties")); + return configurer; + } + } + + @MapperScan(basePackages = "org.mybatis.spring.filter.datasource", processPropertyPlaceHolders = false, excludeFilters = { + @ComponentScan.Filter(type = FilterType.ANNOTATION, classes = AnnoTypeFilter.class) }) + public static class AnnoFilterWithProcessPlaceHolderOffConfig { + + } } diff --git a/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java b/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java index 59c94c1eca..237e3d1d8d 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java +++ b/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java @@ -18,6 +18,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; +import java.util.regex.PatternSyntaxException; + import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -138,6 +140,14 @@ void warpedClassNotFoundException() { closeContext(); } + @Test + void processPropertyPlaceHoldersSwitchTest() { + // if processPropertyPlaceHolders turn off regex compile will fail + assertThrows(PatternSyntaxException.class, + () -> startContext("org/mybatis/spring/filter/xml/appContextProcessPlaceHolderOff.xml")); + closeContext(); + } + private void startContext(String config) { applicationContext = new ClassPathXmlApplicationContext(config); applicationContext.refresh(); diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextProcessPlaceHolderOff.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextProcessPlaceHolderOff.xml new file mode 100644 index 0000000000..71e28999b0 --- /dev/null +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextProcessPlaceHolderOff.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/default.properties b/src/test/java/org/mybatis/spring/filter/xml/default.properties index 69057dc48e..9c6582656d 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/default.properties +++ b/src/test/java/org/mybatis/spring/filter/xml/default.properties @@ -15,4 +15,5 @@ # filter.custom=org.mybatis.spring.filter.customfilter.CustomTypeFilter -filter.aspectj=*..CommonDataSourceMapper \ No newline at end of file +filter.aspectj=*..CommonDataSourceMapper +filter.regex=org\.mybatis\.spring\.filter\.datasource\.datasource1\..* \ No newline at end of file From c6a487480676a5a01e71c7761b7b1538915a9f8d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 23 Jul 2023 16:15:06 +0000 Subject: [PATCH 118/383] Update dependency org.junit.jupiter:junit-jupiter-engine to v5.10.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 63b7d36020..705a16acd4 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 5.0.2 org.mybatis.spring - 5.9.3 + 5.10.0 1684514485 From b7f09eb2b89830f391995ee7040b2486cc3e2644 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 23 Jul 2023 21:51:53 +0000 Subject: [PATCH 119/383] Update dependency com.mockrunner:mockrunner-core to v2.0.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 63b7d36020..45ccfaabb4 100644 --- a/pom.xml +++ b/pom.xml @@ -250,7 +250,7 @@ com.mockrunner mockrunner-core - 2.0.6 + 2.0.7 test From 0eda0e2ac633521f5bd1ff8ed3bcb1d427ae45bb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 23 Jul 2023 21:51:57 +0000 Subject: [PATCH 120/383] Update dependency com.mockrunner:mockrunner-ejb to v2.0.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 63b7d36020..e85b99f84c 100644 --- a/pom.xml +++ b/pom.xml @@ -278,7 +278,7 @@ com.mockrunner mockrunner-ejb - 2.0.6 + 2.0.7 test From 5ba168205dd43fd215cab926f28f583783971f5a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 01:44:48 +0000 Subject: [PATCH 121/383] Update dependency com.mockrunner:mockrunner-jdbc to v2.0.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 63b7d36020..da854b6e08 100644 --- a/pom.xml +++ b/pom.xml @@ -294,7 +294,7 @@ com.mockrunner mockrunner-jdbc - 2.0.6 + 2.0.7 test From b4607b738c5a76bbd216fdd8aa27dee4f36c5732 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 11:41:31 +0000 Subject: [PATCH 122/383] Update dependency maven to v3.9.4 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 6d3a56651d..ac184013fc 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar From 07628b846c198c5dde947b782c6de3f937e3b1ae Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 23:07:52 +0000 Subject: [PATCH 123/383] Update dependency net.bytebuddy:byte-buddy to v1.14.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4aed544dab..5f77e87648 100644 --- a/pom.xml +++ b/pom.xml @@ -320,7 +320,7 @@ net.bytebuddy byte-buddy - 1.14.5 + 1.14.6 test From 957e12b85df744cda73d9ef1a147480ed1b000df Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 23:07:56 +0000 Subject: [PATCH 124/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.14.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4aed544dab..d905a7e50d 100644 --- a/pom.xml +++ b/pom.xml @@ -326,7 +326,7 @@ net.bytebuddy byte-buddy-agent - 1.14.5 + 1.14.6 test From a5762c4236463d4765ff3a82c2e5743edcd76fb5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 22 Aug 2023 10:27:49 +0000 Subject: [PATCH 125/383] Update dependency org.mockito:mockito-core to v5.5.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f5ace7699e..079d9411d0 100644 --- a/pom.xml +++ b/pom.xml @@ -236,7 +236,7 @@ org.mockito mockito-core - 5.4.0 + 5.5.0 test From c8be6843cab282792b20729bae43126a4b9cfe8f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 23 Aug 2023 19:14:22 +0000 Subject: [PATCH 126/383] Update spring batch to v5.0.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f5ace7699e..6a22dbb018 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ 3.5.13 6.0.11 - 5.0.2 + 5.0.3 org.mybatis.spring 5.10.0 From f4f0ff16e08232434c91d5aa6118872e0ad80485 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 01:37:56 +0000 Subject: [PATCH 127/383] Update dependency net.bytebuddy:byte-buddy to v1.14.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cce47bb7f7..dfff277c8d 100644 --- a/pom.xml +++ b/pom.xml @@ -320,7 +320,7 @@ net.bytebuddy byte-buddy - 1.14.6 + 1.14.7 test From a375349e540f7db677850b19b3955f1bf02ecada Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 01:38:00 +0000 Subject: [PATCH 128/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.14.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cce47bb7f7..5603d575eb 100644 --- a/pom.xml +++ b/pom.xml @@ -326,7 +326,7 @@ net.bytebuddy byte-buddy-agent - 1.14.6 + 1.14.7 test From 2fbbdb9224822922e338f7a5ea4fef235337e12a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 3 Sep 2023 18:37:59 +0000 Subject: [PATCH 129/383] Update dependency org.slf4j:slf4j-simple to v2.0.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3757952b6c..28cb5362e6 100644 --- a/pom.xml +++ b/pom.xml @@ -229,7 +229,7 @@ org.slf4j slf4j-simple - 2.0.7 + 2.0.9 test From 3aeeeb56a51734c49b7bda4cc134afdfdeae61eb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 13:48:13 +0000 Subject: [PATCH 130/383] Update actions/checkout action to v4 --- .github/workflows/ci.yaml | 2 +- .github/workflows/coveralls.yaml | 2 +- .github/workflows/sonar.yaml | 2 +- .github/workflows/sonatype.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index dce307ae9a..50b3d508c7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,7 +33,7 @@ jobs: name: Test JDK ${{ matrix.java }}, ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - name: Set up JDK uses: actions/setup-java@v3 with: diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index ac387747b0..a7ae1a8902 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -25,7 +25,7 @@ jobs: if: github.repository_owner == 'mybatis' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - name: Set up JDK uses: actions/setup-java@v3 with: diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index eda5f33114..3265674054 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -26,7 +26,7 @@ jobs: if: github.repository_owner == 'mybatis' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 with: # Disabling shallow clone is recommended for improving relevancy of reporting fetch-depth: 0 diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index 008954a7f3..f98fbaa737 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -26,7 +26,7 @@ jobs: if: github.repository_owner == 'mybatis' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]') runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - name: Set up JDK uses: actions/setup-java@v3 with: From 881df32fa4522078b5107f56b650124861392222 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Sep 2023 09:26:00 +0000 Subject: [PATCH 131/383] Update spring core to v6.0.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 28cb5362e6..9ecca0ddd4 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 17 3.5.13 - 6.0.11 + 6.0.12 5.0.3 org.mybatis.spring From 46ef4c34a083a74491a1bfcedf944331429ea02b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Sep 2023 17:15:01 +0000 Subject: [PATCH 132/383] Update dependency net.bytebuddy:byte-buddy to v1.14.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 28cb5362e6..3f87736771 100644 --- a/pom.xml +++ b/pom.xml @@ -320,7 +320,7 @@ net.bytebuddy byte-buddy - 1.14.7 + 1.14.8 test From d2af28c5b47591782a1b88717bc9d6804b6bab0d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Sep 2023 17:15:06 +0000 Subject: [PATCH 133/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.14.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 28cb5362e6..6e5823d0ff 100644 --- a/pom.xml +++ b/pom.xml @@ -326,7 +326,7 @@ net.bytebuddy byte-buddy-agent - 1.14.7 + 1.14.8 test From d4b00fcd6113cbe057c53e1d34cc4e522e90a1c8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Sep 2023 19:34:03 +0000 Subject: [PATCH 134/383] Update actions/checkout digest to 8ade135 --- .github/workflows/ci.yaml | 2 +- .github/workflows/coveralls.yaml | 2 +- .github/workflows/sonar.yaml | 2 +- .github/workflows/sonatype.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 50b3d508c7..50327c2fcc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,7 +33,7 @@ jobs: name: Test JDK ${{ matrix.java }}, ${{ matrix.os }} steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 - name: Set up JDK uses: actions/setup-java@v3 with: diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index a7ae1a8902..e9013c47ca 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -25,7 +25,7 @@ jobs: if: github.repository_owner == 'mybatis' runs-on: ubuntu-latest steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 - name: Set up JDK uses: actions/setup-java@v3 with: diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 3265674054..6c1ce41476 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -26,7 +26,7 @@ jobs: if: github.repository_owner == 'mybatis' runs-on: ubuntu-latest steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 with: # Disabling shallow clone is recommended for improving relevancy of reporting fetch-depth: 0 diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index f98fbaa737..8b1b444bba 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -26,7 +26,7 @@ jobs: if: github.repository_owner == 'mybatis' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]') runs-on: ubuntu-latest steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 - name: Set up JDK uses: actions/setup-java@v3 with: From 7f48df6d3f20fbeb2c8b3df34eeb797f90483a25 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 24 Sep 2023 00:10:04 +0000 Subject: [PATCH 135/383] Update dependency org.mybatis:mybatis-parent to v39 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a31e5bf31e..3cf807cfa7 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.mybatis mybatis-parent - 38 + 39 From 7d9928b129610a245301abb075c185955996fb61 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 21:05:58 +0000 Subject: [PATCH 136/383] Update dependency maven to v3.9.5 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index ac184013fc..eacdc9ed17 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar From 8054b095e1fc7881c7bb8d88704aabad7526e1ba Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 16:19:30 +0000 Subject: [PATCH 137/383] Update dependency org.mockito:mockito-core to v5.6.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3cf807cfa7..1467f8e633 100644 --- a/pom.xml +++ b/pom.xml @@ -236,7 +236,7 @@ org.mockito mockito-core - 5.5.0 + 5.6.0 test From 37eac4baa8a158ec464e20a4e06c60475e3ed7f0 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 8 Oct 2023 16:22:47 -0400 Subject: [PATCH 138/383] [GHA] Fix checkout and update jdks --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/coveralls.yaml | 4 ++-- .github/workflows/sonar.yaml | 4 ++-- .github/workflows/sonatype.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 50327c2fcc..14ed4e2d7c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,14 +26,14 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - java: [17, 20, 21-ea] + java: [17, 21] distribution: ['zulu'] fail-fast: false max-parallel: 5 name: Test JDK ${{ matrix.java }}, ${{ matrix.os }} steps: - - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 with: diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index e9013c47ca..0413b2c8d0 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -25,11 +25,11 @@ jobs: if: github.repository_owner == 'mybatis' runs-on: ubuntu-latest steps: - - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 21 distribution: zulu - name: Report Coverage to Coveralls for Pull Requests if: github.event_name == 'pull_request' diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 6c1ce41476..7188289209 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -26,14 +26,14 @@ jobs: if: github.repository_owner == 'mybatis' runs-on: ubuntu-latest steps: - - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + - uses: actions/checkout@v4 with: # Disabling shallow clone is recommended for improving relevancy of reporting fetch-depth: 0 - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 21 distribution: zulu - name: Analyze with SonarCloud run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_spring -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index 8b1b444bba..d579dae246 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -26,11 +26,11 @@ jobs: if: github.repository_owner == 'mybatis' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]') runs-on: ubuntu-latest steps: - - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 21 distribution: zulu - name: Deploy to Sonatype run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml -Dlicense.skip=true From 27d118d3620cdc6ab149a0baf10c8c547c818e08 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 11:51:17 +0000 Subject: [PATCH 139/383] Update dependency net.bytebuddy:byte-buddy to v1.14.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1467f8e633..5f9ea730b0 100644 --- a/pom.xml +++ b/pom.xml @@ -320,7 +320,7 @@ net.bytebuddy byte-buddy - 1.14.8 + 1.14.9 test From 301fb324b1b0277efb1070cb6d9ad238a832ae8d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 11:51:21 +0000 Subject: [PATCH 140/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.14.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1467f8e633..59097c07fd 100644 --- a/pom.xml +++ b/pom.xml @@ -326,7 +326,7 @@ net.bytebuddy byte-buddy-agent - 1.14.8 + 1.14.9 test From 87fb1b73e0347e6d1ec7e426a2ba7a443d508e4f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 13:46:43 +0000 Subject: [PATCH 141/383] Update spring core to v6.0.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6b9af45be9..73be746329 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 17 3.5.13 - 6.0.12 + 6.0.13 5.0.3 org.mybatis.spring From a781e865356dc4e7dbdf437aa5927356dcca96b0 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Mon, 23 Oct 2023 20:22:39 +0900 Subject: [PATCH 142/383] Corrected to set bean class instead of bean class name to factoryBeanObjectType of BeanDefinition attribute. Fixes gh-855 * Related with gh-494 * Related with spring-projects/spring-framework#29799 --- .../mybatis/spring/mapper/ClassPathMapperScanner.java | 10 +++++----- .../spring/mapper/MapperScannerConfigurerTest.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java index 626cba9985..fab1c66ac5 100644 --- a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java +++ b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java @@ -262,8 +262,12 @@ private void processBeanDefinitions(Set beanDefinitions) { // but, the actual class of the bean is MapperFactoryBean definition.getConstructorArgumentValues().addGenericArgumentValue(beanClassName); // issue #59 try { + Class beanClass = Resources.classForName(beanClassName); + // Attribute for MockitoPostProcessor + // https://github.com/mybatis/spring-boot-starter/issues/475 + definition.setAttribute(FACTORY_BEAN_OBJECT_TYPE, beanClass); // for spring-native - definition.getPropertyValues().add("mapperInterface", Resources.classForName(beanClassName)); + definition.getPropertyValues().add("mapperInterface", beanClass); } catch (ClassNotFoundException ignore) { // ignore } @@ -272,10 +276,6 @@ private void processBeanDefinitions(Set beanDefinitions) { definition.getPropertyValues().add("addToConfig", this.addToConfig); - // Attribute for MockitoPostProcessor - // https://github.com/mybatis/spring-boot-starter/issues/475 - definition.setAttribute(FACTORY_BEAN_OBJECT_TYPE, beanClassName); - boolean explicitFactoryUsed = false; if (StringUtils.hasText(this.sqlSessionFactoryBeanName)) { definition.getPropertyValues().add("sqlSessionFactory", diff --git a/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java b/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java index 0dc0854393..3a9a3f16f9 100644 --- a/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java +++ b/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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. @@ -399,7 +399,7 @@ void testMapperBeanAttribute() { startContext(); assertThat(applicationContext.getBeanDefinition("annotatedMapper") - .getAttribute(ClassPathMapperScanner.FACTORY_BEAN_OBJECT_TYPE)).isEqualTo(AnnotatedMapper.class.getName()); + .getAttribute(ClassPathMapperScanner.FACTORY_BEAN_OBJECT_TYPE)).isEqualTo(AnnotatedMapper.class); } private void setupSqlSessionFactory(String name) { From ad1e61e34061876bdaecc734ca193923cafeca83 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Tue, 31 Oct 2023 09:28:12 +0900 Subject: [PATCH 143/383] Support JDK 22 on CI Fixes gh-867 --- .github/workflows/ci.yaml | 11 +++++++++-- pom.xml | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 14ed4e2d7c..fd0b334d10 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,7 +26,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - java: [17, 21] + java: [17, 21, 22] distribution: ['zulu'] fail-fast: false max-parallel: 5 @@ -34,10 +34,17 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK + - name: Set JDK from jdk.java.net + uses: oracle-actions/setup-java@v1 + with: + website: jdk.java.net + release: ${{ matrix.java }} + if: ${{ matrix.java != '17' }} + - name: Set up older JDK uses: actions/setup-java@v3 with: java-version: ${{ matrix.java }} distribution: ${{ matrix.distribution }} + if: ${{ matrix.java == '17' }} - name: Test with Maven run: ./mvnw test -B -D"license.skip=true" diff --git a/pom.xml b/pom.xml index 73be746329..9ba69852fb 100644 --- a/pom.xml +++ b/pom.xml @@ -119,8 +119,8 @@ 1684514485 - - 0.8.9 + + 0.8.11 true From 08004f22009a409b23415dd485dc5c2ba7a0fbac Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Nov 2023 07:46:34 +0000 Subject: [PATCH 144/383] Update dependency org.mybatis:mybatis to v3.5.14 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9ba69852fb..b043c85c32 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ 17 17 - 3.5.13 + 3.5.14 6.0.13 5.0.3 org.mybatis.spring From 97b14966e8de74b0ffd64e41b1246da9e4634fab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Nov 2023 21:38:42 +0000 Subject: [PATCH 145/383] Update dependency org.mockito:mockito-core to v5.7.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b043c85c32..99638cc445 100644 --- a/pom.xml +++ b/pom.xml @@ -236,7 +236,7 @@ org.mockito mockito-core - 5.6.0 + 5.7.0 test From 4e2a04adf13f7586e46b7384bbee615b013fc2d5 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Fri, 3 Nov 2023 09:26:12 +0900 Subject: [PATCH 146/383] Switch to temurin as JDK distribution on CI for support JDK 22 Fixes gh-867 --- .github/workflows/ci.yaml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fd0b334d10..531c9ae997 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,25 +26,18 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - java: [17, 21, 22] - distribution: ['zulu'] + java: [17, 21, 22-ea] + distribution: ['temurin'] fail-fast: false max-parallel: 5 name: Test JDK ${{ matrix.java }}, ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - name: Set JDK from jdk.java.net - uses: oracle-actions/setup-java@v1 - with: - website: jdk.java.net - release: ${{ matrix.java }} - if: ${{ matrix.java != '17' }} - - name: Set up older JDK + - name: Set up JDK uses: actions/setup-java@v3 with: java-version: ${{ matrix.java }} distribution: ${{ matrix.distribution }} - if: ${{ matrix.java == '17' }} - name: Test with Maven run: ./mvnw test -B -D"license.skip=true" From ad01f74bc1a447a3fc7e4f81c0dbc828882f5090 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 5 Nov 2023 18:53:10 +0000 Subject: [PATCH 147/383] Update dependency org.junit.jupiter:junit-jupiter-engine to v5.10.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99638cc445..75db090ff3 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 5.0.3 org.mybatis.spring - 5.10.0 + 5.10.1 1684514485 From b2ef5140fc4581dc19af257e2a281ae010221fbd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 08:10:49 +0000 Subject: [PATCH 148/383] Update dependency org.mybatis:mybatis-parent to v40 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 75db090ff3..b4cb071a71 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.mybatis mybatis-parent - 39 + 40 From f8715f6af155a350516ac1b261bcc5625f7d7451 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 8 Nov 2023 21:40:07 -0500 Subject: [PATCH 149/383] [mvn] Move gh-pages to gh-pages-scm --- .mvn/settings.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.mvn/settings.xml b/.mvn/settings.xml index 61c3da7c04..645d1f9f7d 100644 --- a/.mvn/settings.xml +++ b/.mvn/settings.xml @@ -24,8 +24,13 @@ ${env.CI_DEPLOY_USERNAME} ${env.CI_DEPLOY_PASSWORD} + - gh-pages + gh-pages-scm + + branch + gh-pages + github From 846e0db1bc69fa753a8044114691c02a2443aa70 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 8 Nov 2023 21:40:18 -0500 Subject: [PATCH 150/383] [ci] update notice --- NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index 8617f29c7d..79fd4a0c7d 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ MyBatis Spring -Copyright 2010-2013 +Copyright 2010-2023 This product includes software developed by The MyBatis Team (http://www.mybatis.org/). From 44bc2068ca6045cabcfad26847c47e2e3bcab4a4 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 8 Nov 2023 21:40:35 -0500 Subject: [PATCH 151/383] [pom] Update site distribution --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b4cb071a71..ccd0b2b761 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ http://github.com/mybatis/spring - scm:git:ssh://github.com/mybatis/spring.git + scm:git:ssh://git@github.com/mybatis/spring.git scm:git:ssh://git@github.com/mybatis/spring.git HEAD @@ -92,9 +92,9 @@ - gh-pages + gh-pages-scm Mybatis GitHub Pages - git:ssh://git@github.com/mybatis/spring.git?gh-pages# + scm:git:ssh://git@github.com/mybatis/spring.git From c2d9115bab8b6f6ae296a843b1557e612978331e Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 9 Nov 2023 18:24:27 -0500 Subject: [PATCH 152/383] [pom] Sortpom --- pom.xml | 146 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/pom.xml b/pom.xml index ccd0b2b761..2cd823925f 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.mybatis mybatis-parent 40 - + mybatis-spring @@ -77,10 +77,10 @@ - http://github.com/mybatis/spring scm:git:ssh://git@github.com/mybatis/spring.git scm:git:ssh://git@github.com/mybatis/spring.git HEAD + http://github.com/mybatis/spring GitHub Issue Management @@ -212,10 +212,10 @@ ${spring-batch.version} test - - junit - junit - + + junit + junit + @@ -331,7 +331,72 @@ + + + sonatype-oss-snapshots + Sonatype OSS Snapshots Repository + https://oss.sonatype.org/content/repositories/snapshots + + + + false + + spring-snapshot + Spring Snapshots + https://repo.spring.io/snapshot + + + + false + + spring-milestone + Spring Milestone + https://repo.spring.io/milestone + + + + + + + false + + spring-snapshot + Spring Snapshots + https://repo.spring.io/snapshot + + + + false + + spring-milestone + Spring Milestone + https://repo.spring.io/milestone + + + + + + + META-INF + ${project.basedir} + + LICENSE + NOTICE + + + + ${project.basedir}/src/main/resources + + + + + ${project.build.testSourceDirectory} + + **/*.java + + + org.apache.maven.plugins @@ -356,10 +421,10 @@ filter-site - pre-site copy-resources + pre-site ${project.build.directory}/site-src @@ -378,7 +443,7 @@ en,es,zh_CN,ja,ko ${project.build.directory}/site-src - + @@ -394,70 +459,5 @@ - - - - ${project.basedir} - META-INF - - LICENSE - NOTICE - - - - ${project.basedir}/src/main/resources - - - - - ${project.build.testSourceDirectory} - - **/*.java - - - - - - - sonatype-oss-snapshots - Sonatype OSS Snapshots Repository - https://oss.sonatype.org/content/repositories/snapshots - - - spring-snapshot - Spring Snapshots - https://repo.spring.io/snapshot - - false - - - - spring-milestone - Spring Milestone - https://repo.spring.io/milestone - - false - - - - - - - spring-snapshot - Spring Snapshots - https://repo.spring.io/snapshot - - false - - - - spring-milestone - Spring Milestone - https://repo.spring.io/milestone - - false - - - From 08811d43138e9240f7582bc394aa7bdd6928e472 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 9 Nov 2023 18:24:53 -0500 Subject: [PATCH 153/383] [mvn] Update maven wrapper --- .mvn/maven.config | 1 + .mvn/wrapper/MavenWrapperDownloader.java | 2 +- .mvn/wrapper/maven-wrapper.properties | 2 +- mvnw | 2 +- mvnw.cmd | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.mvn/maven.config b/.mvn/maven.config index 956533e67c..afdcfab795 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1 +1,2 @@ -Daether.checksums.algorithms=SHA-512,SHA-256,SHA-1,MD5 +-Daether.connector.smartChecksums=false diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java index 84d1e60d8d..f57fd86fbf 100644 --- a/.mvn/wrapper/MavenWrapperDownloader.java +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -7,7 +7,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index eacdc9ed17..39a584eb21 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -6,7 +6,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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 diff --git a/mvnw b/mvnw index 8d937f4c14..66df285428 100755 --- a/mvnw +++ b/mvnw @@ -8,7 +8,7 @@ # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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 diff --git a/mvnw.cmd b/mvnw.cmd index c4586b564e..95ba6f54ac 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -7,7 +7,7 @@ @REM "License"); you may not use this file except in compliance @REM with the License. You may obtain a copy of the License at @REM -@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM https://www.apache.org/licenses/LICENSE-2.0 @REM @REM Unless required by applicable law or agreed to in writing, @REM software distributed under the License is distributed on an From 2454d55a2adb8ab32f3deb0f092355aac2265518 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Thu, 9 Nov 2023 18:27:00 -0500 Subject: [PATCH 154/383] [GHA] Update actions --- .github/workflows/ci.yaml | 28 +++++----------------------- .github/workflows/coveralls.yaml | 24 +++--------------------- .github/workflows/sonar.yaml | 18 +----------------- .github/workflows/sonatype.yaml | 18 +----------------- 4 files changed, 10 insertions(+), 78 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 531c9ae997..06b1c2163e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,43 +1,25 @@ -# -# Copyright 2010-2022 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 -# -# http://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. -# - name: Java CI -on: - push: - pull_request: +on: [workflow_dispatch, push, pull_request] jobs: test: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] java: [17, 21, 22-ea] distribution: ['temurin'] fail-fast: false - max-parallel: 5 + max-parallel: 4 name: Test JDK ${{ matrix.java }}, ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - name: Set up JDK + - name: Set up JDK ${{ matrix.java }} ${{ matrix.distribution }} uses: actions/setup-java@v3 with: java-version: ${{ matrix.java }} distribution: ${{ matrix.distribution }} - name: Test with Maven - run: ./mvnw test -B -D"license.skip=true" + run: ./mvnw test -B -V --no-transfer-progress -D"license.skip=true" diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index 0413b2c8d0..03df1ede11 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -1,24 +1,6 @@ -# -# Copyright 2010-2022 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 -# -# http://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. -# - name: Coveralls -on: - push: - pull_request: +on: [push, pull_request] jobs: build: @@ -33,12 +15,12 @@ jobs: distribution: zulu - name: Report Coverage to Coveralls for Pull Requests if: github.event_name == 'pull_request' - run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER + run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --no-transfer-progress env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PR_NUMBER: ${{ github.event.number }} - name: Report Coverage to Coveralls for General Push if: github.event_name == 'push' - run: ./mvnw test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github + run: ./mvnw -B -V test jacoco:report coveralls:report -q -Dlicense.skip=true -DrepoToken=$GITHUB_TOKEN -DserviceName=github --no-transfer-progress env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 7188289209..2c986b2f84 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -1,19 +1,3 @@ -# -# Copyright 2010-2022 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 -# -# http://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. -# - name: SonarCloud on: @@ -36,7 +20,7 @@ jobs: java-version: 21 distribution: zulu - name: Analyze with SonarCloud - run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_spring -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true + run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_spring -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index d579dae246..46800b489e 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -1,19 +1,3 @@ -# -# Copyright 2010-2022 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 -# -# http://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. -# - name: Sonatype on: @@ -33,7 +17,7 @@ jobs: java-version: 21 distribution: zulu - name: Deploy to Sonatype - run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml -Dlicense.skip=true + run: ./mvnw deploy -DskipTests -B -V --no-transfer-progress --settings ./.mvn/settings.xml -Dlicense.skip=true env: CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} From 296b7ab5c80a48ab3f7308d182b3913297ee040e Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 12 Nov 2023 01:13:21 -0500 Subject: [PATCH 155/383] [derby] Restore java 11 and adjust derby to change per jdk version --- .github/workflows/ci.yaml | 2 +- pom.xml | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 06b1c2163e..b14431cd50 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - java: [17, 21, 22-ea] + java: [11, 17, 21, 22-ea] distribution: ['temurin'] fail-fast: false max-parallel: 4 diff --git a/pom.xml b/pom.xml index 2cd823925f..25ceaed902 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,7 @@ 17 17 + 10.17.1.0 3.5.14 6.0.13 5.0.3 @@ -167,7 +168,7 @@ org.apache.derby derby - 10.16.1.1 + ${derby.version} test @@ -460,4 +461,34 @@ + + + + pre16 + + (,16) + + + 10.15.2.0 + + + + 17 + + [17,) + + + 10.16.1.1 + + + + 19 + + [19,) + + + 10.17.1.0 + + + From 2141d75f92ec9bb0f3aa09eef58b93b2a7ac4181 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 12 Nov 2023 01:13:30 -0500 Subject: [PATCH 156/383] [pom] Remove jacoco override as no longer needed --- pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pom.xml b/pom.xml index 25ceaed902..62b011b77c 100644 --- a/pom.xml +++ b/pom.xml @@ -120,9 +120,6 @@ 1684514485 - - 0.8.11 - true From b5fcb5e6d625f990275fd8c826d8814252331075 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 12 Nov 2023 01:18:25 -0500 Subject: [PATCH 157/383] [GHA] Drop jdk 11 again as this is spring 6 left profile as that needs copied to javax support. Javax support can run 11 with derby this way. --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b14431cd50..06b1c2163e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - java: [11, 17, 21, 22-ea] + java: [17, 21, 22-ea] distribution: ['temurin'] fail-fast: false max-parallel: 4 From a66132df6a54562315e911685a4648299fa568be Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 15:42:28 +0000 Subject: [PATCH 158/383] Update dependency org.jboss.byteman:byteman-bmunit to v4.0.22 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62b011b77c..a39fbf5ab0 100644 --- a/pom.xml +++ b/pom.xml @@ -179,7 +179,7 @@ org.jboss.byteman byteman-bmunit - 4.0.21 + 4.0.22 test From 827940b1dedf314e2e5de569b2a5a4738a9ceddb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 15:42:33 +0000 Subject: [PATCH 159/383] Update spring core to v6.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62b011b77c..fa0401b676 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ 10.17.1.0 3.5.14 - 6.0.13 + 6.1.0 5.0.3 org.mybatis.spring From a0af9840f398cacf864e164d0d365a8379921492 Mon Sep 17 00:00:00 2001 From: Iwao AVE! Date: Mon, 20 Nov 2023 19:32:36 +0900 Subject: [PATCH 160/383] [maven-release-plugin] prepare release mybatis-spring-3.0.3 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index dc135150bb..93670a43fb 100644 --- a/pom.xml +++ b/pom.xml @@ -23,11 +23,11 @@ org.mybatis mybatis-parent 40 - + mybatis-spring - 3.0.3-SNAPSHOT + 3.0.3 jar mybatis-spring @@ -79,7 +79,7 @@ scm:git:ssh://git@github.com/mybatis/spring.git scm:git:ssh://git@github.com/mybatis/spring.git - HEAD + mybatis-spring-3.0.3 http://github.com/mybatis/spring @@ -118,7 +118,7 @@ 5.10.1 - 1684514485 + 1700476303 true From 8d8e362446001dcf3480d63e4b157eab9b49599a Mon Sep 17 00:00:00 2001 From: Iwao AVE! Date: Mon, 20 Nov 2023 19:32:41 +0900 Subject: [PATCH 161/383] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 93670a43fb..9111a3b0cc 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ mybatis-spring - 3.0.3 + 3.0.4-SNAPSHOT jar mybatis-spring @@ -79,7 +79,7 @@ scm:git:ssh://git@github.com/mybatis/spring.git scm:git:ssh://git@github.com/mybatis/spring.git - mybatis-spring-3.0.3 + HEAD http://github.com/mybatis/spring @@ -118,7 +118,7 @@ 5.10.1 - 1700476303 + 1700476361 true From 8abde7855ef80bd4a71f94d791cc976b8992ef6d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 10:32:53 +0000 Subject: [PATCH 162/383] Update dependency net.bytebuddy:byte-buddy to v1.14.10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9111a3b0cc..dfe32d237e 100644 --- a/pom.xml +++ b/pom.xml @@ -318,7 +318,7 @@ net.bytebuddy byte-buddy - 1.14.9 + 1.14.10 test From ff050aaee9b014062fd8b85cfe86919ef7d22a3f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 10:32:57 +0000 Subject: [PATCH 163/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.14.10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9111a3b0cc..368f6b5e87 100644 --- a/pom.xml +++ b/pom.xml @@ -324,7 +324,7 @@ net.bytebuddy byte-buddy-agent - 1.14.9 + 1.14.10 test From 64286838acc5495278dac0d917eb2c7e0ad7e022 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Nov 2023 18:26:30 +0000 Subject: [PATCH 164/383] Update spring batch to v5.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0c56ac7c9f..9a287b8a9f 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 10.17.1.0 3.5.14 6.1.0 - 5.0.3 + 5.1.0 org.mybatis.spring 5.10.1 From f8162fe252a1be4e681e292ef9bbc58de49fcb24 Mon Sep 17 00:00:00 2001 From: Iwao AVE! Date: Fri, 24 Nov 2023 05:37:30 +0900 Subject: [PATCH 165/383] Adjust MyBatisSystemException to Spring 6 Since Spring 6, `org.springframework.core.NestedRuntimeException` no longer includes the message of the wrapped exception. https://github.com/spring-projects/spring-framework/issues/25162 Should fix gh-887 --- .../org/mybatis/spring/MyBatisExceptionTranslator.java | 8 ++++++-- .../java/org/mybatis/spring/MyBatisSystemException.java | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java b/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java index 2fdc030060..f7a8bb5825 100644 --- a/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java +++ b/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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. @@ -82,8 +82,12 @@ public DataAccessException translateExceptionIfPossible(RuntimeException e) { if (e instanceof PersistenceException) { // Batch exceptions come inside another PersistenceException // recursion has a risk of infinite loop so better make another if + String msg = e.getMessage(); if (e.getCause() instanceof PersistenceException) { e = (PersistenceException) e.getCause(); + if (msg == null) { + msg = e.getMessage(); + } } if (e.getCause() instanceof SQLException) { this.initExceptionTranslator(); @@ -94,7 +98,7 @@ public DataAccessException translateExceptionIfPossible(RuntimeException e) { } else if (e.getCause() instanceof TransactionException) { throw (TransactionException) e.getCause(); } - return new MyBatisSystemException(e); + return new MyBatisSystemException(msg, e); } return null; } diff --git a/src/main/java/org/mybatis/spring/MyBatisSystemException.java b/src/main/java/org/mybatis/spring/MyBatisSystemException.java index 566cf9ba62..b794708de4 100644 --- a/src/main/java/org/mybatis/spring/MyBatisSystemException.java +++ b/src/main/java/org/mybatis/spring/MyBatisSystemException.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-2023 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. @@ -31,8 +31,8 @@ public class MyBatisSystemException extends UncategorizedDataAccessException { private static final long serialVersionUID = -5284728621670758939L; - public MyBatisSystemException(Throwable cause) { - super(null, cause); + public MyBatisSystemException(String msg, Throwable cause) { + super(msg, cause); } } From 6427eb0879bc35c11bbc873e76028cce708db188 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 24 Nov 2023 05:04:55 +0000 Subject: [PATCH 166/383] Update spring core to v6.1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a287b8a9f..68e09cff56 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ 10.17.1.0 3.5.14 - 6.1.0 + 6.1.1 5.1.0 org.mybatis.spring From f53cfce9298bdce7e3b07ebcfa049cd5b4eb85b2 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Sat, 25 Nov 2023 19:34:16 +0900 Subject: [PATCH 167/383] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 00df4dc767..1108087d39 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Supported Versions ------------------ - master - Support for Spring 6 and Spring Batch 5 -- 2.1.x - Enhance and maintenance for Spring 5 and Spring Batch 4 +- 2.1.x - Maintenance for Spring 5 and Spring Batch 4 Essentials ---------- From 2234e483b17eee526761a3e1376b8323e6af5714 Mon Sep 17 00:00:00 2001 From: Iwao AVE! Date: Sun, 26 Nov 2023 08:47:04 +0900 Subject: [PATCH 168/383] Add tests for MyBatisExceptionTranslator behavior --- .../MyBatisExceptionTranslatorTest.java | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 src/test/java/org/mybatis/spring/MyBatisExceptionTranslatorTest.java diff --git a/src/test/java/org/mybatis/spring/MyBatisExceptionTranslatorTest.java b/src/test/java/org/mybatis/spring/MyBatisExceptionTranslatorTest.java new file mode 100644 index 0000000000..62db9e51cf --- /dev/null +++ b/src/test/java/org/mybatis/spring/MyBatisExceptionTranslatorTest.java @@ -0,0 +1,86 @@ +/* + * Copyright 2010-2023 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.mybatis.spring; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +import com.mockrunner.mock.jdbc.MockDataSource; + +import java.sql.SQLException; + +import org.apache.ibatis.exceptions.PersistenceException; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.dao.DataAccessException; +import org.springframework.jdbc.UncategorizedSQLException; +import org.springframework.jdbc.support.SQLExceptionTranslator; + +class MyBatisExceptionTranslatorTest { + + @Test + void shouldNonPersistenceExceptionBeTranslatedToNull() { + MockDataSource mockDataSource = new MockDataSource(); + MyBatisExceptionTranslator translator = new MyBatisExceptionTranslator(mockDataSource, false); + DataAccessException e = translator.translateExceptionIfPossible(new RuntimeException()); + assertNull(e); + } + + @Test + void shouldSqlExceptionBeTranslatedToUncategorizedSqlException() { + String msg = "Error!"; + SQLException sqlException = new SQLException(msg); + SQLExceptionTranslator sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class); + MyBatisExceptionTranslator translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false); + DataAccessException e = translator.translateExceptionIfPossible(new PersistenceException(sqlException)); + assertTrue(e instanceof UncategorizedSQLException); + Mockito.verify(sqlExceptionTranslator, times(1)).translate(SQLException.class.getName() + ": " + msg + "\n", null, + sqlException); + } + + @Test + void shouldPersistenceExceptionBeTranslatedToMyBatisSystemException() { + String msg = "Error!"; + SQLExceptionTranslator sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class); + MyBatisExceptionTranslator translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false); + DataAccessException e = translator.translateExceptionIfPossible(new PersistenceException(msg)); + assertTrue(e instanceof MyBatisSystemException); + assertEquals(msg, e.getMessage()); + } + + @Test + void shouldNestedPersistenceExceptionReportsMsgOfParentException() { + String msg = "Error!"; + SQLExceptionTranslator sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class); + MyBatisExceptionTranslator translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false); + DataAccessException e = translator + .translateExceptionIfPossible(new PersistenceException(msg, new PersistenceException("Inner error!"))); + assertTrue(e instanceof MyBatisSystemException); + assertEquals(msg, e.getMessage()); + } + + @Test + void shouldNestedPersistenceExceptionReportsMsgOfChildExceptionIfParentsMsgIsNull() { + String msg = "Error!"; + SQLExceptionTranslator sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class); + MyBatisExceptionTranslator translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false); + DataAccessException e = translator + .translateExceptionIfPossible(new PersistenceException(null, new PersistenceException(msg))); + assertTrue(e instanceof MyBatisSystemException); + assertEquals(msg, e.getMessage()); + } + +} From 2afe7e441afeec2022ee18bcd914cadb14c03692 Mon Sep 17 00:00:00 2001 From: Iwao AVE! Date: Sun, 26 Nov 2023 08:51:19 +0900 Subject: [PATCH 169/383] Restore the original constructor with `@Deprecated` --- .../org/mybatis/spring/MyBatisSystemException.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/mybatis/spring/MyBatisSystemException.java b/src/main/java/org/mybatis/spring/MyBatisSystemException.java index b794708de4..42c47e378f 100644 --- a/src/main/java/org/mybatis/spring/MyBatisSystemException.java +++ b/src/main/java/org/mybatis/spring/MyBatisSystemException.java @@ -18,11 +18,9 @@ import org.springframework.dao.UncategorizedDataAccessException; /** - * MyBatis specific subclass of {@code UncategorizedDataAccessException}, for MyBatis system errors that do not match - * any concrete {@code org.springframework.dao} exceptions. + * MyBatis specific subclass of {@code UncategorizedDataAccessException}, for MyBatis system errors that do not match any concrete {@code org.springframework.dao} exceptions. *

- * In MyBatis 3 {@code org.apache.ibatis.exceptions.PersistenceException} is a {@code RuntimeException}, but using this - * wrapper class to bring everything under a single hierarchy will be easier for client code to handle. + * In MyBatis 3 {@code org.apache.ibatis.exceptions.PersistenceException} is a {@code RuntimeException}, but using this wrapper class to bring everything under a single hierarchy will be easier for client code to handle. * * @author Hunter Presnall */ @@ -31,6 +29,11 @@ public class MyBatisSystemException extends UncategorizedDataAccessException { private static final long serialVersionUID = -5284728621670758939L; + @Deprecated(since = "3.0.4", forRemoval = true) + public MyBatisSystemException(Throwable cause) { + this(cause.getMessage(), cause); + } + public MyBatisSystemException(String msg, Throwable cause) { super(msg, cause); } From d3490694e8b465375cddebacb828463b975911e7 Mon Sep 17 00:00:00 2001 From: Iwao AVE! Date: Sun, 26 Nov 2023 09:10:17 +0900 Subject: [PATCH 170/383] Revert unintentional format change --- .../java/org/mybatis/spring/MyBatisSystemException.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/mybatis/spring/MyBatisSystemException.java b/src/main/java/org/mybatis/spring/MyBatisSystemException.java index 42c47e378f..a40d25c4a6 100644 --- a/src/main/java/org/mybatis/spring/MyBatisSystemException.java +++ b/src/main/java/org/mybatis/spring/MyBatisSystemException.java @@ -18,9 +18,11 @@ import org.springframework.dao.UncategorizedDataAccessException; /** - * MyBatis specific subclass of {@code UncategorizedDataAccessException}, for MyBatis system errors that do not match any concrete {@code org.springframework.dao} exceptions. + * MyBatis specific subclass of {@code UncategorizedDataAccessException}, for MyBatis system errors that do not match + * any concrete {@code org.springframework.dao} exceptions. *

- * In MyBatis 3 {@code org.apache.ibatis.exceptions.PersistenceException} is a {@code RuntimeException}, but using this wrapper class to bring everything under a single hierarchy will be easier for client code to handle. + * In MyBatis 3 {@code org.apache.ibatis.exceptions.PersistenceException} is a {@code RuntimeException}, but using this + * wrapper class to bring everything under a single hierarchy will be easier for client code to handle. * * @author Hunter Presnall */ From 7a3059211686f202388cbda62f2082922a914e43 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 16:28:13 +0000 Subject: [PATCH 171/383] Update actions/setup-java action to v4 --- .github/workflows/ci.yaml | 2 +- .github/workflows/coveralls.yaml | 2 +- .github/workflows/sonar.yaml | 2 +- .github/workflows/sonatype.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 06b1c2163e..d1bb42b90a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} ${{ matrix.distribution }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: ${{ matrix.distribution }} diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml index 03df1ede11..a898e37933 100644 --- a/.github/workflows/coveralls.yaml +++ b/.github/workflows/coveralls.yaml @@ -9,7 +9,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 21 distribution: zulu diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 2c986b2f84..4cab3d94a9 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -15,7 +15,7 @@ jobs: # Disabling shallow clone is recommended for improving relevancy of reporting fetch-depth: 0 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 21 distribution: zulu diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml index 46800b489e..72086bc1d7 100644 --- a/.github/workflows/sonatype.yaml +++ b/.github/workflows/sonatype.yaml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 21 distribution: zulu From 217c6a4e70863397d337bef4d553004faca5ecc0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 12:00:28 +0000 Subject: [PATCH 172/383] Update dependency maven to v3.9.6 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 39a584eb21..2f9352f713 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar From 8929f3f17dab347c906249115dccccc8ad25fb09 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 18:37:36 +0000 Subject: [PATCH 173/383] Update dependency org.mybatis:mybatis-parent to v41 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68e09cff56..b924a9dfa5 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.mybatis mybatis-parent - 40 + 41 From f19dc645a95ca6f722b405b58fdf47e91d70b375 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 23:47:56 +0000 Subject: [PATCH 174/383] Update dependency org.mockito:mockito-core to v5.8.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68e09cff56..98c32b3a1f 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,7 @@ org.mockito mockito-core - 5.7.0 + 5.8.0 test From 2f5a5c1a6d52a8662733777dff0daa20694ca647 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 19:56:32 +0000 Subject: [PATCH 175/383] Update spring core to v6.1.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b845e03924..fe0eefb0bf 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ 10.17.1.0 3.5.14 - 6.1.1 + 6.1.2 5.1.0 org.mybatis.spring From 36a7084f3e35d6b7f05733e3de076a1e5fefd65d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 06:37:19 +0000 Subject: [PATCH 176/383] Update dependency org.mybatis:mybatis to v3.5.15 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fe0eefb0bf..f0ce436de0 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 17 10.17.1.0 - 3.5.14 + 3.5.15 6.1.2 5.1.0 org.mybatis.spring From 65e2cbaa469602685dce211de69b8fb1aa4440ef Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Dec 2023 00:17:52 +0000 Subject: [PATCH 177/383] Update dependency net.bytebuddy:byte-buddy to v1.14.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f0ce436de0..ab9542cf39 100644 --- a/pom.xml +++ b/pom.xml @@ -318,7 +318,7 @@ net.bytebuddy byte-buddy - 1.14.10 + 1.14.11 test From 2a47b71fd30fe44b0d15a0730789bb1e8538e1b2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Dec 2023 00:17:55 +0000 Subject: [PATCH 178/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.14.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f0ce436de0..459f5dc1e7 100644 --- a/pom.xml +++ b/pom.xml @@ -324,7 +324,7 @@ net.bytebuddy byte-buddy-agent - 1.14.10 + 1.14.11 test From c0da6181593043e75903c67f1a303d2083fdc213 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 17 Dec 2023 23:16:28 -0500 Subject: [PATCH 179/383] [site] Add site for GHA distributions --- .github/workflows/site.yaml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/site.yaml diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml new file mode 100644 index 0000000000..f3ca17bff7 --- /dev/null +++ b/.github/workflows/site.yaml @@ -0,0 +1,34 @@ +name: Site + +on: + push: + branches: + - site + +jobs: + build: + if: github.repository_owner == 'mybatis' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]') + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: 21 + distribution: zulu + - uses: webfactory/ssh-agent@master + with: + ssh-private-key: ${{ secrets.DEPLOY_KEY }} + - name: Build site + run: ./mvnw site site:stage -DskipTests -B -V --no-transfer-progress -Dlicense.skip=true + env: + CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Deploy Site to gh-pages + uses: JamesIves/github-pages-deploy-action@v4.4.3 + with: + ssh-key: true + branch: gh-pages + folder: target/staging + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From d4f59f8954a875f9e55720286e022ff812b6b1cc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Dec 2023 02:24:58 +0000 Subject: [PATCH 180/383] Update JamesIves/github-pages-deploy-action action to v4.5.0 --- .github/workflows/site.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml index f3ca17bff7..cefbc68d15 100644 --- a/.github/workflows/site.yaml +++ b/.github/workflows/site.yaml @@ -25,7 +25,7 @@ jobs: CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Deploy Site to gh-pages - uses: JamesIves/github-pages-deploy-action@v4.4.3 + uses: JamesIves/github-pages-deploy-action@v4.5.0 with: ssh-key: true branch: gh-pages From 20266e9889e903fc042ce270f8f04cf706309191 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Dec 2023 02:25:01 +0000 Subject: [PATCH 181/383] Update actions/setup-java action to v4 --- .github/workflows/site.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml index f3ca17bff7..dc1644d54c 100644 --- a/.github/workflows/site.yaml +++ b/.github/workflows/site.yaml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 21 distribution: zulu From 35b3d9d5b5b929cb80a3ffec5647773e51c98ab2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 01:39:47 +0000 Subject: [PATCH 182/383] Update dependency org.slf4j:slf4j-simple to v2.0.10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b3d71a1495..330f8d3f59 100644 --- a/pom.xml +++ b/pom.xml @@ -227,7 +227,7 @@ org.slf4j slf4j-simple - 2.0.9 + 2.0.10 test From ff4339ebf9c7db8321e95b58242f2a38cc0b1ee5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 31 Dec 2023 19:16:57 +0000 Subject: [PATCH 183/383] Update dependency org.assertj:assertj-core to v3.25.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 330f8d3f59..29b0b52e8f 100644 --- a/pom.xml +++ b/pom.xml @@ -241,7 +241,7 @@ org.assertj assertj-core - 3.24.2 + 3.25.0 test From 1a5468ebe1e29e0c9ba2851a4effb00460801e1c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 00:34:30 +0000 Subject: [PATCH 184/383] Update dependency org.assertj:assertj-core to v3.25.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 29b0b52e8f..c6e9503600 100644 --- a/pom.xml +++ b/pom.xml @@ -241,7 +241,7 @@ org.assertj assertj-core - 3.25.0 + 3.25.1 test From 824c3477cfa01e6e33ffc9f313cc5fa2f1c97245 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 19:47:38 +0000 Subject: [PATCH 185/383] Update dependency org.slf4j:slf4j-simple to v2.0.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c6e9503600..9a9879677a 100644 --- a/pom.xml +++ b/pom.xml @@ -227,7 +227,7 @@ org.slf4j slf4j-simple - 2.0.10 + 2.0.11 test From bced6b200f94d37a4d0c76bda2e9922894484e10 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 12:36:42 +0000 Subject: [PATCH 186/383] Update spring core to v6.1.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a9879677a..8b9377f6a4 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ 10.17.1.0 3.5.15 - 6.1.2 + 6.1.3 5.1.0 org.mybatis.spring From ca11c7544ff48b3ed99c7f30beb66bed9f6a32c6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 14 Jan 2024 15:06:32 +0000 Subject: [PATCH 187/383] Update dependency org.mockito:mockito-core to v5.9.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8b9377f6a4..1fd726ac59 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,7 @@ org.mockito mockito-core - 5.8.0 + 5.9.0 test From ec4164818984340795db5ccc11d235c2ec9ce9fb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 16:28:41 +0000 Subject: [PATCH 188/383] Update dependency org.assertj:assertj-core to v3.25.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1fd726ac59..4b8ad4bd25 100644 --- a/pom.xml +++ b/pom.xml @@ -241,7 +241,7 @@ org.assertj assertj-core - 3.25.1 + 3.25.2 test From 8bc4211320c28fbf4260430bc606ab72e1e604df Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 23:03:18 +0000 Subject: [PATCH 189/383] Update dependency org.mockito:mockito-core to v5.10.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1fd726ac59..2e4af9bdf4 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,7 @@ org.mockito mockito-core - 5.9.0 + 5.10.0 test From ae2e3f38dc4dc2ed60631562a48898129701a19f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 28 Jan 2024 21:32:27 +0000 Subject: [PATCH 190/383] Update dependency org.mybatis:mybatis-parent to v42 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a0090bbb1..8e8878f715 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.mybatis mybatis-parent - 41 + 42 From 1db79cccd872f4657dce60ddcf4b78f116e6852c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 4 Feb 2024 11:20:24 +0000 Subject: [PATCH 191/383] Update dependency org.junit.jupiter:junit-jupiter-engine to v5.10.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8e8878f715..fa5b479955 100644 --- a/pom.xml +++ b/pom.xml @@ -115,7 +115,7 @@ 5.1.0 org.mybatis.spring - 5.10.1 + 5.10.2 1700476361 From 9aeea6a5626a7ff858d142a77e65b90ed3b8aa07 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 4 Feb 2024 22:38:19 +0000 Subject: [PATCH 192/383] Update dependency org.assertj:assertj-core to v3.25.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa5b479955..5b16e20c25 100644 --- a/pom.xml +++ b/pom.xml @@ -241,7 +241,7 @@ org.assertj assertj-core - 3.25.2 + 3.25.3 test From c6b5a031ee946c4487aa255244c5070676495d7f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 01:21:34 +0000 Subject: [PATCH 193/383] Update dependency org.slf4j:slf4j-simple to v2.0.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b16e20c25..dd6f1b5e6e 100644 --- a/pom.xml +++ b/pom.xml @@ -227,7 +227,7 @@ org.slf4j slf4j-simple - 2.0.11 + 2.0.12 test From bc13f05b5b596c898f2bf3c65ffbc5991aa1ab06 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Feb 2024 14:41:59 -0500 Subject: [PATCH 194/383] Create codeql.yml --- .github/workflows/codeql.yml | 84 ++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000000..bd854db357 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,84 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + schedule: + - cron: '37 14 * * 6' + +jobs: + analyze: + name: Analyze + # Runner size impacts CodeQL analysis time. To learn more, please see: + # - https://gh.io/recommended-hardware-resources-for-running-codeql + # - https://gh.io/supported-runners-and-hardware-resources + # - https://gh.io/using-larger-runners + # Consider using larger runners for possible analysis time improvements. + runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} + permissions: + # required for all workflows + security-events: write + + # only required for workflows in private repositories + actions: read + contents: read + + strategy: + fail-fast: false + matrix: + language: [ 'java-kotlin' ] + # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ] + # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both + # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both + # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + + # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v3 + + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + + # If the Autobuild fails above, remove it and uncomment the following three lines. + # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + + # - run: | + # echo "Run, Build Application using script" + # ./location_of_script_within_repo/buildscript.sh + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" From 797b61daeebf13c5c80916d5458e450e883018d5 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 4 Feb 2024 14:15:02 -0500 Subject: [PATCH 195/383] [ci] Use https in license --- LICENSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 57bc88a15a..7e835b2fa9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -192,7 +192,7 @@ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + 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, From 5203a00e32a0ccf5dd3c60d4da7df9d717f659e4 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 4 Feb 2024 14:15:09 -0500 Subject: [PATCH 196/383] [renovate] Update config --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 39a2b6e9a5..5db72dd6a9 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "config:base" + "config:recommended" ] } From edb4648d4ad7e820a5f33cc548b2f1ff685701c2 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Feb 2024 14:27:48 -0500 Subject: [PATCH 197/383] [GHA] Update sonar.login to sonar.token --- .github/workflows/sonar.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 4cab3d94a9..a803d9e302 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -20,7 +20,7 @@ jobs: java-version: 21 distribution: zulu - name: Analyze with SonarCloud - run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_spring -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress + run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_spring -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 7ac58f19f6011c2376eeab0a27fc8c5a16140fa1 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Feb 2024 18:06:11 -0500 Subject: [PATCH 198/383] [pom] Cleanup pom and fix urls --- pom.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index dd6f1b5e6e..bec26b2911 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ --> + 4.0.0 @@ -26,13 +27,13 @@ + org.mybatis mybatis-spring 3.0.4-SNAPSHOT - jar mybatis-spring An easy-to-use Spring bridge for MyBatis sql mapping framework. - http://www.mybatis.org/spring/ + https://www.mybatis.org/spring/ @@ -80,7 +81,7 @@ scm:git:ssh://git@github.com/mybatis/spring.git scm:git:ssh://git@github.com/mybatis/spring.git HEAD - http://github.com/mybatis/spring + https://github.com/mybatis/spring/ GitHub Issue Management From a1b320afb82bd92338a6f7490b0bafea249a6e11 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Feb 2024 18:08:48 -0500 Subject: [PATCH 199/383] [git] Update git ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 001d888176..908d8660e8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ .mvn/wrapper/maven-wrapper.jar release.properties *.releaseBackup +.github/keys/ From 2afd409f71e2691549bb03738c535d961e56cac9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Feb 2024 13:01:12 +0000 Subject: [PATCH 200/383] Update spring core to v6.1.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bec26b2911..391d9461df 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 10.17.1.0 3.5.15 - 6.1.3 + 6.1.4 5.1.0 org.mybatis.spring From 6d5a081c313b92af7b0bd7b4a2f7f166053286ef Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:15:25 +0000 Subject: [PATCH 201/383] Update dependency net.bytebuddy:byte-buddy to v1.14.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bec26b2911..3632062af2 100644 --- a/pom.xml +++ b/pom.xml @@ -319,7 +319,7 @@ net.bytebuddy byte-buddy - 1.14.11 + 1.14.12 test From ec74507290155b21aeb4fba7ce046a75fd6ad9df Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:15:28 +0000 Subject: [PATCH 202/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.14.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bec26b2911..efe772b533 100644 --- a/pom.xml +++ b/pom.xml @@ -325,7 +325,7 @@ net.bytebuddy byte-buddy-agent - 1.14.11 + 1.14.12 test From 41c2d5cd1a6010d853169a003637f7596af8ec4a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 16:47:44 +0000 Subject: [PATCH 203/383] Update spring batch to v5.1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a2796aa0b0..cf96bdf5cd 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 10.17.1.0 3.5.15 6.1.4 - 5.1.0 + 5.1.1 org.mybatis.spring 5.10.2 From bde2594e9eaea73ea61891232d8d56b9aae2ec74 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 10:23:19 +0000 Subject: [PATCH 204/383] Update dependency org.mockito:mockito-core to v5.11.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cf96bdf5cd..219430c3a5 100644 --- a/pom.xml +++ b/pom.xml @@ -235,7 +235,7 @@ org.mockito mockito-core - 5.10.0 + 5.11.0 test From 2f41efef3ed865abd584f0f7d2bcdafaf3ed65cb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 12:20:55 +0000 Subject: [PATCH 205/383] Update spring core to v6.1.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 219430c3a5..7b98667884 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 10.17.1.0 3.5.15 - 6.1.4 + 6.1.5 5.1.1 org.mybatis.spring From fb4b69159ff8cbaff4242347d6867a8edd123b65 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 23:31:41 +0000 Subject: [PATCH 206/383] Update dependency net.bytebuddy:byte-buddy to v1.14.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7b98667884..febffc55eb 100644 --- a/pom.xml +++ b/pom.xml @@ -319,7 +319,7 @@ net.bytebuddy byte-buddy - 1.14.12 + 1.14.13 test From 7fd77174dc08384bb212dd3be681d2a17e22f093 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 23:31:45 +0000 Subject: [PATCH 207/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.14.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7b98667884..2d41cc11f6 100644 --- a/pom.xml +++ b/pom.xml @@ -325,7 +325,7 @@ net.bytebuddy byte-buddy-agent - 1.14.12 + 1.14.13 test From 0b59fd7a4708c324aa12c1f59f6e645378ef1519 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 18:48:35 +0000 Subject: [PATCH 208/383] Update dependency org.mybatis:mybatis to v3.5.16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 64e04f90cf..fd6005e4ec 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ 17 10.17.1.0 - 3.5.15 + 3.5.16 6.1.5 5.1.1 org.mybatis.spring From fe56bf513a375bde58039af4bc227a8d2f6851b7 Mon Sep 17 00:00:00 2001 From: Iwao AVE! Date: Sun, 7 Apr 2024 04:10:13 +0900 Subject: [PATCH 209/383] Adjustment needed to build the site properly - Change the language : en -> default - Rename the directory zh to zh_CN --- pom.xml | 2 +- src/site/es/markdown/index.md | 2 +- src/site/ja/markdown/index.md | 2 +- src/site/ko/markdown/index.md | 2 +- src/site/markdown/index.md | 2 +- src/site/resources/{zh => zh_CN}/css/site.css | 0 src/site/{site_zh.xml => site_zh_CN.xml} | 0 src/site/{zh => zh_CN}/markdown/README.md | 0 src/site/{zh => zh_CN}/markdown/batch.md | 0 src/site/{zh => zh_CN}/markdown/boot.md | 0 src/site/{zh => zh_CN}/markdown/factorybean.md | 0 src/site/{zh => zh_CN}/markdown/getting-started.md | 0 src/site/{zh => zh_CN}/markdown/index.md | 0 src/site/{zh => zh_CN}/markdown/mappers.md | 0 src/site/{zh => zh_CN}/markdown/sample.md | 0 src/site/{zh => zh_CN}/markdown/sqlsession.md | 0 src/site/{zh => zh_CN}/markdown/transactions.md | 0 src/site/{zh => zh_CN}/markdown/using-api.md | 0 18 files changed, 5 insertions(+), 5 deletions(-) rename src/site/resources/{zh => zh_CN}/css/site.css (100%) rename src/site/{site_zh.xml => site_zh_CN.xml} (100%) rename src/site/{zh => zh_CN}/markdown/README.md (100%) rename src/site/{zh => zh_CN}/markdown/batch.md (100%) rename src/site/{zh => zh_CN}/markdown/boot.md (100%) rename src/site/{zh => zh_CN}/markdown/factorybean.md (100%) rename src/site/{zh => zh_CN}/markdown/getting-started.md (100%) rename src/site/{zh => zh_CN}/markdown/index.md (100%) rename src/site/{zh => zh_CN}/markdown/mappers.md (100%) rename src/site/{zh => zh_CN}/markdown/sample.md (100%) rename src/site/{zh => zh_CN}/markdown/sqlsession.md (100%) rename src/site/{zh => zh_CN}/markdown/transactions.md (100%) rename src/site/{zh => zh_CN}/markdown/using-api.md (100%) diff --git a/pom.xml b/pom.xml index fd6005e4ec..05ca68757e 100644 --- a/pom.xml +++ b/pom.xml @@ -440,7 +440,7 @@ org.apache.maven.plugins maven-site-plugin - en,es,zh_CN,ja,ko + default,es,zh_CN,ja,ko ${project.build.directory}/site-src diff --git a/src/site/es/markdown/index.md b/src/site/es/markdown/index.md index 52a789bfd8..25d8c9331b 100644 --- a/src/site/es/markdown/index.md +++ b/src/site/es/markdown/index.md @@ -51,7 +51,7 @@ Users can read about MyBatis-Spring in the following translations:

  • EspaÃąol
  • æ—ĨæœŦčĒž
  • 한ęĩ­ė–´
    • -
  • įŽ€äŊ“中文
    • +
  • įŽ€äŊ“中文
    • Do you want to read about MyBatis in your own native language? Fill an issue providing patches with your mother tongue documentation! diff --git a/src/site/ja/markdown/index.md b/src/site/ja/markdown/index.md index 1bd7b7408b..74d84347e5 100644 --- a/src/site/ja/markdown/index.md +++ b/src/site/ja/markdown/index.md @@ -48,7 +48,7 @@ MyBatis-Spring はäģĨä¸‹ãŽč¨€čĒžãŽįŋģč¨ŗをį”¨æ„ã—ãĻいぞす。
  • EspaÃąol
  • æ—ĨæœŦčĒž
  • 한ęĩ­ė–´
    • -
  • įŽ€äŊ“中文
    • +
  • įŽ€äŊ“中文
    • 母å›ŊčĒžã§MyBatis SpringぎãƒĒãƒ•ã‚ĄãƒŦãƒŗã‚šã‚’čĒ­ã‚“でãŋぞせんかīŧŸ ãœã˛ãƒ‰ã‚­ãƒĨãƒĄãƒŗトを母å›ŊčĒžã¸įŋģč¨ŗするためぎIssue(パッチ)をäŊœæˆã—ãĻくださいīŧ diff --git a/src/site/ko/markdown/index.md b/src/site/ko/markdown/index.md index 83e5567550..e2bd35161f 100644 --- a/src/site/ko/markdown/index.md +++ b/src/site/ko/markdown/index.md @@ -48,7 +48,7 @@ MyBatis-Spring requires following versions: diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index bdfcad162f..8f9f49ae10 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -49,7 +49,7 @@ Users can read about MyBatis-Spring in the following translations:
  • EspaÃąol
  • æ—ĨæœŦčĒž
  • 한ęĩ­ė–´
    • -
  • įŽ€äŊ“中文
    • +
  • įŽ€äŊ“中文
    • Do you want to read about MyBatis in your own native language? Fill an issue providing patches with your mother tongue documentation! diff --git a/src/site/resources/zh/css/site.css b/src/site/resources/zh_CN/css/site.css similarity index 100% rename from src/site/resources/zh/css/site.css rename to src/site/resources/zh_CN/css/site.css diff --git a/src/site/site_zh.xml b/src/site/site_zh_CN.xml similarity index 100% rename from src/site/site_zh.xml rename to src/site/site_zh_CN.xml diff --git a/src/site/zh/markdown/README.md b/src/site/zh_CN/markdown/README.md similarity index 100% rename from src/site/zh/markdown/README.md rename to src/site/zh_CN/markdown/README.md diff --git a/src/site/zh/markdown/batch.md b/src/site/zh_CN/markdown/batch.md similarity index 100% rename from src/site/zh/markdown/batch.md rename to src/site/zh_CN/markdown/batch.md diff --git a/src/site/zh/markdown/boot.md b/src/site/zh_CN/markdown/boot.md similarity index 100% rename from src/site/zh/markdown/boot.md rename to src/site/zh_CN/markdown/boot.md diff --git a/src/site/zh/markdown/factorybean.md b/src/site/zh_CN/markdown/factorybean.md similarity index 100% rename from src/site/zh/markdown/factorybean.md rename to src/site/zh_CN/markdown/factorybean.md diff --git a/src/site/zh/markdown/getting-started.md b/src/site/zh_CN/markdown/getting-started.md similarity index 100% rename from src/site/zh/markdown/getting-started.md rename to src/site/zh_CN/markdown/getting-started.md diff --git a/src/site/zh/markdown/index.md b/src/site/zh_CN/markdown/index.md similarity index 100% rename from src/site/zh/markdown/index.md rename to src/site/zh_CN/markdown/index.md diff --git a/src/site/zh/markdown/mappers.md b/src/site/zh_CN/markdown/mappers.md similarity index 100% rename from src/site/zh/markdown/mappers.md rename to src/site/zh_CN/markdown/mappers.md diff --git a/src/site/zh/markdown/sample.md b/src/site/zh_CN/markdown/sample.md similarity index 100% rename from src/site/zh/markdown/sample.md rename to src/site/zh_CN/markdown/sample.md diff --git a/src/site/zh/markdown/sqlsession.md b/src/site/zh_CN/markdown/sqlsession.md similarity index 100% rename from src/site/zh/markdown/sqlsession.md rename to src/site/zh_CN/markdown/sqlsession.md diff --git a/src/site/zh/markdown/transactions.md b/src/site/zh_CN/markdown/transactions.md similarity index 100% rename from src/site/zh/markdown/transactions.md rename to src/site/zh_CN/markdown/transactions.md diff --git a/src/site/zh/markdown/using-api.md b/src/site/zh_CN/markdown/using-api.md similarity index 100% rename from src/site/zh/markdown/using-api.md rename to src/site/zh_CN/markdown/using-api.md From 2b69e584377f0e0514ea29b5f909ce10afe8a970 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 11:44:44 +0000 Subject: [PATCH 210/383] Update spring core to v6.1.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd6005e4ec..582ad64749 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 10.17.1.0 3.5.16 - 6.1.5 + 6.1.6 5.1.1 org.mybatis.spring From 8713e532a292cccd04629a4195bc8bc2710e4e79 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 16:36:28 +0000 Subject: [PATCH 211/383] Update dependency org.slf4j:slf4j-simple to v2.0.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4f47d74f0d..b16b86a5c4 100644 --- a/pom.xml +++ b/pom.xml @@ -228,7 +228,7 @@ org.slf4j slf4j-simple - 2.0.12 + 2.0.13 test From 5e225dd27f27dfd8481a11b342d9e763ee0ec6b8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 01:43:44 +0000 Subject: [PATCH 212/383] Update dependency org.mybatis:mybatis-parent to v43 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b16b86a5c4..dffc1301b2 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.mybatis mybatis-parent - 42 + 43 From eae721b0ee575dd962ab35a6806e13fd291e8e30 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 14:02:01 +0000 Subject: [PATCH 213/383] Update JamesIves/github-pages-deploy-action action to v4.6.0 --- .github/workflows/site.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml index d0c67a283a..651ce3145d 100644 --- a/.github/workflows/site.yaml +++ b/.github/workflows/site.yaml @@ -25,7 +25,7 @@ jobs: CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Deploy Site to gh-pages - uses: JamesIves/github-pages-deploy-action@v4.5.0 + uses: JamesIves/github-pages-deploy-action@v4.6.0 with: ssh-key: true branch: gh-pages From 48ed5a6d290fdaddd8e83b5d43348151330e63d9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 21:07:36 +0000 Subject: [PATCH 214/383] Update dependency net.bytebuddy:byte-buddy to v1.14.14 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dffc1301b2..98815b1833 100644 --- a/pom.xml +++ b/pom.xml @@ -319,7 +319,7 @@ net.bytebuddy byte-buddy - 1.14.13 + 1.14.14 test From 0924a4629fb9cf89546b3df85005dfd7258ff435 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 21:07:39 +0000 Subject: [PATCH 215/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.14.14 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dffc1301b2..f8c7636a06 100644 --- a/pom.xml +++ b/pom.xml @@ -325,7 +325,7 @@ net.bytebuddy byte-buddy-agent - 1.14.13 + 1.14.14 test     From c2f7dece35ae8d5b96519cfbe54904630ed0d0c8 Mon Sep 17 00:00:00 2001 From: luozhenyu Date: Sat, 27 Apr 2024 19:55:58 +0800 Subject: [PATCH 216/383] Add environment to ClassPathMapperScanner to get properties from PropertySources --- pom.xml | 8 ++++++ .../spring/mapper/ClassPathMapperScanner.java | 13 ++++++++- .../mapper/MapperScannerConfigurer.java | 4 +-- .../AnnotatedMapperOnPropertyCondition.java | 27 +++++++++++++++++++ .../mapper/MapperScannerConfigurerTest.java | 16 ++++++++++- 5 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 src/test/java/org/mybatis/spring/mapper/AnnotatedMapperOnPropertyCondition.java diff --git a/pom.xml b/pom.xml index dffc1301b2..afb3b778bb 100644 --- a/pom.xml +++ b/pom.xml @@ -113,6 +113,7 @@ 10.17.1.0 3.5.16 6.1.6 + 3.2.5 5.1.1 org.mybatis.spring @@ -218,6 +219,13 @@ + + org.springframework.boot + spring-boot-autoconfigure + ${spring-boot.version} + test + + org.hsqldb hsqldb diff --git a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java index fab1c66ac5..dca8d02f3f 100644 --- a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java +++ b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. @@ -38,6 +38,7 @@ import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.annotation.ClassPathBeanDefinitionScanner; import org.springframework.core.NativeDetector; +import org.springframework.core.env.Environment; import org.springframework.core.type.filter.AnnotationTypeFilter; import org.springframework.core.type.filter.AssignableTypeFilter; import org.springframework.util.StringUtils; @@ -86,6 +87,16 @@ public class ClassPathMapperScanner extends ClassPathBeanDefinitionScanner { private String defaultScope; + public ClassPathMapperScanner(BeanDefinitionRegistry registry, Environment environment) { + super(registry, false, environment); + setIncludeAnnotationConfig(!AotDetector.useGeneratedArtifacts()); + setPrintWarnLogIfNotFoundMappers(!NativeDetector.inNativeImage()); + } + + /** + * @deprecated Please use the {@link #ClassPathMapperScanner(BeanDefinitionRegistry, Environment)}. + */ + @Deprecated(since = "3.0.4", forRemoval = true) public ClassPathMapperScanner(BeanDefinitionRegistry registry) { super(registry, false); setIncludeAnnotationConfig(!AotDetector.useGeneratedArtifacts()); diff --git a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java index 5b10b71192..29552ef25b 100644 --- a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java +++ b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -360,7 +360,7 @@ public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) { processPropertyPlaceHolders(); } - ClassPathMapperScanner scanner = new ClassPathMapperScanner(registry); + ClassPathMapperScanner scanner = new ClassPathMapperScanner(registry, getEnvironment()); scanner.setAddToConfig(this.addToConfig); scanner.setAnnotationClass(this.annotationClass); scanner.setMarkerInterface(this.markerInterface); diff --git a/src/test/java/org/mybatis/spring/mapper/AnnotatedMapperOnPropertyCondition.java b/src/test/java/org/mybatis/spring/mapper/AnnotatedMapperOnPropertyCondition.java new file mode 100644 index 0000000000..a5170a92bc --- /dev/null +++ b/src/test/java/org/mybatis/spring/mapper/AnnotatedMapperOnPropertyCondition.java @@ -0,0 +1,27 @@ +/* + * Copyright 2010-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.mybatis.spring.mapper; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Component; + +// annotated interface for MapperScannerPostProcessor tests +// ensures annotated classes are loaded on property condition +@Component +@ConditionalOnProperty(prefix = "mapper", value = "condition", havingValue = "true") +public interface AnnotatedMapperOnPropertyCondition { + void method(); +} diff --git a/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java b/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java index 3a9a3f16f9..fc1ce5f4b3 100644 --- a/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java +++ b/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. @@ -46,6 +46,8 @@ import org.springframework.beans.factory.support.GenericBeanDefinition; import org.springframework.context.support.GenericApplicationContext; import org.springframework.context.support.SimpleThreadScope; +import org.springframework.core.env.MutablePropertySources; +import org.springframework.mock.env.MockPropertySource; import org.springframework.stereotype.Component; class MapperScannerConfigurerTest { @@ -402,6 +404,18 @@ void testMapperBeanAttribute() { .getAttribute(ClassPathMapperScanner.FACTORY_BEAN_OBJECT_TYPE)).isEqualTo(AnnotatedMapper.class); } + @Test + void testMapperBeanOnConditionalProperties() { + MutablePropertySources propertySources = applicationContext.getEnvironment().getPropertySources(); + propertySources.addLast(new MockPropertySource().withProperty("mapper.condition", "true")); + + startContext(); + + assertThat(applicationContext.getBeanDefinition("annotatedMapperOnPropertyCondition") + .getAttribute(ClassPathMapperScanner.FACTORY_BEAN_OBJECT_TYPE)) + .isEqualTo(AnnotatedMapperOnPropertyCondition.class); + } + private void setupSqlSessionFactory(String name) { GenericBeanDefinition definition = new GenericBeanDefinition(); definition.setBeanClass(SqlSessionFactoryBean.class); From ad6c07cea22602683661bc91cc9a6c18b82ceae0 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 27 Apr 2024 14:30:07 -0400 Subject: [PATCH 217/383] [mvn] Update maven wrapper --- .mvn/extensions.xml | 2 +- .mvn/settings.xml | 14 +- .mvn/wrapper/MavenWrapperDownloader.java | 93 ++++---- .mvn/wrapper/maven-wrapper.properties | 3 +- mvnw | 256 +++++++++++++---------- mvnw.cmd | 21 +- pom.xml | 2 +- src/site/resources/zh_CN/css/site.css | 2 +- src/site/site_zh_CN.xml | 2 +- 9 files changed, 214 insertions(+), 181 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 5d2499ed32..aeaad3ef68 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -1,7 +1,7 @@ + + ossrh ${env.CI_DEPLOY_USERNAME} ${env.CI_DEPLOY_PASSWORD} + gh-pages-scm @@ -32,10 +35,19 @@ gh-pages + + github ${env.CI_DEPLOY_USERNAME} ${env.GITHUB_TOKEN} + + + + nvd + ${env.NVD_API_KEY} + + diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java index f57fd86fbf..f6cb0fa0bb 100644 --- a/.mvn/wrapper/MavenWrapperDownloader.java +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -21,77 +21,72 @@ import java.io.InputStream; import java.net.Authenticator; import java.net.PasswordAuthentication; +import java.net.URI; import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; +import java.util.concurrent.ThreadLocalRandom; -public final class MavenWrapperDownloader -{ - private static final String WRAPPER_VERSION = "3.2.0"; +public final class MavenWrapperDownloader { + private static final String WRAPPER_VERSION = "3.3.1"; - private static final boolean VERBOSE = Boolean.parseBoolean( System.getenv( "MVNW_VERBOSE" ) ); + private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("MVNW_VERBOSE")); - public static void main( String[] args ) - { - log( "Apache Maven Wrapper Downloader " + WRAPPER_VERSION ); + public static void main(String[] args) { + log("Apache Maven Wrapper Downloader " + WRAPPER_VERSION); - if ( args.length != 2 ) - { - System.err.println( " - ERROR wrapperUrl or wrapperJarPath parameter missing" ); - System.exit( 1 ); + if (args.length != 2) { + System.err.println(" - ERROR wrapperUrl or wrapperJarPath parameter missing"); + System.exit(1); } - try - { - log( " - Downloader started" ); - final URL wrapperUrl = new URL( args[0] ); - final String jarPath = args[1].replace( "..", "" ); // Sanitize path - final Path wrapperJarPath = Paths.get( jarPath ).toAbsolutePath().normalize(); - downloadFileFromURL( wrapperUrl, wrapperJarPath ); - log( "Done" ); - } - catch ( IOException e ) - { - System.err.println( "- Error downloading: " + e.getMessage() ); - if ( VERBOSE ) - { + try { + log(" - Downloader started"); + final URL wrapperUrl = URI.create(args[0]).toURL(); + final String jarPath = args[1].replace("..", ""); // Sanitize path + final Path wrapperJarPath = Paths.get(jarPath).toAbsolutePath().normalize(); + downloadFileFromURL(wrapperUrl, wrapperJarPath); + log("Done"); + } catch (IOException e) { + System.err.println("- Error downloading: " + e.getMessage()); + if (VERBOSE) { e.printStackTrace(); } - System.exit( 1 ); + System.exit(1); } } - private static void downloadFileFromURL( URL wrapperUrl, Path wrapperJarPath ) - throws IOException - { - log( " - Downloading to: " + wrapperJarPath ); - if ( System.getenv( "MVNW_USERNAME" ) != null && System.getenv( "MVNW_PASSWORD" ) != null ) - { - final String username = System.getenv( "MVNW_USERNAME" ); - final char[] password = System.getenv( "MVNW_PASSWORD" ).toCharArray(); - Authenticator.setDefault( new Authenticator() - { + private static void downloadFileFromURL(URL wrapperUrl, Path wrapperJarPath) + throws IOException { + log(" - Downloading to: " + wrapperJarPath); + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + final String username = System.getenv("MVNW_USERNAME"); + final char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { @Override - protected PasswordAuthentication getPasswordAuthentication() - { - return new PasswordAuthentication( username, password ); + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); } - } ); + }); } - try ( InputStream inStream = wrapperUrl.openStream() ) - { - Files.copy( inStream, wrapperJarPath, StandardCopyOption.REPLACE_EXISTING ); + Path temp = wrapperJarPath + .getParent() + .resolve(wrapperJarPath.getFileName() + "." + + Long.toUnsignedString(ThreadLocalRandom.current().nextLong()) + ".tmp"); + try (InputStream inStream = wrapperUrl.openStream()) { + Files.copy(inStream, temp, StandardCopyOption.REPLACE_EXISTING); + Files.move(temp, wrapperJarPath, StandardCopyOption.REPLACE_EXISTING); + } finally { + Files.deleteIfExists(temp); } - log( " - Downloader complete" ); + log(" - Downloader complete"); } - private static void log( String msg ) - { - if ( VERBOSE ) - { - System.out.println( msg ); + private static void log(String msg) { + if (VERBOSE) { + System.out.println(msg); } } diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 2f9352f713..d2a5c3fb8f 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +wrapperVersion=3.3.1 distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar diff --git a/mvnw b/mvnw index 66df285428..b21a698ee2 100755 --- a/mvnw +++ b/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.2.0 +# Apache Maven Wrapper startup batch script, version 3.3.1 # # Required ENV vars: # ------------------ @@ -33,75 +33,84 @@ # MAVEN_SKIP_RC - flag to disable loading of mavenrc files # ---------------------------------------------------------------------------- -if [ -z "$MAVEN_SKIP_RC" ] ; then +if [ -z "$MAVEN_SKIP_RC" ]; then - if [ -f /usr/local/etc/mavenrc ] ; then + if [ -f /usr/local/etc/mavenrc ]; then . /usr/local/etc/mavenrc fi - if [ -f /etc/mavenrc ] ; then + if [ -f /etc/mavenrc ]; then . /etc/mavenrc fi - if [ -f "$HOME/.mavenrc" ] ; then + if [ -f "$HOME/.mavenrc" ]; then . "$HOME/.mavenrc" fi fi # OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; +cygwin=false +darwin=false mingw=false case "$(uname)" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME - else - JAVA_HOME="/Library/Java/Home"; export JAVA_HOME - fi +CYGWIN*) cygwin=true ;; +MINGW*) mingw=true ;; +Darwin*) + darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)" + export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home" + export JAVA_HOME fi - ;; + fi + ;; esac -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then +if [ -z "$JAVA_HOME" ]; then + if [ -r /etc/gentoo-release ]; then JAVA_HOME=$(java-config --jre-home) fi fi # For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --unix "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +if $cygwin; then + [ -n "$JAVA_HOME" ] \ + && JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] \ + && CLASSPATH=$(cygpath --path --unix "$CLASSPATH") fi # For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && - JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" +if $mingw; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] \ + && JAVA_HOME="$( + cd "$JAVA_HOME" || ( + echo "cannot cd into $JAVA_HOME." >&2 + exit 1 + ) + pwd + )" fi if [ -z "$JAVA_HOME" ]; then javaExecutable="$(which javac)" - if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + if [ -n "$javaExecutable" ] && ! [ "$(expr "$javaExecutable" : '\([^ ]*\)')" = "no" ]; then # readlink(1) is not available as standard on Solaris 10. readLink=$(which readlink) if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then - if $darwin ; then - javaHome="$(dirname "\"$javaExecutable\"")" - javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + if $darwin; then + javaHome="$(dirname "$javaExecutable")" + javaExecutable="$(cd "$javaHome" && pwd -P)/javac" else - javaExecutable="$(readlink -f "\"$javaExecutable\"")" + javaExecutable="$(readlink -f "$javaExecutable")" fi - javaHome="$(dirname "\"$javaExecutable\"")" + javaHome="$(dirname "$javaExecutable")" javaHome=$(expr "$javaHome" : '\(.*\)/bin') JAVA_HOME="$javaHome" export JAVA_HOME @@ -109,52 +118,60 @@ if [ -z "$JAVA_HOME" ]; then fi fi -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +if [ -z "$JAVACMD" ]; then + if [ -n "$JAVA_HOME" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then # IBM's JDK on AIX uses strange locations for the executables JAVACMD="$JAVA_HOME/jre/sh/java" else JAVACMD="$JAVA_HOME/bin/java" fi else - JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + JAVACMD="$( + \unset -f command 2>/dev/null + \command -v java + )" fi fi -if [ ! -x "$JAVACMD" ] ; then +if [ ! -x "$JAVACMD" ]; then echo "Error: JAVA_HOME is not defined correctly." >&2 echo " We cannot execute $JAVACMD" >&2 exit 1 fi -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." +if [ -z "$JAVA_HOME" ]; then + echo "Warning: JAVA_HOME environment variable is not set." >&2 fi # traverses directory structure from process work directory to filesystem root # first directory with .mvn subdirectory is considered project base directory find_maven_basedir() { - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" + if [ -z "$1" ]; then + echo "Path not specified to find_maven_basedir" >&2 return 1 fi basedir="$1" wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then + while [ "$wdir" != '/' ]; do + if [ -d "$wdir"/.mvn ]; then basedir=$wdir break fi # workaround for JBEAP-8937 (on Solaris 10/Sparc) if [ -d "${wdir}" ]; then - wdir=$(cd "$wdir/.." || exit 1; pwd) + wdir=$( + cd "$wdir/.." || exit 1 + pwd + ) fi # end of workaround done - printf '%s' "$(cd "$basedir" || exit 1; pwd)" + printf '%s' "$( + cd "$basedir" || exit 1 + pwd + )" } # concatenates all lines of a file @@ -165,7 +182,7 @@ concat_lines() { # enabled. Otherwise, we may read lines that are delimited with # \r\n and produce $'-Xarg\r' rather than -Xarg due to word # splitting rules. - tr -s '\r\n' ' ' < "$1" + tr -s '\r\n' ' ' <"$1" fi } @@ -177,10 +194,11 @@ log() { BASE_DIR=$(find_maven_basedir "$(dirname "$0")") if [ -z "$BASE_DIR" ]; then - exit 1; + exit 1 fi -MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +export MAVEN_PROJECTBASEDIR log "$MAVEN_PROJECTBASEDIR" ########################################################################################## @@ -189,63 +207,66 @@ log "$MAVEN_PROJECTBASEDIR" ########################################################################################## wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" if [ -r "$wrapperJarPath" ]; then - log "Found $wrapperJarPath" + log "Found $wrapperJarPath" else - log "Couldn't find $wrapperJarPath, downloading it ..." + log "Couldn't find $wrapperJarPath, downloading it ..." - if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in wrapperUrl) + wrapperUrl="$safeValue" + break + ;; + esac + done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget >/dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" fi - while IFS="=" read -r key value; do - # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) - safeValue=$(echo "$value" | tr -d '\r') - case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; - esac - done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" - log "Downloading from: $wrapperUrl" - + elif command -v curl >/dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac if $cygwin; then - wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") fi - - if command -v wget > /dev/null; then - log "Found wget ... using wget" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - log "Found curl ... using curl" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - fi - else - log "Falling back to using Java to download" - javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" - javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaSource=$(cygpath --path --windows "$javaSource") - javaClass=$(cygpath --path --windows "$javaClass") - fi - if [ -e "$javaSource" ]; then - if [ ! -e "$javaClass" ]; then - log " - Compiling MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/javac" "$javaSource") - fi - if [ -e "$javaClass" ]; then - log " - Running MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" - fi - fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi fi + fi fi ########################################################################################## # End of extension @@ -254,22 +275,25 @@ fi # If specified, validate the SHA-256 sum of the Maven wrapper jar file wrapperSha256Sum="" while IFS="=" read -r key value; do - case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + case "$key" in wrapperSha256Sum) + wrapperSha256Sum=$value + break + ;; esac -done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" if [ -n "$wrapperSha256Sum" ]; then wrapperSha256Result=false - if command -v sha256sum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + if command -v sha256sum >/dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c >/dev/null 2>&1; then wrapperSha256Result=true fi - elif command -v shasum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + elif command -v shasum >/dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c >/dev/null 2>&1; then wrapperSha256Result=true fi else - echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." - echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." >&2 exit 1 fi if [ $wrapperSha256Result = false ]; then @@ -284,12 +308,12 @@ MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" # For Cygwin, switch paths to Windows format before running java if $cygwin; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --windows "$CLASSPATH") - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") + [ -n "$JAVA_HOME" ] \ + && JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] \ + && CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] \ + && MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") fi # Provide a "standardized" way to retrieve the CLI args that will diff --git a/mvnw.cmd b/mvnw.cmd index 95ba6f54ac..f93f29a8e3 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -18,7 +18,7 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.2.0 +@REM Apache Maven Wrapper startup batch script, version 3.3.1 @REM @REM Required ENV vars: @REM JAVA_HOME - location of a JDK home dir @@ -59,22 +59,22 @@ set ERROR_CODE=0 @REM ==== START VALIDATION ==== if not "%JAVA_HOME%" == "" goto OkJHome -echo. +echo. >&2 echo Error: JAVA_HOME not found in your environment. >&2 echo Please set the JAVA_HOME variable in your environment to match the >&2 echo location of your Java installation. >&2 -echo. +echo. >&2 goto error :OkJHome if exist "%JAVA_HOME%\bin\java.exe" goto init -echo. +echo. >&2 echo Error: JAVA_HOME is set to an invalid directory. >&2 echo JAVA_HOME = "%JAVA_HOME%" >&2 echo Please set the JAVA_HOME variable in your environment to match the >&2 echo location of your Java installation. >&2 -echo. +echo. >&2 goto error @REM ==== END VALIDATION ==== @@ -119,7 +119,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain -set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar" FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B @@ -133,7 +133,7 @@ if exist %WRAPPER_JAR% ( ) ) else ( if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar" ) if "%MVNW_VERBOSE%" == "true" ( echo Couldn't find %WRAPPER_JAR%, downloading it ... @@ -160,11 +160,12 @@ FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapp ) IF NOT %WRAPPER_SHA_256_SUM%=="" ( powershell -Command "&{"^ + "Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash;"^ "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ - " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ - " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ - " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " Write-Error 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Error 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Error 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ " exit 1;"^ "}"^ "}" diff --git a/pom.xml b/pom.xml index bfd6a34d39..fe8ae88f54 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ - - + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextAspectJFilter.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextAspectJFilter.xml index 952f381415..594ba58a3c 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/appContextAspectJFilter.xml +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextAspectJFilter.xml @@ -27,8 +27,8 @@ - - + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextAssignFilter.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextAssignFilter.xml index afddfa1898..6336a75ece 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/appContextAssignFilter.xml +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextAssignFilter.xml @@ -27,8 +27,8 @@ - - + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextCombinedFilter.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextCombinedFilter.xml index b882eacb27..f477031cc0 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/appContextCombinedFilter.xml +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextCombinedFilter.xml @@ -28,8 +28,8 @@ - - + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextCustFilter.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextCustFilter.xml index 8d5aa2dd72..2cc3416793 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/appContextCustFilter.xml +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextCustFilter.xml @@ -27,8 +27,8 @@ - - + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter.xml index dd3ee9281d..dfb19ac3d2 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter.xml +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter.xml @@ -27,8 +27,8 @@ - - + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter1.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter1.xml index 49c126b478..a3c9cb881d 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter1.xml +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter1.xml @@ -27,8 +27,8 @@ - - + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter2.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter2.xml index a38d81c527..b6f835770f 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter2.xml +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextInvalidFilter2.xml @@ -27,8 +27,8 @@ - - + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextPlaceHolder.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextPlaceHolder.xml index 75398c62e5..e2f5c502bf 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/appContextPlaceHolder.xml +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextPlaceHolder.xml @@ -28,8 +28,8 @@ - - + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextPlaceHolder1.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextPlaceHolder1.xml index a4a1e2b951..2b508e804b 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/appContextPlaceHolder1.xml +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextPlaceHolder1.xml @@ -28,8 +28,8 @@ - - + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextProcessPlaceHolderOff.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextProcessPlaceHolderOff.xml index 71e28999b0..f37b79028e 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/appContextProcessPlaceHolderOff.xml +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextProcessPlaceHolderOff.xml @@ -28,8 +28,8 @@ - - + + diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextRegexFilter.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextRegexFilter.xml index 6bd23fb252..2d909a4fe5 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/appContextRegexFilter.xml +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextRegexFilter.xml @@ -27,8 +27,8 @@ - - + + From 3b5f798247d5c79ff8b0e6d17bc24b8e5acf0b7b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 23:06:27 +0000 Subject: [PATCH 221/383] Update dependency org.aspectj:aspectjweaver to v1.9.22 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c237fb2fd0..161a8c617c 100644 --- a/pom.xml +++ b/pom.xml @@ -326,7 +326,7 @@ org.aspectj aspectjweaver - 1.9.19 + 1.9.22 true From fbb5db2c77befae7fe67d1d68d75b5e8286250ef Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 May 2024 08:11:01 +0000 Subject: [PATCH 222/383] Update dependency org.aspectj:aspectjweaver to v1.9.22.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 161a8c617c..34d8e42cdc 100644 --- a/pom.xml +++ b/pom.xml @@ -326,7 +326,7 @@ org.aspectj aspectjweaver - 1.9.22 + 1.9.22.1 true From 95e8ff04c6a9021f6ffc946043a6a375517046e6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 May 2024 13:05:41 +0000 Subject: [PATCH 223/383] Update dependency org.mockito:mockito-core to v5.12.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 161a8c617c..c859458ee5 100644 --- a/pom.xml +++ b/pom.xml @@ -243,7 +243,7 @@ org.mockito mockito-core - 5.11.0 + 5.12.0 test From 09df48b82f3414cdbb27bc3e30891163f9643fae Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 15:39:05 +0000 Subject: [PATCH 224/383] Update spring core to v6.1.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f8061a8d8a..39218757fd 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 10.17.1.0 3.5.16 - 6.1.6 + 6.1.7 3.2.5 5.1.1 org.mybatis.spring From bebd18111b7a5ceb3296b3cd003bb13314d7f0f3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 May 2024 11:43:23 +0000 Subject: [PATCH 225/383] Update JamesIves/github-pages-deploy-action action to v4.6.1 --- .github/workflows/site.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml index 651ce3145d..746afc0ec6 100644 --- a/.github/workflows/site.yaml +++ b/.github/workflows/site.yaml @@ -25,7 +25,7 @@ jobs: CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Deploy Site to gh-pages - uses: JamesIves/github-pages-deploy-action@v4.6.0 + uses: JamesIves/github-pages-deploy-action@v4.6.1 with: ssh-key: true branch: gh-pages From 36a8e2d3609e8782bd718543f64ad2d02c23b906 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 19 May 2024 14:22:13 -0400 Subject: [PATCH 226/383] [GHA] Add setup java for codeql --- .github/workflows/codeql.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index bd854db357..4f13b7e031 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -50,6 +50,12 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + - name: Setup Java + uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: 'temurin' + # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v3 From b6f55ffe1b6d13da4a42dfbb89e1e177999348cb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 13:57:50 +0000 Subject: [PATCH 227/383] Update dependency net.bytebuddy:byte-buddy to v1.14.16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 39218757fd..f16d2b5445 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ net.bytebuddy byte-buddy - 1.14.15 + 1.14.16 test From aaf241bfc7f9cdd6a003fed44c2ff0bcbb498c47 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 13:57:54 +0000 Subject: [PATCH 228/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.14.16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 39218757fd..24d436d793 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ net.bytebuddy byte-buddy-agent - 1.14.15 + 1.14.16 test     From f2e89d090bf49dadcbf3ba162bdb21e24791a07d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 17:00:06 +0000 Subject: [PATCH 229/383] Update spring batch to v5.1.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 39218757fd..e75ef0778f 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 3.5.16 6.1.7 3.2.5 - 5.1.1 + 5.1.2 org.mybatis.spring 5.10.2 From 2ceaa7b6abf089d441aa7e3eba3dbcc6b9d1d666 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 19:20:54 +0000 Subject: [PATCH 230/383] Update spring core to v6.1.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 39218757fd..2168cce6e9 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 10.17.1.0 3.5.16 - 6.1.7 + 6.1.8 3.2.5 5.1.1 org.mybatis.spring From 35fb42043d520b6984b5f01c9acc3c605a4231c4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 14:41:08 +0000 Subject: [PATCH 231/383] Update dependency org.springframework.boot:spring-boot-autoconfigure to v3.3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index def4d9920d..703fb55203 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 10.17.1.0 3.5.16 6.1.8 - 3.2.5 + 3.3.0 5.1.2 org.mybatis.spring From 090fb4ae0a88853a03c7ae1e4f12bed458c54656 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 25 May 2024 10:35:11 +0000 Subject: [PATCH 232/383] Update dependency maven to v3.9.7 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index d2a5c3fb8f..34d5438899 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. wrapperVersion=3.3.1 -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar From 102740b18d1b37ee05703beff957ba1c8dbfbf4c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 26 May 2024 13:38:17 +0000 Subject: [PATCH 233/383] Update dependency org.assertj:assertj-core to v3.26.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 703fb55203..835c35a952 100644 --- a/pom.xml +++ b/pom.xml @@ -250,7 +250,7 @@ org.assertj assertj-core - 3.25.3 + 3.26.0 test From 27ed0c34ae67fa0523a2cd36dc48c48b02b7eda7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 20:25:54 +0000 Subject: [PATCH 234/383] Update dependency org.mybatis:mybatis-parent to v44 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 835c35a952..5bffb97641 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.mybatis mybatis-parent - 43 + 44 From f4230426abe9f4184ed69458a51e464a1c5334ad Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 18:31:55 +0000 Subject: [PATCH 235/383] Update dependency org.jboss.byteman:byteman-bmunit to v4.0.23 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5bffb97641..41896686f0 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,7 @@ org.jboss.byteman byteman-bmunit - 4.0.22 + 4.0.23 test From fb83b852e0730c116266675db9a70b05bb9dd858 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 19:49:04 +0000 Subject: [PATCH 236/383] Update dependency net.bytebuddy:byte-buddy to v1.14.17 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 41896686f0..dc4d18f8b5 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ net.bytebuddy byte-buddy - 1.14.16 + 1.14.17 test From 67cf83e15501dc6ab017f340e357f21f2209d2a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 19:49:08 +0000 Subject: [PATCH 237/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.14.17 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 41896686f0..6bf42346a3 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ net.bytebuddy byte-buddy-agent - 1.14.16 + 1.14.17 test     From 6490ee159db7dcc2a572d913d96413120a385a97 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 05:10:44 +0000 Subject: [PATCH 238/383] Update dependency org.hsqldb:hsqldb to v2.7.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0108f4d79e..88c40b196b 100644 --- a/pom.xml +++ b/pom.xml @@ -229,7 +229,7 @@ org.hsqldb hsqldb - 2.7.2 + 2.7.3 test From 62aacd5f3eb396a8d177f388458d3cb1c17edb6e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 14:06:45 +0000 Subject: [PATCH 239/383] Update dependency jakarta.servlet:jakarta.servlet-api to v6.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 88c40b196b..8ad02784ac 100644 --- a/pom.xml +++ b/pom.xml @@ -320,7 +320,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 test From 623ced743683867e8fd3235928254c77d6490d78 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 12:40:52 +0000 Subject: [PATCH 240/383] Update spring core to v6.1.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8ad02784ac..0cc8da32db 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 10.17.1.0 3.5.16 - 6.1.8 + 6.1.9 3.3.0 5.1.2 org.mybatis.spring From 79c3bf8dbe7ba0e2897cebde5de0aca9b434664f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 13:47:27 +0000 Subject: [PATCH 241/383] Update dependency maven to v3.9.8 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 34d5438899..bceca511d6 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. wrapperVersion=3.3.1 -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar From 4d0305fc6a3a4db9aebf034141a3d0946b250460 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 11:21:17 +0000 Subject: [PATCH 242/383] Update dependency org.springframework.boot:spring-boot-autoconfigure to v3.3.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0cc8da32db..5b8c5ca0b6 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 10.17.1.0 3.5.16 6.1.9 - 3.3.0 + 3.3.1 5.1.2 org.mybatis.spring From bc15b50c11266b1b87cff790ddc1c5bfcd2daffb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2024 03:21:16 +0000 Subject: [PATCH 243/383] Update spring core to v6.1.10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b8c5ca0b6..cf677f2233 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 10.17.1.0 3.5.16 - 6.1.9 + 6.1.10 3.3.1 5.1.2 org.mybatis.spring From a75801afbc662d19a1b4b2667d37206027df65d5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 15:24:41 +0000 Subject: [PATCH 244/383] Update dependency org.junit.jupiter:junit-jupiter-engine to v5.10.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cf677f2233..d4554afc63 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ 5.1.2 org.mybatis.spring - 5.10.2 + 5.10.3 1700476361 From 6a2e7bc3c2ba7942ffadce3f9266fcce8e1ace73 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 5 Jul 2024 18:29:03 +0000 Subject: [PATCH 245/383] Update JamesIves/github-pages-deploy-action action to v4.6.3 --- .github/workflows/site.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml index 746afc0ec6..11eb6ac739 100644 --- a/.github/workflows/site.yaml +++ b/.github/workflows/site.yaml @@ -25,7 +25,7 @@ jobs: CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Deploy Site to gh-pages - uses: JamesIves/github-pages-deploy-action@v4.6.1 + uses: JamesIves/github-pages-deploy-action@v4.6.3 with: ssh-key: true branch: gh-pages From 58b695e383dd5203cb76564c32a5e41181885cf1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 19:41:52 +0000 Subject: [PATCH 246/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.14.18 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d4554afc63..5ad12d81d7 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ net.bytebuddy byte-buddy-agent - 1.14.17 + 1.14.18 test From 37eabf8c9bfdbc0e5657c54d9d3309bb3458103a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 22:35:41 +0000 Subject: [PATCH 247/383] Update dependency net.bytebuddy:byte-buddy to v1.14.18 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d4554afc63..fb88375984 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.14.18 test From 280814fa39deb6a5261d2c1c111ca91e4142a8d7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 18:46:15 +0000 Subject: [PATCH 248/383] Update dependency org.assertj:assertj-core to v3.26.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9d6142e977..9c46e3174a 100644 --- a/pom.xml +++ b/pom.xml @@ -250,7 +250,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 test From a0832abcf4e10cd5d8d0abb074c8c9f5e0c157d6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 10:26:34 +0000 Subject: [PATCH 249/383] Update spring core to v6.1.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9c46e3174a..bd72f8cee3 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 10.17.1.0 3.5.16 - 6.1.10 + 6.1.11 3.3.1 5.1.2 org.mybatis.spring From 593380bd3dd4e083488a51443ac65ebb2cfd1d5f Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 13 Jul 2024 20:39:52 -0400 Subject: [PATCH 250/383] [ci] Update copyright date --- .../java/org/mybatis/spring/filter/xml/appContextAnnoFilter.xml | 2 +- .../org/mybatis/spring/filter/xml/appContextAspectJFilter.xml | 2 +- .../org/mybatis/spring/filter/xml/appContextAssignFilter.xml | 2 +- .../org/mybatis/spring/filter/xml/appContextCombinedFilter.xml | 2 +- .../java/org/mybatis/spring/filter/xml/appContextCustFilter.xml | 2 +- .../org/mybatis/spring/filter/xml/appContextInvalidFilter.xml | 2 +- .../org/mybatis/spring/filter/xml/appContextInvalidFilter1.xml | 2 +- .../org/mybatis/spring/filter/xml/appContextInvalidFilter2.xml | 2 +- .../org/mybatis/spring/filter/xml/appContextPlaceHolder.xml | 2 +- .../org/mybatis/spring/filter/xml/appContextPlaceHolder1.xml | 2 +- .../spring/filter/xml/appContextProcessPlaceHolderOff.xml | 2 +- .../org/mybatis/spring/filter/xml/appContextRegexFilter.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/test/java/org/mybatis/spring/filter/xml/appContextAnnoFilter.xml b/src/test/java/org/mybatis/spring/filter/xml/appContextAnnoFilter.xml index c04257fe35..226600a61a 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/appContextAnnoFilter.xml +++ b/src/test/java/org/mybatis/spring/filter/xml/appContextAnnoFilter.xml @@ -1,7 +1,7 @@ 17 17 + 17 + 17 10.17.1.0 3.5.16 @@ -475,15 +477,6 @@ - - pre16 - - (,16) - - - 10.15.2.0 - - 17 From 1433d478524734d340748485197820ebaa20b9cd Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 14:50:13 -0400 Subject: [PATCH 260/383] [docs] javax.inject should be jakarta and reference to EE version should be removed on specific version as Jakarta is all that way --- src/site/es/markdown/mappers.md | 2 +- src/site/ja/markdown/mappers.md | 2 +- src/site/ko/markdown/mappers.md | 2 +- src/site/markdown/mappers.md | 2 +- src/site/zh_CN/markdown/mappers.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/site/es/markdown/mappers.md b/src/site/es/markdown/mappers.md index 5b10210fa8..01e3bce019 100644 --- a/src/site/es/markdown/mappers.md +++ b/src/site/es/markdown/mappers.md @@ -141,7 +141,7 @@ Si se indican ambas se aÃąadirÃĄn todos los mappers que cumplan **cualquier** cr Los mappers descubiertos serÃĄn nombrados usando la estratÊgia de nombres por defecto de Spring para los componentes autodetectados (see [the Spring reference document(Core Technologies -Naming autodetected components-](https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#beans-scanning-name-generator)). Es decir, si no se encuentra ninguna anotaciÃŗn, se usarÃĄ el nombre no cualificado sin capitalizar del mapper. Pero si se encuentra una anotaciÃŗn `@Component` o JSR-330 `@Named` se obtendrÃĄ el nombre de dicha anotaciÃŗn. -Fíjate que puedes usar como valor de la `annotation` el valor `org.springframework.stereotype.Component`, `javax.inject.Named` (if you have JSE 6) o una anotaciÃŗn propia (que debe ser a su vez anotada) de forma que la anotaciÃŗn harÃĄ las veces de localizador y de proveedor de nombre. +Fíjate que puedes usar como valor de la `annotation` el valor `org.springframework.stereotype.Component`, `jakarta.inject.Named` (if you have Jakarta EE) o una anotaciÃŗn propia (que debe ser a su vez anotada) de forma que la anotaciÃŗn harÃĄ las veces de localizador y de proveedor de nombre. NOTE `` no puede encontrar y registrar mappers. Los mappers son interfaces y, para poderlos registrar en Spring, el scanner deben conocer cÃŗmo crear un `MapperFactoryBean` para cada interfaz encontrado. diff --git a/src/site/ja/markdown/mappers.md b/src/site/ja/markdown/mappers.md index 03dcb250a1..9d9a7f09a6 100644 --- a/src/site/ja/markdown/mappers.md +++ b/src/site/ja/markdown/mappers.md @@ -139,7 +139,7 @@ XML č¨­åŽšãŽäž‹īŧš 検å‡ēされた Mapper は、Spring ぎč‡Ē動検å‡ēã‚ŗãƒŗポãƒŧネãƒŗトãĢ寞するデフりãƒĢトå‘Ŋ名čĻå‰‡ãĢよãŖãĻ Bean 名がæąēめられぞす[the Spring reference document(Core Technologies -Naming autodetected components-](https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#beans-scanning-name-generator) を参į…§ã—ãĻください。 ã‚ĸノテãƒŧã‚ˇãƒ§ãƒŗãĢよる指厚がãĒい場合はクナ゚名ぎ先頭を小文字ãĢした文字列が Bean 名とãĒりぞすが、`@Component` あるいは JSR-330 ぎ `@Named` ã‚ĸノテãƒŧã‚ˇãƒ§ãƒŗをäŊŋãŖãĻ Bean 名を明į¤ēįš„ãĢ指厚することもできぞす。 -先ãĢčĒŦ明した `annotation` åąžæ€§ã§ `org.springframework.stereotype.Component` や `javax.inject.Named` īŧˆJava 6 äģĨ降を刊į”¨ã—ãĻいる場合ぎãŋīŧ‰ã‚’指厚すれば、検å‡ē時ぎマãƒŧã‚Ģãƒŧと Bean 名ぎ指厚をīŧ‘つぎã‚ĸノテãƒŧã‚ˇãƒ§ãƒŗでå…ŧねることができぞす。 +先ãĢčĒŦ明した `annotation` åąžæ€§ã§ `org.springframework.stereotype.Component` や `jakarta.inject.Named` īŧˆJakarta EE äģĨ降を刊į”¨ã—ãĻいる場合ぎãŋīŧ‰ã‚’指厚すれば、検å‡ē時ぎマãƒŧã‚Ģãƒŧと Bean 名ぎ指厚をīŧ‘つぎã‚ĸノテãƒŧã‚ˇãƒ§ãƒŗでå…ŧねることができぞす。 同じį›Žįš„でį‹Ŧč‡ĒãĢ厚įžŠã—たã‚ĸノテãƒŧã‚ˇãƒ§ãƒŗをäŊŋうこともできぞすが、こぎã‚ĸノテãƒŧã‚ˇãƒ§ãƒŗč‡ĒäŊ“ãĢ `@Component` か `@Named` をäģ˜åŠ ã—ãĻおくåŋ…čĻãŒã‚りぞす。 NOTE diff --git a/src/site/ko/markdown/mappers.md b/src/site/ko/markdown/mappers.md index c56ba731ff..0d3c2bdf78 100644 --- a/src/site/ko/markdown/mappers.md +++ b/src/site/ko/markdown/mappers.md @@ -136,7 +136,7 @@ The `default-scope` apply to the mapper bean(`MapperFactoryBean`) when scope of 발ę˛Ŧ된 매íŧ는 ėžë™ę˛€ėƒ‰ëœ ėģ´íŦ넌트ëĨŧ ėœ„í•œ ėŠ¤í”„링ė˜ 디폴트 ëĒ…ëĒ…ęˇœėš™ ė „ëžĩ(see [the Spring reference document(Core Technologies -Naming autodetected components-)](https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#beans-scanning-name-generator) ė„ ė‚ŦėšŠí•´ė„œ 뚈ė´ëĻ„ė´ ëĒ…ëĒ…된다. 뚈 ė´ëĻ„ė„ ė •í•˜ëŠ” ė• ë…¸í…Œė´ė…˜ė´ ė—†ë‹¤ëŠ´ 매íŧė˜ ė´ëĻ„ė—ė„œ ė˛Ģ글ėžëĨŧ ė†ŒëŦ¸ėžëĄœ ëŗ€í™˜í•œ 형태로 뚈 ė´ëĻ„ė„ ė‚ŦėšŠí•  것ė´ë‹¤. `@Component` 나 JSR-330ė˜ `@Named` ė• ë…¸í…Œė´ė…˜ė´ ėžˆë‹¤ëŠ´ ė• ë…¸í…Œė´ė…˜ė— ė •ė˜í•œ ė´ëĻ„ė„ 그대로 ė‚ŦėšŠí•  것ė´ë‹¤. -`annotation` 프로íŧ티ëĨŧ `org.springframework.stereotype.Component`, `javax.inject.Named`(ėžë°”SE 1.6ė„ ė‚ŦėšŠí•œë‹¤ëŠ´) 또는 개발ėžę°€ ėŠ¤ėŠ¤ëĄœ ėž‘ė„ąí•œ ė• ë…¸í…Œė´ė…˜ėœŧ로 ė…‹íŒ…í•  ėˆ˜ ėžˆë‹¤. +`annotation` 프로íŧ티ëĨŧ `org.springframework.stereotype.Component`, `jakarta.inject.Named`(Jakarta EEė„ ė‚ŦėšŠí•œë‹¤ëŠ´) 또는 개발ėžę°€ ėŠ¤ėŠ¤ëĄœ ėž‘ė„ąí•œ ė• ë…¸í…Œė´ė…˜ėœŧ로 ė…‹íŒ…í•  ėˆ˜ ėžˆë‹¤. ꡸ëŸŦ늴 ė• ë…¸í…Œė´ė…˜ė€ 마ėģ¤ė™€ ė´ëĻ„ė„ ė œęŗĩ하는 ė—­í• ëĄœ 동ėž‘í•  것ė´ë‹¤. ė¤‘ėš” diff --git a/src/site/markdown/mappers.md b/src/site/markdown/mappers.md index ad365ff92f..79a6582e10 100644 --- a/src/site/markdown/mappers.md +++ b/src/site/markdown/mappers.md @@ -135,7 +135,7 @@ By default, these two properties are null, so all interfaces in the given base p Discovered mappers will be named using Spring default naming strategy for autodetected components (see [the Spring reference document(Core Technologies -Naming autodetected components-)](https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#beans-scanning-name-generator)). That is, if no annotation is found, it will use the uncapitalized non-qualified class name of the mapper. But if either a `@Component` or a JSR-330 `@Named` annotation is found it will get the name from the annotation. -Notice that you can set the `annotation` attribute to `org.springframework.stereotype.Component`, `javax.inject.Named` (if you have JSE 6) or to your own annotation (that must be itself annotated) so the annotation will work both as a marker and as a name provider. +Notice that you can set the `annotation` attribute to `org.springframework.stereotype.Component`, `jakarta.inject.Named` (if you have JakartaEE) or to your own annotation (that must be itself annotated) so the annotation will work both as a marker and as a name provider. NOTE `` won't be able to scan and register mappers. Mappers are interfaces and, in order to register them to Spring, the scanner must know how to create a `MapperFactoryBean` for each interface it finds. diff --git a/src/site/zh_CN/markdown/mappers.md b/src/site/zh_CN/markdown/mappers.md index 0d5dff3ae7..d9cd92b532 100644 --- a/src/site/zh_CN/markdown/mappers.md +++ b/src/site/zh_CN/markdown/mappers.md @@ -137,7 +137,7 @@ public interface GoodsMapper { čĸĢ发įŽ°įš„映射器äŧšæŒ‰į…§ Spring 寚č‡Ē动发įŽ°įģ„äģļįš„éģ˜čŽ¤å‘Ŋ名į­–į•Ĩčŋ›čĄŒå‘Ŋ名īŧˆå‚č€ƒ [the Spring reference document(Core Technologies -Naming autodetected components-)](https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#beans-scanning-name-generator) īŧ‰ã€‚ äšŸå°ąæ˜¯č¯´īŧŒåĻ‚æžœæ˛Ąæœ‰äŊŋį”¨æŗ¨č§Ŗ昞åŧæŒ‡åŽšåį§°īŧŒå°†äŧšäŊŋį”¨æ˜ å°„器įš„éĻ–字母小写非全限厚įąģ名äŊœä¸ē名į§°ã€‚äŊ†åĻ‚果发įŽ°æ˜ å°„å™¨å…ˇæœ‰ `@Component` 或 JSR-330 标准中 `@Named` æŗ¨č§ŖīŧŒäŧšäŊŋį”¨æŗ¨č§Ŗ中įš„名į§°äŊœä¸ē名į§°ã€‚ -提醒一下īŧŒäŊ å¯äģĨ莞įŊŽ `annotation` åąžæ€§ä¸ēäŊ č‡Ē厚䚉įš„æŗ¨č§ŖīŧŒį„ļ后在äŊ įš„æŗ¨č§Ŗ上设įŊŽ `org.springframework.stereotype.Component` 或 `javax.inject.Named`īŧˆéœ€čĻäŊŋį”¨ Java SE 6 äģĨ上īŧ‰æŗ¨č§ŖīŧŒčŋ™æ ˇäŊ įš„æŗ¨č§Ŗæ—ĸ可äģĨäŊœä¸ēæ ‡čŽ°īŧŒäšŸå¯äģĨäŊœä¸ē一ä¸Ē名字提䞛器æĨäŊŋį”¨äē†ã€‚ +提醒一下īŧŒäŊ å¯äģĨ莞įŊŽ `annotation` åąžæ€§ä¸ēäŊ č‡Ē厚䚉įš„æŗ¨č§ŖīŧŒį„ļ后在äŊ įš„æŗ¨č§Ŗ上设įŊŽ `org.springframework.stereotype.Component` 或 `jakarta.inject.Named`īŧˆéœ€čĻäŊŋį”¨ Jakarta EE äģĨ上īŧ‰æŗ¨č§ŖīŧŒčŋ™æ ˇäŊ įš„æŗ¨č§Ŗæ—ĸ可äģĨäŊœä¸ēæ ‡čŽ°īŧŒäšŸå¯äģĨäŊœä¸ē一ä¸Ē名字提䞛器æĨäŊŋį”¨äē†ã€‚ 提į¤ē `` 无æŗ•å‘įŽ°åšļæŗ¨å†Œæ˜ å°„器。映射器įš„æœŦč´¨æ˜¯æŽĨåŖīŧŒä¸ēäē†å°†åŽƒäģŦæŗ¨å†Œåˆ° Spring 中īŧŒå‘įŽ°å™¨åŋ…éĄģįŸĨ道åĻ‚äŊ•ä¸ē扞到įš„每ä¸ĒæŽĨåŖ创åģē一ä¸Ē `MapperFactoryBean`。 From 7c33fd0710b9474e6bd86dd367655d48a8d5a8f6 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 14:53:49 -0400 Subject: [PATCH 261/383] [layout] Move tests into standard maven directory layout --- src/test/{java => resources}/org/mybatis/spring/TestMapper.xml | 2 +- src/test/{java => resources}/org/mybatis/spring/TestMapper2.xml | 2 +- src/test/{java => resources}/org/mybatis/spring/TestMapper3.xml | 2 +- .../org/mybatis/spring/annotation/override.properties | 2 +- .../org/mybatis/spring/annotation/placeholders.properties | 2 +- .../org/mybatis/spring/annotation/scan.properties | 2 +- .../org/mybatis/spring/batch/applicationContext.xml | 2 +- .../org/mybatis/spring/batch/dao/EmployeeMapper.xml | 2 +- .../org/mybatis/spring/batch/db/database-schema.sql | 2 +- .../org/mybatis/spring/batch/db/database-test-data.sql | 2 +- .../org/mybatis/spring/config/annotation.xml | 2 +- .../org/mybatis/spring/config/base-package.xml | 2 +- .../org/mybatis/spring/config/default-scope.properties | 2 +- .../org/mybatis/spring/config/default-scope.xml | 2 +- .../org/mybatis/spring/config/factory-ref.xml | 2 +- .../org/mybatis/spring/config/lazy.properties | 2 +- src/test/{java => resources}/org/mybatis/spring/config/lazy.xml | 2 +- .../org/mybatis/spring/config/mapper-factory-bean-class.xml | 2 +- .../org/mybatis/spring/config/marker-and-annotation.xml | 2 +- .../org/mybatis/spring/config/marker-interface.xml | 2 +- .../org/mybatis/spring/config/name-generator.xml | 2 +- .../org/mybatis/spring/config/override.properties | 2 +- .../org/mybatis/spring/config/placeholders.properties | 2 +- .../spring/config/process-property-placeholders-false.xml | 2 +- .../spring/config/process-property-placeholders-true.xml | 2 +- .../org/mybatis/spring/config/template-ref.xml | 2 +- .../org/mybatis/spring/filter/config/application.properties | 2 +- .../org/mybatis/spring/filter/xml/appContextAnnoFilter.xml | 0 .../org/mybatis/spring/filter/xml/appContextAspectJFilter.xml | 0 .../org/mybatis/spring/filter/xml/appContextAssignFilter.xml | 0 .../org/mybatis/spring/filter/xml/appContextCombinedFilter.xml | 0 .../org/mybatis/spring/filter/xml/appContextCustFilter.xml | 0 .../org/mybatis/spring/filter/xml/appContextInvalidFilter.xml | 0 .../org/mybatis/spring/filter/xml/appContextInvalidFilter1.xml | 0 .../org/mybatis/spring/filter/xml/appContextInvalidFilter2.xml | 0 .../org/mybatis/spring/filter/xml/appContextPlaceHolder.xml | 0 .../org/mybatis/spring/filter/xml/appContextPlaceHolder1.xml | 0 .../spring/filter/xml/appContextProcessPlaceHolderOff.xml | 0 .../org/mybatis/spring/filter/xml/appContextRegexFilter.xml | 0 .../org/mybatis/spring/filter/xml/default.properties | 2 +- .../{java => resources}/org/mybatis/spring/mybatis-config.xml | 2 +- .../mybatis/spring/sample/config/applicationContext-batch.xml | 2 +- .../spring/sample/config/applicationContext-infrastructure.xml | 2 +- .../org/mybatis/spring/sample/config/applicationContext-job.xml | 2 +- .../mybatis/spring/sample/config/applicationContext-mapper.xml | 2 +- .../spring/sample/config/applicationContext-namespace.xml | 2 +- .../mybatis/spring/sample/config/applicationContext-scanner.xml | 2 +- .../spring/sample/config/applicationContext-sqlsession.xml | 2 +- .../org/mybatis/spring/sample/db/database-schema.sql | 2 +- .../org/mybatis/spring/sample/db/database-test-data.sql | 2 +- .../org/mybatis/spring/sample/mapper/PersonMapper.xml | 2 +- .../org/mybatis/spring/sample/mapper/UserMapper.xml | 2 +- .../org/mybatis/spring/submitted/autowire/BarMapper.xml | 2 +- .../org/mybatis/spring/submitted/autowire/FooMapper.xml | 2 +- .../mybatis/spring/submitted/autowire/database-schema-bar.sql | 2 +- .../mybatis/spring/submitted/autowire/database-schema-foo.sql | 2 +- .../org/mybatis/spring/submitted/autowire/spring.xml | 2 +- .../mybatis/spring/submitted/webapp_placeholder/conf.properties | 2 +- .../org/mybatis/spring/submitted/webapp_placeholder/spring.xml | 2 +- .../org/mybatis/spring/submitted/xa/applicationContext.xml | 2 +- .../org/mybatis/spring/submitted/xa/database-schema.sql | 2 +- 61 files changed, 49 insertions(+), 49 deletions(-) rename src/test/{java => resources}/org/mybatis/spring/TestMapper.xml (95%) rename src/test/{java => resources}/org/mybatis/spring/TestMapper2.xml (93%) rename src/test/{java => resources}/org/mybatis/spring/TestMapper3.xml (93%) rename src/test/{java => resources}/org/mybatis/spring/annotation/override.properties (91%) rename src/test/{java => resources}/org/mybatis/spring/annotation/placeholders.properties (91%) rename src/test/{java => resources}/org/mybatis/spring/annotation/scan.properties (91%) rename src/test/{java => resources}/org/mybatis/spring/batch/applicationContext.xml (98%) rename src/test/{java => resources}/org/mybatis/spring/batch/dao/EmployeeMapper.xml (97%) rename src/test/{java => resources}/org/mybatis/spring/batch/db/database-schema.sql (92%) rename src/test/{java => resources}/org/mybatis/spring/batch/db/database-test-data.sql (94%) rename src/test/{java => resources}/org/mybatis/spring/config/annotation.xml (96%) rename src/test/{java => resources}/org/mybatis/spring/config/base-package.xml (96%) rename src/test/{java => resources}/org/mybatis/spring/config/default-scope.properties (91%) rename src/test/{java => resources}/org/mybatis/spring/config/default-scope.xml (96%) rename src/test/{java => resources}/org/mybatis/spring/config/factory-ref.xml (96%) rename src/test/{java => resources}/org/mybatis/spring/config/lazy.properties (91%) rename src/test/{java => resources}/org/mybatis/spring/config/lazy.xml (96%) rename src/test/{java => resources}/org/mybatis/spring/config/mapper-factory-bean-class.xml (95%) rename src/test/{java => resources}/org/mybatis/spring/config/marker-and-annotation.xml (96%) rename src/test/{java => resources}/org/mybatis/spring/config/marker-interface.xml (96%) rename src/test/{java => resources}/org/mybatis/spring/config/name-generator.xml (95%) rename src/test/{java => resources}/org/mybatis/spring/config/override.properties (91%) rename src/test/{java => resources}/org/mybatis/spring/config/placeholders.properties (91%) rename src/test/{java => resources}/org/mybatis/spring/config/process-property-placeholders-false.xml (97%) rename src/test/{java => resources}/org/mybatis/spring/config/process-property-placeholders-true.xml (97%) rename src/test/{java => resources}/org/mybatis/spring/config/template-ref.xml (96%) rename src/test/{java => resources}/org/mybatis/spring/filter/config/application.properties (92%) rename src/test/{java => resources}/org/mybatis/spring/filter/xml/appContextAnnoFilter.xml (100%) rename src/test/{java => resources}/org/mybatis/spring/filter/xml/appContextAspectJFilter.xml (100%) rename src/test/{java => resources}/org/mybatis/spring/filter/xml/appContextAssignFilter.xml (100%) rename src/test/{java => resources}/org/mybatis/spring/filter/xml/appContextCombinedFilter.xml (100%) rename src/test/{java => resources}/org/mybatis/spring/filter/xml/appContextCustFilter.xml (100%) rename src/test/{java => resources}/org/mybatis/spring/filter/xml/appContextInvalidFilter.xml (100%) rename src/test/{java => resources}/org/mybatis/spring/filter/xml/appContextInvalidFilter1.xml (100%) rename src/test/{java => resources}/org/mybatis/spring/filter/xml/appContextInvalidFilter2.xml (100%) rename src/test/{java => resources}/org/mybatis/spring/filter/xml/appContextPlaceHolder.xml (100%) rename src/test/{java => resources}/org/mybatis/spring/filter/xml/appContextPlaceHolder1.xml (100%) rename src/test/{java => resources}/org/mybatis/spring/filter/xml/appContextProcessPlaceHolderOff.xml (100%) rename src/test/{java => resources}/org/mybatis/spring/filter/xml/appContextRegexFilter.xml (100%) rename src/test/{java => resources}/org/mybatis/spring/filter/xml/default.properties (93%) rename src/test/{java => resources}/org/mybatis/spring/mybatis-config.xml (95%) rename src/test/{java => resources}/org/mybatis/spring/sample/config/applicationContext-batch.xml (96%) rename src/test/{java => resources}/org/mybatis/spring/sample/config/applicationContext-infrastructure.xml (98%) rename src/test/{java => resources}/org/mybatis/spring/sample/config/applicationContext-job.xml (98%) rename src/test/{java => resources}/org/mybatis/spring/sample/config/applicationContext-mapper.xml (96%) rename src/test/{java => resources}/org/mybatis/spring/sample/config/applicationContext-namespace.xml (96%) rename src/test/{java => resources}/org/mybatis/spring/sample/config/applicationContext-scanner.xml (96%) rename src/test/{java => resources}/org/mybatis/spring/sample/config/applicationContext-sqlsession.xml (96%) rename src/test/{java => resources}/org/mybatis/spring/sample/db/database-schema.sql (94%) rename src/test/{java => resources}/org/mybatis/spring/sample/db/database-test-data.sql (93%) rename src/test/{java => resources}/org/mybatis/spring/sample/mapper/PersonMapper.xml (94%) rename src/test/{java => resources}/org/mybatis/spring/sample/mapper/UserMapper.xml (95%) rename src/test/{java => resources}/org/mybatis/spring/submitted/autowire/BarMapper.xml (94%) mode change 100755 => 100644 rename src/test/{java => resources}/org/mybatis/spring/submitted/autowire/FooMapper.xml (93%) rename src/test/{java => resources}/org/mybatis/spring/submitted/autowire/database-schema-bar.sql (92%) mode change 100755 => 100644 rename src/test/{java => resources}/org/mybatis/spring/submitted/autowire/database-schema-foo.sql (92%) mode change 100755 => 100644 rename src/test/{java => resources}/org/mybatis/spring/submitted/autowire/spring.xml (98%) rename src/test/{java => resources}/org/mybatis/spring/submitted/webapp_placeholder/conf.properties (92%) rename src/test/{java => resources}/org/mybatis/spring/submitted/webapp_placeholder/spring.xml (96%) rename src/test/{java => resources}/org/mybatis/spring/submitted/xa/applicationContext.xml (99%) rename src/test/{java => resources}/org/mybatis/spring/submitted/xa/database-schema.sql (92%) diff --git a/src/test/java/org/mybatis/spring/TestMapper.xml b/src/test/resources/org/mybatis/spring/TestMapper.xml similarity index 95% rename from src/test/java/org/mybatis/spring/TestMapper.xml rename to src/test/resources/org/mybatis/spring/TestMapper.xml index 6678c0ffa4..389d432dba 100644 --- a/src/test/java/org/mybatis/spring/TestMapper.xml +++ b/src/test/resources/org/mybatis/spring/TestMapper.xml @@ -1,7 +1,7 @@ @@ -325,12 +333,6 @@ 6.1.0 test - - org.aspectj - aspectjweaver - 1.9.22.1 - true - net.bytebuddy From a87843d9a933e8ff20aecc4f32e8de0fcd5af77c Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 14:55:53 -0400 Subject: [PATCH 265/383] [pom] Remove old exclusion no longer needed --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 664e556103..9be4e08be3 100644 --- a/pom.xml +++ b/pom.xml @@ -286,10 +286,6 @@ nekohtml nekohtml - - junit - junit - From a2dfb40aa3ab57c0416d4bbb7b3a7a3d395d386b Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 14:56:04 -0400 Subject: [PATCH 266/383] [pom] Prefer standard directory layout --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index 9be4e08be3..fce0e4ef20 100644 --- a/pom.xml +++ b/pom.xml @@ -402,14 +402,6 @@ ${project.basedir}/src/main/resources - - - ${project.build.testSourceDirectory} - - **/*.java - - - org.apache.maven.plugins From 7d18e7a4ce4f897555527756fd37c7f14b0a5f78 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 14:56:22 -0400 Subject: [PATCH 267/383] [pom] Update deprecated surefire systemProperties to systemPropertyVariables --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fce0e4ef20..e7f4ab9dbb 100644 --- a/pom.xml +++ b/pom.xml @@ -407,7 +407,7 @@ org.apache.maven.plugins maven-surefire-plugin - + derby.stream.error.file ${project.build.directory}/derby.log @@ -416,7 +416,7 @@ com.atomikos.icatch.log_base_dir ${project.build.directory} - + From 3f0679a5be4700c9c2e7c261fe8a12801a7b0066 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 14:56:34 -0400 Subject: [PATCH 268/383] [pom] Use maven variable for directory --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e7f4ab9dbb..5e4b090f48 100644 --- a/pom.xml +++ b/pom.xml @@ -434,7 +434,7 @@ ${project.build.directory}/site-src - src/site + ${project.basedir}/src/site true From b71197644ec340c2ea9623a28cf4e58f35369eb2 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 15:09:32 -0400 Subject: [PATCH 269/383] [docs] Remove legacy inheritDoc as @Overrides does same thing --- .../spring/MyBatisExceptionTranslator.java | 3 - .../mybatis/spring/SqlSessionFactoryBean.java | 15 --- .../mybatis/spring/SqlSessionTemplate.java | 92 ------------------- .../org/mybatis/spring/SqlSessionUtils.java | 18 ---- .../annotation/MapperScannerRegistrar.java | 9 -- .../spring/batch/MyBatisBatchItemWriter.java | 3 - .../MapperScannerBeanDefinitionParser.java | 11 --- .../spring/config/NamespaceHandler.java | 3 - .../spring/mapper/ClassPathMapperScanner.java | 6 -- .../spring/mapper/MapperFactoryBean.java | 12 --- .../mapper/MapperScannerConfigurer.java | 17 ---- .../spring/support/SqlSessionDaoSupport.java | 3 - .../transaction/SpringManagedTransaction.java | 15 --- .../SpringManagedTransactionFactory.java | 9 -- 14 files changed, 216 deletions(-) diff --git a/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java b/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java index f7a8bb5825..09c33cb2bb 100644 --- a/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java +++ b/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java @@ -74,9 +74,6 @@ public MyBatisExceptionTranslator(Supplier exceptionTran } } - /** - * {@inheritDoc} - */ @Override public DataAccessException translateExceptionIfPossible(RuntimeException e) { if (e instanceof PersistenceException) { diff --git a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java index c4032f142c..4ed4961282 100644 --- a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java +++ b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java @@ -564,9 +564,6 @@ private T[] appendArrays(T[] oldArrays, T[] newArrays, IntFunction gene } } - /** - * {@inheritDoc} - */ @Override public void afterPropertiesSet() throws Exception { notNull(dataSource, "Property 'dataSource' is required"); @@ -711,9 +708,6 @@ protected SqlSessionFactory buildSqlSessionFactory() throws Exception { return this.sqlSessionFactoryBuilder.build(targetConfiguration); } - /** - * {@inheritDoc} - */ @Override public SqlSessionFactory getObject() throws Exception { if (this.sqlSessionFactory == null) { @@ -723,25 +717,16 @@ public SqlSessionFactory getObject() throws Exception { return this.sqlSessionFactory; } - /** - * {@inheritDoc} - */ @Override public Class getObjectType() { return this.sqlSessionFactory == null ? SqlSessionFactory.class : this.sqlSessionFactory.getClass(); } - /** - * {@inheritDoc} - */ @Override public boolean isSingleton() { return true; } - /** - * {@inheritDoc} - */ @Override public void onApplicationEvent(ContextRefreshedEvent event) { if (failFast) { diff --git a/src/main/java/org/mybatis/spring/SqlSessionTemplate.java b/src/main/java/org/mybatis/spring/SqlSessionTemplate.java index cb6eaf4bd6..16f9ebf80b 100644 --- a/src/main/java/org/mybatis/spring/SqlSessionTemplate.java +++ b/src/main/java/org/mybatis/spring/SqlSessionTemplate.java @@ -144,243 +144,151 @@ public PersistenceExceptionTranslator getPersistenceExceptionTranslator() { return this.exceptionTranslator; } - /** - * {@inheritDoc} - */ @Override public T selectOne(String statement) { return this.sqlSessionProxy.selectOne(statement); } - /** - * {@inheritDoc} - */ @Override public T selectOne(String statement, Object parameter) { return this.sqlSessionProxy.selectOne(statement, parameter); } - /** - * {@inheritDoc} - */ @Override public Map selectMap(String statement, String mapKey) { return this.sqlSessionProxy.selectMap(statement, mapKey); } - /** - * {@inheritDoc} - */ @Override public Map selectMap(String statement, Object parameter, String mapKey) { return this.sqlSessionProxy.selectMap(statement, parameter, mapKey); } - /** - * {@inheritDoc} - */ @Override public Map selectMap(String statement, Object parameter, String mapKey, RowBounds rowBounds) { return this.sqlSessionProxy.selectMap(statement, parameter, mapKey, rowBounds); } - /** - * {@inheritDoc} - */ @Override public Cursor selectCursor(String statement) { return this.sqlSessionProxy.selectCursor(statement); } - /** - * {@inheritDoc} - */ @Override public Cursor selectCursor(String statement, Object parameter) { return this.sqlSessionProxy.selectCursor(statement, parameter); } - /** - * {@inheritDoc} - */ @Override public Cursor selectCursor(String statement, Object parameter, RowBounds rowBounds) { return this.sqlSessionProxy.selectCursor(statement, parameter, rowBounds); } - /** - * {@inheritDoc} - */ @Override public List selectList(String statement) { return this.sqlSessionProxy.selectList(statement); } - /** - * {@inheritDoc} - */ @Override public List selectList(String statement, Object parameter) { return this.sqlSessionProxy.selectList(statement, parameter); } - /** - * {@inheritDoc} - */ @Override public List selectList(String statement, Object parameter, RowBounds rowBounds) { return this.sqlSessionProxy.selectList(statement, parameter, rowBounds); } - /** - * {@inheritDoc} - */ @Override public void select(String statement, ResultHandler handler) { this.sqlSessionProxy.select(statement, handler); } - /** - * {@inheritDoc} - */ @Override public void select(String statement, Object parameter, ResultHandler handler) { this.sqlSessionProxy.select(statement, parameter, handler); } - /** - * {@inheritDoc} - */ @Override public void select(String statement, Object parameter, RowBounds rowBounds, ResultHandler handler) { this.sqlSessionProxy.select(statement, parameter, rowBounds, handler); } - /** - * {@inheritDoc} - */ @Override public int insert(String statement) { return this.sqlSessionProxy.insert(statement); } - /** - * {@inheritDoc} - */ @Override public int insert(String statement, Object parameter) { return this.sqlSessionProxy.insert(statement, parameter); } - /** - * {@inheritDoc} - */ @Override public int update(String statement) { return this.sqlSessionProxy.update(statement); } - /** - * {@inheritDoc} - */ @Override public int update(String statement, Object parameter) { return this.sqlSessionProxy.update(statement, parameter); } - /** - * {@inheritDoc} - */ @Override public int delete(String statement) { return this.sqlSessionProxy.delete(statement); } - /** - * {@inheritDoc} - */ @Override public int delete(String statement, Object parameter) { return this.sqlSessionProxy.delete(statement, parameter); } - /** - * {@inheritDoc} - */ @Override public T getMapper(Class type) { return getConfiguration().getMapper(type, this); } - /** - * {@inheritDoc} - */ @Override public void commit() { throw new UnsupportedOperationException("Manual commit is not allowed over a Spring managed SqlSession"); } - /** - * {@inheritDoc} - */ @Override public void commit(boolean force) { throw new UnsupportedOperationException("Manual commit is not allowed over a Spring managed SqlSession"); } - /** - * {@inheritDoc} - */ @Override public void rollback() { throw new UnsupportedOperationException("Manual rollback is not allowed over a Spring managed SqlSession"); } - /** - * {@inheritDoc} - */ @Override public void rollback(boolean force) { throw new UnsupportedOperationException("Manual rollback is not allowed over a Spring managed SqlSession"); } - /** - * {@inheritDoc} - */ @Override public void close() { throw new UnsupportedOperationException("Manual close is not allowed over a Spring managed SqlSession"); } - /** - * {@inheritDoc} - */ @Override public void clearCache() { this.sqlSessionProxy.clearCache(); } - /** - * {@inheritDoc} - */ @Override public Configuration getConfiguration() { return this.sqlSessionFactory.getConfiguration(); } - /** - * {@inheritDoc} - */ @Override public Connection getConnection() { return this.sqlSessionProxy.getConnection(); } - /** - * {@inheritDoc} - * - * @since 1.0.2 - */ @Override public List flushStatements() { return this.sqlSessionProxy.flushStatements(); diff --git a/src/main/java/org/mybatis/spring/SqlSessionUtils.java b/src/main/java/org/mybatis/spring/SqlSessionUtils.java index f36272f0d2..5dbea2862e 100644 --- a/src/main/java/org/mybatis/spring/SqlSessionUtils.java +++ b/src/main/java/org/mybatis/spring/SqlSessionUtils.java @@ -241,18 +241,12 @@ public SqlSessionSynchronization(SqlSessionHolder holder, SqlSessionFactory sess this.sessionFactory = sessionFactory; } - /** - * {@inheritDoc} - */ @Override public int getOrder() { // order right before any Connection synchronization return DataSourceUtils.CONNECTION_SYNCHRONIZATION_ORDER - 1; } - /** - * {@inheritDoc} - */ @Override public void suspend() { if (this.holderActive) { @@ -261,9 +255,6 @@ public void suspend() { } } - /** - * {@inheritDoc} - */ @Override public void resume() { if (this.holderActive) { @@ -272,9 +263,6 @@ public void resume() { } } - /** - * {@inheritDoc} - */ @Override public void beforeCommit(boolean readOnly) { // Connection commit or rollback will be handled by ConnectionSynchronization or @@ -300,9 +288,6 @@ public void beforeCommit(boolean readOnly) { } } - /** - * {@inheritDoc} - */ @Override public void beforeCompletion() { // Issue #18 Close SqlSession and deregister it now @@ -317,9 +302,6 @@ public void beforeCompletion() { } } - /** - * {@inheritDoc} - */ @Override public void afterCompletion(int status) { if (this.holderActive) { diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java index 88155e15e0..beecd3199e 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java @@ -63,17 +63,11 @@ public class MapperScannerRegistrar implements ImportBeanDefinitionRegistrar, Re private ResourceLoader resourceLoader; - /** - * {@inheritDoc} - */ @Override public void setResourceLoader(ResourceLoader resourceLoader) { this.resourceLoader = resourceLoader; } - /** - * {@inheritDoc} - */ @Override public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) { AnnotationAttributes mapperScanAttrs = AnnotationAttributes @@ -249,9 +243,6 @@ private static String getDefaultBasePackage(AnnotationMetadata importingClassMet * @since 2.0.0 */ static class RepeatingRegistrar extends MapperScannerRegistrar { - /** - * {@inheritDoc} - */ @Override public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) { AnnotationAttributes mapperScansAttrs = AnnotationAttributes diff --git a/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java b/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java index 1da81f0547..de10b752d6 100644 --- a/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java +++ b/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java @@ -133,9 +133,6 @@ public void afterPropertiesSet() { notNull(itemToParameterConverter, "A itemToParameterConverter is required."); } - /** - * {@inheritDoc} - */ @Override public void write(final Chunk items) { diff --git a/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java b/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java index 5858a2e3b6..e85706e16f 100644 --- a/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java +++ b/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java @@ -50,7 +50,6 @@ * @see ClassPathMapperScanner * @see MapperScannerConfigurer */ - public class MapperScannerBeanDefinitionParser extends AbstractBeanDefinitionParser { private static final String ATTRIBUTE_BASE_PACKAGE = "base-package"; @@ -65,11 +64,6 @@ public class MapperScannerBeanDefinitionParser extends AbstractBeanDefinitionPar private static final String ATTRIBUTE_PROCESS_PROPERTY_PLACEHOLDERS = "process-property-placeholders"; private static final String ATTRIBUTE_EXCLUDE_FILTER = "exclude-filter"; - /** - * {@inheritDoc} - * - * @since 2.0.2 - */ @Override protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MapperScannerConfigurer.class); @@ -147,11 +141,6 @@ private List> parseScanTypeFilters(Element element, ParserCo return typeFilters; } - /** - * {@inheritDoc} - * - * @since 2.0.2 - */ @Override protected boolean shouldGenerateIdAsFallback() { return true; diff --git a/src/main/java/org/mybatis/spring/config/NamespaceHandler.java b/src/main/java/org/mybatis/spring/config/NamespaceHandler.java index e3e777f5d2..410fa886d9 100644 --- a/src/main/java/org/mybatis/spring/config/NamespaceHandler.java +++ b/src/main/java/org/mybatis/spring/config/NamespaceHandler.java @@ -28,9 +28,6 @@ */ public class NamespaceHandler extends NamespaceHandlerSupport { - /** - * {@inheritDoc} - */ @Override public void init() { registerBeanDefinitionParser("scan", new MapperScannerBeanDefinitionParser()); diff --git a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java index 441f433162..0e755007db 100644 --- a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java +++ b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java @@ -354,17 +354,11 @@ private void processBeanDefinitions(Set beanDefinitions) { } } - /** - * {@inheritDoc} - */ @Override protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) { return beanDefinition.getMetadata().isInterface() && beanDefinition.getMetadata().isIndependent(); } - /** - * {@inheritDoc} - */ @Override protected boolean checkCandidate(String beanName, BeanDefinition beanDefinition) { if (super.checkCandidate(beanName, beanDefinition)) { diff --git a/src/main/java/org/mybatis/spring/mapper/MapperFactoryBean.java b/src/main/java/org/mybatis/spring/mapper/MapperFactoryBean.java index 89e4e1e415..6c16d862d1 100644 --- a/src/main/java/org/mybatis/spring/mapper/MapperFactoryBean.java +++ b/src/main/java/org/mybatis/spring/mapper/MapperFactoryBean.java @@ -65,9 +65,6 @@ public MapperFactoryBean(Class mapperInterface) { this.mapperInterface = mapperInterface; } - /** - * {@inheritDoc} - */ @Override protected void checkDaoConfig() { super.checkDaoConfig(); @@ -87,25 +84,16 @@ protected void checkDaoConfig() { } } - /** - * {@inheritDoc} - */ @Override public T getObject() throws Exception { return getSqlSession().getMapper(this.mapperInterface); } - /** - * {@inheritDoc} - */ @Override public Class getObjectType() { return this.mapperInterface; } - /** - * {@inheritDoc} - */ @Override public boolean isSingleton() { return true; diff --git a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java index 613d064ae7..aec74d4544 100644 --- a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java +++ b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java @@ -322,17 +322,11 @@ public void setMapperFactoryBeanClass(Class mapperF this.mapperFactoryBeanClass = mapperFactoryBeanClass; } - /** - * {@inheritDoc} - */ @Override public void setApplicationContext(ApplicationContext applicationContext) { this.applicationContext = applicationContext; } - /** - * {@inheritDoc} - */ @Override public void setBeanName(String name) { this.beanName = name; @@ -376,27 +370,16 @@ public void setDefaultScope(String defaultScope) { this.defaultScope = defaultScope; } - /** - * {@inheritDoc} - */ @Override public void afterPropertiesSet() throws Exception { notNull(this.basePackage, "Property 'basePackage' is required"); } - /** - * {@inheritDoc} - */ @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) { // left intentionally blank } - /** - * {@inheritDoc} - * - * @since 1.0.2 - */ @Override public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) { if (this.processPropertyPlaceHolders) { diff --git a/src/main/java/org/mybatis/spring/support/SqlSessionDaoSupport.java b/src/main/java/org/mybatis/spring/support/SqlSessionDaoSupport.java index 0c312105be..c129bd6833 100644 --- a/src/main/java/org/mybatis/spring/support/SqlSessionDaoSupport.java +++ b/src/main/java/org/mybatis/spring/support/SqlSessionDaoSupport.java @@ -117,9 +117,6 @@ public SqlSessionTemplate getSqlSessionTemplate() { return this.sqlSessionTemplate; } - /** - * {@inheritDoc} - */ @Override protected void checkDaoConfig() { notNull(this.sqlSessionTemplate, "Property 'sqlSessionFactory' or 'sqlSessionTemplate' are required"); diff --git a/src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java b/src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java index 5bc038b51f..f2919e8b35 100644 --- a/src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java +++ b/src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java @@ -58,9 +58,6 @@ public SpringManagedTransaction(DataSource dataSource) { this.dataSource = dataSource; } - /** - * {@inheritDoc} - */ @Override public Connection getConnection() throws SQLException { if (this.connection == null) { @@ -85,9 +82,6 @@ private void openConnection() throws SQLException { + (this.isConnectionTransactional ? " " : " not ") + "be managed by Spring"); } - /** - * {@inheritDoc} - */ @Override public void commit() throws SQLException { if (this.connection != null && !this.isConnectionTransactional && !this.autoCommit) { @@ -96,9 +90,6 @@ public void commit() throws SQLException { } } - /** - * {@inheritDoc} - */ @Override public void rollback() throws SQLException { if (this.connection != null && !this.isConnectionTransactional && !this.autoCommit) { @@ -107,17 +98,11 @@ public void rollback() throws SQLException { } } - /** - * {@inheritDoc} - */ @Override public void close() throws SQLException { DataSourceUtils.releaseConnection(this.connection, this.dataSource); } - /** - * {@inheritDoc} - */ @Override public Integer getTimeout() throws SQLException { ConnectionHolder holder = (ConnectionHolder) TransactionSynchronizationManager.getResource(dataSource); diff --git a/src/main/java/org/mybatis/spring/transaction/SpringManagedTransactionFactory.java b/src/main/java/org/mybatis/spring/transaction/SpringManagedTransactionFactory.java index 32efd490f5..6135b13d4d 100644 --- a/src/main/java/org/mybatis/spring/transaction/SpringManagedTransactionFactory.java +++ b/src/main/java/org/mybatis/spring/transaction/SpringManagedTransactionFactory.java @@ -31,25 +31,16 @@ */ public class SpringManagedTransactionFactory implements TransactionFactory { - /** - * {@inheritDoc} - */ @Override public Transaction newTransaction(DataSource dataSource, TransactionIsolationLevel level, boolean autoCommit) { return new SpringManagedTransaction(dataSource); } - /** - * {@inheritDoc} - */ @Override public Transaction newTransaction(Connection conn) { throw new UnsupportedOperationException("New Spring transactions require a DataSource"); } - /** - * {@inheritDoc} - */ @Override public void setProperties(Properties props) { // not needed in this version From be8276180ff0c0808133b1cf2170166127df8fad Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 15:13:57 -0400 Subject: [PATCH 270/383] [ci] Update copyright dates --- .../java/org/mybatis/spring/MyBatisExceptionTranslator.java | 2 +- src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java | 2 +- src/main/java/org/mybatis/spring/SqlSessionTemplate.java | 2 +- src/main/java/org/mybatis/spring/SqlSessionUtils.java | 2 +- .../org/mybatis/spring/annotation/MapperScannerRegistrar.java | 2 +- .../java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java | 2 +- .../spring/config/MapperScannerBeanDefinitionParser.java | 2 +- src/main/java/org/mybatis/spring/config/NamespaceHandler.java | 2 +- src/main/java/org/mybatis/spring/mapper/MapperFactoryBean.java | 2 +- .../java/org/mybatis/spring/support/SqlSessionDaoSupport.java | 2 +- .../mybatis/spring/transaction/SpringManagedTransaction.java | 2 +- .../spring/transaction/SpringManagedTransactionFactory.java | 2 +- .../spring/asyncsynchronization/AsyncAfterCompletionHelper.java | 1 - 13 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java b/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java index 09c33cb2bb..c2215925c1 100644 --- a/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java +++ b/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. diff --git a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java index 4ed4961282..8a0a44c3d6 100644 --- a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java +++ b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. diff --git a/src/main/java/org/mybatis/spring/SqlSessionTemplate.java b/src/main/java/org/mybatis/spring/SqlSessionTemplate.java index 16f9ebf80b..130987488a 100644 --- a/src/main/java/org/mybatis/spring/SqlSessionTemplate.java +++ b/src/main/java/org/mybatis/spring/SqlSessionTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/main/java/org/mybatis/spring/SqlSessionUtils.java b/src/main/java/org/mybatis/spring/SqlSessionUtils.java index 5dbea2862e..9c2804ec1f 100644 --- a/src/main/java/org/mybatis/spring/SqlSessionUtils.java +++ b/src/main/java/org/mybatis/spring/SqlSessionUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java index beecd3199e..181273ea92 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. diff --git a/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java b/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java index de10b752d6..d2fbbdc3e7 100644 --- a/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java +++ b/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java b/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java index e85706e16f..33c93665f9 100644 --- a/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java +++ b/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. diff --git a/src/main/java/org/mybatis/spring/config/NamespaceHandler.java b/src/main/java/org/mybatis/spring/config/NamespaceHandler.java index 410fa886d9..12912c8dc6 100644 --- a/src/main/java/org/mybatis/spring/config/NamespaceHandler.java +++ b/src/main/java/org/mybatis/spring/config/NamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/main/java/org/mybatis/spring/mapper/MapperFactoryBean.java b/src/main/java/org/mybatis/spring/mapper/MapperFactoryBean.java index 6c16d862d1..a6fe818c65 100644 --- a/src/main/java/org/mybatis/spring/mapper/MapperFactoryBean.java +++ b/src/main/java/org/mybatis/spring/mapper/MapperFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/main/java/org/mybatis/spring/support/SqlSessionDaoSupport.java b/src/main/java/org/mybatis/spring/support/SqlSessionDaoSupport.java index c129bd6833..d7f4dbe594 100644 --- a/src/main/java/org/mybatis/spring/support/SqlSessionDaoSupport.java +++ b/src/main/java/org/mybatis/spring/support/SqlSessionDaoSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java b/src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java index f2919e8b35..f9e332dcab 100644 --- a/src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java +++ b/src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/main/java/org/mybatis/spring/transaction/SpringManagedTransactionFactory.java b/src/main/java/org/mybatis/spring/transaction/SpringManagedTransactionFactory.java index 6135b13d4d..371c574d54 100644 --- a/src/main/java/org/mybatis/spring/transaction/SpringManagedTransactionFactory.java +++ b/src/main/java/org/mybatis/spring/transaction/SpringManagedTransactionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java b/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java index d6c2074882..9a5de457b8 100644 --- a/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java +++ b/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java @@ -87,7 +87,6 @@ public TransactionSynchronization createSynchronizationWithAsyncAfterComplete( Class[] interfaces = { TransactionSynchronization.class }; return (TransactionSynchronization) Proxy.newProxyInstance(synchronization.getClass().getClassLoader(), interfaces, new AsyncAfterCompletionInvocationHandler(synchronization)); - } } From f9f6d3bbaa2c6b829800cf1d3a4aae1a2b6306f5 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 15:40:40 -0400 Subject: [PATCH 271/383] [tests] Correct commented out test for junit 5 test still doesn't work so leave it commented out. --- .../spring/transaction/SpringTransactionManagerTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/mybatis/spring/transaction/SpringTransactionManagerTest.java b/src/test/java/org/mybatis/spring/transaction/SpringTransactionManagerTest.java index 3c22bcb864..66e7453c96 100644 --- a/src/test/java/org/mybatis/spring/transaction/SpringTransactionManagerTest.java +++ b/src/test/java/org/mybatis/spring/transaction/SpringTransactionManagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -42,6 +42,8 @@ void shouldNoOpWithTx() throws Exception { txManager.commit(status); } + // TODO Test does not compile + // @Disabled // @Test // public void shouldManageWithOtherDatasource() throws Exception { // DefaultTransactionDefinition txDef = new DefaultTransactionDefinition(); @@ -53,8 +55,8 @@ void shouldNoOpWithTx() throws Exception { // false); // transaction.commit(); // transaction.close(); - // assertEquals("should call commit on Connection", 1, connection.getNumberCommits()); - // assertTrue("should close the Connection", connection.isClosed()); + // assertEquals(1, connection.getNumberCommits(), "should call commit on Connection"); + // assertTrue(connection.isClosed(), "should close the Connection"); // // txManager.commit(status); // } From 2dd5732c501f51911733faa1299ff748b1f700b6 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 15:45:16 -0400 Subject: [PATCH 272/383] [test] Add comment about left open resource as spring closes it --- src/test/java/org/mybatis/spring/SqlSessionTemplateTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/mybatis/spring/SqlSessionTemplateTest.java b/src/test/java/org/mybatis/spring/SqlSessionTemplateTest.java index 59cabcd7c3..9f84fd5b18 100644 --- a/src/test/java/org/mybatis/spring/SqlSessionTemplateTest.java +++ b/src/test/java/org/mybatis/spring/SqlSessionTemplateTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. @@ -94,6 +94,7 @@ void testRollback() { @Test void testExecutorType() { + // Do not close this, spring will close it SqlSessionTemplate template = new SqlSessionTemplate(sqlSessionFactory, ExecutorType.BATCH); assertThat(template.getExecutorType()).isEqualTo(ExecutorType.BATCH); From 22d236c66129784af0d9d8407bc07998f2a497b9 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 15:45:20 -0400 Subject: [PATCH 273/383] [ci] Update copyright date --- .../spring/asyncsynchronization/AsyncAfterCompletionHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java b/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java index 9a5de457b8..73ace7f841 100644 --- a/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java +++ b/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. From 4cb0ae1f508ec05d66d01a4907e6c12ca67ff4c7 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 15:54:58 -0400 Subject: [PATCH 274/383] [tests] Update deprecated initMocks to openMocks --- .../org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java | 4 ++-- .../org/mybatis/spring/batch/MyBatisCursorItemReaderTest.java | 4 ++-- .../batch/builder/MyBatisBatchItemWriterBuilderTest.java | 4 ++-- .../batch/builder/MyBatisCursorItemReaderBuilderTest.java | 4 ++-- .../batch/builder/MyBatisPagingItemReaderBuilderTest.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/test/java/org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java b/src/test/java/org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java index 827328bbc9..5acbe63f31 100644 --- a/src/test/java/org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java +++ b/src/test/java/org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. @@ -54,7 +54,7 @@ class MyBatisBatchItemWriterTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); } @Test diff --git a/src/test/java/org/mybatis/spring/batch/MyBatisCursorItemReaderTest.java b/src/test/java/org/mybatis/spring/batch/MyBatisCursorItemReaderTest.java index b3a19914f5..0333db4f6c 100644 --- a/src/test/java/org/mybatis/spring/batch/MyBatisCursorItemReaderTest.java +++ b/src/test/java/org/mybatis/spring/batch/MyBatisCursorItemReaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -50,7 +50,7 @@ class MyBatisCursorItemReaderTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); } @Test diff --git a/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java b/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java index 4b8fe68203..5f50da82d1 100644 --- a/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java +++ b/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. @@ -61,7 +61,7 @@ class MyBatisBatchItemWriterBuilderTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); { Configuration configuration = new Configuration(); Environment environment = new Environment("unittest", new JdbcTransactionFactory(), dataSource); diff --git a/src/test/java/org/mybatis/spring/batch/builder/MyBatisCursorItemReaderBuilderTest.java b/src/test/java/org/mybatis/spring/batch/builder/MyBatisCursorItemReaderBuilderTest.java index 35363172b6..95e0b04740 100644 --- a/src/test/java/org/mybatis/spring/batch/builder/MyBatisCursorItemReaderBuilderTest.java +++ b/src/test/java/org/mybatis/spring/batch/builder/MyBatisCursorItemReaderBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -54,7 +54,7 @@ class MyBatisCursorItemReaderBuilderTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); Mockito.when(this.sqlSessionFactory.openSession(ExecutorType.SIMPLE)).thenReturn(this.sqlSession); Mockito.when(this.cursor.iterator()).thenReturn(getFoos().iterator()); diff --git a/src/test/java/org/mybatis/spring/batch/builder/MyBatisPagingItemReaderBuilderTest.java b/src/test/java/org/mybatis/spring/batch/builder/MyBatisPagingItemReaderBuilderTest.java index b936ede448..5dca993aaa 100644 --- a/src/test/java/org/mybatis/spring/batch/builder/MyBatisPagingItemReaderBuilderTest.java +++ b/src/test/java/org/mybatis/spring/batch/builder/MyBatisPagingItemReaderBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -58,7 +58,7 @@ class MyBatisPagingItemReaderBuilderTest { @BeforeEach void setUp() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); Configuration configuration = new Configuration(); Environment environment = new Environment("unittest", new JdbcTransactionFactory(), dataSource); From e5f7aecf3d725cd0930d2314f8119f06bb8d77a8 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 15:55:18 -0400 Subject: [PATCH 275/383] [test] Update propertyplaceholderconfigurer to propertysourcesplaceholderconfigurer --- .../mybatis/spring/mapper/MapperScannerConfigurerTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java b/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java index fc1ce5f4b3..a37fd27380 100644 --- a/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java +++ b/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java @@ -40,11 +40,11 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConstructorArgumentValues; -import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.GenericBeanDefinition; import org.springframework.context.support.GenericApplicationContext; +import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.context.support.SimpleThreadScope; import org.springframework.core.env.MutablePropertySources; import org.springframework.mock.env.MockPropertySource; @@ -305,7 +305,7 @@ void testScanWithExplicitSqlSessionFactoryViaPlaceholder() { props.put("sqlSessionFactoryBeanNameProperty", "sqlSessionFactory2"); GenericBeanDefinition propertyDefinition = new GenericBeanDefinition(); - propertyDefinition.setBeanClass(PropertyPlaceholderConfigurer.class); + propertyDefinition.setBeanClass(PropertySourcesPlaceholderConfigurer.class); propertyDefinition.getPropertyValues().add("properties", props); applicationContext.registerBeanDefinition("propertiesPlaceholder", propertyDefinition); @@ -355,7 +355,7 @@ void testScanWithPropertyPlaceholders() { props.put("mybatis.lazy-initialization", "true"); GenericBeanDefinition propertyDefinition = new GenericBeanDefinition(); - propertyDefinition.setBeanClass(PropertyPlaceholderConfigurer.class); + propertyDefinition.setBeanClass(PropertySourcesPlaceholderConfigurer.class); propertyDefinition.getPropertyValues().add("properties", props); applicationContext.registerBeanDefinition("propertiesPlaceholder", propertyDefinition); From 8639ceb52092b8b42f4bc68bf3580a5ffec1947e Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 16:04:44 -0400 Subject: [PATCH 276/383] [tests] Update to java 10 --- .../spring/AbstractMyBatisSpringTest.java | 10 +- .../mybatis/spring/ExecutorInterceptor.java | 2 +- .../MyBatisExceptionTranslatorTest.java | 50 +++++----- .../org/mybatis/spring/MyBatisSpringTest.java | 82 ++++++++-------- .../mybatis/spring/PooledMockDataSource.java | 2 +- .../spring/SqlSessionFactoryBeanTest.java | 95 +++++++++---------- .../spring/SqlSessionTemplateTest.java | 14 +-- .../java/org/mybatis/spring/TestMapper.java | 2 +- .../spring/annotation/MapperScanTest.java | 48 +++++----- .../annotation/factory/SimpleFactoryBean.java | 4 +- .../AsyncAfterCompletionHelper.java | 37 ++++---- .../batch/MyBatisBatchItemWriterTest.java | 6 +- .../batch/MyBatisCursorItemReaderTest.java | 10 +- .../mybatis/spring/batch/SpringBatchTest.java | 18 ++-- .../MyBatisBatchItemWriterBuilderTest.java | 73 +++++++------- .../MyBatisCursorItemReaderBuilderTest.java | 53 +++++------ .../MyBatisPagingItemReaderBuilderTest.java | 75 ++++++++------- .../mybatis/spring/batch/domain/Employee.java | 2 +- .../org/mybatis/spring/config/MyBean.java | 2 +- .../mybatis/spring/config/MyFactoryBean.java | 2 +- .../mybatis/spring/config/NamespaceTest.java | 37 ++++---- .../mybatis/spring/filter/ScanFilterTest.java | 4 +- .../spring/filter/config/AppConfig.java | 8 +- .../filter/customfilter/AnnoTypeFilter.java | 8 +- .../filter/customfilter/CustomTypeFilter.java | 2 +- .../spring/filter/xml/XmlScanFilterTest.java | 5 +- .../spring/mapper/AnnotatedMapper.java | 2 +- .../spring/mapper/MapperFactoryBeanTest.java | 33 ++++--- .../spring/mapper/MapperImplementation.java | 2 +- .../spring/mapper/MapperInterface.java | 2 +- .../mapper/MapperScannerConfigurerTest.java | 54 +++++------ .../spring/mapper/ScopedProxyMapper.java | 2 +- .../mapper/child/MapperChildInterface.java | 2 +- .../spring/sample/AbstractSampleJobTest.java | 26 +++-- .../spring/sample/AbstractSampleTest.java | 5 +- .../spring/sample/SampleBatchTest.java | 2 +- .../spring/sample/SampleEnableTest.java | 2 +- .../spring/sample/SampleJavaConfigTest.java | 7 +- .../sample/SampleJobJavaConfigTest.java | 2 +- .../spring/sample/SampleJobXmlConfigTest.java | 2 +- .../spring/sample/SampleSqlSessionTest.java | 5 +- .../batch/UserToPersonItemProcessor.java | 7 +- .../spring/sample/config/SampleConfig.java | 8 +- .../spring/sample/config/SampleJobConfig.java | 54 +++++------ .../mybatis/spring/sample/dao/UserDao.java | 2 +- .../spring/sample/dao/UserDaoImpl.java | 2 +- .../mybatis/spring/sample/domain/Person.java | 2 +- .../mybatis/spring/sample/domain/User.java | 4 +- .../spring/sample/mapper/UserMapper.java | 2 +- .../spring/sample/service/BarService.java | 2 +- .../spring/sample/service/FooService.java | 2 +- .../org/mybatis/spring/scan/ScanClass1.java | 2 +- .../org/mybatis/spring/scan/ScanClass2.java | 2 +- .../submitted/autowire/AutowireTest.java | 8 +- .../spring/submitted/autowire/BarMapper.java | 2 +- .../spring/submitted/autowire/FooMapper.java | 2 +- .../WebappPlaceholderTest.java | 2 +- .../org/mybatis/spring/submitted/xa/User.java | 2 +- .../spring/submitted/xa/UserMapper.java | 2 +- .../spring/submitted/xa/UserService.java | 2 +- .../spring/submitted/xa/UserServiceImpl.java | 7 +- .../spring/submitted/xa/UserServiceTest.java | 10 +- .../support/SqlSessionDaoSupportTest.java | 10 +- .../SpringTransactionManagerTest.java | 25 ++--- .../spring/type/DummyMapperFactoryBean.java | 7 +- .../mybatis/spring/type/DummyTypeHandler.java | 2 +- .../spring/type/DummyTypeHandler2.java | 2 +- .../spring/type/TypeHandlerFactory.java | 4 +- 68 files changed, 473 insertions(+), 502 deletions(-) diff --git a/src/test/java/org/mybatis/spring/AbstractMyBatisSpringTest.java b/src/test/java/org/mybatis/spring/AbstractMyBatisSpringTest.java index b3b34b4b0b..da41926a10 100644 --- a/src/test/java/org/mybatis/spring/AbstractMyBatisSpringTest.java +++ b/src/test/java/org/mybatis/spring/AbstractMyBatisSpringTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -50,7 +50,7 @@ public abstract class AbstractMyBatisSpringTest { @BeforeAll public static void setupBase() throws Exception { // create an SqlSessionFactory that will use SpringManagedTransactions - SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean(); + var factoryBean = new SqlSessionFactoryBean(); factoryBean.setMapperLocations(new ClassPathResource("org/mybatis/spring/TestMapper.xml")); // note running without SqlSessionFactoryBean.configLocation set => default configuration factoryBean.setDataSource(dataSource); @@ -111,7 +111,7 @@ protected void assertExecuteCount(int count) { protected void assertConnectionClosed(MockConnection connection) { try { - if ((connection != null) && !connection.isClosed()) { + if (connection != null && !connection.isClosed()) { fail("Connection is not closed"); } } catch (SQLException sqle) { @@ -121,10 +121,10 @@ protected void assertConnectionClosed(MockConnection connection) { protected MockConnection createMockConnection() { // this query must be the same as the query in TestMapper.xml - MockResultSet rs = new MockResultSet("SELECT 1"); + var rs = new MockResultSet("SELECT 1"); rs.addRow(new Object[] { 1 }); - MockConnection con = new MockConnection(); + var con = new MockConnection(); con.getPreparedStatementResultSetHandler().prepareResultSet("SELECT 1", rs); return con; diff --git a/src/test/java/org/mybatis/spring/ExecutorInterceptor.java b/src/test/java/org/mybatis/spring/ExecutorInterceptor.java index 1364f0e4d6..fe26fc9711 100644 --- a/src/test/java/org/mybatis/spring/ExecutorInterceptor.java +++ b/src/test/java/org/mybatis/spring/ExecutorInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/MyBatisExceptionTranslatorTest.java b/src/test/java/org/mybatis/spring/MyBatisExceptionTranslatorTest.java index 62db9e51cf..2a60d343ec 100644 --- a/src/test/java/org/mybatis/spring/MyBatisExceptionTranslatorTest.java +++ b/src/test/java/org/mybatis/spring/MyBatisExceptionTranslatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. @@ -15,8 +15,10 @@ */ package org.mybatis.spring; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.times; import com.mockrunner.mock.jdbc.MockDataSource; @@ -25,7 +27,6 @@ import org.apache.ibatis.exceptions.PersistenceException; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import org.springframework.dao.DataAccessException; import org.springframework.jdbc.UncategorizedSQLException; import org.springframework.jdbc.support.SQLExceptionTranslator; @@ -33,19 +34,19 @@ class MyBatisExceptionTranslatorTest { @Test void shouldNonPersistenceExceptionBeTranslatedToNull() { - MockDataSource mockDataSource = new MockDataSource(); - MyBatisExceptionTranslator translator = new MyBatisExceptionTranslator(mockDataSource, false); - DataAccessException e = translator.translateExceptionIfPossible(new RuntimeException()); + var mockDataSource = new MockDataSource(); + var translator = new MyBatisExceptionTranslator(mockDataSource, false); + var e = translator.translateExceptionIfPossible(new RuntimeException()); assertNull(e); } @Test void shouldSqlExceptionBeTranslatedToUncategorizedSqlException() { - String msg = "Error!"; - SQLException sqlException = new SQLException(msg); - SQLExceptionTranslator sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class); - MyBatisExceptionTranslator translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false); - DataAccessException e = translator.translateExceptionIfPossible(new PersistenceException(sqlException)); + var msg = "Error!"; + var sqlException = new SQLException(msg); + var sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class); + var translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false); + var e = translator.translateExceptionIfPossible(new PersistenceException(sqlException)); assertTrue(e instanceof UncategorizedSQLException); Mockito.verify(sqlExceptionTranslator, times(1)).translate(SQLException.class.getName() + ": " + msg + "\n", null, sqlException); @@ -53,20 +54,20 @@ void shouldSqlExceptionBeTranslatedToUncategorizedSqlException() { @Test void shouldPersistenceExceptionBeTranslatedToMyBatisSystemException() { - String msg = "Error!"; - SQLExceptionTranslator sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class); - MyBatisExceptionTranslator translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false); - DataAccessException e = translator.translateExceptionIfPossible(new PersistenceException(msg)); + var msg = "Error!"; + var sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class); + var translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false); + var e = translator.translateExceptionIfPossible(new PersistenceException(msg)); assertTrue(e instanceof MyBatisSystemException); assertEquals(msg, e.getMessage()); } @Test void shouldNestedPersistenceExceptionReportsMsgOfParentException() { - String msg = "Error!"; - SQLExceptionTranslator sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class); - MyBatisExceptionTranslator translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false); - DataAccessException e = translator + var msg = "Error!"; + var sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class); + var translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false); + var e = translator .translateExceptionIfPossible(new PersistenceException(msg, new PersistenceException("Inner error!"))); assertTrue(e instanceof MyBatisSystemException); assertEquals(msg, e.getMessage()); @@ -74,11 +75,10 @@ void shouldNestedPersistenceExceptionReportsMsgOfParentException() { @Test void shouldNestedPersistenceExceptionReportsMsgOfChildExceptionIfParentsMsgIsNull() { - String msg = "Error!"; - SQLExceptionTranslator sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class); - MyBatisExceptionTranslator translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false); - DataAccessException e = translator - .translateExceptionIfPossible(new PersistenceException(null, new PersistenceException(msg))); + var msg = "Error!"; + var sqlExceptionTranslator = Mockito.mock(SQLExceptionTranslator.class); + var translator = new MyBatisExceptionTranslator(() -> sqlExceptionTranslator, false); + var e = translator.translateExceptionIfPossible(new PersistenceException(null, new PersistenceException(msg))); assertTrue(e instanceof MyBatisSystemException); assertEquals(msg, e.getMessage()); } diff --git a/src/test/java/org/mybatis/spring/MyBatisSpringTest.java b/src/test/java/org/mybatis/spring/MyBatisSpringTest.java index fda8ebf659..4e5f8d2827 100644 --- a/src/test/java/org/mybatis/spring/MyBatisSpringTest.java +++ b/src/test/java/org/mybatis/spring/MyBatisSpringTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. @@ -47,7 +47,7 @@ class MyBatisSpringTest extends AbstractMyBatisSpringTest { @AfterEach void validateSessionClose() { // assume if the Executor is closed, the Session is too - if ((session != null) && !executorInterceptor.isExecutorClosed()) { + if (session != null && !executorInterceptor.isExecutorClosed()) { session = null; fail("SqlSession is not closed"); } else { @@ -140,8 +140,8 @@ void testSpringAPIWithMyBatisClose() { // Spring API should work with a MyBatis TransactionFactories @Test void testWithNonSpringTransactionFactory() { - Environment original = sqlSessionFactory.getConfiguration().getEnvironment(); - Environment nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), dataSource); + var original = sqlSessionFactory.getConfiguration().getEnvironment(); + var nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), dataSource); sqlSessionFactory.getConfiguration().setEnvironment(nonSpring); try { @@ -162,8 +162,8 @@ void testWithNonSpringTransactionFactory() { // this should not work since the DS will be out of sync with MyBatis @Test void testNonSpringTxFactoryWithTx() throws Exception { - Environment original = sqlSessionFactory.getConfiguration().getEnvironment(); - Environment nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), dataSource); + var original = sqlSessionFactory.getConfiguration().getEnvironment(); + var nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), dataSource); sqlSessionFactory.getConfiguration().setEnvironment(nonSpring); TransactionStatus status = null; @@ -186,12 +186,12 @@ void testNonSpringTxFactoryWithTx() throws Exception { // this should work since the DS is managed MyBatis @Test void testNonSpringTxFactoryNonSpringDSWithTx() throws java.sql.SQLException { - Environment original = sqlSessionFactory.getConfiguration().getEnvironment(); + var original = sqlSessionFactory.getConfiguration().getEnvironment(); - MockDataSource mockDataSource = new MockDataSource(); + var mockDataSource = new MockDataSource(); mockDataSource.setupConnection(createMockConnection()); - Environment nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), mockDataSource); + var nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), mockDataSource); sqlSessionFactory.getConfiguration().setEnvironment(nonSpring); TransactionStatus status; @@ -211,7 +211,7 @@ void testNonSpringTxFactoryNonSpringDSWithTx() throws java.sql.SQLException { // SqlSession uses its own connection // that connection will not have committed since no SQL was executed by the session - MockConnection mockConnection = (MockConnection) mockDataSource.getConnection(); + var mockConnection = (MockConnection) mockDataSource.getConnection(); assertThat(mockConnection.getNumberCommits()).as("should call commit on Connection").isEqualTo(0); assertThat(mockConnection.getNumberRollbacks()).as("should not call rollback on Connection").isEqualTo(0); assertCommitSession(); @@ -248,16 +248,16 @@ void testChangeExecutorTypeInTxRequiresNew() throws Exception { try { txManager.setDataSource(dataSource); - TransactionStatus status = txManager.getTransaction(new DefaultTransactionDefinition()); + var status = txManager.getTransaction(new DefaultTransactionDefinition()); session = SqlSessionUtils.getSqlSession(sqlSessionFactory); // start a new tx while the other is in progress - DefaultTransactionDefinition txRequiresNew = new DefaultTransactionDefinition(); + var txRequiresNew = new DefaultTransactionDefinition(); txRequiresNew.setPropagationBehaviorName("PROPAGATION_REQUIRES_NEW"); - TransactionStatus status2 = txManager.getTransaction(txRequiresNew); + var status2 = txManager.getTransaction(txRequiresNew); - SqlSession session2 = SqlSessionUtils.getSqlSession(sqlSessionFactory, ExecutorType.BATCH, exceptionTranslator); + var session2 = SqlSessionUtils.getSqlSession(sqlSessionFactory, ExecutorType.BATCH, exceptionTranslator); SqlSessionUtils.closeSqlSession(session2, sqlSessionFactory); txManager.rollback(status2); @@ -277,12 +277,12 @@ void testChangeExecutorTypeInTxRequiresNew() throws Exception { @Test void testWithJtaTxManager() { - JtaTransactionManager jtaManager = new JtaTransactionManager(Mockito.mock(UserTransaction.class)); + var jtaManager = new JtaTransactionManager(Mockito.mock(UserTransaction.class)); - DefaultTransactionDefinition txDef = new DefaultTransactionDefinition(); + var txDef = new DefaultTransactionDefinition(); txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED"); - TransactionStatus status = jtaManager.getTransaction(txDef); + var status = jtaManager.getTransaction(txDef); session = SqlSessionUtils.getSqlSession(sqlSessionFactory); session.getMapper(TestMapper.class).findTest(); @@ -298,20 +298,20 @@ void testWithJtaTxManager() { @Test void testWithJtaTxManagerAndNonSpringTxManager() throws java.sql.SQLException { - Environment original = sqlSessionFactory.getConfiguration().getEnvironment(); + var original = sqlSessionFactory.getConfiguration().getEnvironment(); - MockDataSource mockDataSource = new MockDataSource(); + var mockDataSource = new MockDataSource(); mockDataSource.setupConnection(createMockConnection()); - Environment nonSpring = new Environment("non-spring", new ManagedTransactionFactory(), mockDataSource); + var nonSpring = new Environment("non-spring", new ManagedTransactionFactory(), mockDataSource); sqlSessionFactory.getConfiguration().setEnvironment(nonSpring); - JtaTransactionManager jtaManager = new JtaTransactionManager(Mockito.mock(UserTransaction.class)); + var jtaManager = new JtaTransactionManager(Mockito.mock(UserTransaction.class)); - DefaultTransactionDefinition txDef = new DefaultTransactionDefinition(); + var txDef = new DefaultTransactionDefinition(); txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED"); - TransactionStatus status = jtaManager.getTransaction(txDef); + var status = jtaManager.getTransaction(txDef); try { session = SqlSessionUtils.getSqlSession(sqlSessionFactory); @@ -326,7 +326,7 @@ void testWithJtaTxManagerAndNonSpringTxManager() throws java.sql.SQLException { assertNoCommitJdbc(); assertCommitSession(); - MockConnection mockConnection = (MockConnection) mockDataSource.getConnection(); + var mockConnection = (MockConnection) mockDataSource.getConnection(); assertThat(mockConnection.getNumberCommits()).as("should call commit on Connection").isEqualTo(0); assertThat(mockConnection.getNumberRollbacks()).as("should not call rollback on Connection").isEqualTo(0); @@ -345,10 +345,10 @@ void testWithJtaTxManagerAndNonSpringTxManager() throws java.sql.SQLException { @Test void testWithTxSupports() { - DefaultTransactionDefinition txDef = new DefaultTransactionDefinition(); + var txDef = new DefaultTransactionDefinition(); txDef.setPropagationBehaviorName("PROPAGATION_SUPPORTS"); - TransactionStatus status = txManager.getTransaction(txDef); + var status = txManager.getTransaction(txDef); session = SqlSessionUtils.getSqlSession(sqlSessionFactory); session.getMapper(TestMapper.class).findTest(); @@ -363,10 +363,10 @@ void testWithTxSupports() { @Test void testRollbackWithTxSupports() { - DefaultTransactionDefinition txDef = new DefaultTransactionDefinition(); + var txDef = new DefaultTransactionDefinition(); txDef.setPropagationBehaviorName("PROPAGATION_SUPPORTS"); - TransactionStatus status = txManager.getTransaction(txDef); + var status = txManager.getTransaction(txDef); session = SqlSessionUtils.getSqlSession(sqlSessionFactory); session.getMapper(TestMapper.class).findTest(); @@ -381,10 +381,10 @@ void testRollbackWithTxSupports() { @Test void testWithTxRequired() { - DefaultTransactionDefinition txDef = new DefaultTransactionDefinition(); + var txDef = new DefaultTransactionDefinition(); txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED"); - TransactionStatus status = txManager.getTransaction(txDef); + var status = txManager.getTransaction(txDef); session = SqlSessionUtils.getSqlSession(sqlSessionFactory); session.getMapper(TestMapper.class).findTest(); @@ -399,10 +399,10 @@ void testWithTxRequired() { @Test void testSqlSessionCommitWithTx() { - DefaultTransactionDefinition txDef = new DefaultTransactionDefinition(); + var txDef = new DefaultTransactionDefinition(); txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED"); - TransactionStatus status = txManager.getTransaction(txDef); + var status = txManager.getTransaction(txDef); session = SqlSessionUtils.getSqlSession(sqlSessionFactory); session.getMapper(TestMapper.class).findTest(); @@ -429,7 +429,7 @@ void testWithInterleavedTx() { session.getMapper(TestMapper.class).findTest(); // this transaction should use another Connection - TransactionStatus status = txManager.getTransaction(new DefaultTransactionDefinition()); + var status = txManager.getTransaction(new DefaultTransactionDefinition()); // session continues using original connection session.getMapper(TestMapper.class).insertTest("test2"); @@ -463,16 +463,16 @@ void testSuspendAndResume() { try { txManager.setDataSource(dataSource); - TransactionStatus status = txManager.getTransaction(new DefaultTransactionDefinition()); + var status = txManager.getTransaction(new DefaultTransactionDefinition()); session = SqlSessionUtils.getSqlSession(sqlSessionFactory); // start a new tx while the other is in progress - DefaultTransactionDefinition txRequiresNew = new DefaultTransactionDefinition(); + var txRequiresNew = new DefaultTransactionDefinition(); txRequiresNew.setPropagationBehaviorName("PROPAGATION_REQUIRES_NEW"); - TransactionStatus status2 = txManager.getTransaction(txRequiresNew); + var status2 = txManager.getTransaction(txRequiresNew); - SqlSession session2 = SqlSessionUtils.getSqlSession(sqlSessionFactory); + var session2 = SqlSessionUtils.getSqlSession(sqlSessionFactory); assertThat(session).as("getSqlSession() should not return suspended SqlSession").isNotSameAs(session2); @@ -535,10 +535,10 @@ void testBatch() { void testBatchInTx() { setupBatchStatements(); - DefaultTransactionDefinition txDef = new DefaultTransactionDefinition(); + var txDef = new DefaultTransactionDefinition(); txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED"); - TransactionStatus status = txManager.getTransaction(txDef); + var status = txManager.getTransaction(txDef); session = SqlSessionUtils.getSqlSession(sqlSessionFactory, ExecutorType.BATCH, exceptionTranslator); @@ -577,10 +577,10 @@ void testBatchWithError() { void testBatchInTxWithError() { setupBatchStatements(); - DefaultTransactionDefinition txDef = new DefaultTransactionDefinition(); + var txDef = new DefaultTransactionDefinition(); txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED"); - TransactionStatus status = txManager.getTransaction(txDef); + var status = txManager.getTransaction(txDef); session = SqlSessionUtils.getSqlSession(sqlSessionFactory, ExecutorType.BATCH, exceptionTranslator); diff --git a/src/test/java/org/mybatis/spring/PooledMockDataSource.java b/src/test/java/org/mybatis/spring/PooledMockDataSource.java index b07eaf3600..6493d019c1 100644 --- a/src/test/java/org/mybatis/spring/PooledMockDataSource.java +++ b/src/test/java/org/mybatis/spring/PooledMockDataSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java b/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java index 33cfb618f8..f79f561c20 100644 --- a/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java +++ b/src/test/java/org/mybatis/spring/SqlSessionFactoryBeanTest.java @@ -41,10 +41,7 @@ import org.apache.ibatis.plugin.Invocation; import org.apache.ibatis.plugin.Signature; import org.apache.ibatis.reflection.factory.DefaultObjectFactory; -import org.apache.ibatis.reflection.factory.ObjectFactory; import org.apache.ibatis.reflection.wrapper.DefaultObjectWrapperFactory; -import org.apache.ibatis.reflection.wrapper.ObjectWrapperFactory; -import org.apache.ibatis.scripting.LanguageDriverRegistry; import org.apache.ibatis.scripting.defaults.RawLanguageDriver; import org.apache.ibatis.scripting.xmltags.XMLLanguageDriver; import org.apache.ibatis.session.Configuration; @@ -55,10 +52,8 @@ import org.apache.ibatis.type.BaseTypeHandler; import org.apache.ibatis.type.EnumOrdinalTypeHandler; import org.apache.ibatis.type.JdbcType; -import org.apache.ibatis.type.TypeAliasRegistry; import org.apache.ibatis.type.TypeException; import org.apache.ibatis.type.TypeHandler; -import org.apache.ibatis.type.TypeHandlerRegistry; import org.junit.jupiter.api.Test; import org.mybatis.core.jdk.type.AtomicNumberTypeHandler; import org.mybatis.spring.transaction.SpringManagedTransactionFactory; @@ -152,11 +147,11 @@ void testDefaultConfiguration() throws Exception { void testDefaultConfigurationWithConfigurationProperties() throws Exception { setupFactoryBean(); - Properties configurationProperties = new Properties(); + var configurationProperties = new Properties(); configurationProperties.put("username", "dev"); factoryBean.setConfigurationProperties(configurationProperties); - SqlSessionFactory factory = factoryBean.getObject(); + var factory = factoryBean.getObject(); assertConfig(factory, SpringManagedTransactionFactory.class); assertThat(factory.getConfiguration().getVariables().size()).isEqualTo(1); assertThat(factory.getConfiguration().getVariables().get("username")).isEqualTo("dev"); @@ -166,14 +161,14 @@ void testDefaultConfigurationWithConfigurationProperties() throws Exception { void testSetConfiguration() throws Exception { setupFactoryBean(); - Configuration customConfiguration = new Configuration(); + var customConfiguration = new Configuration(); customConfiguration.setCacheEnabled(false); customConfiguration.setUseGeneratedKeys(true); customConfiguration.setDefaultExecutorType(ExecutorType.REUSE); customConfiguration.setVfsImpl(JBoss6VFS.class); factoryBean.setConfiguration(customConfiguration); - SqlSessionFactory factory = factoryBean.getObject(); + var factory = factoryBean.getObject(); assertThat(factory.getConfiguration().getEnvironment().getId()) .isEqualTo(SqlSessionFactoryBean.class.getSimpleName()); @@ -191,15 +186,15 @@ void testSetConfiguration() throws Exception { void testSpecifyVariablesOnly() throws Exception { setupFactoryBean(); - Configuration customConfiguration = new Configuration(); - Properties variables = new Properties(); + var customConfiguration = new Configuration(); + var variables = new Properties(); variables.put("username", "sa"); customConfiguration.setVariables(variables); factoryBean.setConfiguration(customConfiguration); factoryBean.setConfigurationProperties(null); - SqlSessionFactory factory = factoryBean.getObject(); + var factory = factoryBean.getObject(); assertThat(factory.getConfiguration().getVariables().size()).isEqualTo(1); assertThat(factory.getConfiguration().getVariables().get("username")).isEqualTo("sa"); @@ -209,19 +204,19 @@ void testSpecifyVariablesOnly() throws Exception { void testSpecifyVariablesAndConfigurationProperties() throws Exception { setupFactoryBean(); - Configuration customConfiguration = new Configuration(); - Properties variables = new Properties(); + var customConfiguration = new Configuration(); + var variables = new Properties(); variables.put("url", "jdbc:localhost/test"); variables.put("username", "sa"); customConfiguration.setVariables(variables); factoryBean.setConfiguration(customConfiguration); - Properties configurationProperties = new Properties(); + var configurationProperties = new Properties(); configurationProperties.put("username", "dev"); configurationProperties.put("password", "Passw0rd"); factoryBean.setConfigurationProperties(configurationProperties); - SqlSessionFactory factory = factoryBean.getObject(); + var factory = factoryBean.getObject(); assertThat(factory.getConfiguration().getVariables().size()).isEqualTo(3); assertThat(factory.getConfiguration().getVariables().get("url")).isEqualTo("jdbc:localhost/test"); @@ -233,15 +228,15 @@ void testSpecifyVariablesAndConfigurationProperties() throws Exception { void testSpecifyConfigurationPropertiesOnly() throws Exception { setupFactoryBean(); - Configuration customConfiguration = new Configuration(); + var customConfiguration = new Configuration(); customConfiguration.setVariables(null); factoryBean.setConfiguration(customConfiguration); - Properties configurationProperties = new Properties(); + var configurationProperties = new Properties(); configurationProperties.put("username", "dev"); factoryBean.setConfigurationProperties(configurationProperties); - SqlSessionFactory factory = factoryBean.getObject(); + var factory = factoryBean.getObject(); assertThat(factory.getConfiguration().getVariables().size()).isEqualTo(1); assertThat(factory.getConfiguration().getVariables().get("username")).isEqualTo("dev"); @@ -251,13 +246,13 @@ void testSpecifyConfigurationPropertiesOnly() throws Exception { void testNotSpecifyVariableAndConfigurationProperties() throws Exception { setupFactoryBean(); - Configuration customConfiguration = new Configuration(); + var customConfiguration = new Configuration(); customConfiguration.setVariables(null); factoryBean.setConfiguration(customConfiguration); factoryBean.setConfigurationProperties(null); - SqlSessionFactory factory = factoryBean.getObject(); + var factory = factoryBean.getObject(); assertThat(factory.getConfiguration().getVariables()).isNull(); } @@ -277,7 +272,7 @@ void testSetConfigLocation() throws Exception { factoryBean.setConfigLocation(new ClassPathResource("org/mybatis/spring/mybatis-config.xml")); - SqlSessionFactory factory = factoryBean.getObject(); + var factory = factoryBean.getObject(); assertThat(factory.getConfiguration().getEnvironment().getId()) .isEqualTo(SqlSessionFactoryBean.class.getSimpleName()); @@ -317,7 +312,7 @@ void testFragmentsAreReadWithMapperLocations() throws Exception { factoryBean.setMapperLocations(new ClassPathResource("org/mybatis/spring/TestMapper.xml")); - SqlSessionFactory factory = factoryBean.getObject(); + var factory = factoryBean.getObject(); // one for 'includedSql' and another for 'org.mybatis.spring.TestMapper.includedSql' assertThat(factory.getConfiguration().getSqlFragments().size()).isEqualTo(2); @@ -353,7 +348,7 @@ void testAddATypeHandler() throws Exception { setupFactoryBean(); factoryBean.setTypeHandlers(new DummyTypeHandler()); - TypeHandlerRegistry typeHandlerRegistry = factoryBean.getObject().getConfiguration().getTypeHandlerRegistry(); + var typeHandlerRegistry = factoryBean.getObject().getConfiguration().getTypeHandlerRegistry(); assertThat(typeHandlerRegistry.hasTypeHandler(BigInteger.class)).isTrue(); } @@ -362,7 +357,7 @@ void testAddATypeAlias() throws Exception { setupFactoryBean(); factoryBean.setTypeAliases(DummyTypeAlias.class); - TypeAliasRegistry typeAliasRegistry = factoryBean.getObject().getConfiguration().getTypeAliasRegistry(); + var typeAliasRegistry = factoryBean.getObject().getConfiguration().getTypeAliasRegistry(); typeAliasRegistry.resolveAlias("testAlias"); } @@ -371,7 +366,7 @@ void testSearchATypeAliasPackage() throws Exception { setupFactoryBean(); factoryBean.setTypeAliasesPackage("org.mybatis.spring.type, org.mybatis.spring.scan"); - TypeAliasRegistry typeAliasRegistry = factoryBean.getObject().getConfiguration().getTypeAliasRegistry(); + var typeAliasRegistry = factoryBean.getObject().getConfiguration().getTypeAliasRegistry(); System.out.println(typeAliasRegistry.getTypeAliases().keySet()); assertThat(typeAliasRegistry.getTypeAliases().size()).isEqualTo(89); typeAliasRegistry.resolveAlias("testAlias"); @@ -391,7 +386,7 @@ void testSearchATypeAliasPackageWithSuperType() throws Exception { factoryBean.setTypeAliasesSuperType(SuperType.class); factoryBean.setTypeAliasesPackage("org.mybatis.*.type"); - TypeAliasRegistry typeAliasRegistry = factoryBean.getObject().getConfiguration().getTypeAliasRegistry(); + var typeAliasRegistry = factoryBean.getObject().getConfiguration().getTypeAliasRegistry(); typeAliasRegistry.resolveAlias("testAlias2"); typeAliasRegistry.resolveAlias("superType"); @@ -404,7 +399,7 @@ void testSearchATypeAliasPackageWithSamePackage() throws Exception { setupFactoryBean(); factoryBean.setTypeAliasesPackage("org.mybatis.spring.type, org.*.spring.type"); - TypeAliasRegistry typeAliasRegistry = factoryBean.getObject().getConfiguration().getTypeAliasRegistry(); + var typeAliasRegistry = factoryBean.getObject().getConfiguration().getTypeAliasRegistry(); typeAliasRegistry.resolveAlias("testAlias"); typeAliasRegistry.resolveAlias("testAlias2"); typeAliasRegistry.resolveAlias("dummyTypeHandler"); @@ -416,7 +411,7 @@ void testSearchATypeHandlerPackage() throws Exception { setupFactoryBean(); factoryBean.setTypeHandlersPackage("org.mybatis.**.type"); - TypeHandlerRegistry typeHandlerRegistry = factoryBean.getObject().getConfiguration().getTypeHandlerRegistry(); + var typeHandlerRegistry = factoryBean.getObject().getConfiguration().getTypeHandlerRegistry(); assertThat(typeHandlerRegistry.hasTypeHandler(BigInteger.class)).isTrue(); assertThat(typeHandlerRegistry.hasTypeHandler(BigDecimal.class)).isTrue(); assertThat(typeHandlerRegistry.getTypeHandler(UUID.class)).isInstanceOf(TypeHandlerFactory.InnerTypeHandler.class); @@ -429,7 +424,7 @@ void testSearchATypeHandlerPackageWithSamePackage() throws Exception { setupFactoryBean(); factoryBean.setTypeHandlersPackage("org.mybatis.spring.type, org.mybatis.*.type"); - TypeHandlerRegistry typeHandlerRegistry = factoryBean.getObject().getConfiguration().getTypeHandlerRegistry(); + var typeHandlerRegistry = factoryBean.getObject().getConfiguration().getTypeHandlerRegistry(); assertThat(typeHandlerRegistry.hasTypeHandler(BigInteger.class)).isTrue(); assertThat(typeHandlerRegistry.hasTypeHandler(BigDecimal.class)).isTrue(); } @@ -439,7 +434,7 @@ void testDefaultEnumTypeHandler() throws Exception { setupFactoryBean(); factoryBean.setDefaultEnumTypeHandler(EnumOrdinalTypeHandler.class); - TypeHandlerRegistry typeHandlerRegistry = factoryBean.getObject().getConfiguration().getTypeHandlerRegistry(); + var typeHandlerRegistry = factoryBean.getObject().getConfiguration().getTypeHandlerRegistry(); assertThat(typeHandlerRegistry.getTypeHandler(MyEnum.class)).isInstanceOf(EnumOrdinalTypeHandler.class); } @@ -448,7 +443,7 @@ void testSetObjectFactory() throws Exception { setupFactoryBean(); factoryBean.setObjectFactory(new TestObjectFactory()); - ObjectFactory objectFactory = factoryBean.getObject().getConfiguration().getObjectFactory(); + var objectFactory = factoryBean.getObject().getConfiguration().getObjectFactory(); assertThat(objectFactory).isInstanceOf(TestObjectFactory.class); } @@ -457,14 +452,14 @@ void testSetObjectWrapperFactory() throws Exception { setupFactoryBean(); factoryBean.setObjectWrapperFactory(new TestObjectWrapperFactory()); - ObjectWrapperFactory objectWrapperFactory = factoryBean.getObject().getConfiguration().getObjectWrapperFactory(); + var objectWrapperFactory = factoryBean.getObject().getConfiguration().getObjectWrapperFactory(); assertThat(objectWrapperFactory).isInstanceOf(TestObjectWrapperFactory.class); } @Test void testAddCache() { setupFactoryBean(); - PerpetualCache cache = new PerpetualCache("test-cache"); + var cache = new PerpetualCache("test-cache"); this.factoryBean.setCache(cache); assertThat(this.factoryBean.getCache().getId()).isEqualTo("test-cache"); } @@ -473,7 +468,7 @@ void testAddCache() { void testScriptingLanguageDriverEmpty() throws Exception { setupFactoryBean(); this.factoryBean.setScriptingLanguageDrivers(); - LanguageDriverRegistry registry = this.factoryBean.getObject().getConfiguration().getLanguageRegistry(); + var registry = this.factoryBean.getObject().getConfiguration().getLanguageRegistry(); assertThat(registry.getDefaultDriver()).isInstanceOf(XMLLanguageDriver.class); assertThat(registry.getDefaultDriverClass()).isEqualTo(XMLLanguageDriver.class); } @@ -482,7 +477,7 @@ void testScriptingLanguageDriverEmpty() throws Exception { void testScriptingLanguageDriver() throws Exception { setupFactoryBean(); this.factoryBean.setScriptingLanguageDrivers(new MyLanguageDriver1(), new MyLanguageDriver2()); - LanguageDriverRegistry registry = this.factoryBean.getObject().getConfiguration().getLanguageRegistry(); + var registry = this.factoryBean.getObject().getConfiguration().getLanguageRegistry(); assertThat(registry.getDefaultDriver()).isInstanceOf(XMLLanguageDriver.class); assertThat(registry.getDefaultDriverClass()).isEqualTo(XMLLanguageDriver.class); assertThat(registry.getDriver(MyLanguageDriver1.class)).isNotNull(); @@ -496,7 +491,7 @@ void testScriptingLanguageDriverWithDefault() throws Exception { setupFactoryBean(); this.factoryBean.setScriptingLanguageDrivers(new MyLanguageDriver1(), new MyLanguageDriver2()); this.factoryBean.setDefaultScriptingLanguageDriver(MyLanguageDriver1.class); - LanguageDriverRegistry registry = this.factoryBean.getObject().getConfiguration().getLanguageRegistry(); + var registry = this.factoryBean.getObject().getConfiguration().getLanguageRegistry(); assertThat(registry.getDefaultDriver()).isInstanceOf(MyLanguageDriver1.class); assertThat(registry.getDefaultDriverClass()).isEqualTo(MyLanguageDriver1.class); assertThat(registry.getDriver(MyLanguageDriver1.class)).isNotNull(); @@ -526,10 +521,10 @@ void testAppendableMethod() throws Exception { this.factoryBean.addTypeHandlers(null); this.factoryBean.addTypeAliases(null); this.factoryBean.addMapperLocations(null); - SqlSessionFactory factory = this.factoryBean.getObject(); - LanguageDriverRegistry languageDriverRegistry = factory.getConfiguration().getLanguageRegistry(); - TypeHandlerRegistry typeHandlerRegistry = factory.getConfiguration().getTypeHandlerRegistry(); - TypeAliasRegistry typeAliasRegistry = factory.getConfiguration().getTypeAliasRegistry(); + var factory = this.factoryBean.getObject(); + var languageDriverRegistry = factory.getConfiguration().getLanguageRegistry(); + var typeHandlerRegistry = factory.getConfiguration().getTypeHandlerRegistry(); + var typeAliasRegistry = factory.getConfiguration().getTypeAliasRegistry(); assertThat(languageDriverRegistry.getDriver(MyLanguageDriver1.class)).isNotNull(); assertThat(languageDriverRegistry.getDriver(MyLanguageDriver2.class)).isNotNull(); assertThat(typeHandlerRegistry.getTypeHandlers().stream().map(TypeHandler::getClass).map(Class::getSimpleName) @@ -555,10 +550,10 @@ void testAppendableMethodWithEmpty() throws Exception { this.factoryBean.addTypeHandlers(); this.factoryBean.addTypeAliases(); this.factoryBean.addMapperLocations(); - SqlSessionFactory factory = this.factoryBean.getObject(); - LanguageDriverRegistry languageDriverRegistry = factory.getConfiguration().getLanguageRegistry(); - TypeHandlerRegistry typeHandlerRegistry = factory.getConfiguration().getTypeHandlerRegistry(); - TypeAliasRegistry typeAliasRegistry = factory.getConfiguration().getTypeAliasRegistry(); + var factory = this.factoryBean.getObject(); + var languageDriverRegistry = factory.getConfiguration().getLanguageRegistry(); + var typeHandlerRegistry = factory.getConfiguration().getTypeHandlerRegistry(); + var typeAliasRegistry = factory.getConfiguration().getTypeAliasRegistry(); assertThat(languageDriverRegistry.getDriver(MyLanguageDriver1.class)).isNull(); assertThat(languageDriverRegistry.getDriver(MyLanguageDriver2.class)).isNull(); assertThat(typeHandlerRegistry.getTypeHandlers()).hasSize(40); @@ -575,10 +570,10 @@ void testAppendableMethodWithNull() throws Exception { this.factoryBean.addTypeHandlers(null); this.factoryBean.addTypeAliases(null); this.factoryBean.addMapperLocations(null); - SqlSessionFactory factory = this.factoryBean.getObject(); - LanguageDriverRegistry languageDriverRegistry = factory.getConfiguration().getLanguageRegistry(); - TypeHandlerRegistry typeHandlerRegistry = factory.getConfiguration().getTypeHandlerRegistry(); - TypeAliasRegistry typeAliasRegistry = factory.getConfiguration().getTypeAliasRegistry(); + var factory = this.factoryBean.getObject(); + var languageDriverRegistry = factory.getConfiguration().getLanguageRegistry(); + var typeHandlerRegistry = factory.getConfiguration().getTypeHandlerRegistry(); + var typeAliasRegistry = factory.getConfiguration().getTypeAliasRegistry(); assertThat(languageDriverRegistry.getDriver(MyLanguageDriver1.class)).isNull(); assertThat(languageDriverRegistry.getDriver(MyLanguageDriver2.class)).isNull(); assertThat(typeHandlerRegistry.getTypeHandlers()).hasSize(40); @@ -682,7 +677,7 @@ private static class MyTypeHandler2 extends MyBaseTypeHandler { private static class MyTypeHandler3 extends MyBaseTypeHandler { } - private static enum MyEnum { + private enum MyEnum { } } diff --git a/src/test/java/org/mybatis/spring/SqlSessionTemplateTest.java b/src/test/java/org/mybatis/spring/SqlSessionTemplateTest.java index 9f84fd5b18..f89e7777c9 100644 --- a/src/test/java/org/mybatis/spring/SqlSessionTemplateTest.java +++ b/src/test/java/org/mybatis/spring/SqlSessionTemplateTest.java @@ -53,7 +53,7 @@ void tearDown() { @Test void testGetConnection() throws java.sql.SQLException { - java.sql.Connection conn = sqlSessionTemplate.getConnection(); + var conn = sqlSessionTemplate.getConnection(); // outside of an explicit tx, getConnection() will start a tx, get an open connection then // end the tx, which closes the connection @@ -67,7 +67,7 @@ void testGetConnectionInTx() throws java.sql.SQLException { try { status = txManager.getTransaction(new DefaultTransactionDefinition()); - java.sql.Connection conn = sqlSessionTemplate.getConnection(); + var conn = sqlSessionTemplate.getConnection(); assertThat(conn.isClosed()).isFalse(); @@ -95,10 +95,10 @@ void testRollback() { @Test void testExecutorType() { // Do not close this, spring will close it - SqlSessionTemplate template = new SqlSessionTemplate(sqlSessionFactory, ExecutorType.BATCH); + var template = new SqlSessionTemplate(sqlSessionFactory, ExecutorType.BATCH); assertThat(template.getExecutorType()).isEqualTo(ExecutorType.BATCH); - DataSourceTransactionManager manager = new DataSourceTransactionManager(dataSource); + var manager = new DataSourceTransactionManager(dataSource); TransactionStatus status = null; @@ -108,7 +108,7 @@ void testExecutorType() { // will synchronize the template with the current tx template.getConnection(); - SqlSessionHolder holder = (SqlSessionHolder) TransactionSynchronizationManager.getResource(sqlSessionFactory); + var holder = (SqlSessionHolder) TransactionSynchronizationManager.getResource(sqlSessionFactory); assertThat(holder.getExecutorType()).isEqualTo(ExecutorType.BATCH); } finally { @@ -168,10 +168,10 @@ void testTemplateWithNoTxSelect() { @Test void testWithTxRequired() { - DefaultTransactionDefinition txDef = new DefaultTransactionDefinition(); + var txDef = new DefaultTransactionDefinition(); txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED"); - TransactionStatus status = txManager.getTransaction(txDef); + var status = txManager.getTransaction(txDef); sqlSessionTemplate.getMapper(TestMapper.class).findTest(); diff --git a/src/test/java/org/mybatis/spring/TestMapper.java b/src/test/java/org/mybatis/spring/TestMapper.java index 0a839fc57d..df5f0fa375 100644 --- a/src/test/java/org/mybatis/spring/TestMapper.java +++ b/src/test/java/org/mybatis/spring/TestMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/annotation/MapperScanTest.java b/src/test/java/org/mybatis/spring/annotation/MapperScanTest.java index 51338fff0e..6dbefd9491 100644 --- a/src/test/java/org/mybatis/spring/annotation/MapperScanTest.java +++ b/src/test/java/org/mybatis/spring/annotation/MapperScanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. @@ -220,7 +220,7 @@ void testCustomMapperFactoryBean() { @Test void testScanWithNameConflict() { - GenericBeanDefinition definition = new GenericBeanDefinition(); + var definition = new GenericBeanDefinition(); definition.setBeanClass(Object.class); applicationContext.registerBeanDefinition("mapperInterface", definition); @@ -233,7 +233,7 @@ void testScanWithNameConflict() { } private void setupSqlSessionFactory() { - GenericBeanDefinition definition = new GenericBeanDefinition(); + var definition = new GenericBeanDefinition(); definition.setBeanClass(SqlSessionFactoryBean.class); definition.getPropertyValues().add("dataSource", new MockDataSource()); applicationContext.registerBeanDefinition("sqlSessionFactory", definition); @@ -263,9 +263,9 @@ void testScanWithExplicitSqlSessionFactory() { @Test void testScanWithExplicitSqlSessionTemplate() { - GenericBeanDefinition definition = new GenericBeanDefinition(); + var definition = new GenericBeanDefinition(); definition.setBeanClass(SqlSessionTemplate.class); - ConstructorArgumentValues constructorArgs = new ConstructorArgumentValues(); + var constructorArgs = new ConstructorArgumentValues(); constructorArgs.addGenericArgumentValue(new RuntimeBeanReference("sqlSessionFactory")); definition.setConstructorArgumentValues(constructorArgs); applicationContext.registerBeanDefinition("sqlSessionTemplate", definition); @@ -298,7 +298,7 @@ void testScanWithMapperScans() { startContext(); - SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); + var sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); assertEquals(2, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); applicationContext.getBean("ds1Mapper"); @@ -311,7 +311,7 @@ void testScanWithDefaultMapperScanAndRepeat() { startContext(); - SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); + var sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); assertEquals(2, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); applicationContext.getBean("ds1Mapper"); @@ -324,7 +324,7 @@ void testScanWithDefaultMapperScans() { startContext(); - SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); + var sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); assertEquals(2, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); applicationContext.getBean("ds1Mapper"); @@ -337,7 +337,7 @@ void testLazyScanWithPropertySourcesPlaceholderConfigurer() { startContext(); - SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); + var sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); assertEquals(0, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); applicationContext.getBean(Ds1Mapper.class); assertEquals(1, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); @@ -350,7 +350,7 @@ void testLazyConfigWithPropertySource() { startContext(); - SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); + var sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); assertEquals(0, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); applicationContext.getBean(Ds1Mapper.class); assertEquals(1, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); @@ -369,25 +369,25 @@ void testScopedProxyMapperScanByDefaultScope() { for (String scopedProxyTargetBean : scopedProxyTargetBeans) { { - BeanDefinition definition = applicationContext.getBeanDefinition(scopedProxyTargetBean); + var definition = applicationContext.getBeanDefinition(scopedProxyTargetBean); assertThat(definition.getBeanClassName()).isEqualTo("org.mybatis.spring.mapper.MapperFactoryBean"); assertThat(definition.getScope()).isEqualTo("thread"); } { - BeanDefinition definition = applicationContext.getBeanDefinition(scopedProxyTargetBean.substring(13)); + var definition = applicationContext.getBeanDefinition(scopedProxyTargetBean.substring(13)); assertThat(definition.getBeanClassName()).isEqualTo("org.springframework.aop.scope.ScopedProxyFactoryBean"); assertThat(definition.getScope()).isEqualTo(""); } } { - Ds1Mapper mapper = applicationContext.getBean(Ds1Mapper.class); + var mapper = applicationContext.getBean(Ds1Mapper.class); assertThat(mapper.test()).isEqualTo("ds1"); } { - Ds2Mapper mapper = applicationContext.getBean(Ds2Mapper.class); + var mapper = applicationContext.getBean(Ds2Mapper.class); assertThat(mapper.test()).isEqualTo("ds2"); } - SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); + var sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); assertEquals(2, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); } @@ -397,10 +397,10 @@ void testProcessPropertyPlaceHoldersIsTrue() { startContext(); - SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); + var sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); assertEquals(1, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); - MyBean myBean = applicationContext.getBean(MyBean.class); + var myBean = applicationContext.getBean(MyBean.class); assertThat(myBean.getName()).isEqualTo("MyBean!!"); } @@ -410,10 +410,10 @@ void testProcessPropertyPlaceHoldersIsFalse() { startContext(); - SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); + var sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); assertEquals(1, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); - MyBean myBean = applicationContext.getBean(MyBean.class); + var myBean = applicationContext.getBean(MyBean.class); assertThat(myBean.getName()).isEqualTo("MyBean!!"); } @@ -479,7 +479,7 @@ public static class AppConfigWithMapperScans { public static class LazyConfigWithPropertySourcesPlaceholderConfigurer { @Bean static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { - PropertySourcesPlaceholderConfigurer configurer = new PropertySourcesPlaceholderConfigurer(); + var configurer = new PropertySourcesPlaceholderConfigurer(); configurer.setLocation(new ClassPathResource("/org/mybatis/spring/annotation/scan.properties")); return configurer; } @@ -491,14 +491,14 @@ static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer public static class ProcessPropertyPlaceHoldersTrueConfiguration { @Bean static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { - PropertySourcesPlaceholderConfigurer configurer = new PropertySourcesPlaceholderConfigurer(); + var configurer = new PropertySourcesPlaceholderConfigurer(); configurer.setLocation(new ClassPathResource("/org/mybatis/spring/annotation/placeholders.properties")); return configurer; } @Bean static PropertyOverrideConfigurer propertyOverrideConfigurer() { - PropertyOverrideConfigurer configurer = new PropertyOverrideConfigurer(); + var configurer = new PropertyOverrideConfigurer(); configurer.setLocation(new ClassPathResource("/org/mybatis/spring/annotation/override.properties")); configurer.setIgnoreInvalidKeys(true); return configurer; @@ -515,14 +515,14 @@ MyBean myBean() { public static class ProcessPropertyPlaceHoldersFalseConfiguration { @Bean static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { - PropertySourcesPlaceholderConfigurer configurer = new PropertySourcesPlaceholderConfigurer(); + var configurer = new PropertySourcesPlaceholderConfigurer(); configurer.setLocation(new ClassPathResource("/org/mybatis/spring/annotation/placeholders.properties")); return configurer; } @Bean static PropertyOverrideConfigurer propertyOverrideConfigurer() { - PropertyOverrideConfigurer configurer = new PropertyOverrideConfigurer(); + var configurer = new PropertyOverrideConfigurer(); configurer.setLocation(new ClassPathResource("/org/mybatis/spring/annotation/override.properties")); return configurer; } diff --git a/src/test/java/org/mybatis/spring/annotation/factory/SimpleFactoryBean.java b/src/test/java/org/mybatis/spring/annotation/factory/SimpleFactoryBean.java index 412b87331a..5f496fdc64 100644 --- a/src/test/java/org/mybatis/spring/annotation/factory/SimpleFactoryBean.java +++ b/src/test/java/org/mybatis/spring/annotation/factory/SimpleFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -37,10 +37,12 @@ public SimpleFactoryBean(ApplicationContext context) { } } + @Override public Object getObject() { return new Object(); } + @Override public Class getObjectType() { return Object.class; } diff --git a/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java b/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java index 73ace7f841..ec928f6655 100644 --- a/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java +++ b/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java @@ -46,29 +46,28 @@ static class AsyncAfterCompletionInvocationHandler implements InvocationHandler @Override public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { - if ("afterCompletion".equals(method.getName())) { - final Set retValSet = new HashSet<>(); - final Set exceptionSet = new HashSet<>(); - Thread thread = new Thread(() -> { - try { - retValSet.add(method.invoke(target, args)); - } catch (InvocationTargetException ite) { - exceptionSet.add(ite.getCause()); + if (!"afterCompletion".equals(method.getName())) { + return method.invoke(target, args); + } + final Set retValSet = new HashSet<>(); + final Set exceptionSet = new HashSet<>(); + var thread = new Thread(() -> { + try { + retValSet.add(method.invoke(target, args)); + } catch (InvocationTargetException ite) { + exceptionSet.add(ite.getCause()); - } catch (IllegalArgumentException | IllegalAccessException e) { - exceptionSet.add(e); + } catch (IllegalArgumentException | IllegalAccessException e) { + exceptionSet.add(e); - } - }); - thread.start(); - thread.join(); - if (exceptionSet.isEmpty()) { - return retValSet.iterator().next(); - } else { - throw exceptionSet.iterator().next(); } + }); + thread.start(); + thread.join(); + if (exceptionSet.isEmpty()) { + return retValSet.iterator().next(); } else { - return method.invoke(target, args); + throw exceptionSet.iterator().next(); } } diff --git a/src/test/java/org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java b/src/test/java/org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java index 5acbe63f31..c38083996d 100644 --- a/src/test/java/org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java +++ b/src/test/java/org/mybatis/spring/batch/MyBatisBatchItemWriterTest.java @@ -71,7 +71,7 @@ void testZeroBatchResultShouldThrowException() { void testZeroUpdateCountShouldThrowException() { Chunk employees = Chunk.of(new Employee(), new Employee()); - BatchResult batchResult = new BatchResult(null, null); + var batchResult = new BatchResult(null, null); batchResult.setUpdateCounts(new int[] { 1, 0 }); List batchResults = Collections.singletonList(batchResult); @@ -85,7 +85,7 @@ void testItemToParameterConverterIsDefault() { this.writer.setAssertUpdates(false); this.writer.setStatementId("updateEmployee"); - Employee employee = new Employee(); + var employee = new Employee(); Chunk employees = Chunk.of(employee); writer.write(employees); @@ -103,7 +103,7 @@ void testSetItemToParameterConverter() { return parameter; }); - Employee employee = new Employee(); + var employee = new Employee(); Chunk employees = Chunk.of(employee); writer.write(employees); diff --git a/src/test/java/org/mybatis/spring/batch/MyBatisCursorItemReaderTest.java b/src/test/java/org/mybatis/spring/batch/MyBatisCursorItemReaderTest.java index 0333db4f6c..44f061ce62 100644 --- a/src/test/java/org/mybatis/spring/batch/MyBatisCursorItemReaderTest.java +++ b/src/test/java/org/mybatis/spring/batch/MyBatisCursorItemReaderTest.java @@ -61,13 +61,13 @@ void testCloseOnFailing() throws Exception { Mockito.when(this.sqlSession.selectCursor("selectFoo", Collections.singletonMap("id", 1))) .thenThrow(new RuntimeException("error.")); - MyBatisCursorItemReader itemReader = new MyBatisCursorItemReader<>(); + var itemReader = new MyBatisCursorItemReader(); itemReader.setSqlSessionFactory(this.sqlSessionFactory); itemReader.setQueryId("selectFoo"); itemReader.setParameterValues(Collections.singletonMap("id", 1)); itemReader.afterPropertiesSet(); - ExecutionContext executionContext = new ExecutionContext(); + var executionContext = new ExecutionContext(); try { itemReader.open(executionContext); fail(); @@ -82,7 +82,7 @@ void testCloseOnFailing() throws Exception { @Test void testCloseBeforeOpen() { - MyBatisCursorItemReader itemReader = new MyBatisCursorItemReader<>(); + var itemReader = new MyBatisCursorItemReader(); itemReader.close(); } @@ -96,10 +96,6 @@ private static class Foo { Foo(String name) { this.name = name; } - - public String getName() { - return this.name; - } } } diff --git a/src/test/java/org/mybatis/spring/batch/SpringBatchTest.java b/src/test/java/org/mybatis/spring/batch/SpringBatchTest.java index a27f0ad3a1..f2eb2034d4 100644 --- a/src/test/java/org/mybatis/spring/batch/SpringBatchTest.java +++ b/src/test/java/org/mybatis/spring/batch/SpringBatchTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. @@ -54,8 +54,8 @@ class SpringBatchTest { @Test @Transactional void shouldDuplicateSalaryOfAllEmployees() throws Exception { - Chunk employees = new Chunk<>(); - Employee employee = pagingNoNestedItemReader.read(); + var employees = new Chunk(); + var employee = pagingNoNestedItemReader.read(); while (employee != null) { employee.setSalary(employee.getSalary() * 2); employees.add(employee); @@ -71,8 +71,8 @@ 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 - Chunk employees = new Chunk<>(); - Employee employee = pagingNestedItemReader.read(); + var employees = new Chunk(); + var employee = pagingNestedItemReader.read(); while (employee != null) { employee.setSalary(employee.getSalary() * 2); employees.add(employee); @@ -89,8 +89,8 @@ void checkPagingReadingWithNestedInResultMap() throws Exception { void checkCursorReadingWithoutNestedInResultMap() throws Exception { cursorNoNestedItemReader.doOpen(); try { - Chunk employees = new Chunk<>(); - Employee employee = cursorNoNestedItemReader.read(); + var employees = new Chunk(); + var employee = cursorNoNestedItemReader.read(); while (employee != null) { employee.setSalary(employee.getSalary() * 2); employees.add(employee); @@ -110,8 +110,8 @@ void checkCursorReadingWithoutNestedInResultMap() throws Exception { void checkCursorReadingWithNestedInResultMap() throws Exception { cursorNestedItemReader.doOpen(); try { - Chunk employees = new Chunk<>(); - Employee employee = cursorNestedItemReader.read(); + var employees = new Chunk(); + var employee = cursorNestedItemReader.read(); while (employee != null) { employee.setSalary(employee.getSalary() * 2); employees.add(employee); diff --git a/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java b/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java index 5f50da82d1..6076ba4da5 100644 --- a/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java +++ b/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java @@ -38,7 +38,6 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mybatis.spring.SqlSessionTemplate; -import org.mybatis.spring.batch.MyBatisBatchItemWriter; import org.springframework.batch.item.Chunk; /** @@ -63,14 +62,14 @@ class MyBatisBatchItemWriterBuilderTest { void setUp() { MockitoAnnotations.openMocks(this); { - Configuration configuration = new Configuration(); - Environment environment = new Environment("unittest", new JdbcTransactionFactory(), dataSource); + var configuration = new Configuration(); + var environment = new Environment("unittest", new JdbcTransactionFactory(), dataSource); configuration.setEnvironment(environment); Mockito.when(this.sqlSessionFactory.getConfiguration()).thenReturn(configuration); Mockito.when(this.sqlSessionFactory.openSession(ExecutorType.BATCH)).thenReturn(this.sqlSession); } { - BatchResult result = new BatchResult(null, null); + var result = new BatchResult(null, null); result.setUpdateCounts(new int[] { 1 }); Mockito.when(this.sqlSession.flushStatements()).thenReturn(Collections.singletonList(result)); } @@ -80,14 +79,14 @@ void setUp() { void testConfigurationUsingSqlSessionFactory() { // @formatter:off - MyBatisBatchItemWriter itemWriter = new MyBatisBatchItemWriterBuilder() - .sqlSessionFactory(this.sqlSessionFactory) - .statementId("updateFoo") - .build(); - // @formatter:on + var itemWriter = new MyBatisBatchItemWriterBuilder() + .sqlSessionFactory(this.sqlSessionFactory) + .statementId("updateFoo") + .build(); + // @formatter:on itemWriter.afterPropertiesSet(); - Chunk foos = getFoos(); + var foos = getFoos(); itemWriter.write(foos); @@ -101,14 +100,14 @@ void testConfigurationUsingSqlSessionFactory() { void testConfigurationUsingSqlSessionTemplate() { // @formatter:off - MyBatisBatchItemWriter itemWriter = new MyBatisBatchItemWriterBuilder() - .sqlSessionTemplate(new SqlSessionTemplate(this.sqlSessionFactory, ExecutorType.BATCH)) - .statementId("updateFoo") - .build(); - // @formatter:on + var itemWriter = new MyBatisBatchItemWriterBuilder() + .sqlSessionTemplate(new SqlSessionTemplate(this.sqlSessionFactory, ExecutorType.BATCH)) + .statementId("updateFoo") + .build(); + // @formatter:on itemWriter.afterPropertiesSet(); - Chunk foos = getFoos(); + var foos = getFoos(); itemWriter.write(foos); @@ -124,15 +123,15 @@ void testConfigurationAssertUpdatesIsFalse() { Mockito.when(this.sqlSession.flushStatements()).thenReturn(Collections.emptyList()); // @formatter:off - MyBatisBatchItemWriter itemWriter = new MyBatisBatchItemWriterBuilder() - .sqlSessionTemplate(new SqlSessionTemplate(this.sqlSessionFactory, ExecutorType.BATCH)) - .statementId("updateFoo") - .assertUpdates(false) - .build(); - // @formatter:on + var itemWriter = new MyBatisBatchItemWriterBuilder() + .sqlSessionTemplate(new SqlSessionTemplate(this.sqlSessionFactory, ExecutorType.BATCH)) + .statementId("updateFoo") + .assertUpdates(false) + .build(); + // @formatter:on itemWriter.afterPropertiesSet(); - Chunk foos = getFoos(); + var foos = getFoos(); itemWriter.write(foos); @@ -146,20 +145,20 @@ void testConfigurationAssertUpdatesIsFalse() { void testConfigurationSetItemToParameterConverter() { // @formatter:off - MyBatisBatchItemWriter itemWriter = new MyBatisBatchItemWriterBuilder() - .sqlSessionFactory(this.sqlSessionFactory) - .statementId("updateFoo") - .itemToParameterConverter(item -> { - Map parameter = new HashMap<>(); - parameter.put("item", item); - parameter.put("now", LocalDateTime.now(Clock.fixed(Instant.ofEpochMilli(0), ZoneId.systemDefault()))); - return parameter; - }) - .build(); - // @formatter:on + var itemWriter = new MyBatisBatchItemWriterBuilder() + .sqlSessionFactory(this.sqlSessionFactory) + .statementId("updateFoo") + .itemToParameterConverter(item -> { + Map parameter = new HashMap<>(); + parameter.put("item", item); + parameter.put("now", LocalDateTime.now(Clock.fixed(Instant.ofEpochMilli(0), ZoneId.systemDefault()))); + return parameter; + }) + .build(); + // @formatter:on itemWriter.afterPropertiesSet(); - Chunk foos = getFoos(); + var foos = getFoos(); itemWriter.write(foos); @@ -183,10 +182,6 @@ private static class Foo { Foo(String name) { this.name = name; } - - public String getName() { - return this.name; - } } } diff --git a/src/test/java/org/mybatis/spring/batch/builder/MyBatisCursorItemReaderBuilderTest.java b/src/test/java/org/mybatis/spring/batch/builder/MyBatisCursorItemReaderBuilderTest.java index 95e0b04740..dbad275cd8 100644 --- a/src/test/java/org/mybatis/spring/batch/builder/MyBatisCursorItemReaderBuilderTest.java +++ b/src/test/java/org/mybatis/spring/batch/builder/MyBatisCursorItemReaderBuilderTest.java @@ -31,7 +31,6 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.mybatis.spring.batch.MyBatisCursorItemReader; import org.springframework.batch.item.ExecutionContext; /** @@ -68,16 +67,16 @@ void setUp() { void testConfiguration() throws Exception { // @formatter:off - MyBatisCursorItemReader itemReader = new MyBatisCursorItemReaderBuilder() - .sqlSessionFactory(this.sqlSessionFactory) - .queryId("selectFoo") - .parameterValues(Collections.singletonMap("id", 1)) - .parameterValuesSupplier(() -> Collections.singletonMap("name", "Doe")) - .build(); - // @formatter:on + var itemReader = new MyBatisCursorItemReaderBuilder() + .sqlSessionFactory(this.sqlSessionFactory) + .queryId("selectFoo") + .parameterValues(Collections.singletonMap("id", 1)) + .parameterValuesSupplier(() -> Collections.singletonMap("name", "Doe")) + .build(); + // @formatter:on itemReader.afterPropertiesSet(); - ExecutionContext executionContext = new ExecutionContext(); + var executionContext = new ExecutionContext(); itemReader.open(executionContext); Assertions.assertThat(itemReader.read()).extracting(Foo::getName).isEqualTo("foo1"); @@ -95,17 +94,17 @@ void testConfiguration() throws Exception { void testConfigurationSaveStateIsFalse() throws Exception { // @formatter:off - MyBatisCursorItemReader itemReader = new MyBatisCursorItemReaderBuilder() - .sqlSessionFactory(this.sqlSessionFactory) - .queryId("selectFoo") - .parameterValues(Collections.singletonMap("id", 1)) - .parameterValuesSupplier(() -> Collections.singletonMap("name", "Doe")) - .saveState(false) - .build(); - // @formatter:on + var itemReader = new MyBatisCursorItemReaderBuilder() + .sqlSessionFactory(this.sqlSessionFactory) + .queryId("selectFoo") + .parameterValues(Collections.singletonMap("id", 1)) + .parameterValuesSupplier(() -> Collections.singletonMap("name", "Doe")) + .saveState(false) + .build(); + // @formatter:on itemReader.afterPropertiesSet(); - ExecutionContext executionContext = new ExecutionContext(); + var executionContext = new ExecutionContext(); itemReader.open(executionContext); Assertions.assertThat(itemReader.read()).extracting(Foo::getName).isEqualTo("foo1"); @@ -121,17 +120,17 @@ void testConfigurationSaveStateIsFalse() throws Exception { void testConfigurationMaxItemCount() throws Exception { // @formatter:off - MyBatisCursorItemReader itemReader = new MyBatisCursorItemReaderBuilder() - .sqlSessionFactory(this.sqlSessionFactory) - .queryId("selectFoo") - .parameterValues(Collections.singletonMap("id", 1)) - .parameterValuesSupplier(() -> Collections.singletonMap("name", "Doe")) - .maxItemCount(2) - .build(); - // @formatter:on + var itemReader = new MyBatisCursorItemReaderBuilder() + .sqlSessionFactory(this.sqlSessionFactory) + .queryId("selectFoo") + .parameterValues(Collections.singletonMap("id", 1)) + .parameterValuesSupplier(() -> Collections.singletonMap("name", "Doe")) + .maxItemCount(2) + .build(); + // @formatter:on itemReader.afterPropertiesSet(); - ExecutionContext executionContext = new ExecutionContext(); + var executionContext = new ExecutionContext(); itemReader.open(executionContext); Assertions.assertThat(itemReader.read()).extracting(Foo::getName).isEqualTo("foo1"); diff --git a/src/test/java/org/mybatis/spring/batch/builder/MyBatisPagingItemReaderBuilderTest.java b/src/test/java/org/mybatis/spring/batch/builder/MyBatisPagingItemReaderBuilderTest.java index 5dca993aaa..e1f1961f04 100644 --- a/src/test/java/org/mybatis/spring/batch/builder/MyBatisPagingItemReaderBuilderTest.java +++ b/src/test/java/org/mybatis/spring/batch/builder/MyBatisPagingItemReaderBuilderTest.java @@ -35,7 +35,6 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.mybatis.spring.batch.MyBatisPagingItemReader; import org.springframework.batch.item.ExecutionContext; /** @@ -60,8 +59,8 @@ class MyBatisPagingItemReaderBuilderTest { void setUp() { MockitoAnnotations.openMocks(this); - Configuration configuration = new Configuration(); - Environment environment = new Environment("unittest", new JdbcTransactionFactory(), dataSource); + var configuration = new Configuration(); + var environment = new Environment("unittest", new JdbcTransactionFactory(), dataSource); configuration.setEnvironment(environment); Mockito.when(this.sqlSessionFactory.getConfiguration()).thenReturn(configuration); Mockito.when(this.sqlSessionFactory.openSession(ExecutorType.BATCH)).thenReturn(this.sqlSession); @@ -77,16 +76,16 @@ void setUp() { @Test void testConfiguration() throws Exception { // @formatter:off - MyBatisPagingItemReader itemReader = new MyBatisPagingItemReaderBuilder() - .sqlSessionFactory(this.sqlSessionFactory) - .queryId("selectFoo") - .parameterValues(Collections.singletonMap("id", 1)) - .parameterValuesSupplier(() -> Collections.singletonMap("name", "Doe")) - .build(); - // @formatter:on + var itemReader = new MyBatisPagingItemReaderBuilder() + .sqlSessionFactory(this.sqlSessionFactory) + .queryId("selectFoo") + .parameterValues(Collections.singletonMap("id", 1)) + .parameterValuesSupplier(() -> Collections.singletonMap("name", "Doe")) + .build(); + // @formatter:on itemReader.afterPropertiesSet(); - ExecutionContext executionContext = new ExecutionContext(); + var executionContext = new ExecutionContext(); itemReader.open(executionContext); Assertions.assertThat(itemReader.read()).extracting(Foo::getName).isEqualTo("foo1"); @@ -103,17 +102,17 @@ void testConfiguration() throws Exception { @Test void testConfigurationSaveStateIsFalse() throws Exception { // @formatter:off - MyBatisPagingItemReader itemReader = new MyBatisPagingItemReaderBuilder() - .sqlSessionFactory(this.sqlSessionFactory) - .queryId("selectFoo") - .parameterValues(Collections.singletonMap("id", 1)) - .parameterValuesSupplier(() -> Collections.singletonMap("name", "Doe")) - .saveState(false) - .build(); - // @formatter:on + var itemReader = new MyBatisPagingItemReaderBuilder() + .sqlSessionFactory(this.sqlSessionFactory) + .queryId("selectFoo") + .parameterValues(Collections.singletonMap("id", 1)) + .parameterValuesSupplier(() -> Collections.singletonMap("name", "Doe")) + .saveState(false) + .build(); + // @formatter:on itemReader.afterPropertiesSet(); - ExecutionContext executionContext = new ExecutionContext(); + var executionContext = new ExecutionContext(); itemReader.open(executionContext); Assertions.assertThat(itemReader.read()).extracting(Foo::getName).isEqualTo("foo1"); @@ -127,17 +126,17 @@ void testConfigurationSaveStateIsFalse() throws Exception { @Test void testConfigurationMaxItemCount() throws Exception { // @formatter:off - MyBatisPagingItemReader itemReader = new MyBatisPagingItemReaderBuilder() - .sqlSessionFactory(this.sqlSessionFactory) - .queryId("selectFoo") - .parameterValues(Collections.singletonMap("id", 1)) - .parameterValuesSupplier(() -> Collections.singletonMap("name", "Doe")) - .maxItemCount(2) - .build(); - // @formatter:on + var itemReader = new MyBatisPagingItemReaderBuilder() + .sqlSessionFactory(this.sqlSessionFactory) + .queryId("selectFoo") + .parameterValues(Collections.singletonMap("id", 1)) + .parameterValuesSupplier(() -> Collections.singletonMap("name", "Doe")) + .maxItemCount(2) + .build(); + // @formatter:on itemReader.afterPropertiesSet(); - ExecutionContext executionContext = new ExecutionContext(); + var executionContext = new ExecutionContext(); itemReader.open(executionContext); Assertions.assertThat(itemReader.read()).extracting(Foo::getName).isEqualTo("foo1"); @@ -152,14 +151,14 @@ void testConfigurationMaxItemCount() throws Exception { @Test void testConfigurationPageSize() throws Exception { // @formatter:off - MyBatisPagingItemReader itemReader = new MyBatisPagingItemReaderBuilder() - .sqlSessionFactory(this.sqlSessionFactory) - .queryId("selectFoo") - .parameterValues(Collections.singletonMap("id", 1)) - .parameterValuesSupplier(() -> Collections.singletonMap("name", "Doe")) - .pageSize(2) - .build(); - // @formatter:on + var itemReader = new MyBatisPagingItemReaderBuilder() + .sqlSessionFactory(this.sqlSessionFactory) + .queryId("selectFoo") + .parameterValues(Collections.singletonMap("id", 1)) + .parameterValuesSupplier(() -> Collections.singletonMap("name", "Doe")) + .pageSize(2) + .build(); + // @formatter:on itemReader.afterPropertiesSet(); Map parameters = new HashMap<>(); @@ -170,7 +169,7 @@ void testConfigurationPageSize() throws Exception { parameters.put("_skiprows", 0); Mockito.when(this.sqlSession.selectList("selectFoo", parameters)).thenReturn(getFoos()); - ExecutionContext executionContext = new ExecutionContext(); + var executionContext = new ExecutionContext(); itemReader.open(executionContext); Assertions.assertThat(itemReader.read()).extracting(Foo::getName).isEqualTo("foo1"); diff --git a/src/test/java/org/mybatis/spring/batch/domain/Employee.java b/src/test/java/org/mybatis/spring/batch/domain/Employee.java index 6cd26f9d80..228e9f2828 100644 --- a/src/test/java/org/mybatis/spring/batch/domain/Employee.java +++ b/src/test/java/org/mybatis/spring/batch/domain/Employee.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/config/MyBean.java b/src/test/java/org/mybatis/spring/config/MyBean.java index c597da2455..baa49e5c54 100644 --- a/src/test/java/org/mybatis/spring/config/MyBean.java +++ b/src/test/java/org/mybatis/spring/config/MyBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/config/MyFactoryBean.java b/src/test/java/org/mybatis/spring/config/MyFactoryBean.java index 7227f811f4..a6bb655ce2 100644 --- a/src/test/java/org/mybatis/spring/config/MyFactoryBean.java +++ b/src/test/java/org/mybatis/spring/config/MyFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/config/NamespaceTest.java b/src/test/java/org/mybatis/spring/config/NamespaceTest.java index 3a6293d921..3ec0616ebb 100644 --- a/src/test/java/org/mybatis/spring/config/NamespaceTest.java +++ b/src/test/java/org/mybatis/spring/config/NamespaceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. @@ -87,7 +87,7 @@ void testInterfaceScan() { startContext(); - SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); + var sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); assertEquals(5, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); // all interfaces with methods should be loaded @@ -220,7 +220,7 @@ void testLazy() { startContext(); - SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); + var sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); assertEquals(0, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); // all interfaces with methods should be loaded @@ -247,27 +247,26 @@ void testDefaultScope() { for (String scopedProxyTargetBean : scopedProxyTargetBeans) { { - BeanDefinition definition = applicationContext.getBeanFactory().getBeanDefinition(scopedProxyTargetBean); + var definition = applicationContext.getBeanFactory().getBeanDefinition(scopedProxyTargetBean); assertThat(definition.getBeanClassName()).isEqualTo("org.mybatis.spring.mapper.MapperFactoryBean"); assertThat(definition.getScope()).isEqualTo("thread"); } { - BeanDefinition definition = applicationContext.getBeanFactory() - .getBeanDefinition(scopedProxyTargetBean.substring(13)); + var definition = applicationContext.getBeanFactory().getBeanDefinition(scopedProxyTargetBean.substring(13)); assertThat(definition.getBeanClassName()).isEqualTo("org.springframework.aop.scope.ScopedProxyFactoryBean"); assertThat(definition.getScope()).isEqualTo(""); } } { - ScopedProxyMapper mapper = applicationContext.getBean(ScopedProxyMapper.class); + var mapper = applicationContext.getBean(ScopedProxyMapper.class); assertThat(mapper.test()).isEqualTo("test"); } { - AnnotatedMapper mapper = applicationContext.getBean(AnnotatedMapper.class); + var mapper = applicationContext.getBean(AnnotatedMapper.class); assertThat(mapper.test()).isEqualTo("main"); } - SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); + var sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); assertEquals(2, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); } @@ -279,10 +278,10 @@ void processPropertyPlaceHoldersIsTrue() { startContext(); - SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); + var sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); assertEquals(5, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); - MyBean myBean = applicationContext.getBean("myBean", MyBean.class); + var myBean = applicationContext.getBean("myBean", MyBean.class); assertThat(myBean.getName()).isEqualTo("MyBean!!"); } @@ -295,19 +294,19 @@ void processPropertyPlaceHoldersIsFalse() { startContext(); - SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); + var sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); assertEquals(5, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); - MyBean myBean = applicationContext.getBean("myBean", MyBean.class); + var myBean = applicationContext.getBean("myBean", MyBean.class); assertThat(myBean.getName()).isEqualTo("MyBean!!"); } private GenericApplicationContext setupSqlSessionTemplate() { - GenericApplicationContext genericApplicationContext = setupSqlSessionFactory(); - GenericBeanDefinition definition = new GenericBeanDefinition(); + var genericApplicationContext = setupSqlSessionFactory(); + var definition = new GenericBeanDefinition(); definition.setBeanClass(SqlSessionTemplate.class); - ConstructorArgumentValues constructorArgs = new ConstructorArgumentValues(); + var constructorArgs = new ConstructorArgumentValues(); constructorArgs.addGenericArgumentValue(new RuntimeBeanReference("sqlSessionFactory")); definition.setConstructorArgumentValues(constructorArgs); genericApplicationContext.registerBeanDefinition("sqlSessionTemplate", definition); @@ -316,13 +315,13 @@ private GenericApplicationContext setupSqlSessionTemplate() { private GenericApplicationContext setupSqlSessionFactory() { - GenericApplicationContext genericApplicationContext = new GenericApplicationContext(); + var genericApplicationContext = new GenericApplicationContext(); - GenericBeanDefinition definition = new GenericBeanDefinition(); + var definition = new GenericBeanDefinition(); definition.setBeanClass(SqlSessionFactoryBean.class); definition.getPropertyValues().add("dataSource", new MockDataSource()); - DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); + var factory = new DefaultListableBeanFactory(); factory.registerBeanDefinition("sqlSessionFactory", definition); genericApplicationContext.registerBeanDefinition("sqlSessionFactory", definition); diff --git a/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java b/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java index 76a96a7baf..1cb984c765 100644 --- a/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java +++ b/src/test/java/org/mybatis/spring/filter/ScanFilterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. @@ -214,7 +214,7 @@ private void startContext(Class config) { } private void setupSqlSessionFactory(String name) { - GenericBeanDefinition definition = new GenericBeanDefinition(); + var definition = new GenericBeanDefinition(); definition.setBeanClass(SqlSessionFactoryBean.class); definition.getPropertyValues().add("dataSource", new MockDataSource()); applicationContext.registerBeanDefinition(name, definition); diff --git a/src/test/java/org/mybatis/spring/filter/config/AppConfig.java b/src/test/java/org/mybatis/spring/filter/config/AppConfig.java index f331e2d8ce..88990b6ca9 100644 --- a/src/test/java/org/mybatis/spring/filter/config/AppConfig.java +++ b/src/test/java/org/mybatis/spring/filter/config/AppConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. @@ -65,7 +65,7 @@ public static class AspectJFilterConfig { public static class CombinedFilterConfig { @Bean static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { - PropertySourcesPlaceholderConfigurer configurer = new PropertySourcesPlaceholderConfigurer(); + var configurer = new PropertySourcesPlaceholderConfigurer(); configurer.setLocation(new ClassPathResource("/org/mybatis/spring/filter/config/application.properties")); return configurer; } @@ -115,7 +115,7 @@ public static class RegexFilterWithPlaceHolderConfig { public static class RegexFilterWithPlaceHolderConfig1 { @Bean static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { - PropertySourcesPlaceholderConfigurer configurer = new PropertySourcesPlaceholderConfigurer(); + var configurer = new PropertySourcesPlaceholderConfigurer(); configurer.setLocation(new ClassPathResource("/org/mybatis/spring/filter/config/application.properties")); return configurer; } @@ -127,7 +127,7 @@ static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer public static class ProcessPropertyPlaceHoldersOffConfig { @Bean static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { - PropertySourcesPlaceholderConfigurer configurer = new PropertySourcesPlaceholderConfigurer(); + var configurer = new PropertySourcesPlaceholderConfigurer(); configurer.setLocation(new ClassPathResource("/org/mybatis/spring/filter/config/application.properties")); return configurer; } diff --git a/src/test/java/org/mybatis/spring/filter/customfilter/AnnoTypeFilter.java b/src/test/java/org/mybatis/spring/filter/customfilter/AnnoTypeFilter.java index e32715a1c7..2b3ee06b7d 100644 --- a/src/test/java/org/mybatis/spring/filter/customfilter/AnnoTypeFilter.java +++ b/src/test/java/org/mybatis/spring/filter/customfilter/AnnoTypeFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. @@ -15,7 +15,11 @@ */ package org.mybatis.spring.filter.customfilter; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.TYPE }) diff --git a/src/test/java/org/mybatis/spring/filter/customfilter/CustomTypeFilter.java b/src/test/java/org/mybatis/spring/filter/customfilter/CustomTypeFilter.java index 52f8e05875..c149c13aef 100644 --- a/src/test/java/org/mybatis/spring/filter/customfilter/CustomTypeFilter.java +++ b/src/test/java/org/mybatis/spring/filter/customfilter/CustomTypeFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java b/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java index 237e3d1d8d..f0fd88e5fd 100644 --- a/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java +++ b/src/test/java/org/mybatis/spring/filter/xml/XmlScanFilterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. @@ -155,7 +155,8 @@ private void startContext(String config) { } private void closeContext() { - if (null != applicationContext) + if (null != applicationContext) { applicationContext.close(); + } } } diff --git a/src/test/java/org/mybatis/spring/mapper/AnnotatedMapper.java b/src/test/java/org/mybatis/spring/mapper/AnnotatedMapper.java index 129fdf3420..b1f6686bf7 100644 --- a/src/test/java/org/mybatis/spring/mapper/AnnotatedMapper.java +++ b/src/test/java/org/mybatis/spring/mapper/AnnotatedMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/mapper/MapperFactoryBeanTest.java b/src/test/java/org/mybatis/spring/mapper/MapperFactoryBeanTest.java index 25aa1e7759..9654f43a04 100644 --- a/src/test/java/org/mybatis/spring/mapper/MapperFactoryBeanTest.java +++ b/src/test/java/org/mybatis/spring/mapper/MapperFactoryBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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,7 +23,6 @@ import com.mockrunner.mock.jdbc.MockDataSource; import org.apache.ibatis.mapping.Environment; -import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -59,13 +58,13 @@ void testBasicUsage() throws Exception { void testAddToConfigTrue() throws Exception { // the default SqlSessionFactory in AbstractMyBatisSpringTest is created with an explicitly set // MapperLocations list, so create a new factory here that tests auto-loading the config - SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean(); + var factoryBean = new SqlSessionFactoryBean(); factoryBean.setDatabaseIdProvider(null); // mapperLocations properties defaults to null factoryBean.setDataSource(dataSource); factoryBean.setPlugins(executorInterceptor); - SqlSessionFactory sqlSessionFactory = factoryBean.getObject(); + var sqlSessionFactory = factoryBean.getObject(); find(new SqlSessionTemplate(sqlSessionFactory), true); assertCommit(); // SqlSesssionTemplate autocommits @@ -80,11 +79,11 @@ void testAddToConfigFalse() throws Throwable { // the default SqlSessionFactory in AbstractMyBatisSpringTest is created with an explicitly // set MapperLocations list, so create a new factory here that tests auto-loading the // config - SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean(); + var factoryBean = new SqlSessionFactoryBean(); // mapperLocations properties defaults to null factoryBean.setDataSource(dataSource); - SqlSessionFactory sqlSessionFactory = factoryBean.getObject(); + var sqlSessionFactory = factoryBean.getObject(); assertThrows(org.apache.ibatis.binding.BindingException.class, () -> find(new SqlSessionTemplate(sqlSessionFactory), false)); @@ -100,7 +99,7 @@ void testAddToConfigFalse() throws Throwable { @Test void testWithTx() throws Exception { - TransactionStatus status = txManager.getTransaction(new DefaultTransactionDefinition()); + var status = txManager.getTransaction(new DefaultTransactionDefinition()); find(); @@ -115,8 +114,8 @@ void testWithTx() throws Exception { // transaction @Test void testWithNonSpringTransactionFactory() throws Exception { - Environment original = sqlSessionFactory.getConfiguration().getEnvironment(); - Environment nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), dataSource); + var original = sqlSessionFactory.getConfiguration().getEnvironment(); + var nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), dataSource); sqlSessionFactory.getConfiguration().setEnvironment(nonSpring); try { @@ -135,8 +134,8 @@ void testWithNonSpringTransactionFactory() throws Exception { // this should error @Test void testNonSpringTxMgrWithTx() throws Exception { - Environment original = sqlSessionFactory.getConfiguration().getEnvironment(); - Environment nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), dataSource); + var original = sqlSessionFactory.getConfiguration().getEnvironment(); + var nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), dataSource); sqlSessionFactory.getConfiguration().setEnvironment(nonSpring); TransactionStatus status = null; @@ -162,15 +161,15 @@ void testNonSpringTxMgrWithTx() throws Exception { // similar to testNonSpringTxFactoryNonSpringDSWithTx() in MyBatisSpringTest @Test void testNonSpringWithTx() throws Exception { - Environment original = sqlSessionFactory.getConfiguration().getEnvironment(); + var original = sqlSessionFactory.getConfiguration().getEnvironment(); - MockDataSource mockDataSource = new MockDataSource(); + var mockDataSource = new MockDataSource(); mockDataSource.setupConnection(createMockConnection()); - Environment nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), mockDataSource); + var nonSpring = new Environment("non-spring", new JdbcTransactionFactory(), mockDataSource); sqlSessionFactory.getConfiguration().setEnvironment(nonSpring); - SqlSessionTemplate sqlSessionTemplate = new SqlSessionTemplate(sqlSessionFactory); + var sqlSessionTemplate = new SqlSessionTemplate(sqlSessionFactory); TransactionStatus status; @@ -186,7 +185,7 @@ void testNonSpringWithTx() throws Exception { assertSingleConnection(); // SqlSessionTemplate uses its own connection - MockConnection mockConnection = (MockConnection) mockDataSource.getConnection(); + var mockConnection = (MockConnection) mockDataSource.getConnection(); assertThat(mockConnection.getNumberCommits()).as("should call commit on Connection").isEqualTo(1); assertThat(mockConnection.getNumberRollbacks()).as("should not call rollback on Connection").isEqualTo(0); assertCommitSession(); @@ -207,7 +206,7 @@ private void find(SqlSessionTemplate sqlSessionTemplate) throws Exception { private void find(SqlSessionTemplate sqlSessionTemplate, boolean addToConfig) throws Exception { // recreate the mapper for each test since sqlSessionTemplate or the underlying // SqlSessionFactory could change for each test - MapperFactoryBean mapper = new MapperFactoryBean<>(); + var mapper = new MapperFactoryBean(); mapper.setMapperInterface(TestMapper.class); mapper.setSqlSessionTemplate(sqlSessionTemplate); mapper.setAddToConfig(addToConfig); diff --git a/src/test/java/org/mybatis/spring/mapper/MapperImplementation.java b/src/test/java/org/mybatis/spring/mapper/MapperImplementation.java index b5ad8bec2e..409bd04607 100644 --- a/src/test/java/org/mybatis/spring/mapper/MapperImplementation.java +++ b/src/test/java/org/mybatis/spring/mapper/MapperImplementation.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/mapper/MapperInterface.java b/src/test/java/org/mybatis/spring/mapper/MapperInterface.java index d9c5dc970d..545f3a62f8 100644 --- a/src/test/java/org/mybatis/spring/mapper/MapperInterface.java +++ b/src/test/java/org/mybatis/spring/mapper/MapperInterface.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java b/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java index a37fd27380..c2de7a5c02 100644 --- a/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java +++ b/src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java @@ -23,7 +23,6 @@ import com.mockrunner.mock.jdbc.MockDataSource; import java.util.List; -import java.util.Properties; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -46,7 +45,6 @@ import org.springframework.context.support.GenericApplicationContext; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.context.support.SimpleThreadScope; -import org.springframework.core.env.MutablePropertySources; import org.springframework.mock.env.MockPropertySource; import org.springframework.stereotype.Component; @@ -60,7 +58,7 @@ void setupContext() { // add the mapper scanner as a bean definition rather than explicitly setting a // postProcessor on the context so initialization follows the same code path as reading from // an XML config file - GenericBeanDefinition definition = new GenericBeanDefinition(); + var definition = new GenericBeanDefinition(); definition.setBeanClass(MapperScannerConfigurer.class); definition.getPropertyValues().add("basePackage", "org.mybatis.spring.mapper"); applicationContext.registerBeanDefinition("mapperScanner", definition); @@ -98,7 +96,7 @@ void assertNoMapperClass() { void testInterfaceScan() { startContext(); - SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); + var sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); assertEquals(5, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); @@ -126,7 +124,7 @@ void testInterfaceScan() { @Test void testNameGenerator() { - GenericBeanDefinition definition = new GenericBeanDefinition(); + var definition = new GenericBeanDefinition(); definition.setBeanClass(BeanNameGenerator.class); applicationContext.registerBeanDefinition("beanNameGenerator", definition); @@ -193,29 +191,29 @@ void testScopedProxyMapperScan() { startContext(); { - BeanDefinition definition = applicationContext.getBeanDefinition("scopedProxyMapper"); + var definition = applicationContext.getBeanDefinition("scopedProxyMapper"); assertThat(definition.getBeanClassName()).isEqualTo("org.springframework.aop.scope.ScopedProxyFactoryBean"); assertThat(definition.getScope()).isEqualTo(""); } { - BeanDefinition definition = applicationContext.getBeanDefinition("scopedTarget.scopedProxyMapper"); + var definition = applicationContext.getBeanDefinition("scopedTarget.scopedProxyMapper"); assertThat(definition.getBeanClassName()).isEqualTo("org.mybatis.spring.mapper.MapperFactoryBean"); assertThat(definition.getScope()).isEqualTo("thread"); } { - ScopedProxyMapper mapper = applicationContext.getBean(ScopedProxyMapper.class); + var mapper = applicationContext.getBean(ScopedProxyMapper.class); assertThat(mapper.test()).isEqualTo("test"); } { - ScopedProxyMapper mapper = applicationContext.getBean("scopedTarget.scopedProxyMapper", ScopedProxyMapper.class); + var mapper = applicationContext.getBean("scopedTarget.scopedProxyMapper", ScopedProxyMapper.class); assertThat(mapper.test()).isEqualTo("test"); } { - ScopedProxyMapper mapper = applicationContext.getBean("scopedProxyMapper", ScopedProxyMapper.class); + var mapper = applicationContext.getBean("scopedProxyMapper", ScopedProxyMapper.class); assertThat(mapper.test()).isEqualTo("test"); } - SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); + var sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); assertEquals(1, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); } @@ -233,26 +231,26 @@ void testScopedProxyMapperScanByDefault() { for (String scopedProxyTargetBean : scopedProxyTargetBeans) { { - BeanDefinition definition = applicationContext.getBeanDefinition(scopedProxyTargetBean); + var definition = applicationContext.getBeanDefinition(scopedProxyTargetBean); assertThat(definition.getBeanClassName()).isEqualTo("org.mybatis.spring.mapper.MapperFactoryBean"); assertThat(definition.getScope()).isEqualTo("thread"); } { - BeanDefinition definition = applicationContext.getBeanDefinition(scopedProxyTargetBean.substring(13)); + var definition = applicationContext.getBeanDefinition(scopedProxyTargetBean.substring(13)); assertThat(definition.getBeanClassName()).isEqualTo("org.springframework.aop.scope.ScopedProxyFactoryBean"); assertThat(definition.getScope()).isEqualTo(""); } } { - ScopedProxyMapper mapper = applicationContext.getBean(ScopedProxyMapper.class); + var mapper = applicationContext.getBean(ScopedProxyMapper.class); assertThat(mapper.test()).isEqualTo("test"); } { - AnnotatedMapper mapper = applicationContext.getBean(AnnotatedMapper.class); + var mapper = applicationContext.getBean(AnnotatedMapper.class); assertThat(mapper.test()).isEqualTo("main"); } - SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); + var sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); assertEquals(2, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); } @@ -274,9 +272,9 @@ void testScanWithExplicitSqlSessionFactory() { @Test void testScanWithExplicitSqlSessionTemplate() { - GenericBeanDefinition definition = new GenericBeanDefinition(); + var definition = new GenericBeanDefinition(); definition.setBeanClass(SqlSessionTemplate.class); - ConstructorArgumentValues constructorArgs = new ConstructorArgumentValues(); + var constructorArgs = new ConstructorArgumentValues(); constructorArgs.addGenericArgumentValue(new RuntimeBeanReference("sqlSessionFactory")); definition.setConstructorArgumentValues(constructorArgs); applicationContext.registerBeanDefinition("sqlSessionTemplate", definition); @@ -301,10 +299,10 @@ void testScanWithExplicitSqlSessionFactoryViaPlaceholder() { applicationContext.getBeanDefinition("mapperScanner").getPropertyValues().add("sqlSessionFactoryBeanName", "${sqlSessionFactoryBeanNameProperty}"); - Properties props = new java.util.Properties(); + var props = new java.util.Properties(); props.put("sqlSessionFactoryBeanNameProperty", "sqlSessionFactory2"); - GenericBeanDefinition propertyDefinition = new GenericBeanDefinition(); + var propertyDefinition = new GenericBeanDefinition(); propertyDefinition.setBeanClass(PropertySourcesPlaceholderConfigurer.class); propertyDefinition.getPropertyValues().add("properties", props); @@ -321,7 +319,7 @@ void testScanWithExplicitSqlSessionFactoryViaPlaceholder() { @Test void testScanWithNameConflict() { - GenericBeanDefinition definition = new GenericBeanDefinition(); + var definition = new GenericBeanDefinition(); definition.setBeanClass(Object.class); applicationContext.registerBeanDefinition("mapperInterface", definition); @@ -333,7 +331,7 @@ void testScanWithNameConflict() { @Test void testScanWithPropertyPlaceholders() { - GenericBeanDefinition definition = (GenericBeanDefinition) applicationContext.getBeanDefinition("mapperScanner"); + var definition = (GenericBeanDefinition) applicationContext.getBeanDefinition("mapperScanner"); // use a property placeholder for basePackage definition.getPropertyValues().removePropertyValue("basePackage"); @@ -349,12 +347,12 @@ void testScanWithPropertyPlaceholders() { definition.getPropertyValues().removePropertyValue("configLocation"); definition.getPropertyValues().add("configLocation", "${configLocationProperty}"); - Properties props = new java.util.Properties(); + var props = new java.util.Properties(); props.put("basePackageProperty", "org.mybatis.spring.mapper"); props.put("configLocationProperty", "classpath:org/mybatis/spring/mybatis-config.xml"); props.put("mybatis.lazy-initialization", "true"); - GenericBeanDefinition propertyDefinition = new GenericBeanDefinition(); + var propertyDefinition = new GenericBeanDefinition(); propertyDefinition.setBeanClass(PropertySourcesPlaceholderConfigurer.class); propertyDefinition.getPropertyValues().add("properties", props); @@ -362,7 +360,7 @@ void testScanWithPropertyPlaceholders() { startContext(); - SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); + var sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class); System.out.println(sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers()); assertEquals(1, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); @@ -376,7 +374,7 @@ void testScanWithPropertyPlaceholders() { // make sure the configLocation was setup correctly // mybatis-config.xml changes the executor from the default SIMPLE type - SqlSessionFactory sessionFactory = (SqlSessionFactory) applicationContext.getBean("sqlSessionFactory"); + var sessionFactory = (SqlSessionFactory) applicationContext.getBean("sqlSessionFactory"); assertThat(sessionFactory.getConfiguration().getDefaultExecutorType()).isSameAs(ExecutorType.REUSE); } @@ -406,7 +404,7 @@ void testMapperBeanAttribute() { @Test void testMapperBeanOnConditionalProperties() { - MutablePropertySources propertySources = applicationContext.getEnvironment().getPropertySources(); + var propertySources = applicationContext.getEnvironment().getPropertySources(); propertySources.addLast(new MockPropertySource().withProperty("mapper.condition", "true")); startContext(); @@ -417,7 +415,7 @@ void testMapperBeanOnConditionalProperties() { } private void setupSqlSessionFactory(String name) { - GenericBeanDefinition definition = new GenericBeanDefinition(); + var definition = new GenericBeanDefinition(); definition.setBeanClass(SqlSessionFactoryBean.class); definition.getPropertyValues().add("dataSource", new MockDataSource()); applicationContext.registerBeanDefinition(name, definition); diff --git a/src/test/java/org/mybatis/spring/mapper/ScopedProxyMapper.java b/src/test/java/org/mybatis/spring/mapper/ScopedProxyMapper.java index c07ec1a0d3..6294408eee 100644 --- a/src/test/java/org/mybatis/spring/mapper/ScopedProxyMapper.java +++ b/src/test/java/org/mybatis/spring/mapper/ScopedProxyMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/mapper/child/MapperChildInterface.java b/src/test/java/org/mybatis/spring/mapper/child/MapperChildInterface.java index a540f16613..51b4523ce8 100644 --- a/src/test/java/org/mybatis/spring/mapper/child/MapperChildInterface.java +++ b/src/test/java/org/mybatis/spring/mapper/child/MapperChildInterface.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/sample/AbstractSampleJobTest.java b/src/test/java/org/mybatis/spring/sample/AbstractSampleJobTest.java index 8f17d16183..b076e29469 100644 --- a/src/test/java/org/mybatis/spring/sample/AbstractSampleJobTest.java +++ b/src/test/java/org/mybatis/spring/sample/AbstractSampleJobTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -15,15 +15,11 @@ */ package org.mybatis.spring.sample; -import java.util.List; -import java.util.Map; - import javax.sql.DataSource; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.batch.core.Job; -import org.springframework.batch.core.JobExecution; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -42,17 +38,17 @@ abstract class AbstractSampleJobTest { @Test void testJob() throws Exception { - JobExecution jobExecution = jobLauncherTestUtils.launchJob(); + var jobExecution = jobLauncherTestUtils.launchJob(); Assertions.assertEquals("COMPLETED", jobExecution.getExitStatus().getExitCode()); - List> persons = jdbcTemplate.queryForList("SELECT * FROM persons ORDER BY person_id", + var persons = jdbcTemplate.queryForList("SELECT * FROM persons ORDER BY person_id", EmptySqlParameterSource.INSTANCE); Assertions.assertEquals(5, persons.size()); - Object operationBy = persons.get(0).get("OPERATION_BY"); - Object operationAt = persons.get(0).get("OPERATION_AT"); + var operationBy = persons.get(0).get("OPERATION_BY"); + var operationAt = persons.get(0).get("OPERATION_AT"); { - Map person = persons.get(0); + var person = persons.get(0); Assertions.assertEquals(0, person.get("PERSON_ID")); Assertions.assertEquals("Pocoyo", person.get("FIRST_NAME")); Assertions.assertNull(person.get("LAST_NAME")); @@ -60,7 +56,7 @@ void testJob() throws Exception { Assertions.assertNotNull(operationAt); } { - Map person = persons.get(1); + var person = persons.get(1); Assertions.assertEquals(1, person.get("PERSON_ID")); Assertions.assertEquals("Pato", person.get("FIRST_NAME")); Assertions.assertNull(person.get("LAST_NAME")); @@ -68,7 +64,7 @@ void testJob() throws Exception { Assertions.assertEquals(operationAt, person.get("OPERATION_AT")); } { - Map person = persons.get(2); + var person = persons.get(2); Assertions.assertEquals(2, person.get("PERSON_ID")); Assertions.assertEquals("Eli", person.get("FIRST_NAME")); Assertions.assertNull(person.get("LAST_NAME")); @@ -76,7 +72,7 @@ void testJob() throws Exception { Assertions.assertEquals(operationAt, person.get("OPERATION_AT")); } { - Map person = persons.get(3); + var person = persons.get(3); Assertions.assertEquals(3, person.get("PERSON_ID")); Assertions.assertEquals("Valentina", person.get("FIRST_NAME")); Assertions.assertNull(person.get("LAST_NAME")); @@ -84,7 +80,7 @@ void testJob() throws Exception { Assertions.assertEquals(operationAt, person.get("OPERATION_AT")); } { - Map person = persons.get(4); + var person = persons.get(4); Assertions.assertEquals(4, person.get("PERSON_ID")); Assertions.assertEquals("Taro", person.get("FIRST_NAME")); Assertions.assertEquals("Yamada", person.get("LAST_NAME")); @@ -99,7 +95,7 @@ void testJob() throws Exception { static class LocalContext { @Bean JobLauncherTestUtils jobLauncherTestUtils(Job job) { - JobLauncherTestUtils utils = new JobLauncherTestUtils(); + var utils = new JobLauncherTestUtils(); utils.setJob(job); return utils; } diff --git a/src/test/java/org/mybatis/spring/sample/AbstractSampleTest.java b/src/test/java/org/mybatis/spring/sample/AbstractSampleTest.java index 577f555305..3c3309e2f7 100644 --- a/src/test/java/org/mybatis/spring/sample/AbstractSampleTest.java +++ b/src/test/java/org/mybatis/spring/sample/AbstractSampleTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. @@ -18,7 +18,6 @@ import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; -import org.mybatis.spring.sample.domain.User; import org.mybatis.spring.sample.service.FooService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.DirtiesContext; @@ -31,7 +30,7 @@ abstract class AbstractSampleTest { @Test final void testFooService() { - User user = this.fooService.doSomeBusinessStuff("u1"); + var user = this.fooService.doSomeBusinessStuff("u1"); assertThat(user).isNotNull(); assertThat(user.getName()).isEqualTo("Pocoyo"); } diff --git a/src/test/java/org/mybatis/spring/sample/SampleBatchTest.java b/src/test/java/org/mybatis/spring/sample/SampleBatchTest.java index 1e2d7febff..3c0c49629d 100644 --- a/src/test/java/org/mybatis/spring/sample/SampleBatchTest.java +++ b/src/test/java/org/mybatis/spring/sample/SampleBatchTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/sample/SampleEnableTest.java b/src/test/java/org/mybatis/spring/sample/SampleEnableTest.java index 1555387e33..f11d76a370 100644 --- a/src/test/java/org/mybatis/spring/sample/SampleEnableTest.java +++ b/src/test/java/org/mybatis/spring/sample/SampleEnableTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/sample/SampleJavaConfigTest.java b/src/test/java/org/mybatis/spring/sample/SampleJavaConfigTest.java index fd7b4526be..61b1c890e8 100644 --- a/src/test/java/org/mybatis/spring/sample/SampleJavaConfigTest.java +++ b/src/test/java/org/mybatis/spring/sample/SampleJavaConfigTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -22,7 +22,6 @@ import org.junit.jupiter.api.Test; import org.mybatis.spring.sample.config.SampleConfig; -import org.mybatis.spring.sample.domain.User; import org.mybatis.spring.sample.service.FooService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; @@ -38,13 +37,13 @@ class SampleJavaConfigTest { @Test void test() { - User user = fooService.doSomeBusinessStuff("u1"); + var user = fooService.doSomeBusinessStuff("u1"); assertThat(user.getName()).isEqualTo("Pocoyo"); } @Test void testWithMapperFactoryBean() { - User user = fooServiceWithMapperFactoryBean.doSomeBusinessStuff("u1"); + var user = fooServiceWithMapperFactoryBean.doSomeBusinessStuff("u1"); assertThat(user.getName()).isEqualTo("Pocoyo"); } diff --git a/src/test/java/org/mybatis/spring/sample/SampleJobJavaConfigTest.java b/src/test/java/org/mybatis/spring/sample/SampleJobJavaConfigTest.java index 7f6c32c699..82713606b6 100644 --- a/src/test/java/org/mybatis/spring/sample/SampleJobJavaConfigTest.java +++ b/src/test/java/org/mybatis/spring/sample/SampleJobJavaConfigTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/sample/SampleJobXmlConfigTest.java b/src/test/java/org/mybatis/spring/sample/SampleJobXmlConfigTest.java index 7dfe2f3691..937adcbacd 100644 --- a/src/test/java/org/mybatis/spring/sample/SampleJobXmlConfigTest.java +++ b/src/test/java/org/mybatis/spring/sample/SampleJobXmlConfigTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java b/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java index c8750d6cc9..da0cbfedb2 100644 --- a/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java +++ b/src/test/java/org/mybatis/spring/sample/SampleSqlSessionTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. @@ -18,7 +18,6 @@ import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; -import org.mybatis.spring.sample.domain.User; import org.mybatis.spring.sample.service.BarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.DirtiesContext; @@ -37,7 +36,7 @@ class SampleSqlSessionTest { @Test void testFooService() { - User user = this.barService.doSomeBusinessStuff("u1"); + var user = this.barService.doSomeBusinessStuff("u1"); assertThat(user).isNotNull(); assertThat(user.getName()).isEqualTo("Pocoyo"); } diff --git a/src/test/java/org/mybatis/spring/sample/batch/UserToPersonItemProcessor.java b/src/test/java/org/mybatis/spring/sample/batch/UserToPersonItemProcessor.java index 293b04b068..b09e21f13d 100644 --- a/src/test/java/org/mybatis/spring/sample/batch/UserToPersonItemProcessor.java +++ b/src/test/java/org/mybatis/spring/sample/batch/UserToPersonItemProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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,12 +23,11 @@ public class UserToPersonItemProcessor implements ItemProcessor { @Override public Person process(final User user) throws Exception { - final String[] names = user.getName().split(" "); + final var names = user.getName().split(" "); if (names.length == 1) { return new Person(names[0], null); - } else { - return new Person(names[0], names[1]); } + return new Person(names[0], names[1]); } } diff --git a/src/test/java/org/mybatis/spring/sample/config/SampleConfig.java b/src/test/java/org/mybatis/spring/sample/config/SampleConfig.java index 20ff578288..c5419b54de 100644 --- a/src/test/java/org/mybatis/spring/sample/config/SampleConfig.java +++ b/src/test/java/org/mybatis/spring/sample/config/SampleConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -47,7 +47,7 @@ public PlatformTransactionManager transactionalManager() { @Bean public SqlSessionFactory sqlSessionFactory() throws Exception { - SqlSessionFactoryBean ss = new SqlSessionFactoryBean(); + var ss = new SqlSessionFactoryBean(); ss.setDataSource(dataSource()); ss.setMapperLocations(new ClassPathResource("org/mybatis/spring/sample/mapper/UserMapper.xml")); return ss.getObject(); @@ -56,13 +56,13 @@ public SqlSessionFactory sqlSessionFactory() throws Exception { @Bean public UserMapper userMapper() throws Exception { // when using javaconfig a template requires less lines than a MapperFactoryBean - SqlSessionTemplate sqlSessionTemplate = new SqlSessionTemplate(sqlSessionFactory()); + var sqlSessionTemplate = new SqlSessionTemplate(sqlSessionFactory()); return sqlSessionTemplate.getMapper(UserMapper.class); } @Bean public UserMapper userMapperWithFactory() throws Exception { - MapperFactoryBean mapperFactoryBean = new MapperFactoryBean<>(); + var mapperFactoryBean = new MapperFactoryBean(); mapperFactoryBean.setMapperInterface(UserMapper.class); mapperFactoryBean.setSqlSessionFactory(sqlSessionFactory()); mapperFactoryBean.afterPropertiesSet(); diff --git a/src/test/java/org/mybatis/spring/sample/config/SampleJobConfig.java b/src/test/java/org/mybatis/spring/sample/config/SampleJobConfig.java index d951605dc9..8c6fbd8e12 100644 --- a/src/test/java/org/mybatis/spring/sample/config/SampleJobConfig.java +++ b/src/test/java/org/mybatis/spring/sample/config/SampleJobConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -69,11 +69,11 @@ public PlatformTransactionManager transactionManager(DataSource dataSource) { @Bean public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception { - PathMatchingResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver(); - SqlSessionFactoryBean ss = new SqlSessionFactoryBean(); + var resourcePatternResolver = new PathMatchingResourcePatternResolver(); + var ss = new SqlSessionFactoryBean(); ss.setDataSource(dataSource); ss.setMapperLocations(resourcePatternResolver.getResources("org/mybatis/spring/sample/mapper/*.xml")); - org.apache.ibatis.session.Configuration configuration = new org.apache.ibatis.session.Configuration(); + var configuration = new org.apache.ibatis.session.Configuration(); configuration.setDefaultExecutorType(ExecutorType.BATCH); ss.setConfiguration(configuration); return ss.getObject(); @@ -82,11 +82,11 @@ public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Excepti @Bean public MyBatisCursorItemReader reader(SqlSessionFactory sqlSessionFactory) { // @formatter:off - return new MyBatisCursorItemReaderBuilder() - .sqlSessionFactory(sqlSessionFactory) - .queryId("org.mybatis.spring.sample.mapper.UserMapper.getUsers") - .build(); - // @formatter:on + return new MyBatisCursorItemReaderBuilder() + .sqlSessionFactory(sqlSessionFactory) + .queryId("org.mybatis.spring.sample.mapper.UserMapper.getUsers") + .build(); + // @formatter:on } @Bean @@ -97,12 +97,12 @@ public UserToPersonItemProcessor processor() { @Bean public MyBatisBatchItemWriter writer(SqlSessionFactory sqlSessionFactory) { // @formatter:off - return new MyBatisBatchItemWriterBuilder() - .sqlSessionFactory(sqlSessionFactory) - .statementId("org.mybatis.spring.sample.mapper.PersonMapper.createPerson") - .itemToParameterConverter(createItemToParameterMapConverter("batch_java_config_user", LocalDateTime.now())) - .build(); - // @formatter:on + return new MyBatisBatchItemWriterBuilder() + .sqlSessionFactory(sqlSessionFactory) + .statementId("org.mybatis.spring.sample.mapper.PersonMapper.createPerson") + .itemToParameterConverter(createItemToParameterMapConverter("batch_java_config_user", LocalDateTime.now())) + .build(); + // @formatter:on } public static Converter> createItemToParameterMapConverter(String operationBy, @@ -119,24 +119,24 @@ public static Converter> createItemToParameterMapConv @Bean public Job importUserJob(JobRepository jobRepository, Step step1) { // @formatter:off - return new JobBuilder("importUserJob", jobRepository) - .flow(step1) - .end() - .build(); - // @formatter:on + return new JobBuilder("importUserJob", jobRepository) + .flow(step1) + .end() + .build(); + // @formatter:on } @Bean public Step step1(JobRepository jobRepository, PlatformTransactionManager transactionManager, ItemReader reader, ItemProcessor processor, ItemWriter writer) { // @formatter:off - return new StepBuilder("step1", jobRepository) - .chunk(10, transactionManager) - .reader(reader) - .processor(processor) - .writer(writer) - .build(); - // @formatter:on + return new StepBuilder("step1", jobRepository) + .chunk(10, transactionManager) + .reader(reader) + .processor(processor) + .writer(writer) + .build(); + // @formatter:on } } diff --git a/src/test/java/org/mybatis/spring/sample/dao/UserDao.java b/src/test/java/org/mybatis/spring/sample/dao/UserDao.java index 4ce3693efa..39e0ce608d 100644 --- a/src/test/java/org/mybatis/spring/sample/dao/UserDao.java +++ b/src/test/java/org/mybatis/spring/sample/dao/UserDao.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/sample/dao/UserDaoImpl.java b/src/test/java/org/mybatis/spring/sample/dao/UserDaoImpl.java index 27276f1f8e..794d142752 100644 --- a/src/test/java/org/mybatis/spring/sample/dao/UserDaoImpl.java +++ b/src/test/java/org/mybatis/spring/sample/dao/UserDaoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/sample/domain/Person.java b/src/test/java/org/mybatis/spring/sample/domain/Person.java index ec5a9eea2a..71c1352d3d 100644 --- a/src/test/java/org/mybatis/spring/sample/domain/Person.java +++ b/src/test/java/org/mybatis/spring/sample/domain/Person.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/sample/domain/User.java b/src/test/java/org/mybatis/spring/sample/domain/User.java index 346d6e10e3..95fc9df6f1 100644 --- a/src/test/java/org/mybatis/spring/sample/domain/User.java +++ b/src/test/java/org/mybatis/spring/sample/domain/User.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -42,7 +42,7 @@ public void setName(String name) { @Override public String toString() { - StringBuilder buf = new StringBuilder(30); + var buf = new StringBuilder(30); buf.append("{"); buf.append(id); buf.append(", "); diff --git a/src/test/java/org/mybatis/spring/sample/mapper/UserMapper.java b/src/test/java/org/mybatis/spring/sample/mapper/UserMapper.java index 13252a5242..0308a28a6e 100644 --- a/src/test/java/org/mybatis/spring/sample/mapper/UserMapper.java +++ b/src/test/java/org/mybatis/spring/sample/mapper/UserMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/sample/service/BarService.java b/src/test/java/org/mybatis/spring/sample/service/BarService.java index 24182f91ab..640e37e12c 100644 --- a/src/test/java/org/mybatis/spring/sample/service/BarService.java +++ b/src/test/java/org/mybatis/spring/sample/service/BarService.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/sample/service/FooService.java b/src/test/java/org/mybatis/spring/sample/service/FooService.java index 8bd39db806..1ff450b2f6 100644 --- a/src/test/java/org/mybatis/spring/sample/service/FooService.java +++ b/src/test/java/org/mybatis/spring/sample/service/FooService.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/scan/ScanClass1.java b/src/test/java/org/mybatis/spring/scan/ScanClass1.java index 6734fd7732..169ad00c85 100644 --- a/src/test/java/org/mybatis/spring/scan/ScanClass1.java +++ b/src/test/java/org/mybatis/spring/scan/ScanClass1.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/scan/ScanClass2.java b/src/test/java/org/mybatis/spring/scan/ScanClass2.java index e139e2d940..5c73725f03 100644 --- a/src/test/java/org/mybatis/spring/scan/ScanClass2.java +++ b/src/test/java/org/mybatis/spring/scan/ScanClass2.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/submitted/autowire/AutowireTest.java b/src/test/java/org/mybatis/spring/submitted/autowire/AutowireTest.java index d8b0a0d92f..5c348c0698 100644 --- a/src/test/java/org/mybatis/spring/submitted/autowire/AutowireTest.java +++ b/src/test/java/org/mybatis/spring/submitted/autowire/AutowireTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -24,14 +24,14 @@ class AutowireTest { @Test void shouldReturnMapper() { - try (ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( + try (var context = new ClassPathXmlApplicationContext( "classpath:org/mybatis/spring/submitted/autowire/spring.xml")) { - FooMapper fooMapper = (FooMapper) context.getBean("fooMapper"); + var fooMapper = (FooMapper) context.getBean("fooMapper"); assertThat(fooMapper).isNotNull(); fooMapper.executeFoo(); - BarMapper barMapper = (BarMapper) context.getBean("barMapper"); + var barMapper = (BarMapper) context.getBean("barMapper"); assertThat(barMapper).isNotNull(); barMapper.executeBar(); } diff --git a/src/test/java/org/mybatis/spring/submitted/autowire/BarMapper.java b/src/test/java/org/mybatis/spring/submitted/autowire/BarMapper.java index 35d9dc7177..6ecced0f0e 100644 --- a/src/test/java/org/mybatis/spring/submitted/autowire/BarMapper.java +++ b/src/test/java/org/mybatis/spring/submitted/autowire/BarMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/submitted/autowire/FooMapper.java b/src/test/java/org/mybatis/spring/submitted/autowire/FooMapper.java index 71b2bd84af..b711bbbf9b 100644 --- a/src/test/java/org/mybatis/spring/submitted/autowire/FooMapper.java +++ b/src/test/java/org/mybatis/spring/submitted/autowire/FooMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/submitted/webapp_placeholder/WebappPlaceholderTest.java b/src/test/java/org/mybatis/spring/submitted/webapp_placeholder/WebappPlaceholderTest.java index 838bdf1966..c50cdb94a9 100644 --- a/src/test/java/org/mybatis/spring/submitted/webapp_placeholder/WebappPlaceholderTest.java +++ b/src/test/java/org/mybatis/spring/submitted/webapp_placeholder/WebappPlaceholderTest.java @@ -41,7 +41,7 @@ class WebappPlaceholderTest { @Test void testName() { Assertions.assertEquals(0, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); - Mapper mapper = applicationContext.getBean(Mapper.class); + var mapper = applicationContext.getBean(Mapper.class); assertThat(mapper).isNotNull(); Assertions.assertEquals(1, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size()); } diff --git a/src/test/java/org/mybatis/spring/submitted/xa/User.java b/src/test/java/org/mybatis/spring/submitted/xa/User.java index 8915696f92..c27dabaa95 100644 --- a/src/test/java/org/mybatis/spring/submitted/xa/User.java +++ b/src/test/java/org/mybatis/spring/submitted/xa/User.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/submitted/xa/UserMapper.java b/src/test/java/org/mybatis/spring/submitted/xa/UserMapper.java index f630b7bbfd..151969e96f 100644 --- a/src/test/java/org/mybatis/spring/submitted/xa/UserMapper.java +++ b/src/test/java/org/mybatis/spring/submitted/xa/UserMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/submitted/xa/UserService.java b/src/test/java/org/mybatis/spring/submitted/xa/UserService.java index 5110a91c37..f28c790cbd 100644 --- a/src/test/java/org/mybatis/spring/submitted/xa/UserService.java +++ b/src/test/java/org/mybatis/spring/submitted/xa/UserService.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/submitted/xa/UserServiceImpl.java b/src/test/java/org/mybatis/spring/submitted/xa/UserServiceImpl.java index 38e715d524..967d6a6c21 100644 --- a/src/test/java/org/mybatis/spring/submitted/xa/UserServiceImpl.java +++ b/src/test/java/org/mybatis/spring/submitted/xa/UserServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -44,10 +44,9 @@ public void saveWithFailure(User user) { @Override public boolean checkUserExists(int id) { - if (userMapperMaster.select(id) != null) - return true; - if (userMapperSlave.select(id) != null) + if ((userMapperMaster.select(id) != null) || (userMapperSlave.select(id) != null)) { return true; + } return false; } } diff --git a/src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java b/src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java index 60a59ab50e..3c2fc2ff4b 100644 --- a/src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java +++ b/src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 the original author or authors. + * Copyright 2010-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. @@ -39,14 +39,14 @@ class UserServiceTest { @Test void testCommit() { - User user = new User(1, "Pocoyo"); + var user = new User(1, "Pocoyo"); userService.saveWithNoFailure(user); assertThat(userService.checkUserExists(user.getId())).isTrue(); } @Test void testRollback() { - User user = new User(2, "Pocoyo"); + var user = new User(2, "Pocoyo"); try { userService.saveWithFailure(user); } catch (RuntimeException ignore) { @@ -58,7 +58,7 @@ void testRollback() { @Test void testCommitWithExistingTx() throws Exception { userTransaction.begin(); - User user = new User(3, "Pocoyo"); + var user = new User(3, "Pocoyo"); userService.saveWithNoFailure(user); userTransaction.commit(); assertThat(userService.checkUserExists(user.getId())).isTrue(); @@ -71,7 +71,7 @@ void testCommitWithExistingTx() throws Exception { @Test void testRollbackWithExistingTx() throws Exception { userTransaction.begin(); - User user = new User(5, "Pocoyo"); + var user = new User(5, "Pocoyo"); userService.saveWithNoFailure(user); userTransaction.rollback(); assertThat(userService.checkUserExists(user.getId())).isFalse(); diff --git a/src/test/java/org/mybatis/spring/support/SqlSessionDaoSupportTest.java b/src/test/java/org/mybatis/spring/support/SqlSessionDaoSupportTest.java index 403d900053..eb4a64c6a3 100644 --- a/src/test/java/org/mybatis/spring/support/SqlSessionDaoSupportTest.java +++ b/src/test/java/org/mybatis/spring/support/SqlSessionDaoSupportTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -48,7 +48,7 @@ void closeConnection() throws SQLException { @Test void testWithSqlSessionTemplate() { - SqlSessionTemplate sessionTemplate = new SqlSessionTemplate(sqlSessionFactory); + var sessionTemplate = new SqlSessionTemplate(sqlSessionFactory); sqlSessionDaoSupport.setSqlSessionTemplate(sessionTemplate); sqlSessionDaoSupport.afterPropertiesSet(); @@ -66,7 +66,7 @@ void testWithSqlSessionFactory() { @Test void testWithBothFactoryAndTemplate() { - SqlSessionTemplate sessionTemplate = new SqlSessionTemplate(sqlSessionFactory); + var sessionTemplate = new SqlSessionTemplate(sqlSessionFactory); sqlSessionDaoSupport.setSqlSessionTemplate(sessionTemplate); sqlSessionDaoSupport.setSqlSessionFactory(sqlSessionFactory); sqlSessionDaoSupport.afterPropertiesSet(); @@ -98,7 +98,7 @@ void testAutowireWithTwoFactories() { private void setupContext() { applicationContext = new GenericApplicationContext(); - GenericBeanDefinition definition = new GenericBeanDefinition(); + var definition = new GenericBeanDefinition(); definition.setBeanClass(MockSqlSessionDao.class); applicationContext.registerBeanDefinition("dao", definition); @@ -114,7 +114,7 @@ private void startContext() { } private void setupSqlSessionFactory(String name) { - GenericBeanDefinition definition = new GenericBeanDefinition(); + var definition = new GenericBeanDefinition(); definition.setBeanClass(SqlSessionFactoryBean.class); definition.getPropertyValues().add("dataSource", dataSource); diff --git a/src/test/java/org/mybatis/spring/transaction/SpringTransactionManagerTest.java b/src/test/java/org/mybatis/spring/transaction/SpringTransactionManagerTest.java index 66e7453c96..5c233a039b 100644 --- a/src/test/java/org/mybatis/spring/transaction/SpringTransactionManagerTest.java +++ b/src/test/java/org/mybatis/spring/transaction/SpringTransactionManagerTest.java @@ -19,20 +19,18 @@ import org.junit.jupiter.api.Test; import org.mybatis.spring.AbstractMyBatisSpringTest; -import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.DefaultTransactionDefinition; class SpringTransactionManagerTest extends AbstractMyBatisSpringTest { @Test void shouldNoOpWithTx() throws Exception { - DefaultTransactionDefinition txDef = new DefaultTransactionDefinition(); + var txDef = new DefaultTransactionDefinition(); txDef.setPropagationBehaviorName("PROPAGATION_REQUIRED"); - TransactionStatus status = txManager.getTransaction(txDef); + var status = txManager.getTransaction(txDef); - SpringManagedTransactionFactory transactionFactory = new SpringManagedTransactionFactory(); - SpringManagedTransaction transaction = (SpringManagedTransaction) transactionFactory.newTransaction(dataSource, - null, false); + var transactionFactory = new SpringManagedTransactionFactory(); + var transaction = (SpringManagedTransaction) transactionFactory.newTransaction(dataSource, null, false); transaction.getConnection(); transaction.commit(); transaction.close(); @@ -63,9 +61,8 @@ void shouldNoOpWithTx() throws Exception { @Test void shouldManageWithNoTx() throws Exception { - SpringManagedTransactionFactory transactionFactory = new SpringManagedTransactionFactory(); - SpringManagedTransaction transaction = (SpringManagedTransaction) transactionFactory.newTransaction(dataSource, - null, false); + var transactionFactory = new SpringManagedTransactionFactory(); + var transaction = (SpringManagedTransaction) transactionFactory.newTransaction(dataSource, null, false); transaction.getConnection(); transaction.commit(); transaction.close(); @@ -75,9 +72,8 @@ void shouldManageWithNoTx() throws Exception { @Test void shouldNotCommitWithNoTxAndAutocommitIsOn() throws Exception { - SpringManagedTransactionFactory transactionFactory = new SpringManagedTransactionFactory(); - SpringManagedTransaction transaction = (SpringManagedTransaction) transactionFactory.newTransaction(dataSource, - null, false); + var transactionFactory = new SpringManagedTransactionFactory(); + var transaction = (SpringManagedTransaction) transactionFactory.newTransaction(dataSource, null, false); connection.setAutoCommit(true); transaction.getConnection(); transaction.commit(); @@ -88,9 +84,8 @@ void shouldNotCommitWithNoTxAndAutocommitIsOn() throws Exception { @Test void shouldIgnoreAutocommit() throws Exception { - SpringManagedTransactionFactory transactionFactory = new SpringManagedTransactionFactory(); - SpringManagedTransaction transaction = (SpringManagedTransaction) transactionFactory.newTransaction(dataSource, - null, true); + var transactionFactory = new SpringManagedTransactionFactory(); + var transaction = (SpringManagedTransaction) transactionFactory.newTransaction(dataSource, null, true); transaction.getConnection(); transaction.commit(); transaction.close(); diff --git a/src/test/java/org/mybatis/spring/type/DummyMapperFactoryBean.java b/src/test/java/org/mybatis/spring/type/DummyMapperFactoryBean.java index 831193d59d..7682d2b3d2 100644 --- a/src/test/java/org/mybatis/spring/type/DummyMapperFactoryBean.java +++ b/src/test/java/org/mybatis/spring/type/DummyMapperFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -26,7 +26,6 @@ public class DummyMapperFactoryBean extends MapperFactoryBean { public DummyMapperFactoryBean() { - super(); } public DummyMapperFactoryBean(Class mapperInterface) { @@ -48,11 +47,11 @@ protected void checkDaoConfig() { @Override public T getObject() throws Exception { - MapperFactoryBean mapperFactoryBean = new MapperFactoryBean<>(); + var mapperFactoryBean = new MapperFactoryBean(); mapperFactoryBean.setMapperInterface(getMapperInterface()); mapperFactoryBean.setAddToConfig(isAddToConfig()); mapperFactoryBean.setSqlSessionFactory(getCustomSessionFactoryForClass()); - T object = mapperFactoryBean.getObject(); + var object = mapperFactoryBean.getObject(); mapperInstanceCount.incrementAndGet(); return object; } diff --git a/src/test/java/org/mybatis/spring/type/DummyTypeHandler.java b/src/test/java/org/mybatis/spring/type/DummyTypeHandler.java index f42b49dca6..421db96c51 100644 --- a/src/test/java/org/mybatis/spring/type/DummyTypeHandler.java +++ b/src/test/java/org/mybatis/spring/type/DummyTypeHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/type/DummyTypeHandler2.java b/src/test/java/org/mybatis/spring/type/DummyTypeHandler2.java index 72d5b873da..581ba77a21 100644 --- a/src/test/java/org/mybatis/spring/type/DummyTypeHandler2.java +++ b/src/test/java/org/mybatis/spring/type/DummyTypeHandler2.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. diff --git a/src/test/java/org/mybatis/spring/type/TypeHandlerFactory.java b/src/test/java/org/mybatis/spring/type/TypeHandlerFactory.java index 3cfbc572f2..2f563c208a 100644 --- a/src/test/java/org/mybatis/spring/type/TypeHandlerFactory.java +++ b/src/test/java/org/mybatis/spring/type/TypeHandlerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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,7 +27,7 @@ public interface TypeHandlerFactory { static TypeHandler handler1() { - return new TypeHandler() { + return new TypeHandler<>() { @Override public void setParameter(PreparedStatement ps, int i, String parameter, JdbcType jdbcType) { From 6d64d357e17ba7fd14d17114b9d89776a761f11f Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 16:11:14 -0400 Subject: [PATCH 277/383] [source] Cleanup source code --- .../spring/MyBatisExceptionTranslator.java | 11 ++++--- .../mybatis/spring/SqlSessionFactoryBean.java | 24 +++++++------- .../mybatis/spring/SqlSessionTemplate.java | 8 ++--- .../org/mybatis/spring/SqlSessionUtils.java | 33 ++++++++----------- .../annotation/MapperScannerRegistrar.java | 30 ++++++++--------- .../spring/batch/MyBatisBatchItemWriter.java | 11 +++---- .../MyBatisBatchItemWriterBuilder.java | 4 +-- .../MyBatisCursorItemReaderBuilder.java | 4 +-- .../MyBatisPagingItemReaderBuilder.java | 4 +-- .../MapperScannerBeanDefinitionParser.java | 30 ++++++++--------- .../spring/mapper/ClassPathMapperScanner.java | 23 +++++++------ .../spring/mapper/MapperFactoryBean.java | 3 +- .../mapper/MapperScannerConfigurer.java | 19 +++++------ .../spring/support/SqlSessionDaoSupport.java | 2 +- .../transaction/SpringManagedTransaction.java | 2 +- 15 files changed, 96 insertions(+), 112 deletions(-) diff --git a/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java b/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java index c2215925c1..9f389d117d 100644 --- a/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java +++ b/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java @@ -79,7 +79,7 @@ public DataAccessException translateExceptionIfPossible(RuntimeException e) { if (e instanceof PersistenceException) { // Batch exceptions come inside another PersistenceException // recursion has a risk of infinite loop so better make another if - String msg = e.getMessage(); + var msg = e.getMessage(); if (e.getCause() instanceof PersistenceException) { e = (PersistenceException) e.getCause(); if (msg == null) { @@ -88,11 +88,12 @@ public DataAccessException translateExceptionIfPossible(RuntimeException e) { } if (e.getCause() instanceof SQLException) { this.initExceptionTranslator(); - String task = e.getMessage() + "\n"; - SQLException se = (SQLException) e.getCause(); - DataAccessException dae = this.exceptionTranslator.translate(task, null, se); + var task = e.getMessage() + "\n"; + var se = (SQLException) e.getCause(); + var dae = this.exceptionTranslator.translate(task, null, se); return dae != null ? dae : new UncategorizedSQLException(task, null, se); - } else if (e.getCause() instanceof TransactionException) { + } + if (e.getCause() instanceof TransactionException) { throw (TransactionException) e.getCause(); } return new MyBatisSystemException(msg, e); diff --git a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java index 8a0a44c3d6..282bbdf333 100644 --- a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java +++ b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java @@ -64,7 +64,6 @@ import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; -import org.springframework.core.type.ClassMetadata; import org.springframework.core.type.classreading.CachingMetadataReaderFactory; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy; @@ -553,14 +552,13 @@ public void addTypeAliases(Class... typeAliases) { private T[] appendArrays(T[] oldArrays, T[] newArrays, IntFunction generator) { if (oldArrays == null) { return newArrays; + } + if (newArrays == null) { + return oldArrays; } else { - if (newArrays == null) { - return oldArrays; - } else { - List newList = new ArrayList<>(Arrays.asList(oldArrays)); - newList.addAll(Arrays.asList(newArrays)); - return newList.toArray(generator.apply(0)); - } + List newList = new ArrayList<>(Arrays.asList(oldArrays)); + newList.addAll(Arrays.asList(newArrays)); + return newList.toArray(generator.apply(0)); } } @@ -690,8 +688,8 @@ protected SqlSessionFactory buildSqlSessionFactory() throws Exception { continue; } try { - XMLMapperBuilder xmlMapperBuilder = new XMLMapperBuilder(mapperLocation.getInputStream(), - targetConfiguration, mapperLocation.toString(), targetConfiguration.getSqlFragments()); + var xmlMapperBuilder = new XMLMapperBuilder(mapperLocation.getInputStream(), targetConfiguration, + mapperLocation.toString(), targetConfiguration.getSqlFragments()); xmlMapperBuilder.parse(); } catch (Exception e) { throw new IOException("Failed to parse mapping resource: '" + mapperLocation + "'", e); @@ -737,14 +735,14 @@ public void onApplicationEvent(ContextRefreshedEvent event) { private Set> scanClasses(String packagePatterns, Class assignableType) throws IOException { Set> classes = new HashSet<>(); - String[] packagePatternArray = tokenizeToStringArray(packagePatterns, + var packagePatternArray = tokenizeToStringArray(packagePatterns, ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS); for (String packagePattern : packagePatternArray) { - Resource[] resources = RESOURCE_PATTERN_RESOLVER.getResources(ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + var resources = RESOURCE_PATTERN_RESOLVER.getResources(ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + ClassUtils.convertClassNameToResourcePath(packagePattern) + "/**/*.class"); for (Resource resource : resources) { try { - ClassMetadata classMetadata = METADATA_READER_FACTORY.getMetadataReader(resource).getClassMetadata(); + var classMetadata = METADATA_READER_FACTORY.getMetadataReader(resource).getClassMetadata(); Class clazz = Resources.classForName(classMetadata.getClassName()); if (assignableType == null || assignableType.isAssignableFrom(clazz)) { classes.add(clazz); diff --git a/src/main/java/org/mybatis/spring/SqlSessionTemplate.java b/src/main/java/org/mybatis/spring/SqlSessionTemplate.java index 130987488a..ca1a6405b5 100644 --- a/src/main/java/org/mybatis/spring/SqlSessionTemplate.java +++ b/src/main/java/org/mybatis/spring/SqlSessionTemplate.java @@ -327,10 +327,10 @@ public void destroy() throws Exception { private class SqlSessionInterceptor implements InvocationHandler { @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - SqlSession sqlSession = getSqlSession(SqlSessionTemplate.this.sqlSessionFactory, - SqlSessionTemplate.this.executorType, SqlSessionTemplate.this.exceptionTranslator); + var sqlSession = getSqlSession(SqlSessionTemplate.this.sqlSessionFactory, SqlSessionTemplate.this.executorType, + SqlSessionTemplate.this.exceptionTranslator); try { - Object result = method.invoke(sqlSession, args); + var result = method.invoke(sqlSession, args); if (!isSqlSessionTransactional(sqlSession, SqlSessionTemplate.this.sqlSessionFactory)) { // force commit even on non-dirty sessions because some databases require // a commit/rollback before calling close() @@ -338,7 +338,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl } return result; } catch (Throwable t) { - Throwable unwrapped = unwrapThrowable(t); + var unwrapped = unwrapThrowable(t); if (SqlSessionTemplate.this.exceptionTranslator != null && unwrapped instanceof PersistenceException) { // release the connection to avoid a deadlock if the translator is no loaded. See issue #22 closeSqlSession(sqlSession, SqlSessionTemplate.this.sqlSessionFactory); diff --git a/src/main/java/org/mybatis/spring/SqlSessionUtils.java b/src/main/java/org/mybatis/spring/SqlSessionUtils.java index 9c2804ec1f..bc629960d9 100644 --- a/src/main/java/org/mybatis/spring/SqlSessionUtils.java +++ b/src/main/java/org/mybatis/spring/SqlSessionUtils.java @@ -18,14 +18,12 @@ import static org.springframework.util.Assert.notNull; import org.apache.ibatis.exceptions.PersistenceException; -import org.apache.ibatis.mapping.Environment; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.logging.Logger; import org.mybatis.logging.LoggerFactory; import org.mybatis.spring.transaction.SpringManagedTransactionFactory; -import org.springframework.dao.DataAccessException; import org.springframework.dao.TransientDataAccessResourceException; import org.springframework.dao.support.PersistenceExceptionTranslator; import org.springframework.jdbc.datasource.DataSourceUtils; @@ -68,7 +66,7 @@ private SqlSessionUtils() { * {@code SpringManagedTransactionFactory} */ public static SqlSession getSqlSession(SqlSessionFactory sessionFactory) { - ExecutorType executorType = sessionFactory.getConfiguration().getDefaultExecutorType(); + var executorType = sessionFactory.getConfiguration().getDefaultExecutorType(); return getSqlSession(sessionFactory, executorType, null); } @@ -99,9 +97,9 @@ public static SqlSession getSqlSession(SqlSessionFactory sessionFactory, Executo notNull(sessionFactory, NO_SQL_SESSION_FACTORY_SPECIFIED); notNull(executorType, NO_EXECUTOR_TYPE_SPECIFIED); - SqlSessionHolder holder = (SqlSessionHolder) TransactionSynchronizationManager.getResource(sessionFactory); + var holder = (SqlSessionHolder) TransactionSynchronizationManager.getResource(sessionFactory); - SqlSession session = sessionHolder(executorType, holder); + var session = sessionHolder(executorType, holder); if (session != null) { return session; } @@ -134,7 +132,7 @@ private static void registerSessionHolder(SqlSessionFactory sessionFactory, Exec PersistenceExceptionTranslator exceptionTranslator, SqlSession session) { SqlSessionHolder holder; if (TransactionSynchronizationManager.isSynchronizationActive()) { - Environment environment = sessionFactory.getConfiguration().getEnvironment(); + var environment = sessionFactory.getConfiguration().getEnvironment(); if (environment.getTransactionFactory() instanceof SpringManagedTransactionFactory) { LOGGER.debug(() -> "Registering transaction synchronization for SqlSession [" + session + "]"); @@ -145,14 +143,12 @@ private static void registerSessionHolder(SqlSessionFactory sessionFactory, Exec .registerSynchronization(new SqlSessionSynchronization(holder, sessionFactory)); holder.setSynchronizedWithTransaction(true); holder.requested(); + } else if (TransactionSynchronizationManager.getResource(environment.getDataSource()) == null) { + LOGGER.debug(() -> "SqlSession [" + session + + "] was not registered for synchronization because DataSource is not transactional"); } else { - if (TransactionSynchronizationManager.getResource(environment.getDataSource()) == null) { - LOGGER.debug(() -> "SqlSession [" + session - + "] was not registered for synchronization because DataSource is not transactional"); - } else { - throw new TransientDataAccessResourceException( - "SqlSessionFactory must be using a SpringManagedTransactionFactory in order to use Spring transaction synchronization"); - } + throw new TransientDataAccessResourceException( + "SqlSessionFactory must be using a SpringManagedTransactionFactory in order to use Spring transaction synchronization"); } } else { LOGGER.debug(() -> "SqlSession [" + session @@ -191,8 +187,8 @@ public static void closeSqlSession(SqlSession session, SqlSessionFactory session notNull(session, NO_SQL_SESSION_SPECIFIED); notNull(sessionFactory, NO_SQL_SESSION_FACTORY_SPECIFIED); - SqlSessionHolder holder = (SqlSessionHolder) TransactionSynchronizationManager.getResource(sessionFactory); - if ((holder != null) && (holder.getSqlSession() == session)) { + var holder = (SqlSessionHolder) TransactionSynchronizationManager.getResource(sessionFactory); + if (holder != null && holder.getSqlSession() == session) { LOGGER.debug(() -> "Releasing transactional SqlSession [" + session + "]"); holder.released(); } else { @@ -215,9 +211,9 @@ public static boolean isSqlSessionTransactional(SqlSession session, SqlSessionFa notNull(session, NO_SQL_SESSION_SPECIFIED); notNull(sessionFactory, NO_SQL_SESSION_FACTORY_SPECIFIED); - SqlSessionHolder holder = (SqlSessionHolder) TransactionSynchronizationManager.getResource(sessionFactory); + var holder = (SqlSessionHolder) TransactionSynchronizationManager.getResource(sessionFactory); - return (holder != null) && (holder.getSqlSession() == session); + return holder != null && holder.getSqlSession() == session; } /** @@ -277,8 +273,7 @@ public void beforeCommit(boolean readOnly) { this.holder.getSqlSession().commit(); } catch (PersistenceException p) { if (this.holder.getPersistenceExceptionTranslator() != null) { - DataAccessException translated = this.holder.getPersistenceExceptionTranslator() - .translateExceptionIfPossible(p); + var translated = this.holder.getPersistenceExceptionTranslator().translateExceptionIfPossible(p); if (translated != null) { throw translated; } diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java index 181273ea92..f1de1b3c1e 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java @@ -70,7 +70,7 @@ public void setResourceLoader(ResourceLoader resourceLoader) { @Override public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) { - AnnotationAttributes mapperScanAttrs = AnnotationAttributes + var mapperScanAttrs = AnnotationAttributes .fromMap(importingClassMetadata.getAnnotationAttributes(MapperScan.class.getName())); if (mapperScanAttrs != null) { registerBeanDefinitions(importingClassMetadata, mapperScanAttrs, registry, @@ -81,7 +81,7 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes annoAttrs, BeanDefinitionRegistry registry, String beanName) { - BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MapperScannerConfigurer.class); + var builder = BeanDefinitionBuilder.genericBeanDefinition(MapperScannerConfigurer.class); builder.addPropertyValue("processPropertyPlaceHolders", annoAttrs.getBoolean("processPropertyPlaceHolders")); Class annotationClass = annoAttrs.getClass("annotationClass"); @@ -104,20 +104,18 @@ void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes a builder.addPropertyValue("mapperFactoryBeanClass", mapperFactoryBeanClass); } - String sqlSessionTemplateRef = annoAttrs.getString("sqlSessionTemplateRef"); + var sqlSessionTemplateRef = annoAttrs.getString("sqlSessionTemplateRef"); if (StringUtils.hasText(sqlSessionTemplateRef)) { builder.addPropertyValue("sqlSessionTemplateBeanName", annoAttrs.getString("sqlSessionTemplateRef")); } - String sqlSessionFactoryRef = annoAttrs.getString("sqlSessionFactoryRef"); + var sqlSessionFactoryRef = annoAttrs.getString("sqlSessionFactoryRef"); if (StringUtils.hasText(sqlSessionFactoryRef)) { builder.addPropertyValue("sqlSessionFactoryBeanName", annoAttrs.getString("sqlSessionFactoryRef")); } - List basePackages = new ArrayList<>(); - - basePackages.addAll(Arrays.stream(annoAttrs.getStringArray("basePackages")).filter(StringUtils::hasText) - .collect(Collectors.toList())); + List basePackages = new ArrayList<>(Arrays.stream(annoAttrs.getStringArray("basePackages")) + .filter(StringUtils::hasText).collect(Collectors.toList())); basePackages.addAll(Arrays.stream(annoAttrs.getClassArray("basePackageClasses")).map(ClassUtils::getPackageName) .collect(Collectors.toList())); @@ -126,7 +124,7 @@ void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes a basePackages.add(getDefaultBasePackage(annoMeta)); } - AnnotationAttributes[] excludeFilterArray = annoAttrs.getAnnotationArray("excludeFilters"); + var excludeFilterArray = annoAttrs.getAnnotationArray("excludeFilters"); if (excludeFilterArray.length > 0) { List typeFilters = new ArrayList<>(); List> rawTypeFilters = new ArrayList<>(); @@ -142,12 +140,12 @@ void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes a builder.addPropertyValue("rawExcludeFilters", rawTypeFilters); } - String lazyInitialization = annoAttrs.getString("lazyInitialization"); + var lazyInitialization = annoAttrs.getString("lazyInitialization"); if (StringUtils.hasText(lazyInitialization)) { builder.addPropertyValue("lazyInitialization", lazyInitialization); } - String defaultScope = annoAttrs.getString("defaultScope"); + var defaultScope = annoAttrs.getString("defaultScope"); if (!AbstractBeanDefinition.SCOPE_DEFAULT.equals(defaultScope)) { builder.addPropertyValue("defaultScope", defaultScope); } @@ -173,7 +171,7 @@ private List> parseFiltersHasPatterns(AnnotationAttributes f List> rawTypeFilters = new ArrayList<>(); FilterType filterType = filterAttributes.getEnum("type"); - String[] expressionArray = filterAttributes.getStringArray("pattern"); + var expressionArray = filterAttributes.getStringArray("pattern"); for (String expression : expressionArray) { switch (filterType) { case REGEX: @@ -210,7 +208,7 @@ private List typeFiltersFor(AnnotationAttributes filterAttributes) { Assert.isAssignable(Annotation.class, filterClass, "Specified an unsupported type in 'ANNOTATION' exclude filter of @MapperScan"); @SuppressWarnings("unchecked") - Class annoClass = (Class) filterClass; + var annoClass = (Class) filterClass; typeFilters.add(new AnnotationTypeFilter(annoClass)); break; case ASSIGNABLE_TYPE: @@ -245,11 +243,11 @@ private static String getDefaultBasePackage(AnnotationMetadata importingClassMet static class RepeatingRegistrar extends MapperScannerRegistrar { @Override public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) { - AnnotationAttributes mapperScansAttrs = AnnotationAttributes + var mapperScansAttrs = AnnotationAttributes .fromMap(importingClassMetadata.getAnnotationAttributes(MapperScans.class.getName())); if (mapperScansAttrs != null) { - AnnotationAttributes[] annotations = mapperScansAttrs.getAnnotationArray("value"); - for (int i = 0; i < annotations.length; i++) { + var annotations = mapperScansAttrs.getAnnotationArray("value"); + for (var i = 0; i < annotations.length; i++) { registerBeanDefinitions(importingClassMetadata, annotations[i], registry, generateBaseBeanName(importingClassMetadata, i)); } diff --git a/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java b/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java index d2fbbdc3e7..9999275ba2 100644 --- a/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java +++ b/src/main/java/org/mybatis/spring/batch/MyBatisBatchItemWriter.java @@ -18,9 +18,6 @@ import static org.springframework.util.Assert.isTrue; import static org.springframework.util.Assert.notNull; -import java.util.List; - -import org.apache.ibatis.executor.BatchResult; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; @@ -143,7 +140,7 @@ public void write(final Chunk items) { sqlSessionTemplate.update(statementId, itemToParameterConverter.convert(item)); } - List results = sqlSessionTemplate.flushStatements(); + var results = sqlSessionTemplate.flushStatements(); if (assertUpdates) { if (results.size() != 1) { @@ -151,10 +148,10 @@ public void write(final Chunk items) { + "Expected 1 but number of BatchResult objects returned was " + results.size()); } - int[] updateCounts = results.get(0).getUpdateCounts(); + var updateCounts = results.get(0).getUpdateCounts(); - for (int i = 0; i < updateCounts.length; i++) { - int value = updateCounts[i]; + for (var i = 0; i < updateCounts.length; i++) { + var value = updateCounts[i]; if (value == 0) { throw new EmptyResultDataAccessException("Item " + i + " of " + updateCounts.length + " did not update any rows: [" + items.getItems().get(i) + "]", 1); diff --git a/src/main/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilder.java b/src/main/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilder.java index f833454b84..6270175fb4 100644 --- a/src/main/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilder.java +++ b/src/main/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -120,7 +120,7 @@ public MyBatisBatchItemWriterBuilder itemToParameterConverter(Converter * @return the writer */ public MyBatisBatchItemWriter build() { - MyBatisBatchItemWriter writer = new MyBatisBatchItemWriter<>(); + var writer = new MyBatisBatchItemWriter(); writer.setSqlSessionTemplate(this.sqlSessionTemplate); writer.setSqlSessionFactory(this.sqlSessionFactory); writer.setStatementId(this.statementId); diff --git a/src/main/java/org/mybatis/spring/batch/builder/MyBatisCursorItemReaderBuilder.java b/src/main/java/org/mybatis/spring/batch/builder/MyBatisCursorItemReaderBuilder.java index da81b4e227..11d0eec554 100644 --- a/src/main/java/org/mybatis/spring/batch/builder/MyBatisCursorItemReaderBuilder.java +++ b/src/main/java/org/mybatis/spring/batch/builder/MyBatisCursorItemReaderBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -140,7 +140,7 @@ public MyBatisCursorItemReaderBuilder maxItemCount(int maxItemCount) { * @return the reader */ public MyBatisCursorItemReader build() { - MyBatisCursorItemReader reader = new MyBatisCursorItemReader<>(); + var reader = new MyBatisCursorItemReader(); reader.setSqlSessionFactory(this.sqlSessionFactory); reader.setQueryId(this.queryId); reader.setParameterValues(this.parameterValues); diff --git a/src/main/java/org/mybatis/spring/batch/builder/MyBatisPagingItemReaderBuilder.java b/src/main/java/org/mybatis/spring/batch/builder/MyBatisPagingItemReaderBuilder.java index 4428318c79..e4504b6559 100644 --- a/src/main/java/org/mybatis/spring/batch/builder/MyBatisPagingItemReaderBuilder.java +++ b/src/main/java/org/mybatis/spring/batch/builder/MyBatisPagingItemReaderBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 the original author or authors. + * Copyright 2010-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. @@ -156,7 +156,7 @@ public MyBatisPagingItemReaderBuilder maxItemCount(int maxItemCount) { * @return the reader */ public MyBatisPagingItemReader build() { - MyBatisPagingItemReader reader = new MyBatisPagingItemReader<>(); + var reader = new MyBatisPagingItemReader(); reader.setSqlSessionFactory(this.sqlSessionFactory); reader.setQueryId(this.queryId); reader.setParameterValues(this.parameterValues); diff --git a/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java b/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java index 33c93665f9..3ad4365cfd 100644 --- a/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java +++ b/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java @@ -31,12 +31,10 @@ import org.springframework.beans.factory.support.BeanNameGenerator; import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.beans.factory.xml.XmlReaderContext; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * A {#code BeanDefinitionParser} that handles the element scan of the MyBatis. namespace @@ -66,33 +64,33 @@ public class MapperScannerBeanDefinitionParser extends AbstractBeanDefinitionPar @Override protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { - BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MapperScannerConfigurer.class); + var builder = BeanDefinitionBuilder.genericBeanDefinition(MapperScannerConfigurer.class); - ClassLoader classLoader = ClassUtils.getDefaultClassLoader(); + var classLoader = ClassUtils.getDefaultClassLoader(); - String processPropertyPlaceHolders = element.getAttribute(ATTRIBUTE_PROCESS_PROPERTY_PLACEHOLDERS); + var processPropertyPlaceHolders = element.getAttribute(ATTRIBUTE_PROCESS_PROPERTY_PLACEHOLDERS); builder.addPropertyValue("processPropertyPlaceHolders", !StringUtils.hasText(processPropertyPlaceHolders) || Boolean.parseBoolean(processPropertyPlaceHolders)); try { - String annotationClassName = element.getAttribute(ATTRIBUTE_ANNOTATION); + var annotationClassName = element.getAttribute(ATTRIBUTE_ANNOTATION); if (StringUtils.hasText(annotationClassName)) { @SuppressWarnings("unchecked") Class annotationClass = (Class) classLoader .loadClass(annotationClassName); builder.addPropertyValue("annotationClass", annotationClass); } - String markerInterfaceClassName = element.getAttribute(ATTRIBUTE_MARKER_INTERFACE); + var markerInterfaceClassName = element.getAttribute(ATTRIBUTE_MARKER_INTERFACE); if (StringUtils.hasText(markerInterfaceClassName)) { Class markerInterface = classLoader.loadClass(markerInterfaceClassName); builder.addPropertyValue("markerInterface", markerInterface); } - String nameGeneratorClassName = element.getAttribute(ATTRIBUTE_NAME_GENERATOR); + var nameGeneratorClassName = element.getAttribute(ATTRIBUTE_NAME_GENERATOR); if (StringUtils.hasText(nameGeneratorClassName)) { Class nameGeneratorClass = classLoader.loadClass(nameGeneratorClassName); - BeanNameGenerator nameGenerator = BeanUtils.instantiateClass(nameGeneratorClass, BeanNameGenerator.class); + var nameGenerator = BeanUtils.instantiateClass(nameGeneratorClass, BeanNameGenerator.class); builder.addPropertyValue("nameGenerator", nameGenerator); } - String mapperFactoryBeanClassName = element.getAttribute(ATTRIBUTE_MAPPER_FACTORY_BEAN_CLASS); + var mapperFactoryBeanClassName = element.getAttribute(ATTRIBUTE_MAPPER_FACTORY_BEAN_CLASS); if (StringUtils.hasText(mapperFactoryBeanClassName)) { @SuppressWarnings("unchecked") Class mapperFactoryBeanClass = (Class) classLoader @@ -101,13 +99,13 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa } // parse raw exclude-filter in - List> rawExcludeFilters = parseScanTypeFilters(element, parserContext); + var rawExcludeFilters = parseScanTypeFilters(element, parserContext); if (!rawExcludeFilters.isEmpty()) { builder.addPropertyValue("rawExcludeFilters", rawExcludeFilters); } } catch (Exception ex) { - XmlReaderContext readerContext = parserContext.getReaderContext(); + var readerContext = parserContext.getReaderContext(); readerContext.error(ex.getMessage(), readerContext.extractSource(element), ex.getCause()); } @@ -125,11 +123,11 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa private List> parseScanTypeFilters(Element element, ParserContext parserContext) { List> typeFilters = new ArrayList<>(); - NodeList nodeList = element.getChildNodes(); - for (int i = 0; i < nodeList.getLength(); i++) { - Node node = nodeList.item(i); + var nodeList = element.getChildNodes(); + for (var i = 0; i < nodeList.getLength(); i++) { + var node = nodeList.item(i); if (Node.ELEMENT_NODE == node.getNodeType()) { - String localName = parserContext.getDelegate().getLocalName(node); + var localName = parserContext.getDelegate().getLocalName(node); if (ATTRIBUTE_EXCLUDE_FILTER.equals(localName)) { Map filter = new HashMap<>(16); filter.put("type", ((Element) node).getAttribute("type")); diff --git a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java index 0e755007db..62955111e1 100644 --- a/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java +++ b/src/main/java/org/mybatis/spring/mapper/ClassPathMapperScanner.java @@ -208,7 +208,7 @@ public void setDefaultScope(String defaultScope) { * that extends a markerInterface or/and those annotated with the annotationClass */ public void registerFilters() { - boolean acceptAllInterfaces = true; + var acceptAllInterfaces = true; // if specified, use the given annotation and / or marker interface if (this.annotationClass != null) { @@ -234,7 +234,7 @@ protected boolean matchClassName(String className) { // exclude package-info.java addExcludeFilter((metadataReader, metadataReaderFactory) -> { - String className = metadataReader.getClassMetadata().getClassName(); + var className = metadataReader.getClassMetadata().getClassName(); return className.endsWith("package-info"); }); @@ -252,7 +252,7 @@ protected boolean matchClassName(String className) { */ @Override public Set doScan(String... basePackages) { - Set beanDefinitions = super.doScan(basePackages); + var beanDefinitions = super.doScan(basePackages); if (beanDefinitions.isEmpty()) { if (printWarnLogIfNotFoundMappers) { @@ -268,10 +268,10 @@ public Set doScan(String... basePackages) { private void processBeanDefinitions(Set beanDefinitions) { AbstractBeanDefinition definition; - BeanDefinitionRegistry registry = getRegistry(); + var registry = getRegistry(); for (BeanDefinitionHolder holder : beanDefinitions) { definition = (AbstractBeanDefinition) holder.getBeanDefinition(); - boolean scopedProxy = false; + var scopedProxy = false; if (ScopedProxyFactoryBean.class.getName().equals(definition.getBeanClassName())) { definition = (AbstractBeanDefinition) Optional .ofNullable(((RootBeanDefinition) definition).getDecoratedDefinition()) @@ -279,7 +279,7 @@ private void processBeanDefinitions(Set beanDefinitions) { "The target bean definition of scoped proxy bean not found. Root bean definition[" + holder + "]")); scopedProxy = true; } - String beanClassName = definition.getBeanClassName(); + var beanClassName = definition.getBeanClassName(); LOGGER.debug(() -> "Creating MapperFactoryBean with name '" + holder.getBeanName() + "' and '" + beanClassName + "' mapperInterface"); @@ -301,7 +301,7 @@ private void processBeanDefinitions(Set beanDefinitions) { definition.getPropertyValues().add("addToConfig", this.addToConfig); - boolean explicitFactoryUsed = false; + var explicitFactoryUsed = false; if (StringUtils.hasText(this.sqlSessionFactoryBeanName)) { definition.getPropertyValues().add("sqlSessionFactory", new RuntimeBeanReference(this.sqlSessionFactoryBeanName)); @@ -344,7 +344,7 @@ private void processBeanDefinitions(Set beanDefinitions) { } if (!definition.isSingleton()) { - BeanDefinitionHolder proxyHolder = ScopedProxyUtils.createScopedProxy(holder, registry, true); + var proxyHolder = ScopedProxyUtils.createScopedProxy(holder, registry, true); if (registry.containsBeanDefinition(proxyHolder.getBeanName())) { registry.removeBeanDefinition(proxyHolder.getBeanName()); } @@ -363,11 +363,10 @@ protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) { protected boolean checkCandidate(String beanName, BeanDefinition beanDefinition) { if (super.checkCandidate(beanName, beanDefinition)) { return true; - } else { - LOGGER.warn(() -> "Skipping MapperFactoryBean with name '" + beanName + "' and '" - + beanDefinition.getBeanClassName() + "' mapperInterface" + ". Bean already defined with the same name!"); - return false; } + LOGGER.warn(() -> "Skipping MapperFactoryBean with name '" + beanName + "' and '" + + beanDefinition.getBeanClassName() + "' mapperInterface" + ". Bean already defined with the same name!"); + return false; } } diff --git a/src/main/java/org/mybatis/spring/mapper/MapperFactoryBean.java b/src/main/java/org/mybatis/spring/mapper/MapperFactoryBean.java index a6fe818c65..f95b721314 100644 --- a/src/main/java/org/mybatis/spring/mapper/MapperFactoryBean.java +++ b/src/main/java/org/mybatis/spring/mapper/MapperFactoryBean.java @@ -18,7 +18,6 @@ import static org.springframework.util.Assert.notNull; import org.apache.ibatis.executor.ErrorContext; -import org.apache.ibatis.session.Configuration; import org.mybatis.spring.SqlSessionTemplate; import org.mybatis.spring.support.SqlSessionDaoSupport; import org.springframework.beans.factory.FactoryBean; @@ -71,7 +70,7 @@ protected void checkDaoConfig() { notNull(this.mapperInterface, "Property 'mapperInterface' is required"); - Configuration configuration = getSqlSession().getConfiguration(); + var configuration = getSqlSession().getConfiguration(); if (this.addToConfig && !configuration.hasMapper(this.mapperInterface)) { try { configuration.addMapper(this.mapperInterface); diff --git a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java index aec74d4544..eaf7c6f3b1 100644 --- a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java +++ b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java @@ -27,11 +27,9 @@ import org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.spring.SqlSessionTemplate; import org.springframework.beans.BeanUtils; -import org.springframework.beans.PropertyValue; import org.springframework.beans.PropertyValues; import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.PropertyResourceConfigurer; import org.springframework.beans.factory.config.TypedStringValue; @@ -386,7 +384,7 @@ public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) { processPropertyPlaceHolders(); } - ClassPathMapperScanner scanner = new ClassPathMapperScanner(registry, getEnvironment()); + var scanner = new ClassPathMapperScanner(registry, getEnvironment()); scanner.setAddToConfig(this.addToConfig); scanner.setAnnotationClass(this.annotationClass); scanner.setMarkerInterface(this.markerInterface); @@ -399,7 +397,7 @@ public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) { scanner.setBeanNameGenerator(this.nameGenerator); scanner.setMapperFactoryBeanClass(this.mapperFactoryBeanClass); if (StringUtils.hasText(lazyInitialization)) { - scanner.setLazyInitialization(Boolean.valueOf(lazyInitialization)); + scanner.setLazyInitialization(Boolean.parseBoolean(lazyInitialization)); } if (StringUtils.hasText(defaultScope)) { scanner.setDefaultScope(defaultScope); @@ -420,13 +418,13 @@ private void processPropertyPlaceHolders() { false, false); if (!prcs.isEmpty() && applicationContext instanceof ConfigurableApplicationContext) { - BeanDefinition mapperScannerBean = ((ConfigurableApplicationContext) applicationContext).getBeanFactory() + var mapperScannerBean = ((ConfigurableApplicationContext) applicationContext).getBeanFactory() .getBeanDefinition(beanName); // PropertyResourceConfigurer does not expose any methods to explicitly perform // property placeholder substitution. Instead, create a BeanFactory that just // contains this mapper scanner and post process the factory. - DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); + var factory = new DefaultListableBeanFactory(); factory.registerBeanDefinition(beanName, mapperScannerBean); for (PropertyResourceConfigurer prc : prcs.values()) { @@ -457,17 +455,18 @@ private Environment getEnvironment() { } private String getPropertyValue(String propertyName, PropertyValues values) { - PropertyValue property = values.getPropertyValue(propertyName); + var property = values.getPropertyValue(propertyName); if (property == null) { return null; } - Object value = property.getValue(); + var value = property.getValue(); if (value == null) { return null; - } else if (value instanceof String) { + } + if (value instanceof String) { return value.toString(); } else if (value instanceof TypedStringValue) { return ((TypedStringValue) value).getValue(); @@ -478,7 +477,7 @@ private String getPropertyValue(String propertyName, PropertyValues values) { @SuppressWarnings("unchecked") private List> getPropertyValueForTypeFilter(String propertyName, PropertyValues values) { - PropertyValue property = values.getPropertyValue(propertyName); + var property = values.getPropertyValue(propertyName); Object value; if (property == null || (value = property.getValue()) == null || !(value instanceof List)) { return null; diff --git a/src/main/java/org/mybatis/spring/support/SqlSessionDaoSupport.java b/src/main/java/org/mybatis/spring/support/SqlSessionDaoSupport.java index d7f4dbe594..0eeeab17c6 100644 --- a/src/main/java/org/mybatis/spring/support/SqlSessionDaoSupport.java +++ b/src/main/java/org/mybatis/spring/support/SqlSessionDaoSupport.java @@ -78,7 +78,7 @@ protected SqlSessionTemplate createSqlSessionTemplate(SqlSessionFactory sqlSessi * @return a factory of SqlSession */ public final SqlSessionFactory getSqlSessionFactory() { - return (this.sqlSessionTemplate != null ? this.sqlSessionTemplate.getSqlSessionFactory() : null); + return this.sqlSessionTemplate != null ? this.sqlSessionTemplate.getSqlSessionFactory() : null; } /** diff --git a/src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java b/src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java index f9e332dcab..1b6cd04832 100644 --- a/src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java +++ b/src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java @@ -105,7 +105,7 @@ public void close() throws SQLException { @Override public Integer getTimeout() throws SQLException { - ConnectionHolder holder = (ConnectionHolder) TransactionSynchronizationManager.getResource(dataSource); + var holder = (ConnectionHolder) TransactionSynchronizationManager.getResource(dataSource); if (holder != null && holder.hasTimeout()) { return holder.getTimeToLiveInSeconds(); } From 998b614b1827cde2a835b93e6a6634920f07e578 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 16:31:33 -0400 Subject: [PATCH 278/383] [tests] More cleanup --- .../asyncsynchronization/AsyncAfterCompletionHelper.java | 3 +-- .../java/org/mybatis/spring/submitted/xa/UserServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java b/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java index ec928f6655..6ad1f3d5df 100644 --- a/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java +++ b/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java @@ -66,9 +66,8 @@ public Object invoke(final Object proxy, final Method method, final Object[] arg thread.join(); if (exceptionSet.isEmpty()) { return retValSet.iterator().next(); - } else { - throw exceptionSet.iterator().next(); } + throw exceptionSet.iterator().next(); } } diff --git a/src/test/java/org/mybatis/spring/submitted/xa/UserServiceImpl.java b/src/test/java/org/mybatis/spring/submitted/xa/UserServiceImpl.java index 967d6a6c21..c98a1e1cd9 100644 --- a/src/test/java/org/mybatis/spring/submitted/xa/UserServiceImpl.java +++ b/src/test/java/org/mybatis/spring/submitted/xa/UserServiceImpl.java @@ -44,7 +44,7 @@ public void saveWithFailure(User user) { @Override public boolean checkUserExists(int id) { - if ((userMapperMaster.select(id) != null) || (userMapperSlave.select(id) != null)) { + if (userMapperMaster.select(id) != null || userMapperSlave.select(id) != null) { return true; } return false; From b625cae84c35d79f3e0ed3bf0a77e594e621107f Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 16:40:11 -0400 Subject: [PATCH 279/383] [test] Restore the getName as no real reason to remove yes its not used, neither is the internal object name. If cleanup keeps running it will just remove more and more which makes its usage unclear. Add comment instead --- .../mybatis/spring/batch/MyBatisCursorItemReaderTest.java | 5 +++++ .../batch/builder/MyBatisBatchItemWriterBuilderTest.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/test/java/org/mybatis/spring/batch/MyBatisCursorItemReaderTest.java b/src/test/java/org/mybatis/spring/batch/MyBatisCursorItemReaderTest.java index 44f061ce62..965fa84336 100644 --- a/src/test/java/org/mybatis/spring/batch/MyBatisCursorItemReaderTest.java +++ b/src/test/java/org/mybatis/spring/batch/MyBatisCursorItemReaderTest.java @@ -90,12 +90,17 @@ private List getFoos() { return Arrays.asList(new Foo("foo1"), new Foo("foo2"), new Foo("foo3")); } + // Note: Do not cleanup this 'foo' class private static class Foo { private final String name; Foo(String name) { this.name = name; } + + public String getName() { + return this.name; + } } } diff --git a/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java b/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java index 6076ba4da5..a39fc45e93 100644 --- a/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java +++ b/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java @@ -176,12 +176,17 @@ private Chunk getFoos() { return Chunk.of(new Foo("foo1"), new Foo("foo2"), new Foo("foo3")); } + // Note: Do not cleanup this 'foo' class private static class Foo { private final String name; Foo(String name) { this.name = name; } + + public String getName() { + return this.name; + } } } From 1df5bcd86ac0aafc26c6884e678f231606d81d4b Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 16:43:34 -0400 Subject: [PATCH 280/383] [cleanup] More cleanup --- .../java/org/mybatis/spring/SqlSessionFactoryBean.java | 7 +++---- .../mybatis/spring/annotation/MapperScannerRegistrar.java | 1 + .../org/mybatis/spring/mapper/MapperScannerConfigurer.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java index 282bbdf333..ed97f2e130 100644 --- a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java +++ b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java @@ -555,11 +555,10 @@ private T[] appendArrays(T[] oldArrays, T[] newArrays, IntFunction gene } if (newArrays == null) { return oldArrays; - } else { - List newList = new ArrayList<>(Arrays.asList(oldArrays)); - newList.addAll(Arrays.asList(newArrays)); - return newList.toArray(generator.apply(0)); } + List newList = new ArrayList<>(Arrays.asList(oldArrays)); + newList.addAll(Arrays.asList(newArrays)); + return newList.toArray(generator.apply(0)); } @Override diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java index f1de1b3c1e..66d4b9f418 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java @@ -61,6 +61,7 @@ */ public class MapperScannerRegistrar implements ImportBeanDefinitionRegistrar, ResourceLoaderAware { + // Note: Do not move resourceLoader via cleanup private ResourceLoader resourceLoader; @Override diff --git a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java index eaf7c6f3b1..dd2146308f 100644 --- a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java +++ b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java @@ -468,11 +468,11 @@ private String getPropertyValue(String propertyName, PropertyValues values) { } if (value instanceof String) { return value.toString(); - } else if (value instanceof TypedStringValue) { + } + if (value instanceof TypedStringValue) { return ((TypedStringValue) value).getValue(); - } else { - return null; } + return null; } @SuppressWarnings("unchecked") From eb2de4d06841fef7aea46d9fb3ba8d67661e7a4e Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 16:53:27 -0400 Subject: [PATCH 281/383] [todo] Add a note about code that seems to be incorrectly written --- src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java index ed97f2e130..6a268ced8f 100644 --- a/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java +++ b/src/main/java/org/mybatis/spring/SqlSessionFactoryBean.java @@ -565,6 +565,7 @@ private T[] appendArrays(T[] oldArrays, T[] newArrays, IntFunction gene public void afterPropertiesSet() throws Exception { notNull(dataSource, "Property 'dataSource' is required"); notNull(sqlSessionFactoryBuilder, "Property 'sqlSessionFactoryBuilder' is required"); + // TODO Review this statement as it seems off! state((configuration == null && configLocation == null) || !(configuration != null && configLocation != null), "Property 'configuration' and 'configLocation' can not specified with together"); From 392fbc526aca9767a5ab884554ab3f5d5faa3776 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 17:04:28 -0400 Subject: [PATCH 282/383] [maven-release-plugin] prepare release mybatis-spring-3.0.4 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 5e4b090f48..ae5d712085 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.mybatis mybatis-spring - 3.0.4-SNAPSHOT + 3.0.4 mybatis-spring An easy-to-use Spring bridge for MyBatis sql mapping framework. @@ -80,7 +80,7 @@ scm:git:ssh://git@github.com/mybatis/spring.git scm:git:ssh://git@github.com/mybatis/spring.git - HEAD + mybatis-spring-3.0.4 https://github.com/mybatis/spring/ @@ -122,7 +122,7 @@ 5.10.3 - 1700476361 + 1723410193 true From 1ba4458ac8eb5310173214515c34318b0d91325a Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 17:04:31 -0400 Subject: [PATCH 283/383] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ae5d712085..5e7a6107a7 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.mybatis mybatis-spring - 3.0.4 + 3.0.5-SNAPSHOT mybatis-spring An easy-to-use Spring bridge for MyBatis sql mapping framework. @@ -80,7 +80,7 @@ scm:git:ssh://git@github.com/mybatis/spring.git scm:git:ssh://git@github.com/mybatis/spring.git - mybatis-spring-3.0.4 + HEAD https://github.com/mybatis/spring/ @@ -122,7 +122,7 @@ 5.10.3 - 1723410193 + 1723410271 true From 13146053664f0cc3b9873632ffe68ddf66ab8e73 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 11 Aug 2024 17:18:41 -0400 Subject: [PATCH 284/383] [javadocs] Fix since tag --- src/main/java/org/mybatis/spring/annotation/MapperScan.java | 2 +- .../org/mybatis/spring/annotation/MapperScannerRegistrar.java | 4 ++-- .../org/mybatis/spring/mapper/MapperScannerConfigurer.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScan.java b/src/main/java/org/mybatis/spring/annotation/MapperScan.java index e533833492..270036ba15 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScan.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScan.java @@ -200,7 +200,7 @@ /** * Specifies which types are not eligible for mapper scanning. * - * @since 3.0.3 + * @since 3.0.4 * * @return array of customized mapper excludeFilter */ diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java index 66d4b9f418..81ecd2f1ff 100644 --- a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java +++ b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java @@ -166,7 +166,7 @@ void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes a * @param filterAttributes * AnnotationAttributes of excludeFilters * - * @since 3.0.3 + * @since 3.0.4 */ private List> parseFiltersHasPatterns(AnnotationAttributes filterAttributes) { @@ -196,7 +196,7 @@ private List> parseFiltersHasPatterns(AnnotationAttributes f * @param filterAttributes * AnnotationAttributes of excludeFilters * - * @since 3.0.3 + * @since 3.0.4 */ private List typeFiltersFor(AnnotationAttributes filterAttributes) { diff --git a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java index dd2146308f..f220ce4dee 100644 --- a/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java +++ b/src/main/java/org/mybatis/spring/mapper/MapperScannerConfigurer.java @@ -209,7 +209,7 @@ public void setMarkerInterface(Class superClass) { *

    * The scanner will exclude types that define with excludeFilters. * - * @since 3.0.3 + * @since 3.0.4 * * @param excludeFilters * list of TypeFilter @@ -223,7 +223,7 @@ public void setExcludeFilters(List excludeFilters) { *

    * After parsed, it will be added to excludeFilters. * - * @since 3.0.3 + * @since 3.0.4 * * @param rawExcludeFilters * list of rawExcludeFilter From ff7cf8e778debd5cf7477088bdd43237505982d9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 10:34:15 +0000 Subject: [PATCH 285/383] Update dependency org.junit.jupiter:junit-jupiter-engine to v5.11.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5e7a6107a7..72d0c720c7 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ 5.1.2 org.mybatis.spring - 5.10.3 + 5.11.0 1723410271 From a643fe352012592698491f5cd51a3bd29c6c294c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 12:28:10 +0000 Subject: [PATCH 286/383] Update spring core to v6.1.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 72d0c720c7..645bbd9eb3 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 10.17.1.0 3.5.16 - 6.1.11 + 6.1.12 3.3.2 5.1.2 org.mybatis.spring From 1f49423328056cd736e28833402dbc1976821961 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 00:22:13 +0000 Subject: [PATCH 287/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.14.19 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 645bbd9eb3..e86ad6e5f7 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ net.bytebuddy byte-buddy-agent - 1.14.18 + 1.14.19 test From c545fd2563e20fba2f02c8c476c85578777f0a36 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 16:58:43 +0000 Subject: [PATCH 288/383] Update dependency net.bytebuddy:byte-buddy to v1.14.19 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e86ad6e5f7..4735a75c86 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ net.bytebuddy byte-buddy - 1.14.18 + 1.14.19 test From 024e97aca7951b8e913cc33b43567063619e24e4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 17 Aug 2024 22:45:44 +0000 Subject: [PATCH 289/383] Update dependency maven to v3.9.9 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index fd51663748..01aa6654cd 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -16,5 +16,5 @@ # under the License. wrapperVersion=3.3.2 distributionType=source -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar From 95316f02b090cdc431085d8dcecdc24c49bef688 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 20:24:21 +0000 Subject: [PATCH 290/383] Update dependency org.springframework.boot:spring-boot-autoconfigure to v3.3.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4735a75c86..ef5ea6acee 100644 --- a/pom.xml +++ b/pom.xml @@ -115,7 +115,7 @@ 10.17.1.0 3.5.16 6.1.12 - 3.3.2 + 3.3.3 5.1.2 org.mybatis.spring From 4cc4fd2c21fb74475b773f0003dc555ab3d57ded Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 06:52:40 +0000 Subject: [PATCH 291/383] Update dependency net.bytebuddy:byte-buddy to v1.15.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef5ea6acee..71a4443fc8 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ net.bytebuddy byte-buddy - 1.14.19 + 1.15.0 test From 9577d68a92a6bc8303fa4ceb17db95df5ac6351e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 06:52:44 +0000 Subject: [PATCH 292/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.15.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef5ea6acee..1cab7e76a3 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ net.bytebuddy byte-buddy-agent - 1.14.19 + 1.15.0 test From 9e3e8189cc14893b1cf69f13f6501f999360e612 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 19:39:07 +0000 Subject: [PATCH 293/383] Update dependency org.mockito:mockito-core to v5.13.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a32ba09a49..0fdd0721c3 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 test From 8749e8ea172b5e86791d996af602d5aff9502671 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 18:52:58 +0000 Subject: [PATCH 294/383] Update dependency net.bytebuddy:byte-buddy to v1.15.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0fdd0721c3..c5fdc4f861 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 test From c617575672dcbf3488b7fb7199a0ba5cdeb37f54 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 18:53:01 +0000 Subject: [PATCH 295/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.15.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0fdd0721c3..b499de7aee 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 test From b3c7bd06bb97ed4711861825e9a6878c12a8b45c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 14:38:07 +0000 Subject: [PATCH 296/383] Update spring core to v6.1.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 48bbd13e4a..55a6f9e5d4 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 10.17.1.0 3.5.16 - 6.1.12 + 6.1.13 3.3.3 5.1.2 org.mybatis.spring From c633fef8ca8945b67037f5ad04a533d725719605 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 12:56:06 +0000 Subject: [PATCH 297/383] Update dependency org.springframework.boot:spring-boot-autoconfigure to v3.3.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 55a6f9e5d4..b73d6f3bf1 100644 --- a/pom.xml +++ b/pom.xml @@ -115,7 +115,7 @@ 10.17.1.0 3.5.16 6.1.13 - 3.3.3 + 3.3.4 5.1.2 org.mybatis.spring From dca666c61402383d8e1c77a2cb1bda98edb4b3b7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:38:09 +0000 Subject: [PATCH 298/383] Update dependency net.bytebuddy:byte-buddy to v1.15.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b73d6f3bf1..edb636ff16 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.2 test From d1fa3c5814219181a60f0db2089342ae2ea2d57d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:38:13 +0000 Subject: [PATCH 299/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.15.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b73d6f3bf1..5686a8deac 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.2 test From df04fa2096beef70e47aaaa2e00192986ba53bc4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2024 16:58:57 +0000 Subject: [PATCH 300/383] Update dependency org.junit.jupiter:junit-jupiter-engine to v5.11.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b73d6f3bf1..a0fc68bed0 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ 5.1.2 org.mybatis.spring - 5.11.0 + 5.11.1 1723410271 From 68fb6f360ada6e8dddebc9baf9819d2514e9f585 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 00:46:45 +0000 Subject: [PATCH 301/383] Update dependency net.bytebuddy:byte-buddy to v1.15.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 532946158c..25fc644d11 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ net.bytebuddy byte-buddy - 1.15.2 + 1.15.3 test From ea1d9cd246888c0391275e81ec1830241ec299ab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 00:46:49 +0000 Subject: [PATCH 302/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.15.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 532946158c..14fdd92d7f 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ net.bytebuddy byte-buddy-agent - 1.15.2 + 1.15.3 test From c81eaba97e8dbc07fc1321bbe29531e25ef72ca7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 16:38:33 +0000 Subject: [PATCH 303/383] Update dependency org.mockito:mockito-core to v5.14.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e1784c8ef1..c8f0adb7b8 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.0 test From 2fe17f7b21b52fc9708be95646cdd3e55681c9d0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 14:03:47 +0000 Subject: [PATCH 304/383] Update dependency org.mockito:mockito-core to v5.14.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c8f0adb7b8..64c3b64fdf 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,7 @@ org.mockito mockito-core - 5.14.0 + 5.14.1 test From 4fb32941ff959e3b767aa8c6d127104614d824b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:01:50 +0000 Subject: [PATCH 305/383] Update dependency org.junit.jupiter:junit-jupiter-engine to v5.11.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 64c3b64fdf..b23ce53260 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ 5.1.2 org.mybatis.spring - 5.11.1 + 5.11.2 1723410271 From 2988cf0c61451d3d52e8d9ffeadcde1659eebe4f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 22:49:30 +0000 Subject: [PATCH 306/383] Update dependency net.bytebuddy:byte-buddy to v1.15.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b23ce53260..50cf0ebb89 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.4 test From 50046b0d6bcb2cea5fd833a21c8da80cf008eafb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 22:49:33 +0000 Subject: [PATCH 307/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.15.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b23ce53260..49eaf80ef0 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.4 test From bf0aef3b8ab9a6f45d247e3d874949d4deb43106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=94=E6=98=9F=E5=A5=BD=E5=B8=82=E6=B0=91?= <39870481+cpupg@users.noreply.github.com> Date: Fri, 11 Oct 2024 23:44:14 +0800 Subject: [PATCH 308/383] fix i18n link error in site. change zh to zh_cn in zh_cn/markdown/index.md --- src/site/zh_CN/markdown/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/zh_CN/markdown/index.md b/src/site/zh_CN/markdown/index.md index 3ffbbaaa03..c993cff09c 100644 --- a/src/site/zh_CN/markdown/index.md +++ b/src/site/zh_CN/markdown/index.md @@ -47,7 +47,7 @@ Andrius Juozapaitis, Giovanni Cuccu, Raj Nagappan 和 Tomas Pinos įš„č´ĄįŒŽīŧ›

  • EspaÃąol
  • æ—ĨæœŦčĒž
  • 한ęĩ­ė–´
    • -
  • įŽ€äŊ“中文
    • +
  • įŽ€äŊ“中文
    • æƒŗį”¨č‡Ēåˇąįš„æ¯č¯­é˜…č¯ģčŋ™į¯‡æ–‡æĄŖ吗īŧŸé‚Ŗå°ąį”¨äŊ įš„æ¯č¯­įŋģč¯‘åŽƒå§īŧ From f80a018bc31bd4db90963ea3bd1a95f215cf772a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 15:05:01 +0000 Subject: [PATCH 309/383] Update dependency org.mockito:mockito-core to v5.14.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c1c0178cc9..c41f8d4ca6 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 test From e6e584373c40835841fec9b532a9c1023cdbad38 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:39:13 +0000 Subject: [PATCH 310/383] Update dependency net.bytebuddy:byte-buddy to v1.15.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c41f8d4ca6..17327a6ed2 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ net.bytebuddy byte-buddy - 1.15.4 + 1.15.5 test From c1b21a14a608048e53401c31401ca70b26c8c57d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:39:17 +0000 Subject: [PATCH 311/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.15.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c41f8d4ca6..83f647312e 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ net.bytebuddy byte-buddy-agent - 1.15.4 + 1.15.5 test From a46c9c8bc97d6a767a51993c9cd4d52f33191f2d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 15:15:05 +0000 Subject: [PATCH 312/383] Update spring core to v6.1.14 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4a8cea233d..4d8898047b 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 10.17.1.0 3.5.16 - 6.1.13 + 6.1.14 3.3.4 5.1.2 org.mybatis.spring From 3f85978fbd1d3921d001e7e6ebf51ff475521cfb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 17:33:34 +0000 Subject: [PATCH 313/383] Update dependency org.junit.jupiter:junit-jupiter-engine to v5.11.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4d8898047b..b17f6889bc 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ 5.1.2 org.mybatis.spring - 5.11.2 + 5.11.3 1723410271 From e8315863e975064a5a4419e6a2f143a882254af5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 09:16:23 +0000 Subject: [PATCH 314/383] Update dependency net.bytebuddy:byte-buddy to v1.15.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b17f6889bc..6442374a62 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ net.bytebuddy byte-buddy - 1.15.5 + 1.15.7 test From b1f94216d235acd40263fdeac3b785067986305c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 09:16:26 +0000 Subject: [PATCH 315/383] Update dependency net.bytebuddy:byte-buddy-agent to v1.15.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b17f6889bc..c5a55609ce 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ net.bytebuddy byte-buddy-agent - 1.15.5 + 1.15.7 test From 2204f9e1467dc588b0652574ec1066b4422ff5d7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:11:08 +0000 Subject: [PATCH 316/383] Update dependency org.springframework.boot:spring-boot-autoconfigure to v3.3.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 90dd0f2ad5..03ce3ebc68 100644 --- a/pom.xml +++ b/pom.xml @@ -115,7 +115,7 @@ 10.17.1.0 3.5.16 6.1.14 - 3.3.4 + 3.3.5 5.1.2 org.mybatis.spring From bcb8cf38e3e6593c2a58485236b8a3c936f2afbb Mon Sep 17 00:00:00 2001 From: dongsseop2 Date: Fri, 1 Nov 2024 18:15:12 +0900 Subject: [PATCH 317/383] chore: fix typos --- src/site/ko/markdown/README.md | 2 +- src/site/ko/markdown/batch.md | 56 ++++++++++++------------- src/site/ko/markdown/factorybean.md | 20 ++++----- src/site/ko/markdown/getting-started.md | 16 +++---- src/site/ko/markdown/index.md | 18 ++++---- src/site/ko/markdown/mappers.md | 42 +++++++++---------- src/site/ko/markdown/sqlsession.md | 28 ++++++------- src/site/ko/markdown/transactions.md | 18 ++++---- src/site/ko/markdown/using-api.md | 2 +- 9 files changed, 101 insertions(+), 101 deletions(-) diff --git a/src/site/ko/markdown/README.md b/src/site/ko/markdown/README.md index 4e31a121bc..03cf1d3fa2 100644 --- a/src/site/ko/markdown/README.md +++ b/src/site/ko/markdown/README.md @@ -1,6 +1,6 @@ # ëĒŠė°¨ -ė´ 페ė´ė§€ëŠ” GitHubė—ė„œ ė¸ëąėŠ¤ëĨŧ 렌더링하기ėœ„í•œ 것ėž…니다. +ė´ 페ė´ė§€ëŠ” GitHubė—ė„œ ė¸ëąėŠ¤ëĨŧ 렌더링하기 ėœ„í•œ 것ėž…니다. > **NOTE:** > diff --git a/src/site/ko/markdown/batch.md b/src/site/ko/markdown/batch.md index 87b11c2600..cdcd9d0b5b 100644 --- a/src/site/ko/markdown/batch.md +++ b/src/site/ko/markdown/batch.md @@ -1,15 +1,15 @@ # Spring Batch -마ė´ë°”í‹°ėŠ¤ ėŠ¤í”„링 ė—°ë™ëĒ¨ë“ˆė˜ 1.1.0버ė „ė—ė„œëŠ” ėŠ¤í”„링 ë°°ėš˜ ė• í”ŒëĻŦėŧ€ė´ė…˜ė„ 만들기 ėœ„í•´ ė„¸ę°œė˜ 뚈ė„ ė œęŗĩ한다. -ė„¸ę°œė˜ 뚈ė€ `MyBatisPagingItemReader` ė™€ `MyBatisCursorItemReader` ė™€ MyBatisBatchItemWriterė´ë‹¤. +마ė´ë°”í‹°ėŠ¤ ėŠ¤í”„링 ė—°ë™ ëĒ¨ë“ˆė˜ 1.1.0버ė „ė—ė„œëŠ” ėŠ¤í”„링 ë°°ėš˜ ė• í”ŒëĻŦėŧ€ė´ė…˜ė„ 만들기 ėœ„í•´ ė„¸ 개ė˜ 뚈ė„ ė œęŗĩ한다. +ė„¸ 개ė˜ 뚈ė€ `MyBatisPagingItemReader` ė™€ `MyBatisCursorItemReader` ė™€ MyBatisBatchItemWriterė´ë‹¤. 또한 2.0.0 버ė „ė—ė„œëŠ” Java Configuration ė„ ė§€ė›í•˜ëŠ” 다ėŒė˜ ė„¸ 가ė§€ Builder class ëĨŧ ė œęŗĩ한다. `MyBatisPagingItemReaderBuilder`, `MyBatisCursorItemReaderBuilder` ꡸ëĻŦęŗ  `MyBatisBatchItemWriterBuilder` ė´ë‹¤. ė¤‘ėš” ė´ ëŦ¸ė„œëŠ” [ėŠ¤í”„링 ë°°ėš˜](http://static.springsource.org/spring-batch/) ė— 대한 것ėœŧ로 마ė´ë°”í‹°ėŠ¤ ë°°ėš˜ `SqlSession` ė„ 다ëŖ¨ė§€ëŠ” ė•ŠëŠ”다. -ë°°ėš˜ ė„¸ė…˜ė— 대해ė„œëŠ” [SqlSession ė‚ŦėšŠ](sqlsession.html) ė—ė„œ ėĸ€ë” 다ëŖ¨ė—ˆë‹¤. +ë°°ėš˜ ė„¸ė…˜ė— 대해ė„œëŠ” [SqlSession ė‚ŦėšŠ](sqlsession.html) ė—ė„œ ėĸ€ 더 다ëŖ¨ė—ˆë‹¤. # MyBatisPagingItemReader @@ -17,15 +17,15 @@ ėš”ė˛­ëœ 데ė´í„°ëĨŧ 가ė ¸ė˜¤ę¸° ėœ„í•´ `setQueryId` 프로íŧ티ė— ëĒ…ė‹œëœ ėŋŧëĻŦëĨŧ ė‹¤í–‰í•œë‹¤. ėŋŧëĻŦ는 `setPageSize` 프로íŧ티ė— ëĒ…ė‹œëœ íŦ기만íŧ 데ė´í„°ëĨŧ 가ė ¸ė˜¤ë„록 ė‹¤í–‰ëœë‹¤. -`read()` 메ė„œë“œëĨŧ ė‚ŦėšŠí•˜ëŠ´ 필ėš”í•  때 현ėžŦ ėœ„ėš˜ė—ė„œ ė •í•´ė§„ ėˆ˜ 만íŧ 더 ėļ”ę°€ 데ė´í„°ëĨŧ 가ė ¸ė˜¨ë‹¤. -reader는 ëĒ‡ę°€ė§€ė˜ 표ė¤€ė ė¸ ėŋŧëĻŦ 파ëŧ미터ëĨŧ ė œęŗĩ하ęŗ  ëĒ…ëĒ…된 ėŋŧëĻŦė˜ SQLė€ ėš”ė˛­ëœ íŦ기만íŧė˜ 데ė´í„°ëĨŧ 만들기 ėœ„í•´ 파ëŧ미터ė˜ ėŧëļ€ 혚ė€ ëĒ¨ë‘ ė‚ŦėšŠí•œë‹¤. -ė—Ŧ기ė„œ ė‚ŦėšŠę°€ëŠĨ한 파ëŧ미터ė´ë‹¤. +`read()` 메ė„œë“œëĨŧ ė‚ŦėšŠí•˜ëŠ´ 필ėš”í•  때 현ėžŦ ėœ„ėš˜ė—ė„œ ė •í•´ė§„ ėˆ˜ë§Œíŧ 더 ėļ”ę°€ 데ė´í„°ëĨŧ 가ė ¸ė˜¨ë‹¤. +reader는 ëĒ‡ 가ė§€ė˜ 표ė¤€ė ė¸ ėŋŧëĻŦ 파ëŧ미터ëĨŧ ė œęŗĩ하ęŗ  ëĒ…ëĒ…된 ėŋŧëĻŦė˜ SQLė€ ėš”ė˛­ëœ íŦ기만íŧė˜ 데ė´í„°ëĨŧ 만들기 ėœ„í•´ 파ëŧ미터ė˜ ėŧëļ€ 혚ė€ ëĒ¨ë‘ ė‚ŦėšŠí•œë‹¤. +ė—Ŧ기ė„œ ė‚ŦėšŠ 가ëŠĨ한 파ëŧ미터ė´ë‹¤. * `_page`: ėŊė„ 페ė´ė§€ ėˆ˜(0ëļ€í„° ė‹œėž‘) * `_pagesize`: 페ė´ė§€ė˜ íŦ기, ė´ëĨŧ테면 ëĻŦ턴하는 로ėš° ėˆ˜ * `_skiprows`: `_page` ė™€ `_pagesize`ëĨŧ ęŗąí•œ 결ęŗŧ -각각ė˜ 파ëŧ미터는 seletęĩŦëŦ¸ė—ė„œ 다ėŒė˛˜ëŸŧ 매핑될 ėˆ˜ ėžˆë‹¤. +각각ė˜ 파ëŧ미터는 seletęĩŦëŦ¸ė—ė„œ 다ėŒė˛˜ëŸŧ 매핑 될 ėˆ˜ ėžˆë‹¤. ```xml select * from Bar -- this should run on database Bar, but actually runs on Foo. - \ No newline at end of file + diff --git a/src/test/resources/org/mybatis/spring/submitted/autowire/FooMapper.xml b/src/test/resources/org/mybatis/spring/submitted/autowire/FooMapper.xml index e67a953870..5e4f07f9a5 100644 --- a/src/test/resources/org/mybatis/spring/submitted/autowire/FooMapper.xml +++ b/src/test/resources/org/mybatis/spring/submitted/autowire/FooMapper.xml @@ -21,4 +21,4 @@ - \ No newline at end of file + From 379daf3b0fc91f4a450d8d35ddd0f397c17e5c00 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 8 Jan 2025 20:00:30 -0500 Subject: [PATCH 349/383] [mvn] Update maven wrapper --- .mvn/extensions.xml | 2 +- .mvn/settings.xml | 2 +- .mvn/wrapper/MavenWrapperDownloader.java | 3 +-- pom.xml | 2 +- src/site/site.xml | 2 +- .../org/mybatis/spring/annotation/override.properties | 2 +- .../resources/org/mybatis/spring/annotation/scan.properties | 2 +- .../org/mybatis/spring/config/default-scope.properties | 2 +- src/test/resources/org/mybatis/spring/config/lazy.properties | 2 +- .../resources/org/mybatis/spring/config/override.properties | 2 +- .../org/mybatis/spring/filter/config/application.properties | 2 +- .../resources/org/mybatis/spring/filter/xml/default.properties | 2 +- .../org/mybatis/spring/submitted/autowire/BarMapper.xml | 2 +- .../org/mybatis/spring/submitted/autowire/FooMapper.xml | 2 +- 14 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index aeaad3ef68..8a33a856cd 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -1,7 +1,7 @@ 1723410271 From 8c2fdbc246ea48764d72934e921e89ae58a7666b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 25 Feb 2025 19:39:02 +0000 Subject: [PATCH 366/383] chore(deps): update dependency org.slf4j:slf4j-simple to v2.0.17 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b4ce40fd1b..af4f881dda 100644 --- a/pom.xml +++ b/pom.xml @@ -246,7 +246,7 @@ org.slf4j slf4j-simple - 2.0.16 + 2.0.17 test From 6e0e3e27de6178f4e648710b9a8125a281558916 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Mar 2025 12:55:24 +0000 Subject: [PATCH 367/383] chore(deps): update dependency net.bytebuddy:byte-buddy to v1.17.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index af4f881dda..1b35cf9ad7 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ net.bytebuddy byte-buddy - 1.17.1 + 1.17.2 test From cc6937dcd17797a9c0eb8b3d84d78e6e98c07042 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Mar 2025 12:55:27 +0000 Subject: [PATCH 368/383] chore(deps): update dependency net.bytebuddy:byte-buddy-agent to v1.17.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index af4f881dda..c29beed6e1 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ net.bytebuddy byte-buddy-agent - 1.17.1 + 1.17.2 test From 86b3177bd6252912dd5d76830e352ce67efd4d2f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Mar 2025 19:45:54 +0000 Subject: [PATCH 369/383] chore(deps): update dependency org.mockito:mockito-core to v5.16.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index af4f881dda..8ed323d49d 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,7 @@ org.mockito mockito-core - 5.15.2 + 5.16.0 test From 7da464813bb258d7d7004edb3388c09fb319b159 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 14 Mar 2025 07:41:29 +0000 Subject: [PATCH 370/383] chore(deps): update dependency org.aspectj:aspectjweaver to v1.9.23 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b9732ef63f..820d120e6b 100644 --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ org.aspectj aspectjweaver - 1.9.22.1 + 1.9.23 compile true From e74ef3ed17b9870c85f575562a526a7798ee2254 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 14 Mar 2025 07:41:32 +0000 Subject: [PATCH 371/383] fix(deps): update spring core to v6.2.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b9732ef63f..6ee12c41d8 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 10.17.1.0 3.5.19 - 6.2.3 + 6.2.4 3.4.3 5.2.1 org.mybatis.spring From 2c64093578f713688515fa94577c31c3cfadbbed Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 14 Mar 2025 19:01:38 +0000 Subject: [PATCH 372/383] chore(deps): update dependency org.junit.jupiter:junit-jupiter-engine to v5.12.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b9732ef63f..ddaa3c0094 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ 5.2.1 org.mybatis.spring - 5.12.0 + 5.12.1 1723410271 From 44ad2bc94c347674987017ced6caf57b6b6e76b2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 15 Mar 2025 21:49:06 +0000 Subject: [PATCH 373/383] chore(deps): update dependency org.mockito:mockito-core to v5.16.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a5daab297..fb3b3cfba5 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,7 @@ org.mockito mockito-core - 5.16.0 + 5.16.1 test From 6771711e47f6f1dc6343742f3662021e0bf28720 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Mar 2025 17:08:10 +0000 Subject: [PATCH 374/383] fix(deps): update spring batch to v5.2.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb3b3cfba5..0e81f14778 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ 3.5.19 6.2.4 3.4.3 - 5.2.1 + 5.2.2 org.mybatis.spring 5.12.1 From 925e3aca4185575a0d90fc5f706c4a440d31dfce Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Mar 2025 20:09:59 +0000 Subject: [PATCH 375/383] fix(deps): update spring core to v6.2.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0e81f14778..2518ed6b98 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 10.17.1.0 3.5.19 - 6.2.4 + 6.2.5 3.4.3 5.2.2 org.mybatis.spring From 659284191fca6c5a698b190e6d62e70ce7e72ab1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 21 Mar 2025 07:10:00 +0000 Subject: [PATCH 376/383] chore(deps): update dependency org.springframework.boot:spring-boot-autoconfigure to v3.4.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2518ed6b98..8556f39317 100644 --- a/pom.xml +++ b/pom.xml @@ -115,7 +115,7 @@ 10.17.1.0 3.5.19 6.2.5 - 3.4.3 + 3.4.4 5.2.2 org.mybatis.spring From d20a11609c7b318951d95d9d66db958a333054f0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 21 Mar 2025 23:28:53 +0000 Subject: [PATCH 377/383] chore(deps): update dependency net.bytebuddy:byte-buddy to v1.17.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8556f39317..047c6aafdb 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ net.bytebuddy byte-buddy - 1.17.2 + 1.17.3 test From 269ad85ea7cb8cbb26fcb2aaf2fb66bd8520f6bc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 21 Mar 2025 23:28:56 +0000 Subject: [PATCH 378/383] chore(deps): update dependency net.bytebuddy:byte-buddy-agent to v1.17.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8556f39317..e335ac8675 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ net.bytebuddy byte-buddy-agent - 1.17.2 + 1.17.3 test From fad46275227f00fd3ef23a7967860e0406bfc8c4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 03:29:03 +0000 Subject: [PATCH 379/383] chore(deps): update dependency net.bytebuddy:byte-buddy to v1.17.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 329b240102..e2e0589faa 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ net.bytebuddy byte-buddy - 1.17.3 + 1.17.4 test From ea64da97c29b6431bf5159e0b94b76780f701008 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 03:29:07 +0000 Subject: [PATCH 380/383] chore(deps): update dependency net.bytebuddy:byte-buddy-agent to v1.17.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 329b240102..792b86c51b 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ net.bytebuddy byte-buddy-agent - 1.17.3 + 1.17.4 test From aab8529e576991fc075ad8319676cf7f96e5ca33 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 31 Mar 2025 11:32:56 +0000 Subject: [PATCH 381/383] chore(deps): update dependency net.bytebuddy:byte-buddy to v1.17.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eda49d3f9d..8df38a1650 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ net.bytebuddy byte-buddy - 1.17.4 + 1.17.5 test From 3ebebd4bfe350f0d4160dc89b51dd40a481a5da5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 31 Mar 2025 11:32:59 +0000 Subject: [PATCH 382/383] chore(deps): update dependency net.bytebuddy:byte-buddy-agent to v1.17.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eda49d3f9d..0a105e5e46 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ net.bytebuddy byte-buddy-agent - 1.17.4 + 1.17.5 test From 7f9137a1278c3ea6ed05407b1aa53ddd3d06022b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 4 Apr 2025 14:36:54 +0000 Subject: [PATCH 383/383] chore(deps): update dependency org.mockito:mockito-core to v5.17.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 30d4793613..9cbd9c8e4d 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,7 @@ org.mockito mockito-core - 5.16.1 + 5.17.0 test