Merge branch 'master' into feat/2618-auto-determine-type-when-missing

Author: epochcoder

.gitignore

@@ -10,6 +10,7 @@
 /release.properties
 /target
 .github/keys/
+.profiler/
 
 # These are needed if running in IDE without properties set
 /ibderby

.mvn/extensions.xml

@@ -17,6 +17,7 @@
 
 -->
 <extensions>
+    <!-- Usage as -Dprofile -->
     <extension>
       <groupId>fr.jcgay.maven</groupId>
       <artifactId>maven-profiler</artifactId>

hooks/pre-commit.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+#
+#    Copyright 2009-2025 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.
+#
+set -eo pipefail
+
+function format_and_sort() {
+  # Run the validate and import check commands, suppressing all output and errors
+  if ! mvn formatter:validate impsort:check > /dev/null 2>&1; then
+      # If validation failed, fix it by ensuring code is formatted correctly
+      # and that imports are sorted as some IDEs automatically change it on save
+      mvn formatter:format impsort:sort
+
+      # Fail the commit, so the author can re-select what to commit
+      echo "Formatting and/or import sorting were required. Please check and make another commit."
+      exit 1
+  fi
+
+  # If no error occurred, print a success message
+  echo "All files are properly formatted and imports are sorted."
+}
+
+format_and_sort

pom.xml

@@ -78,6 +78,7 @@
     <mockito.version>5.15.2</mockito.version>
     <mssql-jdbc.version>12.8.1.jre11</mssql-jdbc.version>
     <testcontainers.version>1.20.4</testcontainers.version>
+    <git-build-hook.version>3.5.0</git-build-hook.version>
 
     <!-- Add slow test groups here and annotate classes similar to @Tag('groupName'). -->
     <!-- Excluded groups are ran on github ci, to force here, pass -d"excludedGroups=" -->
@@ -195,7 +196,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.7.4</version>
+      <version>42.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -431,6 +432,24 @@
           </rules>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>com.rudikershaw.gitbuildhook</groupId>
+        <artifactId>git-build-hook-maven-plugin</artifactId>
+        <version>${git-build-hook.version}</version>
+        <configuration>
+          <installHooks>
+            <pre-commit>hooks/pre-commit.sh</pre-commit>
+          </installHooks>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>install</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

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

@@ -623,7 +623,7 @@ void shouldCacheMapperMethod() throws Exception {
   void shouldGetBlogsWithAuthorsAndPosts() {
     try (SqlSession session = sqlSessionFactory.openSession()) {
       BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
-      List<Blog> blogs = mapper.selectBlogsWithAutorAndPosts();
+      List<Blog> blogs = mapper.selectBlogsWithAuthorAndPosts();
       assertEquals(2, blogs.size());
       assertTrue(blogs.get(0) instanceof Proxy);
       assertEquals(101, blogs.get(0).getAuthor().getId());
@@ -640,7 +640,7 @@ void shouldGetBlogsWithAuthorsAndPosts() {
   void shouldGetBlogsWithAuthorsAndPostsEagerly() {
     try (SqlSession session = sqlSessionFactory.openSession()) {
       BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
-      List<Blog> blogs = mapper.selectBlogsWithAutorAndPostsEagerly();
+      List<Blog> blogs = mapper.selectBlogsWithAuthorAndPostsEagerly();
       assertEquals(2, blogs.size());
       assertFalse(blogs.get(0) instanceof Factory);
       assertEquals(101, blogs.get(0).getAuthor().getId());

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

@@ -251,7 +251,7 @@ Blog selectBlogWithAParamNamedValue(@Param("column") String column, @Param("id")
       @Result(property = "posts", column = "id", many = @Many(select = "selectPostsById"))
   })
   // @formatter:on
-  List<Blog> selectBlogsWithAutorAndPosts();
+  List<Blog> selectBlogsWithAuthorAndPosts();
 
   // @formatter:off
   @Select({
@@ -263,6 +263,6 @@ Blog selectBlogWithAParamNamedValue(@Param("column") String column, @Param("id")
       @Result(property = "posts", column = "id", many = @Many(select = "selectPostsById", fetchType = FetchType.EAGER))
   })
   // @formatter:on
-  List<Blog> selectBlogsWithAutorAndPostsEagerly();
+  List<Blog> selectBlogsWithAuthorAndPostsEagerly();
 
 }

src/test/java/org/apache/ibatis/executor/loader/CglibProxyTest.java

@@ -71,7 +71,7 @@ void shouldLetCallALoadedProperty() {
   }
 
   @Test
-  void shouldSerizalizeADeserlizaliedProxy() throws Exception {
+  void shouldSerializeADeserializedProxy() throws Exception {
     Object proxy = ((CglibProxyFactory) proxyFactory).createDeserializationProxy(author, new HashMap<>(),
         new DefaultObjectFactory(), new ArrayList<>(), new ArrayList<>());
     Author author2 = (Author) deserialize(serialize((Serializable) proxy));

src/test/java/org/apache/ibatis/executor/loader/JavassistProxyTest.java

@@ -69,7 +69,7 @@ void shouldLetCallALoadedProperty() {
   }
 
   @Test
-  void shouldSerizalizeADeserlizaliedProxy() throws Exception {
+  void shouldSerializeADeserializedProxy() throws Exception {
     Object proxy = ((JavassistProxyFactory) proxyFactory).createDeserializationProxy(author, new HashMap<>(),
         new DefaultObjectFactory(), new ArrayList<>(), new ArrayList<>());
     Author author2 = (Author) deserialize(serialize((Serializable) proxy));

src/test/java/org/apache/ibatis/executor/loader/SerializableProxyTest.java

@@ -110,7 +110,7 @@ void shouldSerializeAProxyForABeanWithoutDefaultConstructorAndUnloadedProperties
   }
 
   @Test
-  void shouldSerizaliceAFullLoadedObjectToOriginalClass() throws Exception {
+  void shouldSerializeAFullLoadedObjectToOriginalClass() throws Exception {
     Object proxy = proxyFactory.createProxy(author, new ResultLoaderMap(), new Configuration(),
         new DefaultObjectFactory(), new ArrayList<>(), new ArrayList<>());
     Object proxy2 = deserialize(serialize((Serializable) proxy));

src/test/java/org/apache/ibatis/io/ExternalResourcesTest.java

@@ -91,7 +91,7 @@ void getConfiguredTemplate() {
       templateName = ExternalResources.getConfiguredTemplate(tempFile.getAbsolutePath(), "new_command.template");
       assertEquals("templates/col_new_template_migration.sql", templateName);
     } catch (Exception e) {
-      fail("Test failed with execption: " + e.getMessage());
+      fail("Test failed with exception: " + e.getMessage());
     }
   }
 

src/test/java/org/apache/ibatis/jdbc/ScriptRunnerTest.java

@@ -113,7 +113,7 @@ void shouldReturnWarningIfEndOfLineTerminatorNotFound() throws Exception {
   }
 
   @Test
-  void commentAferStatementDelimiterShouldNotCauseRunnerFail() throws Exception {
+  void commentAfterStatementDelimiterShouldNotCauseRunnerFail() throws Exception {
     DataSource ds = createUnpooledDataSource(JPETSTORE_PROPERTIES);
     String resource = "org/apache/ibatis/jdbc/ScriptCommentAfterEOLTerminator.sql";
     try (Connection conn = ds.getConnection(); Reader reader = Resources.getResourceAsReader(resource)) {

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

@@ -36,7 +36,7 @@ void shouldThrowErrorWhenBothResultMapAndNestedSelectAreSet() {
 
   // Issue 4: column is mandatory on nested queries
   @Test
-  void shouldFailWithAMissingColumnInNetstedSelect() {
+  void shouldFailWithAMissingColumnInNestedSelect() {
     Assertions.assertThrows(IllegalStateException.class,
         () -> new ResultMapping.Builder(configuration, "prop").nestedQueryId("nested query ID").build());
   }

src/test/java/org/apache/ibatis/submitted/automapping/AutomappingTest.java

@@ -55,7 +55,7 @@ void shouldGetAUser() {
   }
 
   @Test
-  void shouldGetAUserWhithPhoneNumber() {
+  void shouldGetAUserWithPhoneNumber() {
     sqlSessionFactory.getConfiguration().setAutoMappingBehavior(AutoMappingBehavior.NONE);
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       Mapper mapper = sqlSession.getMapper(Mapper.class);

src/test/java/org/apache/ibatis/submitted/force_flush_on_select/ForceFlushOnSelectTest.java

@@ -118,7 +118,7 @@ void updateShouldFlushLocalCache() {
   }
 
   @Test
-  void selectShouldFlushLocalCacheIfFlushLocalCacheAtferEachStatementIsTrue() throws SQLException {
+  void selectShouldFlushLocalCacheIfFlushLocalCacheAfterEachStatementIsTrue() throws SQLException {
     sqlSessionFactory.getConfiguration().setLocalCacheScope(LocalCacheScope.STATEMENT);
     try (SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.SIMPLE)) {
       PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);

src/test/java/org/apache/ibatis/submitted/keygen/Jdbc3KeyGeneratorTest.java

@@ -197,7 +197,7 @@ void shouldAssignKeysToNamedList() {
   }
 
   @Test
-  void shouldAssingKeysToCollection() {
+  void shouldAssignKeysToCollection() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       try {
         CountryMapper mapper = sqlSession.getMapper(CountryMapper.class);
@@ -215,7 +215,7 @@ void shouldAssingKeysToCollection() {
   }
 
   @Test
-  void shouldAssingKeysToNamedCollection() {
+  void shouldAssignKeysToNamedCollection() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       try {
         CountryMapper mapper = sqlSession.getMapper(CountryMapper.class);
@@ -233,7 +233,7 @@ void shouldAssingKeysToNamedCollection() {
   }
 
   @Test
-  void shouldAssingKeysToArray() {
+  void shouldAssignKeysToArray() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       try {
         CountryMapper mapper = sqlSession.getMapper(CountryMapper.class);
@@ -251,7 +251,7 @@ void shouldAssingKeysToArray() {
   }
 
   @Test
-  void shouldAssingKeysToNamedArray() {
+  void shouldAssignKeysToNamedArray() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       try {
         CountryMapper mapper = sqlSession.getMapper(CountryMapper.class);
@@ -597,7 +597,7 @@ void shouldAssignKeyToAParamWithTrickyName() {
   }
 
   @Test
-  void shouldAssingKeysToAMap() {
+  void shouldAssignKeysToAMap() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       try {
         CountryMapper mapper = sqlSession.getMapper(CountryMapper.class);

src/test/java/org/apache/ibatis/submitted/lazy_properties/LazyPropertiesTest.java

@@ -155,16 +155,16 @@ void verifyCustomLazyLoadTriggerMethods() {
 
   @Test
   void shouldInvokingSetterInvalidateLazyLoading_Javassist() {
-    shoulInvokingSetterInvalidateLazyLoading(new JavassistProxyFactory());
+    shouldInvokingSetterInvalidateLazyLoading(new JavassistProxyFactory());
   }
 
   @Tag("RequireIllegalAccess")
   @Test
   void shouldInvokingSetterInvalidateLazyLoading_Cglib() {
-    shoulInvokingSetterInvalidateLazyLoading(new CglibProxyFactory());
+    shouldInvokingSetterInvalidateLazyLoading(new CglibProxyFactory());
   }
 
-  private void shoulInvokingSetterInvalidateLazyLoading(ProxyFactory proxyFactory) {
+  private void shouldInvokingSetterInvalidateLazyLoading(ProxyFactory proxyFactory) {
     Configuration config = sqlSessionFactory.getConfiguration();
     config.setProxyFactory(proxyFactory);
     config.setAggressiveLazyLoading(false);

src/test/java/org/apache/ibatis/submitted/result_handler/ResulthandlerTest.java renamed to src/test/java/org/apache/ibatis/submitted/result_handler/ResultHandlerTest.java

@@ -26,7 +26,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-class ResulthandlerTest {
+class ResultHandlerTest {
 
   private static SqlSessionFactory sqlSessionFactory;
 

src/test/java/org/apache/ibatis/type/SqlTimetampTypeHandlerTest.java renamed to src/test/java/org/apache/ibatis/type/SqlTimestampTypeHandlerTest.java

@@ -25,7 +25,7 @@
 
 import org.junit.jupiter.api.Test;
 
-class SqlTimetampTypeHandlerTest extends BaseTypeHandlerTest {
+class SqlTimestampTypeHandlerTest extends BaseTypeHandlerTest {
 
   private static final TypeHandler<Timestamp> TYPE_HANDLER = new SqlTimestampTypeHandler();
   private static final Timestamp SQL_TIME = new Timestamp(new Date().getTime());