Merge branch 'master' into feature/101-support-constructor-collection-injection

Author: epochcoder

.github/workflows/ci.yaml

@@ -20,28 +20,11 @@ jobs:
       - name: Set up JDK ${{ matrix.java }} ${{ matrix.distribution }}
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          cache: ${{ matrix.cache }}
           distribution: ${{ matrix.distribution }}
-      - name: Print JDK Version
-        run: java -version
-      - name: Cache local Maven m2
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-m2
-      - name: Skip tests that require illegal reflective access
+          java-version: ${{ matrix.java }}
+      - name: Setup testContainers profile for ubuntu
         if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: echo 'ARG_LINE=-D"excludedGroups=RequireIllegalAccess"' >> $GITHUB_ENV
-      - name: Skip tests that require illegal reflective access
-        if: ${{ matrix.os != 'ubuntu-latest' }}
-        run: echo 'ARG_LINE=-D"excludedGroups=TestcontainersTests,RequireIllegalAccess"' >> $GITHUB_ENV
-      - name: Active Profiles
-        run: ./mvnw help:active-profiles
-      - name: Test with Maven
-        if: ${{ matrix.os != 'windows-latest' }}
-        run: ./mvnw test -B -V  --no-transfer-progress -D"license.skip=true" -D"jacoco.skip=true" $ARG_LINE
+        run: echo 'TEST_CONTAINERS_PROFILE=-PtestContainers' >> $GITHUB_ENV
       - name: Test with Maven
-        if: ${{ matrix.os == 'windows-latest' }}
-        run: ./mvnw test -B -V  --no-transfer-progress -D"license.skip=true" -D"jacoco.skip=true" -D"excludedGroups=TestcontainersTests,RequireIllegalAccess"
+        run: ./mvnw test -B -V  --no-transfer-progress -D"license.skip=true" $TEST_CONTAINERS_PROFILE

ICLA

@@ -1,6 +1,6 @@
                              MyBatis
      Individual Contributor License Agreement ("Agreement") V2.0
-           https://mybatis.googlecode.com/svn/trunk/ICLA
+        https://github.com/mybatis/mybatis-3/edit/master/ICLA
 
 Thank you for your interest in MyBatis (the
 "Project"). In order to clarify the intellectual property license

README.md

@@ -37,38 +37,36 @@ Tests
 
 Mybatis-3 code runs more expressive testing depending on jdk usage and platform.
 
-By default, we set ```<excludedGroups>TestcontainersTests</excludedGroups>``` which will exclude a subset of tests with @Tag('TestcontainersTests').  Further, if pre jdk 16, we will further exclude record classes from executions further reducing tests.
-
-When using jdk 16+, we adjust the rule to ```<excludedGroups>TestcontainersTests,RequireIllegalAccess</excludedGroups>```.
+By default, we set ```<excludedGroups>TestcontainersTests,RequireIllegalAccess</excludedGroups>``` which will exclude a subset of tests with @Tag('TestcontainersTests') and @Tag('RequireIllegalAccess').
 
 When we run on ci platform, we further make adjustments as needed.  See [here](.github/workflows/ci.yaml) for details.
 
-As of 2/20/2023, using combined system + jdk will result in given number of tests ran.  This will change as tests are added or removed over time.
+As of 12/28/2024, using combined system + jdk will result in given number of tests ran.  This will change as tests are added or removed over time.
 
 without adjusting settings (ie use as is, platform does not matter)
 
-- any OS + jdk 11 = 1730 tests
-- any OS + jdk 17 = 1710 tests
-- any OS + jdk 19 = 1710 tests
-- any OS + jdk 20 = 1710 tests
-- any OS + jdk 21 = 1710 tests
+- any OS + jdk 17 = 1899 tests
+- any OS + jdk 21 = 1899 tests
+- any OS + jdk 23 = 1899 tests
+- any OS + jdk 24 = 1899 tests
+- any OS + jdk 25 = 1899 tests
 
 our adjustments for GH actions where platform does matter
 
-- windows + jdk 11 = 1730 tests
-- windows + jdk 17 = 1710 tests
-- windows + jdk 19 = 1710 tests
-- windows + jdk 20 = 1710 tests
-- windows + jdk 21 = 1710 tests
-
-- linux + jdk 11 = 1765 tests
-- linux + jdk 17 = 1745 tests
-- linux + jdk 19 = 1745 tests
-- linux + jdk 20 = 1745 tests
-- linux + jdk 21 = 1745 tests
-
-- mac + jdk 11 = 1730 tests
-- mac + jdk 17 = 1710 tests
-- mac + jdk 19 = 1710 tests
-- mac + jdk 20 = 1710 tests
-- mac + jdk 21 = 1710 tests
+- windows + jdk 17 = 1899 tests
+- windows + jdk 21 = 1899 tests
+- windows + jdk 23 = 1899 tests
+- windows + jdk 24 = 1899 tests
+- windows + jdk 25 = 1899 tests
+
+- linux + jdk 17 = 1934 tests
+- linux + jdk 21 = 1934 tests
+- linux + jdk 23 = 1934 tests
+- linux + jdk 24 = 1934 tests
+- linux + jdk 25 = 1934 tests
+
+- mac + jdk 17 = 1899 tests
+- mac + jdk 21 = 1899 tests
+- mac + jdk 23 = 1899 tests
+- mac + jdk 24 = 1899 tests
+- mac + jdk 25 = 1899 tests

pom.xml

@@ -81,7 +81,8 @@
 
     <!-- Add slow test groups here and annotate classes similar to @Tag('groupName'). -->
     <!-- Excluded groups are ran on github ci, to force here, pass -d"excludedGroups=" -->
-    <excludedGroups>TestcontainersTests</excludedGroups>
+    <!-- Note: RequireIllegalAccess tests are now no longer valid as they only worked prior to java 16 -->
+    <excludedGroups>TestcontainersTests,RequireIllegalAccess</excludedGroups>
 
     <!-- Automatic Module Name -->
     <module.name>org.mybatis</module.name>
@@ -232,6 +233,14 @@
       <artifactId>junit-jupiter</artifactId>
       <version>${testcontainers.version}</version>
       <scope>test</scope>
+      <!--Only Mysqlcontainer is allowed to use junit 4 due to testContainers coupling: Uncomment to test no other leakage
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
+      -->
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
@@ -415,12 +424,9 @@
 
   <profiles>
     <profile>
-      <id>16</id>
-      <activation>
-        <jdk>[16,)</jdk>
-      </activation>
+      <id>testContainers</id>
       <properties>
-        <excludedGroups>TestcontainersTests,RequireIllegalAccess</excludedGroups>
+        <excludedGroups>RequireIllegalAccess</excludedGroups>
       </properties>
     </profile>
     <profile>

src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java

@@ -239,7 +239,7 @@ private ResultMap resultMapElement(XNode resultMapNode, List<ResultMapping> addi
         resultMappings.add(buildResultMappingFromContext(resultChild, typeClass, flags));
       }
     }
-    String id = resultMapNode.getStringAttribute("id", resultMapNode.getValueBasedIdentifier());
+    String id = resultMapNode.getStringAttribute("id", resultMapNode::getValueBasedIdentifier);
     String extend = resultMapNode.getStringAttribute("extends");
     Boolean autoMapping = resultMapNode.getBooleanAttribute("autoMapping");
     ResultMapResolver resultMapResolver = new ResultMapResolver(builderAssistant, id, typeClass, extend, discriminator,
@@ -290,7 +290,7 @@ private Discriminator processDiscriminatorElement(XNode context, Class<?> result
     for (XNode caseChild : context.getChildren()) {
       String value = caseChild.getStringAttribute("value");
       String resultMap = caseChild.getStringAttribute("resultMap",
-          processNestedResultMappings(caseChild, resultMappings, resultType));
+          () -> processNestedResultMappings(caseChild, resultMappings, resultType));
       discriminatorMap.put(value, resultMap);
     }
     return builderAssistant.buildDiscriminator(resultType, column, javaTypeClass, jdbcTypeEnum, typeHandlerClass,

src/test/java/org/apache/ibatis/autoconstructor/BadSubject.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ public BadSubject(final int id, final String name, final int age, final Height h
     this.weight = weight == null ? 0 : weight;
   }
 
-  private class Height {
+  private static class Height {
 
   }
 }

src/test/java/org/apache/ibatis/binding/WrongMapperTest.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -24,9 +24,7 @@ class WrongMapperTest {
   @Test
   void shouldFailForBothOneAndMany() {
     Configuration configuration = new Configuration();
-    Assertions.assertThrows(RuntimeException.class, () -> {
-      configuration.addMapper(MapperWithOneAndMany.class);
-    });
+    Assertions.assertThrows(RuntimeException.class, () -> configuration.addMapper(MapperWithOneAndMany.class));
   }
 
 }

src/test/java/org/apache/ibatis/binding/WrongNamespacesTest.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

src/test/java/org/apache/ibatis/builder/ParameterExpressionTest.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

src/test/java/org/apache/ibatis/builder/SqlSourceBuilderTest.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class SqlSourceBuilderTest {
+class SqlSourceBuilderTest {
 
   private static Configuration configuration;
   private static SqlSourceBuilder sqlSourceBuilder;
@@ -36,15 +36,15 @@ void setUp() {
   }
 
   @Test
-  void testShrinkWhitespacesInSqlIsFalse() {
+  void shrinkWhitespacesInSqlIsFalse() {
     SqlSource sqlSource = sqlSourceBuilder.parse(sqlFromXml, null, null);
     BoundSql boundSql = sqlSource.getBoundSql(null);
     String actual = boundSql.getSql();
     Assertions.assertEquals(sqlFromXml, actual);
   }
 
   @Test
-  void testShrinkWhitespacesInSqlIsTrue() {
+  void shrinkWhitespacesInSqlIsTrue() {
     configuration.setShrinkWhitespacesInSql(true);
     SqlSource sqlSource = sqlSourceBuilder.parse(sqlFromXml, null, null);
     BoundSql boundSql = sqlSource.getBoundSql(null);

src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java

@@ -155,16 +155,16 @@ public E getNullableResult(CallableStatement cs, int columnIndex) throws SQLExce
 
   @Test
   void registerJavaTypeInitializingTypeHandler() {
-    // @formatter:off
-    final String MAPPER_CONFIG = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
-        + "<!DOCTYPE configuration PUBLIC \"-//mybatis.org//DTD Config 3.0//EN\" \"https://mybatis.org/dtd/mybatis-3-config.dtd\">\n"
-        + "<configuration>\n"
-        + "  <typeHandlers>\n"
-        + "    <typeHandler javaType=\"org.apache.ibatis.builder.XmlConfigBuilderTest$MyEnum\"\n"
-        + "      handler=\"org.apache.ibatis.builder.XmlConfigBuilderTest$EnumOrderTypeHandler\"/>\n"
-        + "  </typeHandlers>\n"
-        + "</configuration>\n";
-    // @formatter:on
+    final String MAPPER_CONFIG = """
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "https://mybatis.org/dtd/mybatis-3-config.dtd">
+        <configuration>
+          <typeHandlers>
+            <typeHandler javaType="org.apache.ibatis.builder.XmlConfigBuilderTest$MyEnum"
+                          handler="org.apache.ibatis.builder.XmlConfigBuilderTest$EnumOrderTypeHandler"/>
+          </typeHandlers>
+        </configuration>
+        """;
 
     XMLConfigBuilder builder = new XMLConfigBuilder(new StringReader(MAPPER_CONFIG));
     builder.parse();
@@ -283,15 +283,15 @@ void parseIsTwice() throws Exception {
 
   @Test
   void unknownSettings() {
-    // @formatter:off
-    final String MAPPER_CONFIG = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
-            + "<!DOCTYPE configuration PUBLIC \"-//mybatis.org//DTD Config 3.0//EN\" \"https://mybatis.org/dtd/mybatis-3-config.dtd\">\n"
-            + "<configuration>\n"
-            + "  <settings>\n"
-            + "    <setting name=\"foo\" value=\"bar\"/>\n"
-            + "  </settings>\n"
-            + "</configuration>\n";
-    // @formatter:on
+    final String MAPPER_CONFIG = """
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "https://mybatis.org/dtd/mybatis-3-config.dtd">
+        <configuration>
+          <settings>
+            <setting name="foo" value="bar"/>
+          </settings>
+        </configuration>
+        """;
 
     XMLConfigBuilder builder = new XMLConfigBuilder(new StringReader(MAPPER_CONFIG));
     when(builder::parse);
@@ -301,15 +301,15 @@ void unknownSettings() {
 
   @Test
   void unknownJavaTypeOnTypeHandler() {
-    // @formatter:off
-    final String MAPPER_CONFIG = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
-            + "<!DOCTYPE configuration PUBLIC \"-//mybatis.org//DTD Config 3.0//EN\" \"https://mybatis.org/dtd/mybatis-3-config.dtd\">\n"
-            + "<configuration>\n"
-            + "  <typeAliases>\n"
-            + "    <typeAlias type=\"a.b.c.Foo\"/>\n"
-            + "  </typeAliases>\n"
-            + "</configuration>\n";
-    // @formatter:on
+    final String MAPPER_CONFIG = """
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "https://mybatis.org/dtd/mybatis-3-config.dtd">
+        <configuration>
+          <typeAliases>
+            <typeAlias type="a.b.c.Foo"/>
+          </typeAliases>
+        </configuration>
+        """;
 
     XMLConfigBuilder builder = new XMLConfigBuilder(new StringReader(MAPPER_CONFIG));
     when(builder::parse);
@@ -319,13 +319,13 @@ void unknownJavaTypeOnTypeHandler() {
 
   @Test
   void propertiesSpecifyResourceAndUrlAtSameTime() {
-    // @formatter:off
-    final String MAPPER_CONFIG = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
-        + "<!DOCTYPE configuration PUBLIC \"-//mybatis.org//DTD Config 3.0//EN\" \"https://mybatis.org/dtd/mybatis-3-config.dtd\">\n"
-        + "<configuration>\n"
-        + "  <properties resource=\"a/b/c/foo.properties\" url=\"file:./a/b/c/jdbc.properties\"/>\n"
-        + "</configuration>\n";
-    // @formatter:on
+    final String MAPPER_CONFIG = """
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "https://mybatis.org/dtd/mybatis-3-config.dtd">
+        <configuration>
+          <properties resource="a/b/c/foo.properties" url="file:./a/b/c/jdbc.properties"/>
+        </configuration>
+        """;
 
     XMLConfigBuilder builder = new XMLConfigBuilder(new StringReader(MAPPER_CONFIG));
     when(builder::parse);

src/test/java/org/apache/ibatis/builder/XmlMapperBuilderTest.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -221,7 +221,7 @@ void errorResultMapLocation() throws Exception {
       builder.parse();
       String resultMapName = "java.lang.String";
       // namespace + "." + id
-      String statementId = "org.mybatis.spring.ErrorProblemMapper" + "." + "findProblemResultMapTest";
+      String statementId = "org.mybatis.spring.ErrorProblemMapper.findProblemResultMapTest";
       // same as MapperBuilderAssistant.getStatementResultMaps Exception message
       String message = "Could not find result map '" + resultMapName + "' referenced from '" + statementId + "'";
       IncompleteElementException exception = Assertions.assertThrows(IncompleteElementException.class,

src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

src/test/java/org/apache/ibatis/builder/xsd/XmlMapperBuilderTest.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

src/test/java/org/apache/ibatis/cache/CacheKeyTest.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -112,9 +112,7 @@ void shouldDemonstrateClonedNullCacheKeysAreEqual() throws Exception {
   void serializationExceptionTest() {
     CacheKey cacheKey = new CacheKey();
     cacheKey.update(new Object());
-    assertThrows(NotSerializableException.class, () -> {
-      serialize(cacheKey);
-    });
+    assertThrows(NotSerializableException.class, () -> serialize(cacheKey));
   }
 
   @Test