From 2832d0b1d6c9c2c4683103b73e26f0922ce32c70 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Fri, 3 Feb 2023 23:06:56 -0500
Subject: [PATCH 1/2] [ci] formatting

---
 .../ibatis/annotations/UpdateProvider.java    |   5 +-
 .../builder/xml/XMLStatementBuilder.java      |  27 ++-
 .../unpooled/UnpooledDataSource.java          |   6 +-
 .../apache/ibatis/executor/BaseExecutor.java  |  23 +-
 .../apache/ibatis/executor/BatchExecutor.java |  15 +-
 .../executor/BatchExecutorException.java      |  24 +-
 .../ibatis/executor/CachingExecutor.java      |  14 +-
 .../org/apache/ibatis/executor/Executor.java  |   6 +-
 .../executor/keygen/SelectKeyGenerator.java   |   9 +-
 .../AbstractEnhancedDeserializationProxy.java |  27 +--
 .../loader/AbstractSerialStateHolder.java     |  14 +-
 .../ibatis/executor/loader/ProxyFactory.java  |   3 +-
 .../ibatis/executor/loader/ResultLoader.java  |   6 +-
 .../loader/cglib/CglibProxyFactory.java       |  52 +++--
 .../loader/cglib/CglibSerialStateHolder.java  |  15 +-
 .../javassist/JavassistProxyFactory.java      |  52 +++--
 .../result/DefaultMapResultHandler.java       |   3 +-
 .../resultset/DefaultResultSetHandler.java    | 191 +++++++++-------
 src/main/java/org/apache/ibatis/io/VFS.java   |  56 +++--
 .../org/apache/ibatis/jdbc/AbstractSQL.java   |  81 ++++++-
 .../org/apache/ibatis/jdbc/ScriptRunner.java  |   4 +-
 .../org/apache/ibatis/jdbc/SqlRunner.java     |  74 +++++--
 .../ibatis/logging/jdbc/BaseJdbcLogger.java   |   6 +-
 .../ibatis/logging/jdbc/ConnectionLogger.java |   7 +-
 .../logging/jdbc/PreparedStatementLogger.java |  14 +-
 .../ibatis/logging/jdbc/ResultSetLogger.java  |   4 +-
 .../ibatis/logging/jdbc/StatementLogger.java  |   4 +-
 .../ibatis/logging/log4j/Log4jImpl.java       |   1 +
 .../ibatis/logging/log4j/package-info.java    |   1 +
 .../ibatis/logging/slf4j/Slf4jImpl.java       |   3 +-
 .../org/apache/ibatis/mapping/BoundSql.java   |  10 +-
 .../blocking_cache/BlockingCacheTest.java     |   5 +-
 .../submitted/cacheorder/CacheOrderTest.java  |   2 +-
 .../CallSettersOnNullsTest.java               |   2 +-
 .../DoNotCallSettersOnNullsTest.java          |   5 +-
 .../MyBatisTest.java                          |   3 +-
 .../camelcase/CamelCaseMappingTest.java       |   2 +-
 .../cglib_lazy_error/CglibNPELazyTest.java    |   5 +-
 .../cglib_lazy_error/CglibNPETest.java        |   7 +-
 .../submitted/cglib_lazy_error/Person.java    |  11 +-
 .../CollectionParametersTest.java             |   5 +-
 .../ColumnForwardingTest.java                 |   5 +-
 .../ColumnPrefixAutoMappingTest.java          |   3 +-
 .../column_prefix/ColumnPrefixTest.java       |   2 +-
 .../complex_column/ComplexColumnTest.java     | 180 +++++++--------
 .../submitted/complex_column/Person.java      |  64 +++---
 .../complex_property/ComponentTest.java       |   4 +-
 .../complex_type/ComplexTypeTest.java         |   2 +-
 .../ibatis/submitted/count/CountTest.java     |   2 +-
 .../submitted/criterion/CriterionTest.java    |   6 +-
 .../cursor_nested/CursorNestedTest.java       |   3 +-
 .../ibatis/submitted/cursor_nested/User.java  |   7 +-
 .../cursor_simple/CursorSimpleTest.java       |   3 +-
 .../cursor_simple/PostgresCursorTest.java     |   2 +-
 .../ibatis/submitted/cursor_simple/User.java  |   5 +-
 .../custom_collection_handling/Contact.java   |  42 ++--
 .../CustomCollection.java                     | 207 +++++++++---------
 .../CustomCollectionHandlingTest.java         |  78 +++----
 .../CustomObjectFactory.java                  | 129 +++++------
 .../custom_collection_handling/Person.java    |  42 ++--
 .../default_method/DefaultMethodTest.java     |   4 +-
 .../CommonPropertyDeferLoadTest.java          | 140 ++++++------
 .../deferload_common_property/Father.java     |  28 +--
 .../DisallowDotsOnNamesTest.java              |  10 +-
 .../submitted/disallowdotsonnames/Person.java |  48 ++--
 .../discriminator/DiscriminatorTest.java      |   9 +-
 .../submitted/discriminator/Mapper.java       |   1 +
 .../DuplicateResourceTest.java                |   2 +-
 .../duplicate_statements/AnnotatedMapper.java |   4 +-
 .../AnnotatedMapperExtended.java              |  10 +-
 .../DuplicateStatementsTest.java              |  15 +-
 .../ibatis/submitted/dynsql/CustomUtil.java   |   6 +-
 .../ibatis/submitted/dynsql/DynSqlMapper.java |   3 +
 .../PersonMapper.java                         |   1 +
 .../submitted/nestedresulthandler/Item.java   |  10 +-
 .../submitted/nestedresulthandler/Person.java |  13 +-
 76 files changed, 1055 insertions(+), 839 deletions(-)

diff --git a/src/main/java/org/apache/ibatis/annotations/UpdateProvider.java b/src/main/java/org/apache/ibatis/annotations/UpdateProvider.java
index a3c20796abd..9f3044d05c0 100644
--- a/src/main/java/org/apache/ibatis/annotations/UpdateProvider.java
+++ b/src/main/java/org/apache/ibatis/annotations/UpdateProvider.java
@@ -75,10 +75,9 @@
 
   /**
    * Specify a method for providing an SQL.
-   *
    * <p>
-   * Since 3.5.1, this attribute can omit.
-   * If this attribute omit, the MyBatis will call a method that decide by following rules.
+   * Since 3.5.1, this attribute can omit. If this attribute omit, the MyBatis will call a method that decide by
+   * following rules.
    * <ul>
    *   <li>
    *     If class that specified the {@link #type()} attribute implements the
diff --git a/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java b/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java
index 5c2187c9ce7..bf1088bb579 100644
--- a/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java
+++ b/src/main/java/org/apache/ibatis/builder/xml/XMLStatementBuilder.java
@@ -47,7 +47,8 @@ public XMLStatementBuilder(Configuration configuration, MapperBuilderAssistant b
     this(configuration, builderAssistant, context, null);
   }
 
-  public XMLStatementBuilder(Configuration configuration, MapperBuilderAssistant builderAssistant, XNode context, String databaseId) {
+  public XMLStatementBuilder(Configuration configuration, MapperBuilderAssistant builderAssistant, XNode context,
+      String databaseId) {
     super(configuration);
     this.builderAssistant = builderAssistant;
     this.context = context;
@@ -91,11 +92,12 @@ public void parseStatementNode() {
     } else {
       keyGenerator = context.getBooleanAttribute("useGeneratedKeys",
           configuration.isUseGeneratedKeys() && SqlCommandType.INSERT.equals(sqlCommandType))
-          ? Jdbc3KeyGenerator.INSTANCE : NoKeyGenerator.INSTANCE;
+              ? Jdbc3KeyGenerator.INSTANCE : NoKeyGenerator.INSTANCE;
     }
 
     SqlSource sqlSource = langDriver.createSqlSource(configuration, context, parameterTypeClass);
-    StatementType statementType = StatementType.valueOf(context.getStringAttribute("statementType", StatementType.PREPARED.toString()));
+    StatementType statementType = StatementType
+        .valueOf(context.getStringAttribute("statementType", StatementType.PREPARED.toString()));
     Integer fetchSize = context.getIntAttribute("fetchSize");
     Integer timeout = context.getIntAttribute("timeout");
     String parameterMap = context.getStringAttribute("parameterMap");
@@ -115,9 +117,8 @@ public void parseStatementNode() {
     String resultSets = context.getStringAttribute("resultSets");
     boolean dirtySelect = context.getBooleanAttribute("affectData", Boolean.FALSE);
 
-    builderAssistant.addMappedStatement(id, sqlSource, statementType, sqlCommandType,
-        fetchSize, timeout, parameterMap, parameterTypeClass, resultMap, resultTypeClass,
-        resultSetTypeEnum, flushCache, useCache, resultOrdered,
+    builderAssistant.addMappedStatement(id, sqlSource, statementType, sqlCommandType, fetchSize, timeout, parameterMap,
+        parameterTypeClass, resultMap, resultTypeClass, resultSetTypeEnum, flushCache, useCache, resultOrdered,
         keyGenerator, keyProperty, keyColumn, databaseId, langDriver, resultSets, dirtySelect);
   }
 
@@ -130,7 +131,8 @@ private void processSelectKeyNodes(String id, Class<?> parameterTypeClass, Langu
     removeSelectKeyNodes(selectKeyNodes);
   }
 
-  private void parseSelectKeyNodes(String parentId, List<XNode> list, Class<?> parameterTypeClass, LanguageDriver langDriver, String skRequiredDatabaseId) {
+  private void parseSelectKeyNodes(String parentId, List<XNode> list, Class<?> parameterTypeClass,
+      LanguageDriver langDriver, String skRequiredDatabaseId) {
     for (XNode nodeToHandle : list) {
       String id = parentId + SelectKeyGenerator.SELECT_KEY_SUFFIX;
       String databaseId = nodeToHandle.getStringAttribute("databaseId");
@@ -140,10 +142,12 @@ private void parseSelectKeyNodes(String parentId, List<XNode> list, Class<?> par
     }
   }
 
-  private void parseSelectKeyNode(String id, XNode nodeToHandle, Class<?> parameterTypeClass, LanguageDriver langDriver, String databaseId) {
+  private void parseSelectKeyNode(String id, XNode nodeToHandle, Class<?> parameterTypeClass, LanguageDriver langDriver,
+      String databaseId) {
     String resultType = nodeToHandle.getStringAttribute("resultType");
     Class<?> resultTypeClass = resolveClass(resultType);
-    StatementType statementType = StatementType.valueOf(nodeToHandle.getStringAttribute("statementType", StatementType.PREPARED.toString()));
+    StatementType statementType = StatementType
+        .valueOf(nodeToHandle.getStringAttribute("statementType", StatementType.PREPARED.toString()));
     String keyProperty = nodeToHandle.getStringAttribute("keyProperty");
     String keyColumn = nodeToHandle.getStringAttribute("keyColumn");
     boolean executeBefore = "BEFORE".equals(nodeToHandle.getStringAttribute("order", "AFTER"));
@@ -162,9 +166,8 @@ private void parseSelectKeyNode(String id, XNode nodeToHandle, Class<?> paramete
     SqlSource sqlSource = langDriver.createSqlSource(configuration, nodeToHandle, parameterTypeClass);
     SqlCommandType sqlCommandType = SqlCommandType.SELECT;
 
-    builderAssistant.addMappedStatement(id, sqlSource, statementType, sqlCommandType,
-        fetchSize, timeout, parameterMap, parameterTypeClass, resultMap, resultTypeClass,
-        resultSetTypeEnum, flushCache, useCache, resultOrdered,
+    builderAssistant.addMappedStatement(id, sqlSource, statementType, sqlCommandType, fetchSize, timeout, parameterMap,
+        parameterTypeClass, resultMap, resultTypeClass, resultSetTypeEnum, flushCache, useCache, resultOrdered,
         keyGenerator, keyProperty, keyColumn, databaseId, langDriver, null, false);
 
     id = builderAssistant.applyCurrentNamespace(id, false);
diff --git a/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java b/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java
index 61c0e125a76..422bf48d585 100644
--- a/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java
+++ b/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java
@@ -75,7 +75,8 @@ public UnpooledDataSource(String driver, String url, Properties driverProperties
     this.driverProperties = driverProperties;
   }
 
-  public UnpooledDataSource(ClassLoader driverClassLoader, String driver, String url, String username, String password) {
+  public UnpooledDataSource(ClassLoader driverClassLoader, String driver, String url, String username,
+      String password) {
     this.driverClassLoader = driverClassLoader;
     this.driver = driver;
     this.url = url;
@@ -196,7 +197,8 @@ public Integer getDefaultNetworkTimeout() {
   }
 
   /**
-   * Sets the default network timeout value to wait for the database operation to complete. See {@link Connection#setNetworkTimeout(java.util.concurrent.Executor, int)}
+   * Sets the default network timeout value to wait for the database operation to complete. See
+   * {@link Connection#setNetworkTimeout(java.util.concurrent.Executor, int)}
    *
    * @param defaultNetworkTimeout
    *          The time in milliseconds to wait for the database operation to complete.
diff --git a/src/main/java/org/apache/ibatis/executor/BaseExecutor.java b/src/main/java/org/apache/ibatis/executor/BaseExecutor.java
index 1c2b14b06c5..24609e7d1a3 100644
--- a/src/main/java/org/apache/ibatis/executor/BaseExecutor.java
+++ b/src/main/java/org/apache/ibatis/executor/BaseExecutor.java
@@ -130,7 +130,8 @@ public List<BatchResult> flushStatements(boolean isRollBack) throws SQLException
   }
 
   @Override
-  public <E> List<E> query(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler) throws SQLException {
+  public <E> List<E> query(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler)
+      throws SQLException {
     BoundSql boundSql = ms.getBoundSql(parameter);
     CacheKey key = createCacheKey(ms, parameter, rowBounds, boundSql);
     return query(ms, parameter, rowBounds, resultHandler, key, boundSql);
@@ -138,7 +139,8 @@ public <E> List<E> query(MappedStatement ms, Object parameter, RowBounds rowBoun
 
   @SuppressWarnings("unchecked")
   @Override
-  public <E> List<E> query(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, CacheKey key, BoundSql boundSql) throws SQLException {
+  public <E> List<E> query(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler,
+      CacheKey key, BoundSql boundSql) throws SQLException {
     ErrorContext.instance().resource(ms.getResource()).activity("executing a query").object(ms.getId());
     if (closed) {
       throw new ExecutorException("Executor was closed.");
@@ -179,7 +181,8 @@ public <E> Cursor<E> queryCursor(MappedStatement ms, Object parameter, RowBounds
   }
 
   @Override
-  public void deferLoad(MappedStatement ms, MetaObject resultObject, String property, CacheKey key, Class<?> targetType) {
+  public void deferLoad(MappedStatement ms, MetaObject resultObject, String property, CacheKey key,
+      Class<?> targetType) {
     if (closed) {
       throw new ExecutorException("Executor was closed.");
     }
@@ -271,11 +274,11 @@ public void clearLocalCache() {
 
   protected abstract List<BatchResult> doFlushStatements(boolean isRollback) throws SQLException;
 
-  protected abstract <E> List<E> doQuery(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql)
-      throws SQLException;
+  protected abstract <E> List<E> doQuery(MappedStatement ms, Object parameter, RowBounds rowBounds,
+      ResultHandler resultHandler, BoundSql boundSql) throws SQLException;
 
-  protected abstract <E> Cursor<E> doQueryCursor(MappedStatement ms, Object parameter, RowBounds rowBounds, BoundSql boundSql)
-      throws SQLException;
+  protected abstract <E> Cursor<E> doQueryCursor(MappedStatement ms, Object parameter, RowBounds rowBounds,
+      BoundSql boundSql) throws SQLException;
 
   protected void closeStatement(Statement statement) {
     if (statement != null) {
@@ -304,7 +307,8 @@ protected void applyTransactionTimeout(Statement statement) throws SQLException
     StatementUtil.applyTransactionTimeout(statement, statement.getQueryTimeout(), transaction.getTimeout());
   }
 
-  private void handleLocallyCachedOutputParameters(MappedStatement ms, CacheKey key, Object parameter, BoundSql boundSql) {
+  private void handleLocallyCachedOutputParameters(MappedStatement ms, CacheKey key, Object parameter,
+      BoundSql boundSql) {
     if (ms.getStatementType() == StatementType.CALLABLE) {
       final Object cachedParameter = localOutputParameterCache.getObject(key);
       if (cachedParameter != null && parameter != null) {
@@ -321,7 +325,8 @@ private void handleLocallyCachedOutputParameters(MappedStatement ms, CacheKey ke
     }
   }
 
-  private <E> List<E> queryFromDatabase(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, CacheKey key, BoundSql boundSql) throws SQLException {
+  private <E> List<E> queryFromDatabase(MappedStatement ms, Object parameter, RowBounds rowBounds,
+      ResultHandler resultHandler, CacheKey key, BoundSql boundSql) throws SQLException {
     List<E> list;
     localCache.putObject(key, EXECUTION_PLACEHOLDER);
     try {
diff --git a/src/main/java/org/apache/ibatis/executor/BatchExecutor.java b/src/main/java/org/apache/ibatis/executor/BatchExecutor.java
index c14bd9760f4..685d707497d 100644
--- a/src/main/java/org/apache/ibatis/executor/BatchExecutor.java
+++ b/src/main/java/org/apache/ibatis/executor/BatchExecutor.java
@@ -54,7 +54,8 @@ public BatchExecutor(Configuration configuration, Transaction transaction) {
   @Override
   public int doUpdate(MappedStatement ms, Object parameterObject) throws SQLException {
     final Configuration configuration = ms.getConfiguration();
-    final StatementHandler handler = configuration.newStatementHandler(this, ms, parameterObject, RowBounds.DEFAULT, null, null);
+    final StatementHandler handler = configuration.newStatementHandler(this, ms, parameterObject, RowBounds.DEFAULT,
+        null, null);
     final BoundSql boundSql = handler.getBoundSql();
     final String sql = boundSql.getSql();
     final Statement stmt;
@@ -79,13 +80,14 @@ public int doUpdate(MappedStatement ms, Object parameterObject) throws SQLExcept
   }
 
   @Override
-  public <E> List<E> doQuery(MappedStatement ms, Object parameterObject, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql)
-      throws SQLException {
+  public <E> List<E> doQuery(MappedStatement ms, Object parameterObject, RowBounds rowBounds,
+      ResultHandler resultHandler, BoundSql boundSql) throws SQLException {
     Statement stmt = null;
     try {
       flushStatements();
       Configuration configuration = ms.getConfiguration();
-      StatementHandler handler = configuration.newStatementHandler(wrapper, ms, parameterObject, rowBounds, resultHandler, boundSql);
+      StatementHandler handler = configuration.newStatementHandler(wrapper, ms, parameterObject, rowBounds,
+          resultHandler, boundSql);
       Connection connection = getConnection(ms.getStatementLog());
       stmt = handler.prepare(connection, transaction.getTimeout());
       handler.parameterize(stmt);
@@ -96,7 +98,8 @@ public <E> List<E> doQuery(MappedStatement ms, Object parameterObject, RowBounds
   }
 
   @Override
-  protected <E> Cursor<E> doQueryCursor(MappedStatement ms, Object parameter, RowBounds rowBounds, BoundSql boundSql) throws SQLException {
+  protected <E> Cursor<E> doQueryCursor(MappedStatement ms, Object parameter, RowBounds rowBounds, BoundSql boundSql)
+      throws SQLException {
     flushStatements();
     Configuration configuration = ms.getConfiguration();
     StatementHandler handler = configuration.newStatementHandler(wrapper, ms, parameter, rowBounds, null, boundSql);
@@ -127,7 +130,7 @@ public List<BatchResult> doFlushStatements(boolean isRollback) throws SQLExcepti
           if (Jdbc3KeyGenerator.class.equals(keyGenerator.getClass())) {
             Jdbc3KeyGenerator jdbc3KeyGenerator = (Jdbc3KeyGenerator) keyGenerator;
             jdbc3KeyGenerator.processBatch(ms, stmt, parameterObjects);
-          } else if (!NoKeyGenerator.class.equals(keyGenerator.getClass())) { //issue #141
+          } else if (!NoKeyGenerator.class.equals(keyGenerator.getClass())) { // issue #141
             for (Object parameter : parameterObjects) {
               keyGenerator.processAfter(this, ms, stmt, parameter);
             }
diff --git a/src/main/java/org/apache/ibatis/executor/BatchExecutorException.java b/src/main/java/org/apache/ibatis/executor/BatchExecutorException.java
index 48bf91bde9c..d5faeb1bfb2 100644
--- a/src/main/java/org/apache/ibatis/executor/BatchExecutorException.java
+++ b/src/main/java/org/apache/ibatis/executor/BatchExecutorException.java
@@ -19,10 +19,9 @@
 import java.util.List;
 
 /**
- * This exception is thrown if a <code>java.sql.BatchUpdateException</code> is caught
- * during the execution of any nested batch.  The exception contains the
- * java.sql.BatchUpdateException that is the root cause, as well as
- * the results from any prior nested batch that executed successfully.
+ * This exception is thrown if a <code>java.sql.BatchUpdateException</code> is caught during the execution of any nested
+ * batch. The exception contains the java.sql.BatchUpdateException that is the root cause, as well as the results from
+ * any prior nested batch that executed successfully.
  *
  * @author Jeff Butler
  */
@@ -44,10 +43,8 @@ public BatchExecutorException(String message,
   }
 
   /**
-   * Returns the BatchUpdateException that caused the nested executor
-   * to fail.  That exception contains an array of row counts
-   * that can be used to determine exactly which statement of the
-   * executor caused the failure (or failures).
+   * Returns the BatchUpdateException that caused the nested executor to fail. That exception contains an array of row
+   * counts that can be used to determine exactly which statement of the executor caused the failure (or failures).
    *
    * @return the root BatchUpdateException
    */
@@ -56,20 +53,17 @@ public BatchUpdateException getBatchUpdateException() {
   }
 
   /**
-   * Returns a list of BatchResult objects.  There will be one entry
-   * in the list for each successful sub-executor executed before the failing
-   * executor.
+   * Returns a list of BatchResult objects. There will be one entry in the list for each successful sub-executor
+   * executed before the failing executor.
    *
-   * @return the previously successful executor results (maybe an empty list
-   *         if no executor has executed successfully)
+   * @return the previously successful executor results (maybe an empty list if no executor has executed successfully)
    */
   public List<BatchResult> getSuccessfulBatchResults() {
     return successfulBatchResults;
   }
 
   /**
-   * Returns the SQL statement that caused the failure
-   * (not the parameterArray).
+   * Returns the SQL statement that caused the failure (not the parameterArray).
    *
    * @return the failing SQL string
    */
diff --git a/src/main/java/org/apache/ibatis/executor/CachingExecutor.java b/src/main/java/org/apache/ibatis/executor/CachingExecutor.java
index 9319d0410e1..603a358124a 100644
--- a/src/main/java/org/apache/ibatis/executor/CachingExecutor.java
+++ b/src/main/java/org/apache/ibatis/executor/CachingExecutor.java
@@ -83,15 +83,16 @@ public <E> Cursor<E> queryCursor(MappedStatement ms, Object parameter, RowBounds
   }
 
   @Override
-  public <E> List<E> query(MappedStatement ms, Object parameterObject, RowBounds rowBounds, ResultHandler resultHandler) throws SQLException {
+  public <E> List<E> query(MappedStatement ms, Object parameterObject, RowBounds rowBounds, ResultHandler resultHandler)
+      throws SQLException {
     BoundSql boundSql = ms.getBoundSql(parameterObject);
     CacheKey key = createCacheKey(ms, parameterObject, rowBounds, boundSql);
     return query(ms, parameterObject, rowBounds, resultHandler, key, boundSql);
   }
 
   @Override
-  public <E> List<E> query(MappedStatement ms, Object parameterObject, RowBounds rowBounds, ResultHandler resultHandler, CacheKey key, BoundSql boundSql)
-      throws SQLException {
+  public <E> List<E> query(MappedStatement ms, Object parameterObject, RowBounds rowBounds, ResultHandler resultHandler,
+      CacheKey key, BoundSql boundSql) throws SQLException {
     Cache cache = ms.getCache();
     if (cache != null) {
       flushCacheIfRequired(ms);
@@ -135,7 +136,9 @@ private void ensureNoOutParams(MappedStatement ms, BoundSql boundSql) {
     if (ms.getStatementType() == StatementType.CALLABLE) {
       for (ParameterMapping parameterMapping : boundSql.getParameterMappings()) {
         if (parameterMapping.getMode() != ParameterMode.IN) {
-          throw new ExecutorException("Caching stored procedures with OUT params is not supported.  Please configure useCache=false in " + ms.getId() + " statement.");
+          throw new ExecutorException(
+              "Caching stored procedures with OUT params is not supported.  Please configure useCache=false in "
+                  + ms.getId() + " statement.");
         }
       }
     }
@@ -152,7 +155,8 @@ public boolean isCached(MappedStatement ms, CacheKey key) {
   }
 
   @Override
-  public void deferLoad(MappedStatement ms, MetaObject resultObject, String property, CacheKey key, Class<?> targetType) {
+  public void deferLoad(MappedStatement ms, MetaObject resultObject, String property, CacheKey key,
+      Class<?> targetType) {
     delegate.deferLoad(ms, resultObject, property, key, targetType);
   }
 
diff --git a/src/main/java/org/apache/ibatis/executor/Executor.java b/src/main/java/org/apache/ibatis/executor/Executor.java
index fa5bd5efd88..fc01c4fb503 100644
--- a/src/main/java/org/apache/ibatis/executor/Executor.java
+++ b/src/main/java/org/apache/ibatis/executor/Executor.java
@@ -36,9 +36,11 @@ public interface Executor {
 
   int update(MappedStatement ms, Object parameter) throws SQLException;
 
-  <E> List<E> query(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, CacheKey cacheKey, BoundSql boundSql) throws SQLException;
+  <E> List<E> query(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler,
+      CacheKey cacheKey, BoundSql boundSql) throws SQLException;
 
-  <E> List<E> query(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler) throws SQLException;
+  <E> List<E> query(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler)
+      throws SQLException;
 
   <E> Cursor<E> queryCursor(MappedStatement ms, Object parameter, RowBounds rowBounds) throws SQLException;
 
diff --git a/src/main/java/org/apache/ibatis/executor/keygen/SelectKeyGenerator.java b/src/main/java/org/apache/ibatis/executor/keygen/SelectKeyGenerator.java
index 60c1b4979c4..af1f8c99afc 100644
--- a/src/main/java/org/apache/ibatis/executor/keygen/SelectKeyGenerator.java
+++ b/src/main/java/org/apache/ibatis/executor/keygen/SelectKeyGenerator.java
@@ -91,8 +91,7 @@ private void processGeneratedKeys(Executor executor, MappedStatement ms, Object
     }
   }
 
-  private void handleMultipleProperties(String[] keyProperties,
-      MetaObject metaParam, MetaObject metaResult) {
+  private void handleMultipleProperties(String[] keyProperties, MetaObject metaParam, MetaObject metaResult) {
     String[] keyColumns = keyStatement.getKeyColumns();
 
     if (keyColumns == null || keyColumns.length == 0) {
@@ -102,7 +101,8 @@ private void handleMultipleProperties(String[] keyProperties,
       }
     } else {
       if (keyColumns.length != keyProperties.length) {
-        throw new ExecutorException("If SelectKey has key columns, the number must match the number of key properties.");
+        throw new ExecutorException(
+            "If SelectKey has key columns, the number must match the number of key properties.");
       }
       for (int i = 0; i < keyProperties.length; i++) {
         setValue(metaParam, keyProperties[i], metaResult.getValue(keyColumns[i]));
@@ -114,7 +114,8 @@ private void setValue(MetaObject metaParam, String property, Object value) {
     if (metaParam.hasSetter(property)) {
       metaParam.setValue(property, value);
     } else {
-      throw new ExecutorException("No setter found for the keyProperty '" + property + "' in " + metaParam.getOriginalObject().getClass().getName() + ".");
+      throw new ExecutorException("No setter found for the keyProperty '" + property + "' in "
+          + metaParam.getOriginalObject().getClass().getName() + ".");
     }
   }
 }
diff --git a/src/main/java/org/apache/ibatis/executor/loader/AbstractEnhancedDeserializationProxy.java b/src/main/java/org/apache/ibatis/executor/loader/AbstractEnhancedDeserializationProxy.java
index ff445d3f49c..a324eb2a397 100644
--- a/src/main/java/org/apache/ibatis/executor/loader/AbstractEnhancedDeserializationProxy.java
+++ b/src/main/java/org/apache/ibatis/executor/loader/AbstractEnhancedDeserializationProxy.java
@@ -41,8 +41,9 @@ public abstract class AbstractEnhancedDeserializationProxy {
   private final Object reloadingPropertyLock;
   private boolean reloadingProperty;
 
-  protected AbstractEnhancedDeserializationProxy(Class<?> type, Map<String, ResultLoaderMap.LoadPair> unloadedProperties,
-          ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+  protected AbstractEnhancedDeserializationProxy(Class<?> type,
+      Map<String, ResultLoaderMap.LoadPair> unloadedProperties, ObjectFactory objectFactory,
+      List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
     this.type = type;
     this.unloadedProperties = unloadedProperties;
     this.objectFactory = objectFactory;
@@ -64,7 +65,8 @@ public final Object invoke(Object enhanced, Method method, Object[] args) throws
         }
 
         PropertyCopier.copyBeanProperties(type, enhanced, original);
-        return this.newSerialStateHolder(original, unloadedProperties, objectFactory, constructorArgTypes, constructorArgs);
+        return this.newSerialStateHolder(original, unloadedProperties, objectFactory, constructorArgTypes,
+            constructorArgs);
       } else {
         synchronized (this.reloadingPropertyLock) {
           if (!FINALIZE_METHOD.equals(methodName) && PropertyNamer.isProperty(methodName) && !reloadingProperty) {
@@ -80,10 +82,12 @@ public final Object invoke(Object enhanced, Method method, Object[] args) throws
                   reloadingProperty = false;
                 }
               } else {
-                /* I'm not sure if this case can really happen or is just in tests -
-                 * we have an unread property but no loadPair to load it. */
-                throw new ExecutorException("An attempt has been made to read a not loaded lazy property '"
-                        + property + "' of a disconnected object");
+                /*
+                 * I'm not sure if this case can really happen or is just in tests - we have an unread property but no
+                 * loadPair to load it.
+                 */
+                throw new ExecutorException("An attempt has been made to read a not loaded lazy property '" + property
+                    + "' of a disconnected object");
               }
             }
           }
@@ -96,11 +100,8 @@ public final Object invoke(Object enhanced, Method method, Object[] args) throws
     }
   }
 
-  protected abstract AbstractSerialStateHolder newSerialStateHolder(
-          Object userBean,
-          Map<String, ResultLoaderMap.LoadPair> unloadedProperties,
-          ObjectFactory objectFactory,
-          List<Class<?>> constructorArgTypes,
-          List<Object> constructorArgs);
+  protected abstract AbstractSerialStateHolder newSerialStateHolder(Object userBean,
+      Map<String, ResultLoaderMap.LoadPair> unloadedProperties, ObjectFactory objectFactory,
+      List<Class<?>> constructorArgTypes, List<Object> constructorArgs);
 
 }
diff --git a/src/main/java/org/apache/ibatis/executor/loader/AbstractSerialStateHolder.java b/src/main/java/org/apache/ibatis/executor/loader/AbstractSerialStateHolder.java
index 77992f189c4..2674ea08433 100644
--- a/src/main/java/org/apache/ibatis/executor/loader/AbstractSerialStateHolder.java
+++ b/src/main/java/org/apache/ibatis/executor/loader/AbstractSerialStateHolder.java
@@ -52,12 +52,9 @@ public abstract class AbstractSerialStateHolder implements Externalizable {
   public AbstractSerialStateHolder() {
   }
 
-  public AbstractSerialStateHolder(
-          final Object userBean,
-          final Map<String, ResultLoaderMap.LoadPair> unloadedProperties,
-          final ObjectFactory objectFactory,
-          List<Class<?>> constructorArgTypes,
-          List<Object> constructorArgs) {
+  public AbstractSerialStateHolder(final Object userBean,
+      final Map<String, ResultLoaderMap.LoadPair> unloadedProperties, final ObjectFactory objectFactory,
+      List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
     this.userBean = userBean;
     this.unloadedProperties = new HashMap<>(unloadedProperties);
     this.objectFactory = objectFactory;
@@ -129,6 +126,7 @@ protected final Object readResolve() throws ObjectStreamException {
     return this.createDeserializationProxy(userBean, arrayProps, objectFactory, arrayTypes, arrayValues);
   }
 
-  protected abstract Object createDeserializationProxy(Object target, Map<String, ResultLoaderMap.LoadPair> unloadedProperties, ObjectFactory objectFactory,
-          List<Class<?>> constructorArgTypes, List<Object> constructorArgs);
+  protected abstract Object createDeserializationProxy(Object target,
+      Map<String, ResultLoaderMap.LoadPair> unloadedProperties, ObjectFactory objectFactory,
+      List<Class<?>> constructorArgTypes, List<Object> constructorArgs);
 }
diff --git a/src/main/java/org/apache/ibatis/executor/loader/ProxyFactory.java b/src/main/java/org/apache/ibatis/executor/loader/ProxyFactory.java
index 8ada4af0ae9..2a28104f404 100644
--- a/src/main/java/org/apache/ibatis/executor/loader/ProxyFactory.java
+++ b/src/main/java/org/apache/ibatis/executor/loader/ProxyFactory.java
@@ -30,6 +30,7 @@ default void setProperties(Properties properties) {
     // NOP
   }
 
-  Object createProxy(Object target, ResultLoaderMap lazyLoader, Configuration configuration, ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs);
+  Object createProxy(Object target, ResultLoaderMap lazyLoader, Configuration configuration,
+      ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs);
 
 }
diff --git a/src/main/java/org/apache/ibatis/executor/loader/ResultLoader.java b/src/main/java/org/apache/ibatis/executor/loader/ResultLoader.java
index d60530a1d65..458fcb767dd 100644
--- a/src/main/java/org/apache/ibatis/executor/loader/ResultLoader.java
+++ b/src/main/java/org/apache/ibatis/executor/loader/ResultLoader.java
@@ -53,7 +53,8 @@ public class ResultLoader {
   protected boolean loaded;
   protected Object resultObject;
 
-  public ResultLoader(Configuration config, Executor executor, MappedStatement mappedStatement, Object parameterObject, Class<?> targetType, CacheKey cacheKey, BoundSql boundSql) {
+  public ResultLoader(Configuration config, Executor executor, MappedStatement mappedStatement, Object parameterObject,
+      Class<?> targetType, CacheKey cacheKey, BoundSql boundSql) {
     this.configuration = config;
     this.executor = executor;
     this.mappedStatement = mappedStatement;
@@ -78,7 +79,8 @@ private <E> List<E> selectList() throws SQLException {
       localExecutor = newExecutor();
     }
     try {
-      return localExecutor.query(mappedStatement, parameterObject, RowBounds.DEFAULT, Executor.NO_RESULT_HANDLER, cacheKey, boundSql);
+      return localExecutor.query(mappedStatement, parameterObject, RowBounds.DEFAULT, Executor.NO_RESULT_HANDLER,
+          cacheKey, boundSql);
     } finally {
       if (localExecutor != executor) {
         localExecutor.close(false);
diff --git a/src/main/java/org/apache/ibatis/executor/loader/cglib/CglibProxyFactory.java b/src/main/java/org/apache/ibatis/executor/loader/cglib/CglibProxyFactory.java
index 3ad3be57959..be15777e790 100644
--- a/src/main/java/org/apache/ibatis/executor/loader/cglib/CglibProxyFactory.java
+++ b/src/main/java/org/apache/ibatis/executor/loader/cglib/CglibProxyFactory.java
@@ -54,20 +54,26 @@ public CglibProxyFactory() {
     try {
       Resources.classForName("net.sf.cglib.proxy.Enhancer");
     } catch (Throwable e) {
-      throw new IllegalStateException("Cannot enable lazy loading because CGLIB is not available. Add CGLIB to your classpath.", e);
+      throw new IllegalStateException(
+          "Cannot enable lazy loading because CGLIB is not available. Add CGLIB to your classpath.", e);
     }
   }
 
   @Override
-  public Object createProxy(Object target, ResultLoaderMap lazyLoader, Configuration configuration, ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
-    return EnhancedResultObjectProxyImpl.createProxy(target, lazyLoader, configuration, objectFactory, constructorArgTypes, constructorArgs);
+  public Object createProxy(Object target, ResultLoaderMap lazyLoader, Configuration configuration,
+      ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+    return EnhancedResultObjectProxyImpl.createProxy(target, lazyLoader, configuration, objectFactory,
+        constructorArgTypes, constructorArgs);
   }
 
-  public Object createDeserializationProxy(Object target, Map<String, ResultLoaderMap.LoadPair> unloadedProperties, ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
-    return EnhancedDeserializationProxyImpl.createProxy(target, unloadedProperties, objectFactory, constructorArgTypes, constructorArgs);
+  public Object createDeserializationProxy(Object target, Map<String, ResultLoaderMap.LoadPair> unloadedProperties,
+      ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+    return EnhancedDeserializationProxyImpl.createProxy(target, unloadedProperties, objectFactory, constructorArgTypes,
+        constructorArgs);
   }
 
-  static Object createStaticProxy(Class<?> type, Callback callback, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+  static Object createStaticProxy(Class<?> type, Callback callback, List<Class<?>> constructorArgTypes,
+      List<Object> constructorArgs) {
     LogHolder.log.warn("CglibProxyFactory is deprecated. Use another proxy factory implementation.");
     Enhancer enhancer = new Enhancer();
     enhancer.setCallback(callback);
@@ -104,7 +110,8 @@ private static class EnhancedResultObjectProxyImpl implements MethodInterceptor
     private final List<Class<?>> constructorArgTypes;
     private final List<Object> constructorArgs;
 
-    private EnhancedResultObjectProxyImpl(Class<?> type, ResultLoaderMap lazyLoader, Configuration configuration, ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+    private EnhancedResultObjectProxyImpl(Class<?> type, ResultLoaderMap lazyLoader, Configuration configuration,
+        ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
       this.type = type;
       this.lazyLoader = lazyLoader;
       this.aggressive = configuration.isAggressiveLazyLoading();
@@ -114,9 +121,11 @@ private EnhancedResultObjectProxyImpl(Class<?> type, ResultLoaderMap lazyLoader,
       this.constructorArgs = constructorArgs;
     }
 
-    public static Object createProxy(Object target, ResultLoaderMap lazyLoader, Configuration configuration, ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+    public static Object createProxy(Object target, ResultLoaderMap lazyLoader, Configuration configuration,
+        ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
       final Class<?> type = target.getClass();
-      EnhancedResultObjectProxyImpl callback = new EnhancedResultObjectProxyImpl(type, lazyLoader, configuration, objectFactory, constructorArgTypes, constructorArgs);
+      EnhancedResultObjectProxyImpl callback = new EnhancedResultObjectProxyImpl(type, lazyLoader, configuration,
+          objectFactory, constructorArgTypes, constructorArgs);
       Object enhanced = createStaticProxy(type, callback, constructorArgTypes, constructorArgs);
       PropertyCopier.copyBeanProperties(type, target, enhanced);
       return enhanced;
@@ -136,7 +145,8 @@ public Object intercept(Object enhanced, Method method, Object[] args, MethodPro
             }
             PropertyCopier.copyBeanProperties(type, enhanced, original);
             if (lazyLoader.size() > 0) {
-              return new CglibSerialStateHolder(original, lazyLoader.getProperties(), objectFactory, constructorArgTypes, constructorArgs);
+              return new CglibSerialStateHolder(original, lazyLoader.getProperties(), objectFactory,
+                  constructorArgTypes, constructorArgs);
             } else {
               return original;
             }
@@ -163,17 +173,19 @@ public Object intercept(Object enhanced, Method method, Object[] args, MethodPro
     }
   }
 
-  private static class EnhancedDeserializationProxyImpl extends AbstractEnhancedDeserializationProxy implements MethodInterceptor {
+  private static class EnhancedDeserializationProxyImpl extends AbstractEnhancedDeserializationProxy
+      implements MethodInterceptor {
 
-    private EnhancedDeserializationProxyImpl(Class<?> type, Map<String, ResultLoaderMap.LoadPair> unloadedProperties, ObjectFactory objectFactory,
-            List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+    private EnhancedDeserializationProxyImpl(Class<?> type, Map<String, ResultLoaderMap.LoadPair> unloadedProperties,
+        ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
       super(type, unloadedProperties, objectFactory, constructorArgTypes, constructorArgs);
     }
 
-    public static Object createProxy(Object target, Map<String, ResultLoaderMap.LoadPair> unloadedProperties, ObjectFactory objectFactory,
-            List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+    public static Object createProxy(Object target, Map<String, ResultLoaderMap.LoadPair> unloadedProperties,
+        ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
       final Class<?> type = target.getClass();
-      EnhancedDeserializationProxyImpl callback = new EnhancedDeserializationProxyImpl(type, unloadedProperties, objectFactory, constructorArgTypes, constructorArgs);
+      EnhancedDeserializationProxyImpl callback = new EnhancedDeserializationProxyImpl(type, unloadedProperties,
+          objectFactory, constructorArgTypes, constructorArgs);
       Object enhanced = createStaticProxy(type, callback, constructorArgTypes, constructorArgs);
       PropertyCopier.copyBeanProperties(type, target, enhanced);
       return enhanced;
@@ -186,9 +198,11 @@ public Object intercept(Object enhanced, Method method, Object[] args, MethodPro
     }
 
     @Override
-    protected AbstractSerialStateHolder newSerialStateHolder(Object userBean, Map<String, ResultLoaderMap.LoadPair> unloadedProperties, ObjectFactory objectFactory,
-            List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
-      return new CglibSerialStateHolder(userBean, unloadedProperties, objectFactory, constructorArgTypes, constructorArgs);
+    protected AbstractSerialStateHolder newSerialStateHolder(Object userBean,
+        Map<String, ResultLoaderMap.LoadPair> unloadedProperties, ObjectFactory objectFactory,
+        List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+      return new CglibSerialStateHolder(userBean, unloadedProperties, objectFactory, constructorArgTypes,
+          constructorArgs);
     }
   }
 
diff --git a/src/main/java/org/apache/ibatis/executor/loader/cglib/CglibSerialStateHolder.java b/src/main/java/org/apache/ibatis/executor/loader/cglib/CglibSerialStateHolder.java
index b47db0e635c..d1110b6376b 100644
--- a/src/main/java/org/apache/ibatis/executor/loader/cglib/CglibSerialStateHolder.java
+++ b/src/main/java/org/apache/ibatis/executor/loader/cglib/CglibSerialStateHolder.java
@@ -35,18 +35,15 @@ class CglibSerialStateHolder extends AbstractSerialStateHolder {
   public CglibSerialStateHolder() {
   }
 
-  public CglibSerialStateHolder(
-          final Object userBean,
-          final Map<String, ResultLoaderMap.LoadPair> unloadedProperties,
-          final ObjectFactory objectFactory,
-          List<Class<?>> constructorArgTypes,
-          List<Object> constructorArgs) {
+  public CglibSerialStateHolder(final Object userBean, final Map<String, ResultLoaderMap.LoadPair> unloadedProperties,
+      final ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
     super(userBean, unloadedProperties, objectFactory, constructorArgTypes, constructorArgs);
   }
 
   @Override
-  protected Object createDeserializationProxy(Object target, Map<String, ResultLoaderMap.LoadPair> unloadedProperties, ObjectFactory objectFactory,
-          List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
-    return new CglibProxyFactory().createDeserializationProxy(target, unloadedProperties, objectFactory, constructorArgTypes, constructorArgs);
+  protected Object createDeserializationProxy(Object target, Map<String, ResultLoaderMap.LoadPair> unloadedProperties,
+      ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+    return new CglibProxyFactory().createDeserializationProxy(target, unloadedProperties, objectFactory,
+        constructorArgTypes, constructorArgs);
   }
 }
diff --git a/src/main/java/org/apache/ibatis/executor/loader/javassist/JavassistProxyFactory.java b/src/main/java/org/apache/ibatis/executor/loader/javassist/JavassistProxyFactory.java
index 192277ded1c..67b5f5fe21a 100644
--- a/src/main/java/org/apache/ibatis/executor/loader/javassist/JavassistProxyFactory.java
+++ b/src/main/java/org/apache/ibatis/executor/loader/javassist/JavassistProxyFactory.java
@@ -50,20 +50,26 @@ public JavassistProxyFactory() {
     try {
       Resources.classForName("javassist.util.proxy.ProxyFactory");
     } catch (Throwable e) {
-      throw new IllegalStateException("Cannot enable lazy loading because Javassist is not available. Add Javassist to your classpath.", e);
+      throw new IllegalStateException(
+          "Cannot enable lazy loading because Javassist is not available. Add Javassist to your classpath.", e);
     }
   }
 
   @Override
-  public Object createProxy(Object target, ResultLoaderMap lazyLoader, Configuration configuration, ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
-    return EnhancedResultObjectProxyImpl.createProxy(target, lazyLoader, configuration, objectFactory, constructorArgTypes, constructorArgs);
+  public Object createProxy(Object target, ResultLoaderMap lazyLoader, Configuration configuration,
+      ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+    return EnhancedResultObjectProxyImpl.createProxy(target, lazyLoader, configuration, objectFactory,
+        constructorArgTypes, constructorArgs);
   }
 
-  public Object createDeserializationProxy(Object target, Map<String, ResultLoaderMap.LoadPair> unloadedProperties, ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
-    return EnhancedDeserializationProxyImpl.createProxy(target, unloadedProperties, objectFactory, constructorArgTypes, constructorArgs);
+  public Object createDeserializationProxy(Object target, Map<String, ResultLoaderMap.LoadPair> unloadedProperties,
+      ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+    return EnhancedDeserializationProxyImpl.createProxy(target, unloadedProperties, objectFactory, constructorArgTypes,
+        constructorArgs);
   }
 
-  static Object createStaticProxy(Class<?> type, MethodHandler callback, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+  static Object createStaticProxy(Class<?> type, MethodHandler callback, List<Class<?>> constructorArgTypes,
+      List<Object> constructorArgs) {
 
     ProxyFactory enhancer = new ProxyFactory();
     enhancer.setSuperclass(type);
@@ -102,7 +108,8 @@ private static class EnhancedResultObjectProxyImpl implements MethodHandler {
     private final List<Class<?>> constructorArgTypes;
     private final List<Object> constructorArgs;
 
-    private EnhancedResultObjectProxyImpl(Class<?> type, ResultLoaderMap lazyLoader, Configuration configuration, ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+    private EnhancedResultObjectProxyImpl(Class<?> type, ResultLoaderMap lazyLoader, Configuration configuration,
+        ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
       this.type = type;
       this.lazyLoader = lazyLoader;
       this.aggressive = configuration.isAggressiveLazyLoading();
@@ -112,9 +119,11 @@ private EnhancedResultObjectProxyImpl(Class<?> type, ResultLoaderMap lazyLoader,
       this.constructorArgs = constructorArgs;
     }
 
-    public static Object createProxy(Object target, ResultLoaderMap lazyLoader, Configuration configuration, ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+    public static Object createProxy(Object target, ResultLoaderMap lazyLoader, Configuration configuration,
+        ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
       final Class<?> type = target.getClass();
-      EnhancedResultObjectProxyImpl callback = new EnhancedResultObjectProxyImpl(type, lazyLoader, configuration, objectFactory, constructorArgTypes, constructorArgs);
+      EnhancedResultObjectProxyImpl callback = new EnhancedResultObjectProxyImpl(type, lazyLoader, configuration,
+          objectFactory, constructorArgTypes, constructorArgs);
       Object enhanced = createStaticProxy(type, callback, constructorArgTypes, constructorArgs);
       PropertyCopier.copyBeanProperties(type, target, enhanced);
       return enhanced;
@@ -134,7 +143,8 @@ public Object invoke(Object enhanced, Method method, Method methodProxy, Object[
             }
             PropertyCopier.copyBeanProperties(type, enhanced, original);
             if (lazyLoader.size() > 0) {
-              return new JavassistSerialStateHolder(original, lazyLoader.getProperties(), objectFactory, constructorArgTypes, constructorArgs);
+              return new JavassistSerialStateHolder(original, lazyLoader.getProperties(), objectFactory,
+                  constructorArgTypes, constructorArgs);
             } else {
               return original;
             }
@@ -161,17 +171,19 @@ public Object invoke(Object enhanced, Method method, Method methodProxy, Object[
     }
   }
 
-  private static class EnhancedDeserializationProxyImpl extends AbstractEnhancedDeserializationProxy implements MethodHandler {
+  private static class EnhancedDeserializationProxyImpl extends AbstractEnhancedDeserializationProxy
+      implements MethodHandler {
 
-    private EnhancedDeserializationProxyImpl(Class<?> type, Map<String, ResultLoaderMap.LoadPair> unloadedProperties, ObjectFactory objectFactory,
-            List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+    private EnhancedDeserializationProxyImpl(Class<?> type, Map<String, ResultLoaderMap.LoadPair> unloadedProperties,
+        ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
       super(type, unloadedProperties, objectFactory, constructorArgTypes, constructorArgs);
     }
 
-    public static Object createProxy(Object target, Map<String, ResultLoaderMap.LoadPair> unloadedProperties, ObjectFactory objectFactory,
-            List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+    public static Object createProxy(Object target, Map<String, ResultLoaderMap.LoadPair> unloadedProperties,
+        ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
       final Class<?> type = target.getClass();
-      EnhancedDeserializationProxyImpl callback = new EnhancedDeserializationProxyImpl(type, unloadedProperties, objectFactory, constructorArgTypes, constructorArgs);
+      EnhancedDeserializationProxyImpl callback = new EnhancedDeserializationProxyImpl(type, unloadedProperties,
+          objectFactory, constructorArgTypes, constructorArgs);
       Object enhanced = createStaticProxy(type, callback, constructorArgTypes, constructorArgs);
       PropertyCopier.copyBeanProperties(type, target, enhanced);
       return enhanced;
@@ -184,9 +196,11 @@ public Object invoke(Object enhanced, Method method, Method methodProxy, Object[
     }
 
     @Override
-    protected AbstractSerialStateHolder newSerialStateHolder(Object userBean, Map<String, ResultLoaderMap.LoadPair> unloadedProperties, ObjectFactory objectFactory,
-            List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
-      return new JavassistSerialStateHolder(userBean, unloadedProperties, objectFactory, constructorArgTypes, constructorArgs);
+    protected AbstractSerialStateHolder newSerialStateHolder(Object userBean,
+        Map<String, ResultLoaderMap.LoadPair> unloadedProperties, ObjectFactory objectFactory,
+        List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+      return new JavassistSerialStateHolder(userBean, unloadedProperties, objectFactory, constructorArgTypes,
+          constructorArgs);
     }
   }
 
diff --git a/src/main/java/org/apache/ibatis/executor/result/DefaultMapResultHandler.java b/src/main/java/org/apache/ibatis/executor/result/DefaultMapResultHandler.java
index 0289da7fe82..df6bf41cce7 100644
--- a/src/main/java/org/apache/ibatis/executor/result/DefaultMapResultHandler.java
+++ b/src/main/java/org/apache/ibatis/executor/result/DefaultMapResultHandler.java
@@ -36,7 +36,8 @@ public class DefaultMapResultHandler<K, V> implements ResultHandler<V> {
   private final ReflectorFactory reflectorFactory;
 
   @SuppressWarnings("unchecked")
-  public DefaultMapResultHandler(String mapKey, ObjectFactory objectFactory, ObjectWrapperFactory objectWrapperFactory, ReflectorFactory reflectorFactory) {
+  public DefaultMapResultHandler(String mapKey, ObjectFactory objectFactory, ObjectWrapperFactory objectWrapperFactory,
+      ReflectorFactory reflectorFactory) {
     this.objectFactory = objectFactory;
     this.objectWrapperFactory = objectWrapperFactory;
     this.reflectorFactory = reflectorFactory;
diff --git a/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java b/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
index 3ff2cdf77e3..2d5107d3b04 100644
--- a/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
+++ b/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
@@ -160,7 +160,8 @@ public void handleOutputParameters(CallableStatement cs) throws SQLException {
     }
   }
 
-  private void handleRefCursorOutputParameter(ResultSet rs, ParameterMapping parameterMapping, MetaObject metaParam) throws SQLException {
+  private void handleRefCursorOutputParameter(ResultSet rs, ParameterMapping parameterMapping, MetaObject metaParam)
+      throws SQLException {
     if (rs == null) {
       return;
     }
@@ -298,7 +299,8 @@ private void validateResultMapsCount(ResultSetWrapper rsw, int resultMapCount) {
     }
   }
 
-  private void handleResultSet(ResultSetWrapper rsw, ResultMap resultMap, List<Object> multipleResults, ResultMapping parentMapping) throws SQLException {
+  private void handleResultSet(ResultSetWrapper rsw, ResultMap resultMap, List<Object> multipleResults,
+      ResultMapping parentMapping) throws SQLException {
     try {
       if (parentMapping != null) {
         handleRowValues(rsw, resultMap, null, RowBounds.DEFAULT, parentMapping);
@@ -326,7 +328,8 @@ private List<Object> collapseSingleResultList(List<Object> multipleResults) {
   // HANDLE ROWS FOR SIMPLE RESULTMAP
   //
 
-  public void handleRowValues(ResultSetWrapper rsw, ResultMap resultMap, ResultHandler<?> resultHandler, RowBounds rowBounds, ResultMapping parentMapping) throws SQLException {
+  public void handleRowValues(ResultSetWrapper rsw, ResultMap resultMap, ResultHandler<?> resultHandler,
+      RowBounds rowBounds, ResultMapping parentMapping) throws SQLException {
     if (resultMap.hasNestedResultMaps()) {
       ensureNoRowBounds();
       checkResultHandler();
@@ -351,8 +354,8 @@ protected void checkResultHandler() {
     }
   }
 
-  private void handleRowValuesForSimpleResultMap(ResultSetWrapper rsw, ResultMap resultMap, ResultHandler<?> resultHandler, RowBounds rowBounds, ResultMapping parentMapping)
-      throws SQLException {
+  private void handleRowValuesForSimpleResultMap(ResultSetWrapper rsw, ResultMap resultMap,
+      ResultHandler<?> resultHandler, RowBounds rowBounds, ResultMapping parentMapping) throws SQLException {
     DefaultResultContext<Object> resultContext = new DefaultResultContext<>();
     ResultSet resultSet = rsw.getResultSet();
     skipRows(resultSet, rowBounds);
@@ -363,7 +366,8 @@ private void handleRowValuesForSimpleResultMap(ResultSetWrapper rsw, ResultMap r
     }
   }
 
-  private void storeObject(ResultHandler<?> resultHandler, DefaultResultContext<Object> resultContext, Object rowValue, ResultMapping parentMapping, ResultSet rs) throws SQLException {
+  private void storeObject(ResultHandler<?> resultHandler, DefaultResultContext<Object> resultContext, Object rowValue,
+      ResultMapping parentMapping, ResultSet rs) throws SQLException {
     if (parentMapping != null) {
       linkToParents(rs, parentMapping, rowValue);
     } else {
@@ -371,8 +375,9 @@ private void storeObject(ResultHandler<?> resultHandler, DefaultResultContext<Ob
     }
   }
 
-  @SuppressWarnings("unchecked" /* because ResultHandler<?> is always ResultHandler<Object>*/)
-  private void callResultHandler(ResultHandler<?> resultHandler, DefaultResultContext<Object> resultContext, Object rowValue) {
+  @SuppressWarnings("unchecked" /* because ResultHandler<?> is always ResultHandler<Object> */)
+  private void callResultHandler(ResultHandler<?> resultHandler, DefaultResultContext<Object> resultContext,
+      Object rowValue) {
     resultContext.nextResultObject(rowValue);
     ((ResultHandler<Object>) resultHandler).handleResult(resultContext);
   }
@@ -419,7 +424,8 @@ private Object getRowValue(ResultSetWrapper rsw, ResultMap resultMap, String col
   // GET VALUE FROM ROW FOR NESTED RESULT MAP
   //
 
-  private Object getRowValue(ResultSetWrapper rsw, ResultMap resultMap, CacheKey combinedKey, String columnPrefix, Object partialObject) throws SQLException {
+  private Object getRowValue(ResultSetWrapper rsw, ResultMap resultMap, CacheKey combinedKey, String columnPrefix,
+      Object partialObject) throws SQLException {
     final String resultMapId = resultMap.getId();
     Object rowValue = partialObject;
     if (rowValue != null) {
@@ -438,7 +444,8 @@ private Object getRowValue(ResultSetWrapper rsw, ResultMap resultMap, CacheKey c
         }
         foundValues = applyPropertyMappings(rsw, resultMap, metaObject, lazyLoader, columnPrefix) || foundValues;
         putAncestor(rowValue, resultMapId);
-        foundValues = applyNestedResultMappings(rsw, resultMap, metaObject, columnPrefix, combinedKey, true) || foundValues;
+        foundValues = applyNestedResultMappings(rsw, resultMap, metaObject, columnPrefix, combinedKey, true)
+            || foundValues;
         ancestorObjects.remove(resultMapId);
         foundValues = lazyLoader.size() > 0 || foundValues;
         rowValue = foundValues || configuration.isReturnInstanceForEmptyRow() ? rowValue : null;
@@ -470,8 +477,8 @@ private boolean shouldApplyAutomaticMappings(ResultMap resultMap, boolean isNest
   // PROPERTY MAPPINGS
   //
 
-  private boolean applyPropertyMappings(ResultSetWrapper rsw, ResultMap resultMap, MetaObject metaObject, ResultLoaderMap lazyLoader, String columnPrefix)
-      throws SQLException {
+  private boolean applyPropertyMappings(ResultSetWrapper rsw, ResultMap resultMap, MetaObject metaObject,
+      ResultLoaderMap lazyLoader, String columnPrefix) throws SQLException {
     final List<String> mappedColumnNames = rsw.getMappedColumnNames(resultMap, columnPrefix);
     boolean foundValues = false;
     final List<ResultMapping> propertyMappings = resultMap.getPropertyResultMappings();
@@ -484,7 +491,8 @@ private boolean applyPropertyMappings(ResultSetWrapper rsw, ResultMap resultMap,
       if (propertyMapping.isCompositeResult()
           || (column != null && mappedColumnNames.contains(column.toUpperCase(Locale.ENGLISH)))
           || propertyMapping.getResultSet() != null) {
-        Object value = getPropertyMappingValue(rsw.getResultSet(), metaObject, propertyMapping, lazyLoader, columnPrefix);
+        Object value = getPropertyMappingValue(rsw.getResultSet(), metaObject, propertyMapping, lazyLoader,
+            columnPrefix);
         // issue #541 make property optional
         final String property = propertyMapping.getProperty();
         if (property == null) {
@@ -496,7 +504,8 @@ private boolean applyPropertyMappings(ResultSetWrapper rsw, ResultMap resultMap,
         if (value != null) {
           foundValues = true;
         }
-        if (value != null || (configuration.isCallSettersOnNulls() && !metaObject.getSetterType(property).isPrimitive())) {
+        if (value != null
+            || (configuration.isCallSettersOnNulls() && !metaObject.getSetterType(property).isPrimitive())) {
           // gcode issue #377, call setter on nulls (value is not 'found')
           metaObject.setValue(property, value);
         }
@@ -505,12 +514,12 @@ private boolean applyPropertyMappings(ResultSetWrapper rsw, ResultMap resultMap,
     return foundValues;
   }
 
-  private Object getPropertyMappingValue(ResultSet rs, MetaObject metaResultObject, ResultMapping propertyMapping, ResultLoaderMap lazyLoader, String columnPrefix)
-      throws SQLException {
+  private Object getPropertyMappingValue(ResultSet rs, MetaObject metaResultObject, ResultMapping propertyMapping,
+      ResultLoaderMap lazyLoader, String columnPrefix) throws SQLException {
     if (propertyMapping.getNestedQueryId() != null) {
       return getNestedQueryMappingValue(rs, metaResultObject, propertyMapping, lazyLoader, columnPrefix);
     } else if (propertyMapping.getResultSet() != null) {
-      addPendingChildRelation(rs, metaResultObject, propertyMapping);   // TODO is that OK?
+      addPendingChildRelation(rs, metaResultObject, propertyMapping); // TODO is that OK?
       return DEFERRED;
     } else {
       final TypeHandler<?> typeHandler = propertyMapping.getTypeHandler();
@@ -519,7 +528,8 @@ private Object getPropertyMappingValue(ResultSet rs, MetaObject metaResultObject
     }
   }
 
-  private List<UnMappedColumnAutoMapping> createAutomaticMappings(ResultSetWrapper rsw, ResultMap resultMap, MetaObject metaObject, String columnPrefix) throws SQLException {
+  private List<UnMappedColumnAutoMapping> createAutomaticMappings(ResultSetWrapper rsw, ResultMap resultMap,
+      MetaObject metaObject, String columnPrefix) throws SQLException {
     final String mapKey = resultMap.getId() + ":" + columnPrefix;
     List<UnMappedColumnAutoMapping> autoMapping = autoMappingsCache.get(mapKey);
     if (autoMapping == null) {
@@ -549,14 +559,15 @@ private List<UnMappedColumnAutoMapping> createAutomaticMappings(ResultSetWrapper
           final Class<?> propertyType = metaObject.getSetterType(property);
           if (typeHandlerRegistry.hasTypeHandler(propertyType, rsw.getJdbcType(columnName))) {
             final TypeHandler<?> typeHandler = rsw.getTypeHandler(propertyType, columnName);
-            autoMapping.add(new UnMappedColumnAutoMapping(columnName, property, typeHandler, propertyType.isPrimitive()));
+            autoMapping
+                .add(new UnMappedColumnAutoMapping(columnName, property, typeHandler, propertyType.isPrimitive()));
           } else {
-            configuration.getAutoMappingUnknownColumnBehavior()
-                .doAction(mappedStatement, columnName, property, propertyType);
+            configuration.getAutoMappingUnknownColumnBehavior().doAction(mappedStatement, columnName, property,
+                propertyType);
           }
         } else {
-          configuration.getAutoMappingUnknownColumnBehavior()
-              .doAction(mappedStatement, columnName, (property != null) ? property : propertyName, null);
+          configuration.getAutoMappingUnknownColumnBehavior().doAction(mappedStatement, columnName,
+              (property != null) ? property : propertyName, null);
         }
       }
       autoMappingsCache.put(mapKey, autoMapping);
@@ -564,7 +575,8 @@ private List<UnMappedColumnAutoMapping> createAutomaticMappings(ResultSetWrapper
     return autoMapping;
   }
 
-  private boolean applyAutomaticMappings(ResultSetWrapper rsw, ResultMap resultMap, MetaObject metaObject, String columnPrefix) throws SQLException {
+  private boolean applyAutomaticMappings(ResultSetWrapper rsw, ResultMap resultMap, MetaObject metaObject,
+      String columnPrefix) throws SQLException {
     List<UnMappedColumnAutoMapping> autoMapping = createAutomaticMappings(rsw, resultMap, metaObject, columnPrefix);
     boolean foundValues = false;
     if (!autoMapping.isEmpty()) {
@@ -585,7 +597,8 @@ private boolean applyAutomaticMappings(ResultSetWrapper rsw, ResultMap resultMap
   // MULTIPLE RESULT SETS
 
   private void linkToParents(ResultSet rs, ResultMapping parentMapping, Object rowValue) throws SQLException {
-    CacheKey parentKey = createKeyForMultipleResults(rs, parentMapping, parentMapping.getColumn(), parentMapping.getForeignColumn());
+    CacheKey parentKey = createKeyForMultipleResults(rs, parentMapping, parentMapping.getColumn(),
+        parentMapping.getForeignColumn());
     List<PendingRelation> parents = pendingRelations.get(parentKey);
     if (parents != null) {
       for (PendingRelation parent : parents) {
@@ -596,8 +609,10 @@ private void linkToParents(ResultSet rs, ResultMapping parentMapping, Object row
     }
   }
 
-  private void addPendingChildRelation(ResultSet rs, MetaObject metaResultObject, ResultMapping parentMapping) throws SQLException {
-    CacheKey cacheKey = createKeyForMultipleResults(rs, parentMapping, parentMapping.getColumn(), parentMapping.getColumn());
+  private void addPendingChildRelation(ResultSet rs, MetaObject metaResultObject, ResultMapping parentMapping)
+      throws SQLException {
+    CacheKey cacheKey = createKeyForMultipleResults(rs, parentMapping, parentMapping.getColumn(),
+        parentMapping.getColumn());
     PendingRelation deferLoad = new PendingRelation();
     deferLoad.metaObject = metaResultObject;
     deferLoad.propertyMapping = parentMapping;
@@ -614,7 +629,8 @@ private void addPendingChildRelation(ResultSet rs, MetaObject metaResultObject,
     }
   }
 
-  private CacheKey createKeyForMultipleResults(ResultSet rs, ResultMapping resultMapping, String names, String columns) throws SQLException {
+  private CacheKey createKeyForMultipleResults(ResultSet rs, ResultMapping resultMapping, String names, String columns)
+      throws SQLException {
     CacheKey cacheKey = new CacheKey();
     cacheKey.update(resultMapping);
     if (columns != null && names != null) {
@@ -635,7 +651,8 @@ private CacheKey createKeyForMultipleResults(ResultSet rs, ResultMapping resultM
   // INSTANTIATION & CONSTRUCTOR MAPPING
   //
 
-  private Object createResultObject(ResultSetWrapper rsw, ResultMap resultMap, ResultLoaderMap lazyLoader, String columnPrefix) throws SQLException {
+  private Object createResultObject(ResultSetWrapper rsw, ResultMap resultMap, ResultLoaderMap lazyLoader,
+      String columnPrefix) throws SQLException {
     this.useConstructorMappings = false; // reset previous mapping result
     final List<Class<?>> constructorArgTypes = new ArrayList<>();
     final List<Object> constructorArgs = new ArrayList<>();
@@ -645,7 +662,8 @@ private Object createResultObject(ResultSetWrapper rsw, ResultMap resultMap, Res
       for (ResultMapping propertyMapping : propertyMappings) {
         // issue gcode #109 && issue #149
         if (propertyMapping.getNestedQueryId() != null && propertyMapping.isLazy()) {
-          resultObject = configuration.getProxyFactory().createProxy(resultObject, lazyLoader, configuration, objectFactory, constructorArgTypes, constructorArgs);
+          resultObject = configuration.getProxyFactory().createProxy(resultObject, lazyLoader, configuration,
+              objectFactory, constructorArgTypes, constructorArgs);
           break;
         }
       }
@@ -654,25 +672,28 @@ private Object createResultObject(ResultSetWrapper rsw, ResultMap resultMap, Res
     return resultObject;
   }
 
-  private Object createResultObject(ResultSetWrapper rsw, ResultMap resultMap, List<Class<?>> constructorArgTypes, List<Object> constructorArgs, String columnPrefix)
-      throws SQLException {
+  private Object createResultObject(ResultSetWrapper rsw, ResultMap resultMap, List<Class<?>> constructorArgTypes,
+      List<Object> constructorArgs, String columnPrefix) throws SQLException {
     final Class<?> resultType = resultMap.getType();
     final MetaClass metaType = MetaClass.forClass(resultType, reflectorFactory);
     final List<ResultMapping> constructorMappings = resultMap.getConstructorResultMappings();
     if (hasTypeHandlerForResultObject(rsw, resultType)) {
       return createPrimitiveResultObject(rsw, resultMap, columnPrefix);
     } else if (!constructorMappings.isEmpty()) {
-      return createParameterizedResultObject(rsw, resultType, constructorMappings, constructorArgTypes, constructorArgs, columnPrefix);
+      return createParameterizedResultObject(rsw, resultType, constructorMappings, constructorArgTypes, constructorArgs,
+          columnPrefix);
     } else if (resultType.isInterface() || metaType.hasDefaultConstructor()) {
       return objectFactory.create(resultType);
     } else if (shouldApplyAutomaticMappings(resultMap, false)) {
-      return createByConstructorSignature(rsw, resultMap, columnPrefix, resultType, constructorArgTypes, constructorArgs);
+      return createByConstructorSignature(rsw, resultMap, columnPrefix, resultType, constructorArgTypes,
+          constructorArgs);
     }
     throw new ExecutorException("Do not know how to create an instance of " + resultType);
   }
 
-  Object createParameterizedResultObject(ResultSetWrapper rsw, Class<?> resultType, List<ResultMapping> constructorMappings,
-                                         List<Class<?>> constructorArgTypes, List<Object> constructorArgs, String columnPrefix) {
+  Object createParameterizedResultObject(ResultSetWrapper rsw, Class<?> resultType,
+      List<ResultMapping> constructorMappings, List<Class<?>> constructorArgTypes, List<Object> constructorArgs,
+      String columnPrefix) {
     boolean foundValues = false;
     for (ResultMapping constructorMapping : constructorMappings) {
       final Class<?> parameterType = constructorMapping.getJavaType();
@@ -698,8 +719,8 @@ Object createParameterizedResultObject(ResultSetWrapper rsw, Class<?> resultType
     return foundValues ? objectFactory.create(resultType, constructorArgTypes, constructorArgs) : null;
   }
 
-  private Object createByConstructorSignature(ResultSetWrapper rsw, ResultMap resultMap, String columnPrefix, Class<?> resultType,
-      List<Class<?>> constructorArgTypes, List<Object> constructorArgs) throws SQLException {
+  private Object createByConstructorSignature(ResultSetWrapper rsw, ResultMap resultMap, String columnPrefix,
+      Class<?> resultType, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) throws SQLException {
     return applyConstructorAutomapping(rsw, resultMap, columnPrefix, resultType, constructorArgTypes, constructorArgs,
         findConstructorForAutomapping(resultType, rsw).orElseThrow(() -> new ExecutorException(
             "No constructor found in " + resultType.getName() + " matching " + rsw.getClassNames())));
@@ -711,8 +732,7 @@ private Optional<Constructor<?>> findConstructorForAutomapping(final Class<?> re
       return Optional.of(constructors[0]);
     }
     Optional<Constructor<?>> annotated = Arrays.stream(constructors)
-        .filter(x -> x.isAnnotationPresent(AutomapConstructor.class))
-        .reduce((x, y) -> {
+        .filter(x -> x.isAnnotationPresent(AutomapConstructor.class)).reduce((x, y) -> {
           throw new ExecutorException("@AutomapConstructor should be used in only one constructor.");
         });
     if (annotated.isPresent()) {
@@ -741,18 +761,19 @@ private boolean findUsableConstructorByArgTypes(final Constructor<?> constructor
     return true;
   }
 
-  private Object applyConstructorAutomapping(ResultSetWrapper rsw, ResultMap resultMap, String columnPrefix, Class<?> resultType, List<Class<?>> constructorArgTypes, List<Object> constructorArgs, Constructor<?> constructor) throws SQLException {
+  private Object applyConstructorAutomapping(ResultSetWrapper rsw, ResultMap resultMap, String columnPrefix,
+      Class<?> resultType, List<Class<?>> constructorArgTypes, List<Object> constructorArgs, Constructor<?> constructor)
+      throws SQLException {
     boolean foundValues = false;
     if (configuration.isArgNameBasedConstructorAutoMapping()) {
-      foundValues = applyArgNameBasedConstructorAutoMapping(rsw, resultMap, columnPrefix, resultType, constructorArgTypes, constructorArgs,
-          constructor, foundValues);
+      foundValues = applyArgNameBasedConstructorAutoMapping(rsw, resultMap, columnPrefix, resultType,
+          constructorArgTypes, constructorArgs, constructor, foundValues);
     } else {
       foundValues = applyColumnOrderBasedConstructorAutomapping(rsw, constructorArgTypes, constructorArgs, constructor,
           foundValues);
     }
     return foundValues || configuration.isReturnInstanceForEmptyRow()
-        ? objectFactory.create(resultType, constructorArgTypes, constructorArgs)
-        : null;
+        ? objectFactory.create(resultType, constructorArgTypes, constructorArgs) : null;
   }
 
   private boolean applyColumnOrderBasedConstructorAutomapping(ResultSetWrapper rsw, List<Class<?>> constructorArgTypes,
@@ -769,9 +790,9 @@ private boolean applyColumnOrderBasedConstructorAutomapping(ResultSetWrapper rsw
     return foundValues;
   }
 
-  private boolean applyArgNameBasedConstructorAutoMapping(ResultSetWrapper rsw, ResultMap resultMap, String columnPrefix, Class<?> resultType,
-      List<Class<?>> constructorArgTypes, List<Object> constructorArgs, Constructor<?> constructor, boolean foundValues)
-      throws SQLException {
+  private boolean applyArgNameBasedConstructorAutoMapping(ResultSetWrapper rsw, ResultMap resultMap,
+      String columnPrefix, Class<?> resultType, List<Class<?>> constructorArgTypes, List<Object> constructorArgs,
+      Constructor<?> constructor, boolean foundValues) throws SQLException {
     List<String> missingArgs = null;
     Parameter[] params = constructor.getParameters();
     for (Parameter param : params) {
@@ -801,9 +822,9 @@ private boolean applyArgNameBasedConstructorAutoMapping(ResultSetWrapper rsw, Re
       }
     }
     if (foundValues && constructorArgs.size() < params.length) {
-      throw new ExecutorException(MessageFormat.format("Constructor auto-mapping of ''{1}'' failed "
-          + "because ''{0}'' were not found in the result set; "
-          + "Available columns are ''{2}'' and mapUnderscoreToCamelCase is ''{3}''.",
+      throw new ExecutorException(MessageFormat.format(
+          "Constructor auto-mapping of ''{1}'' failed " + "because ''{0}'' were not found in the result set; "
+              + "Available columns are ''{2}'' and mapUnderscoreToCamelCase is ''{3}''.",
           missingArgs, constructor, rsw.getColumnNames(), configuration.isMapUnderscoreToCamelCase()));
     }
     return foundValues;
@@ -820,7 +841,8 @@ private boolean columnMatchesParam(String columnName, String paramName, String c
         .equalsIgnoreCase(configuration.isMapUnderscoreToCamelCase() ? columnName.replace("_", "") : columnName);
   }
 
-  private Object createPrimitiveResultObject(ResultSetWrapper rsw, ResultMap resultMap, String columnPrefix) throws SQLException {
+  private Object createPrimitiveResultObject(ResultSetWrapper rsw, ResultMap resultMap, String columnPrefix)
+      throws SQLException {
     final Class<?> resultType = resultMap.getType();
     final String columnName;
     if (!resultMap.getResultMappings().isEmpty()) {
@@ -838,39 +860,46 @@ private Object createPrimitiveResultObject(ResultSetWrapper rsw, ResultMap resul
   // NESTED QUERY
   //
 
-  private Object getNestedQueryConstructorValue(ResultSet rs, ResultMapping constructorMapping, String columnPrefix) throws SQLException {
+  private Object getNestedQueryConstructorValue(ResultSet rs, ResultMapping constructorMapping, String columnPrefix)
+      throws SQLException {
     final String nestedQueryId = constructorMapping.getNestedQueryId();
     final MappedStatement nestedQuery = configuration.getMappedStatement(nestedQueryId);
     final Class<?> nestedQueryParameterType = nestedQuery.getParameterMap().getType();
-    final Object nestedQueryParameterObject = prepareParameterForNestedQuery(rs, constructorMapping, nestedQueryParameterType, columnPrefix);
+    final Object nestedQueryParameterObject = prepareParameterForNestedQuery(rs, constructorMapping,
+        nestedQueryParameterType, columnPrefix);
     Object value = null;
     if (nestedQueryParameterObject != null) {
       final BoundSql nestedBoundSql = nestedQuery.getBoundSql(nestedQueryParameterObject);
-      final CacheKey key = executor.createCacheKey(nestedQuery, nestedQueryParameterObject, RowBounds.DEFAULT, nestedBoundSql);
+      final CacheKey key = executor.createCacheKey(nestedQuery, nestedQueryParameterObject, RowBounds.DEFAULT,
+          nestedBoundSql);
       final Class<?> targetType = constructorMapping.getJavaType();
-      final ResultLoader resultLoader = new ResultLoader(configuration, executor, nestedQuery, nestedQueryParameterObject, targetType, key, nestedBoundSql);
+      final ResultLoader resultLoader = new ResultLoader(configuration, executor, nestedQuery,
+          nestedQueryParameterObject, targetType, key, nestedBoundSql);
       value = resultLoader.loadResult();
     }
     return value;
   }
 
-  private Object getNestedQueryMappingValue(ResultSet rs, MetaObject metaResultObject, ResultMapping propertyMapping, ResultLoaderMap lazyLoader, String columnPrefix)
-      throws SQLException {
+  private Object getNestedQueryMappingValue(ResultSet rs, MetaObject metaResultObject, ResultMapping propertyMapping,
+      ResultLoaderMap lazyLoader, String columnPrefix) throws SQLException {
     final String nestedQueryId = propertyMapping.getNestedQueryId();
     final String property = propertyMapping.getProperty();
     final MappedStatement nestedQuery = configuration.getMappedStatement(nestedQueryId);
     final Class<?> nestedQueryParameterType = nestedQuery.getParameterMap().getType();
-    final Object nestedQueryParameterObject = prepareParameterForNestedQuery(rs, propertyMapping, nestedQueryParameterType, columnPrefix);
+    final Object nestedQueryParameterObject = prepareParameterForNestedQuery(rs, propertyMapping,
+        nestedQueryParameterType, columnPrefix);
     Object value = null;
     if (nestedQueryParameterObject != null) {
       final BoundSql nestedBoundSql = nestedQuery.getBoundSql(nestedQueryParameterObject);
-      final CacheKey key = executor.createCacheKey(nestedQuery, nestedQueryParameterObject, RowBounds.DEFAULT, nestedBoundSql);
+      final CacheKey key = executor.createCacheKey(nestedQuery, nestedQueryParameterObject, RowBounds.DEFAULT,
+          nestedBoundSql);
       final Class<?> targetType = propertyMapping.getJavaType();
       if (executor.isCached(nestedQuery, key)) {
         executor.deferLoad(nestedQuery, metaResultObject, property, key, targetType);
         value = DEFERRED;
       } else {
-        final ResultLoader resultLoader = new ResultLoader(configuration, executor, nestedQuery, nestedQueryParameterObject, targetType, key, nestedBoundSql);
+        final ResultLoader resultLoader = new ResultLoader(configuration, executor, nestedQuery,
+            nestedQueryParameterObject, targetType, key, nestedBoundSql);
         if (propertyMapping.isLazy()) {
           lazyLoader.addLoader(property, metaResultObject, resultLoader);
           value = DEFERRED;
@@ -882,7 +911,8 @@ private Object getNestedQueryMappingValue(ResultSet rs, MetaObject metaResultObj
     return value;
   }
 
-  private Object prepareParameterForNestedQuery(ResultSet rs, ResultMapping resultMapping, Class<?> parameterType, String columnPrefix) throws SQLException {
+  private Object prepareParameterForNestedQuery(ResultSet rs, ResultMapping resultMapping, Class<?> parameterType,
+      String columnPrefix) throws SQLException {
     if (resultMapping.isCompositeResult()) {
       return prepareCompositeKeyParameter(rs, resultMapping, parameterType, columnPrefix);
     } else {
@@ -890,7 +920,8 @@ private Object prepareParameterForNestedQuery(ResultSet rs, ResultMapping result
     }
   }
 
-  private Object prepareSimpleKeyParameter(ResultSet rs, ResultMapping resultMapping, Class<?> parameterType, String columnPrefix) throws SQLException {
+  private Object prepareSimpleKeyParameter(ResultSet rs, ResultMapping resultMapping, Class<?> parameterType,
+      String columnPrefix) throws SQLException {
     final TypeHandler<?> typeHandler;
     if (typeHandlerRegistry.hasTypeHandler(parameterType)) {
       typeHandler = typeHandlerRegistry.getTypeHandler(parameterType);
@@ -900,7 +931,8 @@ private Object prepareSimpleKeyParameter(ResultSet rs, ResultMapping resultMappi
     return typeHandler.getResult(rs, prependPrefix(resultMapping.getColumn(), columnPrefix));
   }
 
-  private Object prepareCompositeKeyParameter(ResultSet rs, ResultMapping resultMapping, Class<?> parameterType, String columnPrefix) throws SQLException {
+  private Object prepareCompositeKeyParameter(ResultSet rs, ResultMapping resultMapping, Class<?> parameterType,
+      String columnPrefix) throws SQLException {
     final Object parameterObject = instantiateParameterObject(parameterType);
     final MetaObject metaObject = configuration.newMetaObject(parameterObject);
     boolean foundValues = false;
@@ -931,7 +963,8 @@ private Object instantiateParameterObject(Class<?> parameterType) {
   // DISCRIMINATOR
   //
 
-  public ResultMap resolveDiscriminatedResultMap(ResultSet rs, ResultMap resultMap, String columnPrefix) throws SQLException {
+  public ResultMap resolveDiscriminatedResultMap(ResultSet rs, ResultMap resultMap, String columnPrefix)
+      throws SQLException {
     Set<String> pastDiscriminators = new HashSet<>();
     Discriminator discriminator = resultMap.getDiscriminator();
     while (discriminator != null) {
@@ -951,7 +984,8 @@ public ResultMap resolveDiscriminatedResultMap(ResultSet rs, ResultMap resultMap
     return resultMap;
   }
 
-  private Object getDiscriminatorValue(ResultSet rs, Discriminator discriminator, String columnPrefix) throws SQLException {
+  private Object getDiscriminatorValue(ResultSet rs, Discriminator discriminator, String columnPrefix)
+      throws SQLException {
     final ResultMapping resultMapping = discriminator.getResultMapping();
     final TypeHandler<?> typeHandler = resultMapping.getTypeHandler();
     return typeHandler.getResult(rs, prependPrefix(resultMapping.getColumn(), columnPrefix));
@@ -968,7 +1002,8 @@ private String prependPrefix(String columnName, String prefix) {
   // HANDLE NESTED RESULT MAPS
   //
 
-  private void handleRowValuesForNestedResultMap(ResultSetWrapper rsw, ResultMap resultMap, ResultHandler<?> resultHandler, RowBounds rowBounds, ResultMapping parentMapping) throws SQLException {
+  private void handleRowValuesForNestedResultMap(ResultSetWrapper rsw, ResultMap resultMap,
+      ResultHandler<?> resultHandler, RowBounds rowBounds, ResultMapping parentMapping) throws SQLException {
     final DefaultResultContext<Object> resultContext = new DefaultResultContext<>();
     ResultSet resultSet = rsw.getResultSet();
     skipRows(resultSet, rowBounds);
@@ -1003,7 +1038,8 @@ private void handleRowValuesForNestedResultMap(ResultSetWrapper rsw, ResultMap r
   // NESTED RESULT MAP (JOIN MAPPING)
   //
 
-  private boolean applyNestedResultMappings(ResultSetWrapper rsw, ResultMap resultMap, MetaObject metaObject, String parentPrefix, CacheKey parentRowKey, boolean newObject) {
+  private boolean applyNestedResultMappings(ResultSetWrapper rsw, ResultMap resultMap, MetaObject metaObject,
+      String parentPrefix, CacheKey parentRowKey, boolean newObject) {
     boolean foundValues = false;
     for (ResultMapping resultMapping : resultMap.getPropertyResultMappings()) {
       final String nestedResultMapId = resultMapping.getNestedResultMapId();
@@ -1035,7 +1071,8 @@ private boolean applyNestedResultMappings(ResultSetWrapper rsw, ResultMap result
             }
           }
         } catch (SQLException e) {
-          throw new ExecutorException("Error getting nested result map values for '" + resultMapping.getProperty() + "'.  Cause: " + e, e);
+          throw new ExecutorException(
+              "Error getting nested result map values for '" + resultMapping.getProperty() + "'.  Cause: " + e, e);
         }
       }
     }
@@ -1053,7 +1090,8 @@ private String getColumnPrefix(String parentPrefix, ResultMapping resultMapping)
     return columnPrefixBuilder.length() == 0 ? null : columnPrefixBuilder.toString().toUpperCase(Locale.ENGLISH);
   }
 
-  private boolean anyNotNullColumnHasValue(ResultMapping resultMapping, String columnPrefix, ResultSetWrapper rsw) throws SQLException {
+  private boolean anyNotNullColumnHasValue(ResultMapping resultMapping, String columnPrefix, ResultSetWrapper rsw)
+      throws SQLException {
     Set<String> notNullColumns = resultMapping.getNotNullColumns();
     if (notNullColumns != null && !notNullColumns.isEmpty()) {
       ResultSet rs = rsw.getResultSet();
@@ -1075,7 +1113,8 @@ private boolean anyNotNullColumnHasValue(ResultMapping resultMapping, String col
     return true;
   }
 
-  private ResultMap getNestedResultMap(ResultSet rs, String nestedResultMapId, String columnPrefix) throws SQLException {
+  private ResultMap getNestedResultMap(ResultSet rs, String nestedResultMapId, String columnPrefix)
+      throws SQLException {
     ResultMap nestedResultMap = configuration.getResultMap(nestedResultMapId);
     return resolveDiscriminatedResultMap(rs, nestedResultMap, columnPrefix);
   }
@@ -1125,7 +1164,8 @@ private List<ResultMapping> getResultMappingsForRowKey(ResultMap resultMap) {
     return resultMappings;
   }
 
-  private void createRowKeyForMappedProperties(ResultMap resultMap, ResultSetWrapper rsw, CacheKey cacheKey, List<ResultMapping> resultMappings, String columnPrefix) throws SQLException {
+  private void createRowKeyForMappedProperties(ResultMap resultMap, ResultSetWrapper rsw, CacheKey cacheKey,
+      List<ResultMapping> resultMappings, String columnPrefix) throws SQLException {
     for (ResultMapping resultMapping : resultMappings) {
       if (resultMapping.isSimple()) {
         final String column = prependPrefix(resultMapping.getColumn(), columnPrefix);
@@ -1143,7 +1183,8 @@ private void createRowKeyForMappedProperties(ResultMap resultMap, ResultSetWrapp
     }
   }
 
-  private void createRowKeyForUnmappedProperties(ResultMap resultMap, ResultSetWrapper rsw, CacheKey cacheKey, String columnPrefix) throws SQLException {
+  private void createRowKeyForUnmappedProperties(ResultMap resultMap, ResultSetWrapper rsw, CacheKey cacheKey,
+      String columnPrefix) throws SQLException {
     final MetaClass metaType = MetaClass.forClass(resultMap.getType(), reflectorFactory);
     List<String> unmappedColumnNames = rsw.getUnmappedColumnNames(resultMap, columnPrefix);
     for (String column : unmappedColumnNames) {
@@ -1202,7 +1243,9 @@ private Object instantiateCollectionPropertyIfAppropriate(ResultMapping resultMa
           return propertyValue;
         }
       } catch (Exception e) {
-        throw new ExecutorException("Error instantiating collection property for result '" + resultMapping.getProperty() + "'.  Cause: " + e, e);
+        throw new ExecutorException(
+            "Error instantiating collection property for result '" + resultMapping.getProperty() + "'.  Cause: " + e,
+            e);
       }
     } else if (objectFactory.isCollection(propertyValue.getClass())) {
       return propertyValue;
diff --git a/src/main/java/org/apache/ibatis/io/VFS.java b/src/main/java/org/apache/ibatis/io/VFS.java
index 13fdaddaea1..f7ed89597ba 100644
--- a/src/main/java/org/apache/ibatis/io/VFS.java
+++ b/src/main/java/org/apache/ibatis/io/VFS.java
@@ -61,10 +61,10 @@ static VFS createVFS() {
         try {
           vfs = impl.getDeclaredConstructor().newInstance();
           if (!vfs.isValid() && log.isDebugEnabled()) {
-            log.debug("VFS implementation " + impl.getName()
-                + " is not valid in this environment.");
+            log.debug("VFS implementation " + impl.getName() + " is not valid in this environment.");
           }
-        } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
+        } catch (InstantiationException | IllegalAccessException | NoSuchMethodException
+            | InvocationTargetException e) {
           log.error("Failed to instantiate " + impl, e);
           return null;
         }
@@ -89,10 +89,11 @@ public static VFS getInstance() {
   }
 
   /**
-   * Adds the specified class to the list of {@link VFS} implementations. Classes added in this
-   * manner are tried in the order they are added and before any of the built-in implementations.
+   * Adds the specified class to the list of {@link VFS} implementations. Classes added in this manner are tried in the
+   * order they are added and before any of the built-in implementations.
    *
-   * @param clazz The {@link VFS} implementation class to add.
+   * @param clazz
+   *          The {@link VFS} implementation class to add.
    */
   public static void addImplClass(Class<? extends VFS> clazz) {
     if (clazz != null) {
@@ -105,6 +106,7 @@ public static void addImplClass(Class<? extends VFS> clazz) {
    *
    * @param className
    *          the class name
+   *
    * @return the class
    */
   protected static Class<?> getClass(String className) {
@@ -128,6 +130,7 @@ protected static Class<?> getClass(String className) {
    *          The name of the method.
    * @param parameterTypes
    *          The types of the parameters accepted by the method.
+   *
    * @return the method
    */
   protected static Method getMethod(Class<?> clazz, String methodName, Class<?>... parameterTypes) {
@@ -156,7 +159,9 @@ protected static Method getMethod(Class<?> clazz, String methodName, Class<?>...
    *          The instance or class (for static methods) on which to invoke the method.
    * @param parameters
    *          The parameters to pass to the method.
+   *
    * @return Whatever the method returns.
+   *
    * @throws IOException
    *           If I/O errors occur
    * @throws RuntimeException
@@ -179,12 +184,15 @@ protected static <T> T invoke(Method method, Object object, Object... parameters
   }
 
   /**
-   * Get a list of {@link URL}s from the context classloader for all the resources found at the
-   * specified path.
+   * Get a list of {@link URL}s from the context classloader for all the resources found at the specified path.
+   *
+   * @param path
+   *          The resource path.
    *
-   * @param path The resource path.
    * @return A list of {@link URL}s, as returned by {@link ClassLoader#getResources(String)}.
-   * @throws IOException If I/O errors occur
+   *
+   * @throws IOException
+   *           If I/O errors occur
    */
   protected static List<URL> getResources(String path) throws IOException {
     return Collections.list(Thread.currentThread().getContextClassLoader().getResources(path));
@@ -198,24 +206,32 @@ protected static List<URL> getResources(String path) throws IOException {
   public abstract boolean isValid();
 
   /**
-   * Recursively list the full resource path of all the resources that are children of the
-   * resource identified by a URL.
+   * Recursively list the full resource path of all the resources that are children of the resource identified by a URL.
+   *
+   * @param url
+   *          The URL that identifies the resource to list.
+   * @param forPath
+   *          The path to the resource that is identified by the URL. Generally, this is the value passed to
+   *          {@link #getResources(String)} to get the resource URL.
    *
-   * @param url The URL that identifies the resource to list.
-   * @param forPath The path to the resource that is identified by the URL. Generally, this is the
-   *            value passed to {@link #getResources(String)} to get the resource URL.
    * @return A list containing the names of the child resources.
-   * @throws IOException If I/O errors occur
+   *
+   * @throws IOException
+   *           If I/O errors occur
    */
   protected abstract List<String> list(URL url, String forPath) throws IOException;
 
   /**
-   * Recursively list the full resource path of all the resources that are children of all the
-   * resources found at the specified path.
+   * Recursively list the full resource path of all the resources that are children of all the resources found at the
+   * specified path.
+   *
+   * @param path
+   *          The path of the resource(s) to list.
    *
-   * @param path The path of the resource(s) to list.
    * @return A list containing the names of the child resources.
-   * @throws IOException If I/O errors occur
+   *
+   * @throws IOException
+   *           If I/O errors occur
    */
   public List<String> list(String path) throws IOException {
     List<String> names = new ArrayList<>();
diff --git a/src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java b/src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java
index 0ae588d1182..3a75c1ccdea 100644
--- a/src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java
+++ b/src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java
@@ -52,7 +52,9 @@ public T SET(String sets) {
    *
    * @param sets
    *          the sets
+   *
    * @return the t
+   *
    * @since 3.4.2
    */
   public T SET(String... sets) {
@@ -77,7 +79,9 @@ public T VALUES(String columns, String values) {
    *
    * @param columns
    *          the columns
+   *
    * @return the t
+   *
    * @since 3.4.2
    */
   public T INTO_COLUMNS(String... columns) {
@@ -90,7 +94,9 @@ public T INTO_COLUMNS(String... columns) {
    *
    * @param values
    *          the values
+   *
    * @return the t
+   *
    * @since 3.4.2
    */
   public T INTO_VALUES(String... values) {
@@ -110,7 +116,9 @@ public T SELECT(String columns) {
    *
    * @param columns
    *          the columns
+   *
    * @return the t
+   *
    * @since 3.4.2
    */
   public T SELECT(String... columns) {
@@ -130,7 +138,9 @@ public T SELECT_DISTINCT(String columns) {
    *
    * @param columns
    *          the columns
+   *
    * @return the t
+   *
    * @since 3.4.2
    */
   public T SELECT_DISTINCT(String... columns) {
@@ -155,7 +165,9 @@ public T FROM(String table) {
    *
    * @param tables
    *          the tables
+   *
    * @return the t
+   *
    * @since 3.4.2
    */
   public T FROM(String... tables) {
@@ -173,7 +185,9 @@ public T JOIN(String join) {
    *
    * @param joins
    *          the joins
+   *
    * @return the t
+   *
    * @since 3.4.2
    */
   public T JOIN(String... joins) {
@@ -191,7 +205,9 @@ public T INNER_JOIN(String join) {
    *
    * @param joins
    *          the joins
+   *
    * @return the t
+   *
    * @since 3.4.2
    */
   public T INNER_JOIN(String... joins) {
@@ -209,7 +225,9 @@ public T LEFT_OUTER_JOIN(String join) {
    *
    * @param joins
    *          the joins
+   *
    * @return the t
+   *
    * @since 3.4.2
    */
   public T LEFT_OUTER_JOIN(String... joins) {
@@ -227,7 +245,9 @@ public T RIGHT_OUTER_JOIN(String join) {
    *
    * @param joins
    *          the joins
+   *
    * @return the t
+   *
    * @since 3.4.2
    */
   public T RIGHT_OUTER_JOIN(String... joins) {
@@ -245,7 +265,9 @@ public T OUTER_JOIN(String join) {
    *
    * @param joins
    *          the joins
+   *
    * @return the t
+   *
    * @since 3.4.2
    */
   public T OUTER_JOIN(String... joins) {
@@ -264,7 +286,9 @@ public T WHERE(String conditions) {
    *
    * @param conditions
    *          the conditions
+   *
    * @return the t
+   *
    * @since 3.4.2
    */
   public T WHERE(String... conditions) {
@@ -293,7 +317,9 @@ public T GROUP_BY(String columns) {
    *
    * @param columns
    *          the columns
+   *
    * @return the t
+   *
    * @since 3.4.2
    */
   public T GROUP_BY(String... columns) {
@@ -312,7 +338,9 @@ public T HAVING(String conditions) {
    *
    * @param conditions
    *          the conditions
+   *
    * @return the t
+   *
    * @since 3.4.2
    */
   public T HAVING(String... conditions) {
@@ -331,7 +359,9 @@ public T ORDER_BY(String columns) {
    *
    * @param columns
    *          the columns
+   *
    * @return the t
+   *
    * @since 3.4.2
    */
   public T ORDER_BY(String... columns) {
@@ -342,9 +372,13 @@ public T ORDER_BY(String... columns) {
   /**
    * Set the limit variable string(e.g. {@code "#{limit}"}).
    *
-   * @param variable a limit variable string
+   * @param variable
+   *          a limit variable string
+   *
    * @return a self instance
+   *
    * @see #OFFSET(String)
+   *
    * @since 3.5.2
    */
   public T LIMIT(String variable) {
@@ -356,9 +390,13 @@ public T LIMIT(String variable) {
   /**
    * Set the limit value.
    *
-   * @param value an offset value
+   * @param value
+   *          an offset value
+   *
    * @return a self instance
+   *
    * @see #OFFSET(long)
+   *
    * @since 3.5.2
    */
   public T LIMIT(int value) {
@@ -368,9 +406,13 @@ public T LIMIT(int value) {
   /**
    * Set the offset variable string(e.g. {@code "#{offset}"}).
    *
-   * @param variable a offset variable string
+   * @param variable
+   *          a offset variable string
+   *
    * @return a self instance
+   *
    * @see #LIMIT(String)
+   *
    * @since 3.5.2
    */
   public T OFFSET(String variable) {
@@ -382,9 +424,13 @@ public T OFFSET(String variable) {
   /**
    * Set the offset value.
    *
-   * @param value an offset value
+   * @param value
+   *          an offset value
+   *
    * @return a self instance
+   *
    * @see #LIMIT(int)
+   *
    * @since 3.5.2
    */
   public T OFFSET(long value) {
@@ -394,9 +440,13 @@ public T OFFSET(long value) {
   /**
    * Set the fetch first rows variable string(e.g. {@code "#{fetchFirstRows}"}).
    *
-   * @param variable a fetch first rows variable string
+   * @param variable
+   *          a fetch first rows variable string
+   *
    * @return a self instance
+   *
    * @see #OFFSET_ROWS(String)
+   *
    * @since 3.5.2
    */
   public T FETCH_FIRST_ROWS_ONLY(String variable) {
@@ -408,9 +458,13 @@ public T FETCH_FIRST_ROWS_ONLY(String variable) {
   /**
    * Set the fetch first rows value.
    *
-   * @param value a fetch first rows value
+   * @param value
+   *          a fetch first rows value
+   *
    * @return a self instance
+   *
    * @see #OFFSET_ROWS(long)
+   *
    * @since 3.5.2
    */
   public T FETCH_FIRST_ROWS_ONLY(int value) {
@@ -420,9 +474,13 @@ public T FETCH_FIRST_ROWS_ONLY(int value) {
   /**
    * Set the offset rows variable string(e.g. {@code "#{offset}"}).
    *
-   * @param variable a offset rows variable string
+   * @param variable
+   *          a offset rows variable string
+   *
    * @return a self instance
+   *
    * @see #FETCH_FIRST_ROWS_ONLY(String)
+   *
    * @since 3.5.2
    */
   public T OFFSET_ROWS(String variable) {
@@ -434,9 +492,13 @@ public T OFFSET_ROWS(String variable) {
   /**
    * Set the offset rows value.
    *
-   * @param value an offset rows value
+   * @param value
+   *          an offset rows value
+   *
    * @return a self instance
+   *
    * @see #FETCH_FIRST_ROWS_ONLY(int)
+   *
    * @since 3.5.2
    */
   public T OFFSET_ROWS(long value) {
@@ -447,6 +509,7 @@ public T OFFSET_ROWS(long value) {
    * used to add a new inserted row while do multi-row insert.
    *
    * @return the t
+   *
    * @since 3.5.2
    */
   public T ADD_ROW() {
@@ -564,7 +627,7 @@ public SQLStatement() {
     }
 
     private void sqlClause(SafeAppendable builder, String keyword, List<String> parts, String open, String close,
-                           String conjunction) {
+        String conjunction) {
       if (!parts.isEmpty()) {
         if (!builder.isEmpty()) {
           builder.append("\n");
diff --git a/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java b/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
index f6b4ee2fcfd..38b553d42db 100644
--- a/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
+++ b/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
@@ -41,7 +41,8 @@ public class ScriptRunner {
 
   private static final String DEFAULT_DELIMITER = ";";
 
-  private static final Pattern DELIMITER_PATTERN = Pattern.compile("^\\s*((--)|(//))?\\s*(//)?\\s*@DELIMITER\\s+([^\\s]+)", Pattern.CASE_INSENSITIVE);
+  private static final Pattern DELIMITER_PATTERN = Pattern
+      .compile("^\\s*((--)|(//))?\\s*(//)?\\s*@DELIMITER\\s+([^\\s]+)", Pattern.CASE_INSENSITIVE);
 
   private final Connection connection;
 
@@ -87,6 +88,7 @@ public void setRemoveCRs(boolean removeCRs) {
    *
    * @param escapeProcessing
    *          the new escape processing
+   *
    * @since 3.1.1
    */
   public void setEscapeProcessing(boolean escapeProcessing) {
diff --git a/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java b/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java
index 30cc5e812d7..dbd09de5675 100644
--- a/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java
+++ b/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java
@@ -55,10 +55,15 @@ public void setUseGeneratedKeySupport(boolean useGeneratedKeySupport) {
   /**
    * Executes a SELECT statement that returns one row.
    *
-   * @param sql  The SQL
-   * @param args The arguments to be set on the statement.
+   * @param sql
+   *          The SQL
+   * @param args
+   *          The arguments to be set on the statement.
+   *
    * @return The row expected.
-   * @throws SQLException If less or more than one row is returned
+   *
+   * @throws SQLException
+   *           If less or more than one row is returned
    */
   public Map<String, Object> selectOne(String sql, Object... args) throws SQLException {
     List<Map<String, Object>> results = selectAll(sql, args);
@@ -71,10 +76,15 @@ public Map<String, Object> selectOne(String sql, Object... args) throws SQLExcep
   /**
    * Executes a SELECT statement that returns multiple rows.
    *
-   * @param sql  The SQL
-   * @param args The arguments to be set on the statement.
+   * @param sql
+   *          The SQL
+   * @param args
+   *          The arguments to be set on the statement.
+   *
    * @return The list of rows expected.
-   * @throws SQLException If statement preparation or execution fails
+   *
+   * @throws SQLException
+   *           If statement preparation or execution fails
    */
   public List<Map<String, Object>> selectAll(String sql, Object... args) throws SQLException {
     try (PreparedStatement ps = connection.prepareStatement(sql)) {
@@ -88,10 +98,15 @@ public List<Map<String, Object>> selectAll(String sql, Object... args) throws SQ
   /**
    * Executes an INSERT statement.
    *
-   * @param sql  The SQL
-   * @param args The arguments to be set on the statement.
+   * @param sql
+   *          The SQL
+   * @param args
+   *          The arguments to be set on the statement.
+   *
    * @return The number of rows impacted or BATCHED_RESULTS if the statements are being batched.
-   * @throws SQLException If statement preparation or execution fails
+   *
+   * @throws SQLException
+   *           If statement preparation or execution fails
    */
   public int insert(String sql, Object... args) throws SQLException {
     PreparedStatement ps;
@@ -116,7 +131,7 @@ public int insert(String sql, Object... args) throws SQLException {
                 try {
                   return Integer.parseInt(genkey.toString());
                 } catch (NumberFormatException e) {
-                  //ignore, no numeric key support
+                  // ignore, no numeric key support
                 }
               }
             }
@@ -128,7 +143,7 @@ public int insert(String sql, Object... args) throws SQLException {
       try {
         ps.close();
       } catch (SQLException e) {
-        //ignore
+        // ignore
       }
     }
   }
@@ -136,10 +151,15 @@ public int insert(String sql, Object... args) throws SQLException {
   /**
    * Executes an UPDATE statement.
    *
-   * @param sql  The SQL
-   * @param args The arguments to be set on the statement.
+   * @param sql
+   *          The SQL
+   * @param args
+   *          The arguments to be set on the statement.
+   *
    * @return The number of rows impacted or BATCHED_RESULTS if the statements are being batched.
-   * @throws SQLException If statement preparation or execution fails
+   *
+   * @throws SQLException
+   *           If statement preparation or execution fails
    */
   public int update(String sql, Object... args) throws SQLException {
     try (PreparedStatement ps = connection.prepareStatement(sql)) {
@@ -151,21 +171,28 @@ public int update(String sql, Object... args) throws SQLException {
   /**
    * Executes a DELETE statement.
    *
-   * @param sql  The SQL
-   * @param args The arguments to be set on the statement.
+   * @param sql
+   *          The SQL
+   * @param args
+   *          The arguments to be set on the statement.
+   *
    * @return The number of rows impacted or BATCHED_RESULTS if the statements are being batched.
-   * @throws SQLException If statement preparation or execution fails
+   *
+   * @throws SQLException
+   *           If statement preparation or execution fails
    */
   public int delete(String sql, Object... args) throws SQLException {
     return update(sql, args);
   }
 
   /**
-   * Executes any string as a JDBC Statement.
-   * Good for DDL
+   * Executes any string as a JDBC Statement. Good for DDL
+   *
+   * @param sql
+   *          The SQL
    *
-   * @param sql The SQL
-   * @throws SQLException If statement preparation or execution fails
+   * @throws SQLException
+   *           If statement preparation or execution fails
    */
   public void run(String sql) throws SQLException {
     try (Statement stmt = connection.createStatement()) {
@@ -181,14 +208,15 @@ public void closeConnection() {
     try {
       connection.close();
     } catch (SQLException e) {
-      //ignore
+      // ignore
     }
   }
 
   private void setParameters(PreparedStatement ps, Object... args) throws SQLException {
     for (int i = 0, n = args.length; i < n; i++) {
       if (args[i] == null) {
-        throw new SQLException("SqlRunner requires an instance of Null to represent typed null values for JDBC compatibility");
+        throw new SQLException(
+            "SqlRunner requires an instance of Null to represent typed null values for JDBC compatibility");
       } else if (args[i] instanceof Null) {
         ((Null) args[i]).getTypeHandler().setParameter(ps, i + 1, null, ((Null) args[i]).getJdbcType());
       } else {
diff --git a/src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java b/src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java
index dd6601dac00..d20ddfef5c6 100644
--- a/src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java
+++ b/src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java
@@ -65,10 +65,8 @@ public BaseJdbcLogger(Log log, int queryStack) {
 
   static {
     SET_METHODS = Arrays.stream(PreparedStatement.class.getDeclaredMethods())
-            .filter(method -> method.getName().startsWith("set"))
-            .filter(method -> method.getParameterCount() > 1)
-            .map(Method::getName)
-            .collect(Collectors.toSet());
+        .filter(method -> method.getName().startsWith("set")).filter(method -> method.getParameterCount() > 1)
+        .map(Method::getName).collect(Collectors.toSet());
 
     EXECUTE_METHODS.add("execute");
     EXECUTE_METHODS.add("executeUpdate");
diff --git a/src/main/java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java b/src/main/java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java
index d207d0fb567..f23f77844b6 100644
--- a/src/main/java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java
+++ b/src/main/java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java
@@ -30,7 +30,6 @@
  *
  * @author Clinton Begin
  * @author Eduardo Macarron
- *
  */
 public final class ConnectionLogger extends BaseJdbcLogger implements InvocationHandler {
 
@@ -42,8 +41,7 @@ private ConnectionLogger(Connection conn, Log statementLog, int queryStack) {
   }
 
   @Override
-  public Object invoke(Object proxy, Method method, Object[] params)
-      throws Throwable {
+  public Object invoke(Object proxy, Method method, Object[] params) throws Throwable {
     try {
       if (Object.class.equals(method.getDeclaringClass())) {
         return method.invoke(this, params);
@@ -76,12 +74,13 @@ public Object invoke(Object proxy, Method method, Object[] params)
    *          the statement log
    * @param queryStack
    *          the query stack
+   *
    * @return the connection with logging
    */
   public static Connection newInstance(Connection conn, Log statementLog, int queryStack) {
     InvocationHandler handler = new ConnectionLogger(conn, statementLog, queryStack);
     ClassLoader cl = Connection.class.getClassLoader();
-    return (Connection) Proxy.newProxyInstance(cl, new Class[]{Connection.class}, handler);
+    return (Connection) Proxy.newProxyInstance(cl, new Class[] { Connection.class }, handler);
   }
 
   /**
diff --git a/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java b/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java
index 5fbc5be247f..8d546b20e92 100644
--- a/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java
+++ b/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java
@@ -30,7 +30,6 @@
  *
  * @author Clinton Begin
  * @author Eduardo Macarron
- *
  */
 public final class PreparedStatementLogger extends BaseJdbcLogger implements InvocationHandler {
 
@@ -85,15 +84,20 @@ public Object invoke(Object proxy, Method method, Object[] params) throws Throwa
   /**
    * Creates a logging version of a PreparedStatement.
    *
-   * @param stmt - the statement
-   * @param statementLog - the statement log
-   * @param queryStack - the query stack
+   * @param stmt
+   *          - the statement
+   * @param statementLog
+   *          - the statement log
+   * @param queryStack
+   *          - the query stack
+   *
    * @return - the proxy
    */
   public static PreparedStatement newInstance(PreparedStatement stmt, Log statementLog, int queryStack) {
     InvocationHandler handler = new PreparedStatementLogger(stmt, statementLog, queryStack);
     ClassLoader cl = PreparedStatement.class.getClassLoader();
-    return (PreparedStatement) Proxy.newProxyInstance(cl, new Class[]{PreparedStatement.class, CallableStatement.class}, handler);
+    return (PreparedStatement) Proxy.newProxyInstance(cl,
+        new Class[] { PreparedStatement.class, CallableStatement.class }, handler);
   }
 
   /**
diff --git a/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java b/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java
index 46d32d3b42c..d703b6e5bf8 100644
--- a/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java
+++ b/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java
@@ -34,7 +34,6 @@
  *
  * @author Clinton Begin
  * @author Eduardo Macarron
- *
  */
 public final class ResultSetLogger extends BaseJdbcLogger implements InvocationHandler {
 
@@ -127,12 +126,13 @@ private void printColumnValues(int columnCount) {
    *          the statement log
    * @param queryStack
    *          the query stack
+   *
    * @return the ResultSet with logging
    */
   public static ResultSet newInstance(ResultSet rs, Log statementLog, int queryStack) {
     InvocationHandler handler = new ResultSetLogger(rs, statementLog, queryStack);
     ClassLoader cl = ResultSet.class.getClassLoader();
-    return (ResultSet) Proxy.newProxyInstance(cl, new Class[]{ResultSet.class}, handler);
+    return (ResultSet) Proxy.newProxyInstance(cl, new Class[] { ResultSet.class }, handler);
   }
 
   /**
diff --git a/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java b/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java
index 82463dceb2f..19c551ab5fc 100644
--- a/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java
+++ b/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java
@@ -29,7 +29,6 @@
  *
  * @author Clinton Begin
  * @author Eduardo Macarron
- *
  */
 public final class StatementLogger extends BaseJdbcLogger implements InvocationHandler {
 
@@ -76,12 +75,13 @@ public Object invoke(Object proxy, Method method, Object[] params) throws Throwa
    *          the statement log
    * @param queryStack
    *          the query stack
+   *
    * @return the proxy
    */
   public static Statement newInstance(Statement stmt, Log statementLog, int queryStack) {
     InvocationHandler handler = new StatementLogger(stmt, statementLog, queryStack);
     ClassLoader cl = Statement.class.getClassLoader();
-    return (Statement) Proxy.newProxyInstance(cl, new Class[]{Statement.class}, handler);
+    return (Statement) Proxy.newProxyInstance(cl, new Class[] { Statement.class }, handler);
   }
 
   /**
diff --git a/src/main/java/org/apache/ibatis/logging/log4j/Log4jImpl.java b/src/main/java/org/apache/ibatis/logging/log4j/Log4jImpl.java
index d241190f1c5..0c2cd9e7cb5 100644
--- a/src/main/java/org/apache/ibatis/logging/log4j/Log4jImpl.java
+++ b/src/main/java/org/apache/ibatis/logging/log4j/Log4jImpl.java
@@ -21,6 +21,7 @@
 
 /**
  * @author Eduardo Macarron
+ *
  * @deprecated Since 3.5.9 - See https://github.com/mybatis/mybatis-3/issues/1223. This class will remove future.
  */
 @Deprecated
diff --git a/src/main/java/org/apache/ibatis/logging/log4j/package-info.java b/src/main/java/org/apache/ibatis/logging/log4j/package-info.java
index a99a6034c8c..a4f7847d39a 100644
--- a/src/main/java/org/apache/ibatis/logging/log4j/package-info.java
+++ b/src/main/java/org/apache/ibatis/logging/log4j/package-info.java
@@ -15,6 +15,7 @@
  */
 /**
  * logger using Log4J feature.
+ *
  * @deprecated Since 3.5.9 - See https://github.com/mybatis/mybatis-3/issues/1223. This package will remove future.
  */
 package org.apache.ibatis.logging.log4j;
diff --git a/src/main/java/org/apache/ibatis/logging/slf4j/Slf4jImpl.java b/src/main/java/org/apache/ibatis/logging/slf4j/Slf4jImpl.java
index 5f36ba3e271..62483897521 100644
--- a/src/main/java/org/apache/ibatis/logging/slf4j/Slf4jImpl.java
+++ b/src/main/java/org/apache/ibatis/logging/slf4j/Slf4jImpl.java
@@ -35,7 +35,8 @@ public Slf4jImpl(String clazz) {
     if (logger instanceof LocationAwareLogger) {
       try {
         // check for slf4j >= 1.6 method signature
-        logger.getClass().getMethod("log", Marker.class, String.class, int.class, String.class, Object[].class, Throwable.class);
+        logger.getClass().getMethod("log", Marker.class, String.class, int.class, String.class, Object[].class,
+            Throwable.class);
         log = new Slf4jLocationAwareLoggerImpl((LocationAwareLogger) logger);
         return;
       } catch (SecurityException | NoSuchMethodException e) {
diff --git a/src/main/java/org/apache/ibatis/mapping/BoundSql.java b/src/main/java/org/apache/ibatis/mapping/BoundSql.java
index 511f6ba761e..aa23248f35e 100644
--- a/src/main/java/org/apache/ibatis/mapping/BoundSql.java
+++ b/src/main/java/org/apache/ibatis/mapping/BoundSql.java
@@ -24,10 +24,9 @@
 import org.apache.ibatis.session.Configuration;
 
 /**
- * An actual SQL String got from an {@link SqlSource} after having processed any dynamic content.
- * The SQL may have SQL placeholders "?" and a list (ordered) of a parameter mappings
- * with the additional information for each parameter (at least the property name of the input object to read
- * the value from).
+ * An actual SQL String got from an {@link SqlSource} after having processed any dynamic content. The SQL may have SQL
+ * placeholders "?" and a list (ordered) of a parameter mappings with the additional information for each parameter (at
+ * least the property name of the input object to read the value from).
  * <p>
  * Can also have additional parameters that are created by the dynamic language (for loops, bind...).
  *
@@ -41,7 +40,8 @@ public class BoundSql {
   private final Map<String, Object> additionalParameters;
   private final MetaObject metaParameters;
 
-  public BoundSql(Configuration configuration, String sql, List<ParameterMapping> parameterMappings, Object parameterObject) {
+  public BoundSql(Configuration configuration, String sql, List<ParameterMapping> parameterMappings,
+      Object parameterObject) {
     this.sql = sql;
     this.parameterMappings = parameterMappings;
     this.parameterObject = parameterObject;
diff --git a/src/test/java/org/apache/ibatis/submitted/blocking_cache/BlockingCacheTest.java b/src/test/java/org/apache/ibatis/submitted/blocking_cache/BlockingCacheTest.java
index 03eec621cda..5a567f2d554 100644
--- a/src/test/java/org/apache/ibatis/submitted/blocking_cache/BlockingCacheTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/blocking_cache/BlockingCacheTest.java
@@ -36,13 +36,14 @@ class BlockingCacheTest {
   @BeforeEach
   void setUp() throws Exception {
     // create a SqlSessionFactory
-    try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/blocking_cache/mybatis-config.xml")) {
+    try (Reader reader = Resources
+        .getResourceAsReader("org/apache/ibatis/submitted/blocking_cache/mybatis-config.xml")) {
       sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
     }
 
     // populate in-memory database
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-            "org/apache/ibatis/submitted/blocking_cache/CreateDB.sql");
+        "org/apache/ibatis/submitted/blocking_cache/CreateDB.sql");
   }
 
   @Test
diff --git a/src/test/java/org/apache/ibatis/submitted/cacheorder/CacheOrderTest.java b/src/test/java/org/apache/ibatis/submitted/cacheorder/CacheOrderTest.java
index 197193f3476..fa97346808c 100644
--- a/src/test/java/org/apache/ibatis/submitted/cacheorder/CacheOrderTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/cacheorder/CacheOrderTest.java
@@ -41,7 +41,7 @@ static void setUp() throws Exception {
 
     // populate in-memory database
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-            "org/apache/ibatis/submitted/cacheorder/CreateDB.sql");
+        "org/apache/ibatis/submitted/cacheorder/CreateDB.sql");
   }
 
   @Test
diff --git a/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls/CallSettersOnNullsTest.java b/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls/CallSettersOnNullsTest.java
index fad1a6157d4..ce5dfb50b14 100644
--- a/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls/CallSettersOnNullsTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls/CallSettersOnNullsTest.java
@@ -42,7 +42,7 @@ static void setUp() throws Exception {
 
     // populate in-memory database
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-            "org/apache/ibatis/submitted/call_setters_on_nulls/CreateDB.sql");
+        "org/apache/ibatis/submitted/call_setters_on_nulls/CreateDB.sql");
   }
 
   @Test
diff --git a/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls/DoNotCallSettersOnNullsTest.java b/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls/DoNotCallSettersOnNullsTest.java
index 063c0f2ffd8..ca616eba103 100644
--- a/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls/DoNotCallSettersOnNullsTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls/DoNotCallSettersOnNullsTest.java
@@ -34,13 +34,14 @@ class DoNotCallSettersOnNullsTest {
   @BeforeAll
   static void setUp() throws Exception {
     // create a SqlSessionFactory
-    try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/call_setters_on_nulls/mybatis-config-2.xml")) {
+    try (Reader reader = Resources
+        .getResourceAsReader("org/apache/ibatis/submitted/call_setters_on_nulls/mybatis-config-2.xml")) {
       sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
     }
 
     // populate in-memory database
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-            "org/apache/ibatis/submitted/call_setters_on_nulls/CreateDB.sql");
+        "org/apache/ibatis/submitted/call_setters_on_nulls/CreateDB.sql");
   }
 
   @Test
diff --git a/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls_again/MyBatisTest.java b/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls_again/MyBatisTest.java
index 21bf5cc6b67..a7643feb447 100644
--- a/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls_again/MyBatisTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls_again/MyBatisTest.java
@@ -32,7 +32,8 @@ class MyBatisTest {
   @BeforeAll
   static void setUp() throws Exception {
     // create an SqlSessionFactory
-    try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/call_setters_on_nulls_again/mybatis-config.xml")) {
+    try (Reader reader = Resources
+        .getResourceAsReader("org/apache/ibatis/submitted/call_setters_on_nulls_again/mybatis-config.xml")) {
       sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
     }
   }
diff --git a/src/test/java/org/apache/ibatis/submitted/camelcase/CamelCaseMappingTest.java b/src/test/java/org/apache/ibatis/submitted/camelcase/CamelCaseMappingTest.java
index 269b25dfd01..e0210c289d6 100644
--- a/src/test/java/org/apache/ibatis/submitted/camelcase/CamelCaseMappingTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/camelcase/CamelCaseMappingTest.java
@@ -39,7 +39,7 @@ static void setUp() throws Exception {
     }
 
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-            "org/apache/ibatis/submitted/camelcase/CreateDB.sql");
+        "org/apache/ibatis/submitted/camelcase/CreateDB.sql");
   }
 
   @Test
diff --git a/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPELazyTest.java b/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPELazyTest.java
index fa28ba9b446..821a41ae594 100644
--- a/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPELazyTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPELazyTest.java
@@ -32,14 +32,15 @@ class CglibNPELazyTest {
 
   @BeforeAll
   static void initDatabase() throws Exception {
-    try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/cglib_lazy_error/ibatisConfigLazy.xml")) {
+    try (Reader reader = Resources
+        .getResourceAsReader("org/apache/ibatis/submitted/cglib_lazy_error/ibatisConfigLazy.xml")) {
       sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
       sqlSessionFactory.getConfiguration().setLazyLoadingEnabled(true);
       sqlSessionFactory.getConfiguration().setAggressiveLazyLoading(false);
     }
 
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-            "org/apache/ibatis/submitted/cglib_lazy_error/CreateDB.sql");
+        "org/apache/ibatis/submitted/cglib_lazy_error/CreateDB.sql");
   }
 
   @Test
diff --git a/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java b/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java
index 7a8714d4fbc..5ba97fc9373 100644
--- a/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java
+++ b/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java
@@ -32,12 +32,13 @@ class CglibNPETest {
 
   @BeforeAll
   static void initDatabase() throws Exception {
-    try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/cglib_lazy_error/ibatisConfig.xml")) {
+    try (Reader reader = Resources
+        .getResourceAsReader("org/apache/ibatis/submitted/cglib_lazy_error/ibatisConfig.xml")) {
       sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
     }
 
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-            "org/apache/ibatis/submitted/cglib_lazy_error/CreateDB.sql");
+        "org/apache/ibatis/submitted/cglib_lazy_error/CreateDB.sql");
   }
 
   @Test
@@ -102,7 +103,7 @@ void testAncestorAfterQueryingParents() {
 
   @Test
   void testInsertBetweenTwoSelects() {
-    try (SqlSession sqlSession = sqlSessionFactory.openSession()){
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
       Person selected1 = personMapper.selectById(1);
       Person selected2 = personMapper.selectById(2);
diff --git a/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/Person.java b/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/Person.java
index 634189acd9d..d6dbbfa96cd 100644
--- a/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/Person.java
+++ b/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/Person.java
@@ -32,12 +32,15 @@ public Person getAncestor() {
 
   @Override
   public boolean equals(Object o) {
-    if (this == o) return true;
-    if (!(o instanceof Person)) return false;
+    if (this == o)
+      return true;
+    if (!(o instanceof Person))
+      return false;
 
     Person person = (Person) o;
 
-    if (id != null ? !id.equals(person.id) : person.id != null) return false;
+    if (id != null ? !id.equals(person.id) : person.id != null)
+      return false;
 
     return true;
   }
@@ -49,7 +52,7 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return id + ": " + firstName + " " + lastName + " ("+parent+")";
+    return id + ": " + firstName + " " + lastName + " (" + parent + ")";
   }
 
   public String getFirstName() {
diff --git a/src/test/java/org/apache/ibatis/submitted/collectionparameters/CollectionParametersTest.java b/src/test/java/org/apache/ibatis/submitted/collectionparameters/CollectionParametersTest.java
index a4cd27cbe99..d22d1382402 100644
--- a/src/test/java/org/apache/ibatis/submitted/collectionparameters/CollectionParametersTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/collectionparameters/CollectionParametersTest.java
@@ -37,13 +37,14 @@ class CollectionParametersTest {
   @BeforeAll
   static void setUp() throws Exception {
     // create an SqlSessionFactory
-    try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/collectionparameters/mybatis-config.xml")) {
+    try (Reader reader = Resources
+        .getResourceAsReader("org/apache/ibatis/submitted/collectionparameters/mybatis-config.xml")) {
       sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
     }
 
     // populate in-memory database
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-            "org/apache/ibatis/submitted/collectionparameters/CreateDB.sql");
+        "org/apache/ibatis/submitted/collectionparameters/CreateDB.sql");
   }
 
   @Test
diff --git a/src/test/java/org/apache/ibatis/submitted/column_forwarding/ColumnForwardingTest.java b/src/test/java/org/apache/ibatis/submitted/column_forwarding/ColumnForwardingTest.java
index 1b7b9450d34..3246e73743e 100644
--- a/src/test/java/org/apache/ibatis/submitted/column_forwarding/ColumnForwardingTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/column_forwarding/ColumnForwardingTest.java
@@ -33,13 +33,14 @@ class ColumnForwardingTest {
   @BeforeAll
   static void setUp() throws Exception {
     // create a SqlSessionFactory
-    try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/column_forwarding/mybatis-config.xml")) {
+    try (Reader reader = Resources
+        .getResourceAsReader("org/apache/ibatis/submitted/column_forwarding/mybatis-config.xml")) {
       sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
     }
 
     // populate in-memory database
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-            "org/apache/ibatis/submitted/column_forwarding/CreateDB.sql");
+        "org/apache/ibatis/submitted/column_forwarding/CreateDB.sql");
   }
 
   @Test
diff --git a/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixAutoMappingTest.java b/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixAutoMappingTest.java
index 70c8323f5c3..035fe31b5b2 100644
--- a/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixAutoMappingTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixAutoMappingTest.java
@@ -44,7 +44,8 @@ protected String getConfigPath() {
   @Test
   void testCaseInsensitivity() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
-      Brand brand = sqlSession.selectOne("org.apache.ibatis.submitted.column_prefix.MapperAutoMapping.selectBrandWithProducts", 1);
+      Brand brand = sqlSession
+          .selectOne("org.apache.ibatis.submitted.column_prefix.MapperAutoMapping.selectBrandWithProducts", 1);
       assertEquals(Integer.valueOf(1), brand.getId());
       assertEquals(2, brand.getProducts().size());
       assertEquals(Integer.valueOf(10), brand.getProducts().get(0).getId());
diff --git a/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixTest.java b/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixTest.java
index f25c7b5bffc..bfd06c2e94d 100644
--- a/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixTest.java
@@ -39,7 +39,7 @@ void setUp() throws Exception {
     }
 
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-            "org/apache/ibatis/submitted/column_prefix/CreateDB.sql");
+        "org/apache/ibatis/submitted/column_prefix/CreateDB.sql");
   }
 
   @Test
diff --git a/src/test/java/org/apache/ibatis/submitted/complex_column/ComplexColumnTest.java b/src/test/java/org/apache/ibatis/submitted/complex_column/ComplexColumnTest.java
index 685a0448709..27151a40ae7 100644
--- a/src/test/java/org/apache/ibatis/submitted/complex_column/ComplexColumnTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/complex_column/ComplexColumnTest.java
@@ -28,108 +28,108 @@
 
 class ComplexColumnTest {
 
-    private static SqlSessionFactory sqlSessionFactory;
+  private static SqlSessionFactory sqlSessionFactory;
 
-    @BeforeAll
-    static void initDatabase() throws Exception {
-        try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/complex_column/ibatisConfig.xml")) {
-            sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
-        }
-
-        BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-                "org/apache/ibatis/submitted/complex_column/CreateDB.sql");
+  @BeforeAll
+  static void initDatabase() throws Exception {
+    try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/complex_column/ibatisConfig.xml")) {
+      sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
     }
 
-    @Test
-    void testWithoutComplex() {
-        try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
-            PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
-            Person person = personMapper.getWithoutComplex(2L);
-            Assertions.assertNotNull(person, "person must not be null");
-            Assertions.assertEquals("Christian", person.getFirstName());
-            Assertions.assertEquals("Poitras", person.getLastName());
-            Person parent = person.getParent();
-            Assertions.assertNotNull(parent, "parent must not be null");
-            Assertions.assertEquals("John", parent.getFirstName());
-            Assertions.assertEquals("Smith", parent.getLastName());
-        }
+    BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
+        "org/apache/ibatis/submitted/complex_column/CreateDB.sql");
+  }
+
+  @Test
+  void testWithoutComplex() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
+      Person person = personMapper.getWithoutComplex(2L);
+      Assertions.assertNotNull(person, "person must not be null");
+      Assertions.assertEquals("Christian", person.getFirstName());
+      Assertions.assertEquals("Poitras", person.getLastName());
+      Person parent = person.getParent();
+      Assertions.assertNotNull(parent, "parent must not be null");
+      Assertions.assertEquals("John", parent.getFirstName());
+      Assertions.assertEquals("Smith", parent.getLastName());
     }
+  }
 
-    @Test
-    void testWithComplex() {
-        try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
-            PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
-            Person person = personMapper.getWithComplex(2L);
-            Assertions.assertNotNull(person, "person must not be null");
-            Assertions.assertEquals("Christian", person.getFirstName());
-            Assertions.assertEquals("Poitras", person.getLastName());
-            Person parent = person.getParent();
-            Assertions.assertNotNull(parent, "parent must not be null");
-            Assertions.assertEquals("John", parent.getFirstName());
-            Assertions.assertEquals("Smith", parent.getLastName());
-        }
+  @Test
+  void testWithComplex() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
+      Person person = personMapper.getWithComplex(2L);
+      Assertions.assertNotNull(person, "person must not be null");
+      Assertions.assertEquals("Christian", person.getFirstName());
+      Assertions.assertEquals("Poitras", person.getLastName());
+      Person parent = person.getParent();
+      Assertions.assertNotNull(parent, "parent must not be null");
+      Assertions.assertEquals("John", parent.getFirstName());
+      Assertions.assertEquals("Smith", parent.getLastName());
     }
+  }
 
-    @Test
-    void testWithComplex2() {
-        try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
-            PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
-            Person person = personMapper.getWithComplex2(2L);
-            Assertions.assertNotNull(person, "person must not be null");
-            Assertions.assertEquals("Christian", person.getFirstName());
-            Assertions.assertEquals("Poitras", person.getLastName());
-            Person parent = person.getParent();
-            Assertions.assertNotNull(parent, "parent must not be null");
-            Assertions.assertEquals("John", parent.getFirstName());
-            Assertions.assertEquals("Smith", parent.getLastName());
-        }
+  @Test
+  void testWithComplex2() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
+      Person person = personMapper.getWithComplex2(2L);
+      Assertions.assertNotNull(person, "person must not be null");
+      Assertions.assertEquals("Christian", person.getFirstName());
+      Assertions.assertEquals("Poitras", person.getLastName());
+      Person parent = person.getParent();
+      Assertions.assertNotNull(parent, "parent must not be null");
+      Assertions.assertEquals("John", parent.getFirstName());
+      Assertions.assertEquals("Smith", parent.getLastName());
     }
+  }
 
-    @Test
-    void testWithComplex3() {
-        try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
-            PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
-            Person person = personMapper.getWithComplex3(2L);
-            Assertions.assertNotNull(person, "person must not be null");
-            Assertions.assertEquals("Christian", person.getFirstName());
-            Assertions.assertEquals("Poitras", person.getLastName());
-            Person parent = person.getParent();
-            Assertions.assertNotNull(parent, "parent must not be null");
-            Assertions.assertEquals("John", parent.getFirstName());
-            Assertions.assertEquals("Smith", parent.getLastName());
-        }
+  @Test
+  void testWithComplex3() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
+      Person person = personMapper.getWithComplex3(2L);
+      Assertions.assertNotNull(person, "person must not be null");
+      Assertions.assertEquals("Christian", person.getFirstName());
+      Assertions.assertEquals("Poitras", person.getLastName());
+      Person parent = person.getParent();
+      Assertions.assertNotNull(parent, "parent must not be null");
+      Assertions.assertEquals("John", parent.getFirstName());
+      Assertions.assertEquals("Smith", parent.getLastName());
     }
+  }
 
-    @Test
-    void testWithComplex4() {
-      try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
-          PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
-          Person criteria = new Person();
-          criteria.setFirstName("Christian");
-          criteria.setLastName("Poitras");
-          Person person = personMapper.getParentWithComplex(criteria);
-          Assertions.assertNotNull(person, "person must not be null");
-          Assertions.assertEquals("Christian", person.getFirstName());
-          Assertions.assertEquals("Poitras", person.getLastName());
-          Person parent = person.getParent();
-          Assertions.assertNotNull(parent, "parent must not be null");
-          Assertions.assertEquals("John", parent.getFirstName());
-          Assertions.assertEquals("Smith", parent.getLastName());
-      }
+  @Test
+  void testWithComplex4() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
+      Person criteria = new Person();
+      criteria.setFirstName("Christian");
+      criteria.setLastName("Poitras");
+      Person person = personMapper.getParentWithComplex(criteria);
+      Assertions.assertNotNull(person, "person must not be null");
+      Assertions.assertEquals("Christian", person.getFirstName());
+      Assertions.assertEquals("Poitras", person.getLastName());
+      Person parent = person.getParent();
+      Assertions.assertNotNull(parent, "parent must not be null");
+      Assertions.assertEquals("John", parent.getFirstName());
+      Assertions.assertEquals("Smith", parent.getLastName());
     }
+  }
 
-    @Test
-    void testWithParamAttributes() {
-        try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
-            PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
-            Person person = personMapper.getComplexWithParamAttributes(2L);
-            Assertions.assertNotNull(person, "person must not be null");
-            Assertions.assertEquals("Christian", person.getFirstName());
-            Assertions.assertEquals("Poitras", person.getLastName());
-            Person parent = person.getParent();
-            Assertions.assertNotNull(parent, "parent must not be null");
-            Assertions.assertEquals("John", parent.getFirstName());
-            Assertions.assertEquals("Smith", parent.getLastName());
-        }
+  @Test
+  void testWithParamAttributes() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
+      Person person = personMapper.getComplexWithParamAttributes(2L);
+      Assertions.assertNotNull(person, "person must not be null");
+      Assertions.assertEquals("Christian", person.getFirstName());
+      Assertions.assertEquals("Poitras", person.getLastName());
+      Person parent = person.getParent();
+      Assertions.assertNotNull(parent, "parent must not be null");
+      Assertions.assertEquals("John", parent.getFirstName());
+      Assertions.assertEquals("Smith", parent.getLastName());
     }
+  }
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/complex_column/Person.java b/src/test/java/org/apache/ibatis/submitted/complex_column/Person.java
index 479eae0d346..1c55d5463f1 100644
--- a/src/test/java/org/apache/ibatis/submitted/complex_column/Person.java
+++ b/src/test/java/org/apache/ibatis/submitted/complex_column/Person.java
@@ -16,32 +16,40 @@
 package org.apache.ibatis.submitted.complex_column;
 
 public class Person {
-    private Long id;
-    private String firstName;
-    private String lastName;
-    private Person parent;
-    public String getFirstName() {
-        return firstName;
-    }
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-    public String getLastName() {
-        return lastName;
-    }
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-    public Long getId() {
-        return id;
-    }
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public Person getParent() {
-        return parent;
-    }
-    public void setParent(Person parent) {
-        this.parent = parent;
-    }
+  private Long id;
+  private String firstName;
+  private String lastName;
+  private Person parent;
+
+  public String getFirstName() {
+    return firstName;
+  }
+
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+  public String getLastName() {
+    return lastName;
+  }
+
+  public void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public Person getParent() {
+    return parent;
+  }
+
+  public void setParent(Person parent) {
+    this.parent = parent;
+  }
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/complex_property/ComponentTest.java b/src/test/java/org/apache/ibatis/submitted/complex_property/ComponentTest.java
index 0dab95d4051..5689699c5bb 100644
--- a/src/test/java/org/apache/ibatis/submitted/complex_property/ComponentTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/complex_property/ComponentTest.java
@@ -38,13 +38,13 @@ static void setup() throws Exception {
     sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
 
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-            "org/apache/ibatis/submitted/complex_property/db.sql");
+        "org/apache/ibatis/submitted/complex_property/db.sql");
   }
 
   @Test
   void shouldInsertNestedPasswordFieldOfComplexType() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
-      //Create User
+      // Create User
       User user = new User();
       user.setId(500000L);
       user.setPassword(new EncryptedString("secret"));
diff --git a/src/test/java/org/apache/ibatis/submitted/complex_type/ComplexTypeTest.java b/src/test/java/org/apache/ibatis/submitted/complex_type/ComplexTypeTest.java
index 847d8fd3758..04dcbb31f6f 100644
--- a/src/test/java/org/apache/ibatis/submitted/complex_type/ComplexTypeTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/complex_type/ComplexTypeTest.java
@@ -40,7 +40,7 @@ static void setUp() throws Exception {
 
     // populate in-memory database
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-            "org/apache/ibatis/submitted/complex_type/CreateDB.sql");
+        "org/apache/ibatis/submitted/complex_type/CreateDB.sql");
   }
 
   // see https://issues.apache.org/jira/browse/IBATIS-653
diff --git a/src/test/java/org/apache/ibatis/submitted/count/CountTest.java b/src/test/java/org/apache/ibatis/submitted/count/CountTest.java
index 4ab85bb40a9..f63270d5ecb 100644
--- a/src/test/java/org/apache/ibatis/submitted/count/CountTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/count/CountTest.java
@@ -38,7 +38,7 @@ static void setUp() throws Exception {
     }
 
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-            "org/apache/ibatis/submitted/count/CreateDB.sql");
+        "org/apache/ibatis/submitted/count/CreateDB.sql");
   }
 
   @Test
diff --git a/src/test/java/org/apache/ibatis/submitted/criterion/CriterionTest.java b/src/test/java/org/apache/ibatis/submitted/criterion/CriterionTest.java
index c2567a8a139..d88cfae8905 100644
--- a/src/test/java/org/apache/ibatis/submitted/criterion/CriterionTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/criterion/CriterionTest.java
@@ -40,7 +40,7 @@ static void setUp() throws Exception {
     }
 
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-            "org/apache/ibatis/submitted/criterion/CreateDB.sql");
+        "org/apache/ibatis/submitted/criterion/CreateDB.sql");
   }
 
   @Test
@@ -52,8 +52,8 @@ void testSimpleSelect() {
       Parameter parameter = new Parameter();
       parameter.setCriterion(criterion);
 
-      List<Map<String, Object>> answer =
-          sqlSession.selectList("org.apache.ibatis.submitted.criterion.simpleSelect", parameter);
+      List<Map<String, Object>> answer = sqlSession.selectList("org.apache.ibatis.submitted.criterion.simpleSelect",
+          parameter);
 
       assertEquals(1, answer.size());
     }
diff --git a/src/test/java/org/apache/ibatis/submitted/cursor_nested/CursorNestedTest.java b/src/test/java/org/apache/ibatis/submitted/cursor_nested/CursorNestedTest.java
index b2573126db3..3b6d1815a49 100644
--- a/src/test/java/org/apache/ibatis/submitted/cursor_nested/CursorNestedTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/cursor_nested/CursorNestedTest.java
@@ -36,7 +36,8 @@ class CursorNestedTest {
   @BeforeAll
   static void setUp() throws Exception {
     // create a SqlSessionFactory
-    try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/cursor_nested/mybatis-config.xml")) {
+    try (
+        Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/cursor_nested/mybatis-config.xml")) {
       sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
     }
 
diff --git a/src/test/java/org/apache/ibatis/submitted/cursor_nested/User.java b/src/test/java/org/apache/ibatis/submitted/cursor_nested/User.java
index 0df44c75660..9d0642fed6c 100644
--- a/src/test/java/org/apache/ibatis/submitted/cursor_nested/User.java
+++ b/src/test/java/org/apache/ibatis/submitted/cursor_nested/User.java
@@ -58,11 +58,6 @@ public void setName(String name) {
 
   @Override
   public String toString() {
-    return "User{" +
-            "id=" + id +
-            ", name='" + name + '\'' +
-            ", groups=" + groups +
-            ", roles=" + roles +
-            '}';
+    return "User{" + "id=" + id + ", name='" + name + '\'' + ", groups=" + groups + ", roles=" + roles + '}';
   }
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/cursor_simple/CursorSimpleTest.java b/src/test/java/org/apache/ibatis/submitted/cursor_simple/CursorSimpleTest.java
index e7928149570..224705849e4 100644
--- a/src/test/java/org/apache/ibatis/submitted/cursor_simple/CursorSimpleTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/cursor_simple/CursorSimpleTest.java
@@ -40,7 +40,8 @@ class CursorSimpleTest {
   @BeforeAll
   static void setUp() throws Exception {
     // create a SqlSessionFactory
-    try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/cursor_simple/mybatis-config.xml")) {
+    try (
+        Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/cursor_simple/mybatis-config.xml")) {
       sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
     }
 
diff --git a/src/test/java/org/apache/ibatis/submitted/cursor_simple/PostgresCursorTest.java b/src/test/java/org/apache/ibatis/submitted/cursor_simple/PostgresCursorTest.java
index ce096738ce1..516dbbee4f1 100644
--- a/src/test/java/org/apache/ibatis/submitted/cursor_simple/PostgresCursorTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/cursor_simple/PostgresCursorTest.java
@@ -49,7 +49,7 @@ static void setUp() throws Exception {
     sqlSessionFactory = new SqlSessionFactoryBuilder().build(configuration);
 
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-      "org/apache/ibatis/submitted/cursor_simple/CreateDB.sql");
+        "org/apache/ibatis/submitted/cursor_simple/CreateDB.sql");
   }
 
   @Test
diff --git a/src/test/java/org/apache/ibatis/submitted/cursor_simple/User.java b/src/test/java/org/apache/ibatis/submitted/cursor_simple/User.java
index 2d697df4040..92930e7669c 100644
--- a/src/test/java/org/apache/ibatis/submitted/cursor_simple/User.java
+++ b/src/test/java/org/apache/ibatis/submitted/cursor_simple/User.java
@@ -38,9 +38,6 @@ public void setName(String name) {
 
   @Override
   public String toString() {
-    return "User{" +
-            "id=" + id +
-            ", name='" + name + '\'' +
-            '}';
+    return "User{" + "id=" + id + ", name='" + name + '\'' + '}';
   }
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/Contact.java b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/Contact.java
index fe4942be063..1c16314540c 100644
--- a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/Contact.java
+++ b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/Contact.java
@@ -17,32 +17,32 @@
 
 public class Contact {
 
-    private Integer id;
-    private String address;
-    private String phone;
+  private Integer id;
+  private String address;
+  private String phone;
 
-    public String getAddress() {
-        return address;
-    }
+  public String getAddress() {
+    return address;
+  }
 
-    public void setAddress(String address) {
-        this.address = address;
-    }
+  public void setAddress(String address) {
+    this.address = address;
+  }
 
-    public Integer getId() {
-        return id;
-    }
+  public Integer getId() {
+    return id;
+  }
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
+  public void setId(Integer id) {
+    this.id = id;
+  }
 
-    public String getPhone() {
-        return phone;
-    }
+  public String getPhone() {
+    return phone;
+  }
 
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
+  public void setPhone(String phone) {
+    this.phone = phone;
+  }
 
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollection.java b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollection.java
index 8d6213debd6..a87233c870e 100644
--- a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollection.java
+++ b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollection.java
@@ -19,109 +19,110 @@
 
 public class CustomCollection<T> {
 
-    private List<T> data = new ArrayList<>();
+  private List<T> data = new ArrayList<>();
 
-    public <K> K[] toArray(K[] a) {
-        return data.toArray(a);
-    }
-
-    public Object[] toArray() {
-        return data.toArray();
-    }
-
-    public List<T> subList(int fromIndex, int toIndex) {
-        return data.subList(fromIndex, toIndex);
-    }
-
-    public int size() {
-        return data.size();
-    }
-
-    public T set(int index, T element) {
-        return data.set(index, element);
-    }
-
-    public boolean retainAll(Collection<?> c) {
-        return data.retainAll(c);
-    }
-
-    public boolean removeAll(Collection<?> c) {
-        return data.removeAll(c);
-    }
-
-    public T remove(int index) {
-        return data.remove(index);
-    }
-
-    public boolean remove(Object o) {
-        return data.remove(o);
-    }
-
-    public ListIterator<T> listIterator(int index) {
-        return data.listIterator(index);
-    }
-
-    public ListIterator<T> listIterator() {
-        return data.listIterator();
-    }
-
-    public int lastIndexOf(Object o) {
-        return data.lastIndexOf(o);
-    }
-
-    public Iterator<T> iterator() {
-        return data.iterator();
-    }
-
-    public boolean isEmpty() {
-        return data.isEmpty();
-    }
-
-    public int indexOf(Object o) {
-        return data.indexOf(o);
-    }
-
-    @Override
-    public int hashCode() {
-        return data.hashCode();
-    }
-
-    public T get(int index) {
-        return data.get(index);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof CustomCollection)) return false;
-        return data.equals(((CustomCollection)o).data);
-    }
-
-    public boolean containsAll(Collection<?> c) {
-        return data.containsAll(c);
-    }
-
-    public boolean contains(Object o) {
-        return data.contains(o);
-    }
-
-    public void clear() {
-        data.clear();
-    }
-
-    public boolean addAll(int index, Collection<? extends T> c) {
-        return data.addAll(index, c);
-    }
-
-    public boolean addAll(Collection<? extends T> c) {
-        return data.addAll(c);
-    }
-
-    public void add(int index, T element) {
-        data.add(index, element);
-    }
-
-    public boolean add(T e) {
-        return data.add(e);
-    }
+  public <K> K[] toArray(K[] a) {
+    return data.toArray(a);
+  }
+
+  public Object[] toArray() {
+    return data.toArray();
+  }
+
+  public List<T> subList(int fromIndex, int toIndex) {
+    return data.subList(fromIndex, toIndex);
+  }
+
+  public int size() {
+    return data.size();
+  }
+
+  public T set(int index, T element) {
+    return data.set(index, element);
+  }
+
+  public boolean retainAll(Collection<?> c) {
+    return data.retainAll(c);
+  }
+
+  public boolean removeAll(Collection<?> c) {
+    return data.removeAll(c);
+  }
+
+  public T remove(int index) {
+    return data.remove(index);
+  }
+
+  public boolean remove(Object o) {
+    return data.remove(o);
+  }
+
+  public ListIterator<T> listIterator(int index) {
+    return data.listIterator(index);
+  }
+
+  public ListIterator<T> listIterator() {
+    return data.listIterator();
+  }
+
+  public int lastIndexOf(Object o) {
+    return data.lastIndexOf(o);
+  }
+
+  public Iterator<T> iterator() {
+    return data.iterator();
+  }
+
+  public boolean isEmpty() {
+    return data.isEmpty();
+  }
+
+  public int indexOf(Object o) {
+    return data.indexOf(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return data.hashCode();
+  }
+
+  public T get(int index) {
+    return data.get(index);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (!(o instanceof CustomCollection))
+      return false;
+    return data.equals(((CustomCollection) o).data);
+  }
+
+  public boolean containsAll(Collection<?> c) {
+    return data.containsAll(c);
+  }
+
+  public boolean contains(Object o) {
+    return data.contains(o);
+  }
+
+  public void clear() {
+    data.clear();
+  }
+
+  public boolean addAll(int index, Collection<? extends T> c) {
+    return data.addAll(index, c);
+  }
+
+  public boolean addAll(Collection<? extends T> c) {
+    return data.addAll(c);
+  }
+
+  public void add(int index, T element) {
+    data.add(index, element);
+  }
+
+  public boolean add(T e) {
+    return data.add(e);
+  }
 
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollectionHandlingTest.java b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollectionHandlingTest.java
index 601be7e2b35..319a112e715 100644
--- a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollectionHandlingTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollectionHandlingTest.java
@@ -31,50 +31,52 @@
 
 class CustomCollectionHandlingTest {
 
-    /**
-     * Custom collections with nested resultMap.
-     */
-    @Test
-    void testSelectListWithNestedResultMap() throws Exception {
-        String xmlConfig = "org/apache/ibatis/submitted/custom_collection_handling/MapperConfig.xml";
-        SqlSessionFactory sqlSessionFactory = getSqlSessionFactoryXmlConfig(xmlConfig);
-        try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
-            List<Person> list = sqlSession.selectList("org.apache.ibatis.submitted.custom_collection_handling.PersonMapper.findWithResultMap");
-            assertEquals(2, list.size());
-            assertEquals(2, list.get(0).getContacts().size());
-            assertEquals(1, list.get(1).getContacts().size());
-            assertEquals("3 Wall Street", list.get(0).getContacts().get(1).getAddress());
-        }
+  /**
+   * Custom collections with nested resultMap.
+   */
+  @Test
+  void testSelectListWithNestedResultMap() throws Exception {
+    String xmlConfig = "org/apache/ibatis/submitted/custom_collection_handling/MapperConfig.xml";
+    SqlSessionFactory sqlSessionFactory = getSqlSessionFactoryXmlConfig(xmlConfig);
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      List<Person> list = sqlSession
+          .selectList("org.apache.ibatis.submitted.custom_collection_handling.PersonMapper.findWithResultMap");
+      assertEquals(2, list.size());
+      assertEquals(2, list.get(0).getContacts().size());
+      assertEquals(1, list.get(1).getContacts().size());
+      assertEquals("3 Wall Street", list.get(0).getContacts().get(1).getAddress());
     }
+  }
 
-    /**
-     * Custom collections with nested select.
-     */
-    @Test
-    void testSelectListWithNestedSelect() throws Exception {
-        String xmlConfig = "org/apache/ibatis/submitted/custom_collection_handling/MapperConfig.xml";
-        SqlSessionFactory sqlSessionFactory = getSqlSessionFactoryXmlConfig(xmlConfig);
-        try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
-            List<Person> list = sqlSession.selectList("org.apache.ibatis.submitted.custom_collection_handling.PersonMapper.findWithSelect");
-            assertEquals(2, list.size());
-            assertEquals(2, list.get(0).getContacts().size());
-            assertEquals(1, list.get(1).getContacts().size());
-            assertEquals("3 Wall Street", list.get(0).getContacts().get(1).getAddress());
-        }
+  /**
+   * Custom collections with nested select.
+   */
+  @Test
+  void testSelectListWithNestedSelect() throws Exception {
+    String xmlConfig = "org/apache/ibatis/submitted/custom_collection_handling/MapperConfig.xml";
+    SqlSessionFactory sqlSessionFactory = getSqlSessionFactoryXmlConfig(xmlConfig);
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      List<Person> list = sqlSession
+          .selectList("org.apache.ibatis.submitted.custom_collection_handling.PersonMapper.findWithSelect");
+      assertEquals(2, list.size());
+      assertEquals(2, list.get(0).getContacts().size());
+      assertEquals(1, list.get(1).getContacts().size());
+      assertEquals("3 Wall Street", list.get(0).getContacts().get(1).getAddress());
     }
+  }
 
-    private SqlSessionFactory getSqlSessionFactoryXmlConfig(String resource) throws Exception {
-        try (Reader configReader = Resources.getResourceAsReader(resource)) {
-            SqlSessionFactory sqlSessionFactory = new SqlSessionFactoryBuilder().build(configReader);
+  private SqlSessionFactory getSqlSessionFactoryXmlConfig(String resource) throws Exception {
+    try (Reader configReader = Resources.getResourceAsReader(resource)) {
+      SqlSessionFactory sqlSessionFactory = new SqlSessionFactoryBuilder().build(configReader);
 
-            initDb(sqlSessionFactory);
+      initDb(sqlSessionFactory);
 
-            return sqlSessionFactory;
-        }
+      return sqlSessionFactory;
     }
+  }
 
-    private static void initDb(SqlSessionFactory sqlSessionFactory) throws IOException, SQLException {
-        BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-                "org/apache/ibatis/submitted/custom_collection_handling/CreateDB.sql");
-    }
+  private static void initDb(SqlSessionFactory sqlSessionFactory) throws IOException, SQLException {
+    BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
+        "org/apache/ibatis/submitted/custom_collection_handling/CreateDB.sql");
+  }
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomObjectFactory.java b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomObjectFactory.java
index 44306036b99..0930862864f 100644
--- a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomObjectFactory.java
+++ b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomObjectFactory.java
@@ -32,77 +32,78 @@
 
 public class CustomObjectFactory implements ObjectFactory {
 
-    @Override
-    public <T> T create(Class<T> type) {
-        return create(type, null, null);
-    }
+  @Override
+  public <T> T create(Class<T> type) {
+    return create(type, null, null);
+  }
 
-    @Override
-    public <T> T create(Class<T> type, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
-        Class<?> classToCreate = resolveInterface(type);
-        @SuppressWarnings("unchecked") // we know types are assignable
-        T created = (T) instantiateClass(classToCreate, constructorArgTypes, constructorArgs);
-        return created;
-    }
+  @Override
+  public <T> T create(Class<T> type, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+    Class<?> classToCreate = resolveInterface(type);
+    @SuppressWarnings("unchecked") // we know types are assignable
+    T created = (T) instantiateClass(classToCreate, constructorArgTypes, constructorArgs);
+    return created;
+  }
 
-    private <T> T instantiateClass(Class<T> type, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
-        try {
-            Constructor<T> constructor;
-            if (constructorArgTypes == null || constructorArgs == null) {
-                constructor = type.getDeclaredConstructor();
-                if (!constructor.isAccessible()) {
-                    constructor.setAccessible(true);
-                }
-                return constructor.newInstance();
-            }
-            constructor = type.getDeclaredConstructor(constructorArgTypes.toArray(new Class[constructorArgTypes.size()]));
-            if (!constructor.isAccessible()) {
-                constructor.setAccessible(true);
-            }
-            return constructor.newInstance(constructorArgs.toArray(new Object[constructorArgs.size()]));
-        } catch (Exception e) {
-            StringBuilder argTypes = new StringBuilder();
-            if (constructorArgTypes != null) {
-                for (Class<?> argType : constructorArgTypes) {
-                    argTypes.append(argType.getSimpleName());
-                    argTypes.append(",");
-                }
-            }
-            StringBuilder argValues = new StringBuilder();
-            if (constructorArgs != null) {
-                for (Object argValue : constructorArgs) {
-                    argValues.append(String.valueOf(argValue));
-                    argValues.append(",");
-                }
-            }
-            throw new ReflectionException("Error instantiating " + type + " with invalid types (" + argTypes + ") or values (" + argValues + "). Cause: " + e, e);
+  private <T> T instantiateClass(Class<T> type, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
+    try {
+      Constructor<T> constructor;
+      if (constructorArgTypes == null || constructorArgs == null) {
+        constructor = type.getDeclaredConstructor();
+        if (!constructor.isAccessible()) {
+          constructor.setAccessible(true);
         }
-    }
-
-    private Class<?> resolveInterface(Class<?> type) {
-        Class<?> classToCreate;
-        if (type == List.class || type == Collection.class) {
-            classToCreate = LinkedList.class;
-        } else if (type == Map.class) {
-            classToCreate = LinkedHashMap.class;
-        } else if (type == SortedSet.class) { // issue #510 Collections Support
-            classToCreate = TreeSet.class;
-        } else if (type == Set.class) {
-            classToCreate = HashSet.class;
-        } else {
-            classToCreate = type;
+        return constructor.newInstance();
+      }
+      constructor = type.getDeclaredConstructor(constructorArgTypes.toArray(new Class[constructorArgTypes.size()]));
+      if (!constructor.isAccessible()) {
+        constructor.setAccessible(true);
+      }
+      return constructor.newInstance(constructorArgs.toArray(new Object[constructorArgs.size()]));
+    } catch (Exception e) {
+      StringBuilder argTypes = new StringBuilder();
+      if (constructorArgTypes != null) {
+        for (Class<?> argType : constructorArgTypes) {
+          argTypes.append(argType.getSimpleName());
+          argTypes.append(",");
         }
-        return classToCreate;
+      }
+      StringBuilder argValues = new StringBuilder();
+      if (constructorArgs != null) {
+        for (Object argValue : constructorArgs) {
+          argValues.append(String.valueOf(argValue));
+          argValues.append(",");
+        }
+      }
+      throw new ReflectionException("Error instantiating " + type + " with invalid types (" + argTypes + ") or values ("
+          + argValues + "). Cause: " + e, e);
     }
+  }
 
-    @Override
-    public <T> boolean isCollection(Class<T> type) {
-      return CustomCollection.class.isAssignableFrom(type);
+  private Class<?> resolveInterface(Class<?> type) {
+    Class<?> classToCreate;
+    if (type == List.class || type == Collection.class) {
+      classToCreate = LinkedList.class;
+    } else if (type == Map.class) {
+      classToCreate = LinkedHashMap.class;
+    } else if (type == SortedSet.class) { // issue #510 Collections Support
+      classToCreate = TreeSet.class;
+    } else if (type == Set.class) {
+      classToCreate = HashSet.class;
+    } else {
+      classToCreate = type;
     }
+    return classToCreate;
+  }
 
-    @SuppressWarnings("unchecked")
-    public <T> T[] createArray(Class<T> type, int size) {
-      return (T[]) Array.newInstance(type, size);
-    }
+  @Override
+  public <T> boolean isCollection(Class<T> type) {
+    return CustomCollection.class.isAssignableFrom(type);
+  }
+
+  @SuppressWarnings("unchecked")
+  public <T> T[] createArray(Class<T> type, int size) {
+    return (T[]) Array.newInstance(type, size);
+  }
 
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/Person.java b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/Person.java
index c777f89313f..2bd35e78f53 100644
--- a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/Person.java
+++ b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/Person.java
@@ -17,32 +17,32 @@
 
 public class Person {
 
-    private Integer id;
-    private String name;
-    private CustomCollection<Contact> contacts;
+  private Integer id;
+  private String name;
+  private CustomCollection<Contact> contacts;
 
-    public Integer getId() {
-        return id;
-    }
+  public Integer getId() {
+    return id;
+  }
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
+  public void setId(Integer id) {
+    this.id = id;
+  }
 
-    public String getName() {
-        return name;
-    }
+  public String getName() {
+    return name;
+  }
 
-    public void setName(String name) {
-        this.name = name;
-    }
+  public void setName(String name) {
+    this.name = name;
+  }
 
-    public CustomCollection<Contact> getContacts() {
-        return contacts;
-    }
+  public CustomCollection<Contact> getContacts() {
+    return contacts;
+  }
 
-    public void setContacts(CustomCollection<Contact> contacts) {
-        this.contacts = contacts;
-    }
+  public void setContacts(CustomCollection<Contact> contacts) {
+    this.contacts = contacts;
+  }
 
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/default_method/DefaultMethodTest.java b/src/test/java/org/apache/ibatis/submitted/default_method/DefaultMethodTest.java
index cba85f0e680..377dcb4db65 100644
--- a/src/test/java/org/apache/ibatis/submitted/default_method/DefaultMethodTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/default_method/DefaultMethodTest.java
@@ -35,8 +35,8 @@ class DefaultMethodTest {
   @BeforeAll
   static void setUp() throws Exception {
     // create an SqlSessionFactory
-    try (Reader reader = Resources.getResourceAsReader(
-        "org/apache/ibatis/submitted/default_method/mybatis-config.xml")) {
+    try (Reader reader = Resources
+        .getResourceAsReader("org/apache/ibatis/submitted/default_method/mybatis-config.xml")) {
       sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
     }
 
diff --git a/src/test/java/org/apache/ibatis/submitted/deferload_common_property/CommonPropertyDeferLoadTest.java b/src/test/java/org/apache/ibatis/submitted/deferload_common_property/CommonPropertyDeferLoadTest.java
index 47dceb4e061..edf963e87f0 100644
--- a/src/test/java/org/apache/ibatis/submitted/deferload_common_property/CommonPropertyDeferLoadTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/deferload_common_property/CommonPropertyDeferLoadTest.java
@@ -33,85 +33,91 @@
 
 class CommonPropertyDeferLoadTest {
 
-    private static SqlSessionFactory sqlSessionFactory;
-    private static SqlSessionFactory lazyLoadSqlSessionFactory;
+  private static SqlSessionFactory sqlSessionFactory;
+  private static SqlSessionFactory lazyLoadSqlSessionFactory;
 
-    @BeforeAll
-    static void initDatabase() throws Exception {
-        try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/deferload_common_property/ibatisConfig.xml")) {
-            sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
-        }
-        try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/deferload_common_property/lazyLoadIbatisConfig.xml")) {
-            lazyLoadSqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
-        }
-
-        BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-                "org/apache/ibatis/submitted/deferload_common_property/CreateDB.sql");
+  @BeforeAll
+  static void initDatabase() throws Exception {
+    try (Reader reader = Resources
+        .getResourceAsReader("org/apache/ibatis/submitted/deferload_common_property/ibatisConfig.xml")) {
+      sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
+    }
+    try (Reader reader = Resources
+        .getResourceAsReader("org/apache/ibatis/submitted/deferload_common_property/lazyLoadIbatisConfig.xml")) {
+      lazyLoadSqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
     }
 
-    @Test
-    void testDeferLoadAfterResultHandler() {
-        try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
-            class MyResultHandler implements ResultHandler {
-                private List<Child> children = new ArrayList<>();
-                @Override
-                public void handleResult(ResultContext context) {
-                    Child child = (Child)context.getResultObject();
-                    children.add(child);
-                }
-            }
-            MyResultHandler myResultHandler = new MyResultHandler();
-            sqlSession.select("org.apache.ibatis.submitted.deferload_common_property.ChildMapper.selectAll", myResultHandler);
-            for (Child child: myResultHandler.children) {
-                assertNotNull(child.getFather());
-            }
+    BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
+        "org/apache/ibatis/submitted/deferload_common_property/CreateDB.sql");
+  }
+
+  @Test
+  void testDeferLoadAfterResultHandler() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      class MyResultHandler implements ResultHandler {
+        private List<Child> children = new ArrayList<>();
+
+        @Override
+        public void handleResult(ResultContext context) {
+          Child child = (Child) context.getResultObject();
+          children.add(child);
         }
+      }
+      MyResultHandler myResultHandler = new MyResultHandler();
+      sqlSession.select("org.apache.ibatis.submitted.deferload_common_property.ChildMapper.selectAll", myResultHandler);
+      for (Child child : myResultHandler.children) {
+        assertNotNull(child.getFather());
+      }
     }
+  }
 
-    @Test
-    void testDeferLoadDuringResultHandler() {
-        try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
-            class MyResultHandler implements ResultHandler {
-                @Override
-                public void handleResult(ResultContext context) {
-                    Child child = (Child)context.getResultObject();
-                    assertNotNull(child.getFather());
-                }
-            }
-            sqlSession.select("org.apache.ibatis.submitted.deferload_common_property.ChildMapper.selectAll", new MyResultHandler());
+  @Test
+  void testDeferLoadDuringResultHandler() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      class MyResultHandler implements ResultHandler {
+        @Override
+        public void handleResult(ResultContext context) {
+          Child child = (Child) context.getResultObject();
+          assertNotNull(child.getFather());
         }
+      }
+      sqlSession.select("org.apache.ibatis.submitted.deferload_common_property.ChildMapper.selectAll",
+          new MyResultHandler());
     }
+  }
+
+  @Test
+  void testDeferLoadAfterResultHandlerWithLazyLoad() {
+    try (SqlSession sqlSession = lazyLoadSqlSessionFactory.openSession()) {
+      class MyResultHandler implements ResultHandler {
+        private List<Child> children = new ArrayList<>();
 
-    @Test
-    void testDeferLoadAfterResultHandlerWithLazyLoad() {
-        try (SqlSession sqlSession = lazyLoadSqlSessionFactory.openSession()) {
-            class MyResultHandler implements ResultHandler {
-                private List<Child> children = new ArrayList<>();
-                @Override
-                public void handleResult(ResultContext context) {
-                    Child child = (Child)context.getResultObject();
-                    children.add(child);
-                }
-            }
-            MyResultHandler myResultHandler = new MyResultHandler();
-            sqlSession.select("org.apache.ibatis.submitted.deferload_common_property.ChildMapper.selectAll", myResultHandler);
-            for (Child child: myResultHandler.children) {
-                assertNotNull(child.getFather());
-            }
+        @Override
+        public void handleResult(ResultContext context) {
+          Child child = (Child) context.getResultObject();
+          children.add(child);
         }
+      }
+      MyResultHandler myResultHandler = new MyResultHandler();
+      sqlSession.select("org.apache.ibatis.submitted.deferload_common_property.ChildMapper.selectAll", myResultHandler);
+      for (Child child : myResultHandler.children) {
+        assertNotNull(child.getFather());
+      }
     }
+  }
 
-    @Test
-    void testDeferLoadDuringResultHandlerWithLazyLoad() {
-        try (SqlSession sqlSession = lazyLoadSqlSessionFactory.openSession()) {
-            class MyResultHandler implements ResultHandler {
-                @Override
-                public void handleResult(ResultContext context) {
-                    Child child = (Child)context.getResultObject();
-                    assertNotNull(child.getFather());
-                }
-            }
-            sqlSession.select("org.apache.ibatis.submitted.deferload_common_property.ChildMapper.selectAll", new MyResultHandler());
+  @Test
+  void testDeferLoadDuringResultHandlerWithLazyLoad() {
+    try (SqlSession sqlSession = lazyLoadSqlSessionFactory.openSession()) {
+      class MyResultHandler implements ResultHandler {
+        @Override
+        public void handleResult(ResultContext context) {
+          Child child = (Child) context.getResultObject();
+          assertNotNull(child.getFather());
         }
+      }
+      sqlSession.select("org.apache.ibatis.submitted.deferload_common_property.ChildMapper.selectAll",
+          new MyResultHandler());
     }
+  }
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/deferload_common_property/Father.java b/src/test/java/org/apache/ibatis/submitted/deferload_common_property/Father.java
index bd3ad547fb0..31fa2c273ae 100644
--- a/src/test/java/org/apache/ibatis/submitted/deferload_common_property/Father.java
+++ b/src/test/java/org/apache/ibatis/submitted/deferload_common_property/Father.java
@@ -16,22 +16,22 @@
 package org.apache.ibatis.submitted.deferload_common_property;
 
 public class Father {
-    private Integer id;
-    private String name;
+  private Integer id;
+  private String name;
 
-    public Integer getId() {
-        return id;
-    }
+  public Integer getId() {
+    return id;
+  }
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
+  public void setId(Integer id) {
+    this.id = id;
+  }
 
-    public String getName() {
-        return name;
-    }
+  public String getName() {
+    return name;
+  }
 
-    public void setName(String name) {
-        this.name = name;
-    }
+  public void setName(String name) {
+    this.name = name;
+  }
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/DisallowDotsOnNamesTest.java b/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/DisallowDotsOnNamesTest.java
index 1324c7be5cf..497ea39c243 100644
--- a/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/DisallowDotsOnNamesTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/DisallowDotsOnNamesTest.java
@@ -26,10 +26,10 @@
 
 class DisallowDotsOnNamesTest {
 
-    @Test
-    void testShouldNotAllowMappedStatementsWithDots() throws IOException {
-        Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/disallowdotsonnames/ibatisConfig.xml");
-        Assertions.assertThrows(PersistenceException.class, () -> new SqlSessionFactoryBuilder().build(reader));
-    }
+  @Test
+  void testShouldNotAllowMappedStatementsWithDots() throws IOException {
+    Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/disallowdotsonnames/ibatisConfig.xml");
+    Assertions.assertThrows(PersistenceException.class, () -> new SqlSessionFactoryBuilder().build(reader));
+  }
 
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/Person.java b/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/Person.java
index 85f52857a2f..64a0e0e9a70 100644
--- a/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/Person.java
+++ b/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/Person.java
@@ -18,25 +18,31 @@
 import java.io.Serializable;
 
 public class Person implements Serializable {
-    private Integer id;
-    private String firstName;
-    private String lastName;
-    public String getFirstName() {
-        return firstName;
-    }
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-    public String getLastName() {
-        return lastName;
-    }
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-    public Integer getId() {
-        return id;
-    }
-    public void setId(Integer id) {
-        this.id = id;
-    }
+  private Integer id;
+  private String firstName;
+  private String lastName;
+
+  public String getFirstName() {
+    return firstName;
+  }
+
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+  public String getLastName() {
+    return lastName;
+  }
+
+  public void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/discriminator/DiscriminatorTest.java b/src/test/java/org/apache/ibatis/submitted/discriminator/DiscriminatorTest.java
index 8c76fa10882..35bc57c3586 100644
--- a/src/test/java/org/apache/ibatis/submitted/discriminator/DiscriminatorTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/discriminator/DiscriminatorTest.java
@@ -35,13 +35,14 @@ class DiscriminatorTest {
   @BeforeAll
   static void setUp() throws Exception {
     // create an SqlSessionFactory
-    try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/discriminator/mybatis-config.xml")) {
+    try (
+        Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/discriminator/mybatis-config.xml")) {
       sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
     }
 
     // populate in-memory database
     BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-      "org/apache/ibatis/submitted/discriminator/CreateDB.sql");
+        "org/apache/ibatis/submitted/discriminator/CreateDB.sql");
   }
 
   @Test
@@ -50,9 +51,9 @@ void shouldSwitchResultType() {
       Mapper mapper = sqlSession.getMapper(Mapper.class);
       List<Vehicle> vehicles = mapper.selectVehicles();
       assertEquals(Car.class, vehicles.get(0).getClass());
-      assertEquals(Integer.valueOf(5), ((Car)vehicles.get(0)).getDoorCount());
+      assertEquals(Integer.valueOf(5), ((Car) vehicles.get(0)).getDoorCount());
       assertEquals(Truck.class, vehicles.get(1).getClass());
-      assertEquals(Float.valueOf(1.5f), ((Truck)vehicles.get(1)).getCarryingCapacity());
+      assertEquals(Float.valueOf(1.5f), ((Truck) vehicles.get(1)).getCarryingCapacity());
     }
   }
 
diff --git a/src/test/java/org/apache/ibatis/submitted/discriminator/Mapper.java b/src/test/java/org/apache/ibatis/submitted/discriminator/Mapper.java
index a11f84478c3..dbccad224d9 100644
--- a/src/test/java/org/apache/ibatis/submitted/discriminator/Mapper.java
+++ b/src/test/java/org/apache/ibatis/submitted/discriminator/Mapper.java
@@ -20,6 +20,7 @@
 public interface Mapper {
 
   List<Vehicle> selectVehicles();
+
   List<Owner> selectOwnersWithAVehicle();
 
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/duplicate_resource_loaded/DuplicateResourceTest.java b/src/test/java/org/apache/ibatis/submitted/duplicate_resource_loaded/DuplicateResourceTest.java
index 7e9cf5ac811..ae54c87c568 100644
--- a/src/test/java/org/apache/ibatis/submitted/duplicate_resource_loaded/DuplicateResourceTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/duplicate_resource_loaded/DuplicateResourceTest.java
@@ -44,7 +44,7 @@ void shouldDemonstrateDuplicateResourceIssue() throws Exception {
     try (SqlSession sqlSession = factory.openSession()) {
       final Mapper mapper = sqlSession.getMapper(Mapper.class);
       final List<Map<String, Object>> list = mapper.selectAllBlogs();
-      Assertions.assertEquals(2,list.size());
+      Assertions.assertEquals(2, list.size());
     }
   }
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/duplicate_statements/AnnotatedMapper.java b/src/test/java/org/apache/ibatis/submitted/duplicate_statements/AnnotatedMapper.java
index 535701924c1..18457962da3 100644
--- a/src/test/java/org/apache/ibatis/submitted/duplicate_statements/AnnotatedMapper.java
+++ b/src/test/java/org/apache/ibatis/submitted/duplicate_statements/AnnotatedMapper.java
@@ -21,9 +21,7 @@
 import org.apache.ibatis.session.RowBounds;
 
 /**
- * This interface should be OK.  It has duplicate method names, but only
- * because of the RowBounds parameter
- *
+ * This interface should be OK. It has duplicate method names, but only because of the RowBounds parameter
  */
 public interface AnnotatedMapper {
 
diff --git a/src/test/java/org/apache/ibatis/submitted/duplicate_statements/AnnotatedMapperExtended.java b/src/test/java/org/apache/ibatis/submitted/duplicate_statements/AnnotatedMapperExtended.java
index d408fb44d88..67cad0d811b 100644
--- a/src/test/java/org/apache/ibatis/submitted/duplicate_statements/AnnotatedMapperExtended.java
+++ b/src/test/java/org/apache/ibatis/submitted/duplicate_statements/AnnotatedMapperExtended.java
@@ -20,13 +20,11 @@
 import org.apache.ibatis.annotations.Select;
 
 /**
- * This interface should fail when added to the configuration.  It has
- * a method with the same name, but different parameters, as a method
- * in the super interface
- *
+ * This interface should fail when added to the configuration. It has a method with the same name, but different
+ * parameters, as a method in the super interface
  */
 public interface AnnotatedMapperExtended extends AnnotatedMapper {
 
-    @Select("select * from users")
-    List<User> getAllUsers(int i);
+  @Select("select * from users")
+  List<User> getAllUsers(int i);
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/duplicate_statements/DuplicateStatementsTest.java b/src/test/java/org/apache/ibatis/submitted/duplicate_statements/DuplicateStatementsTest.java
index b2714ba3ef5..9e17c1a9074 100644
--- a/src/test/java/org/apache/ibatis/submitted/duplicate_statements/DuplicateStatementsTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/duplicate_statements/DuplicateStatementsTest.java
@@ -35,14 +35,15 @@ class DuplicateStatementsTest {
 
   @BeforeEach
   void setupDb() throws Exception {
-      // create a SqlSessionFactory
-      try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/duplicate_statements/mybatis-config.xml")) {
-        sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
-      }
+    // create a SqlSessionFactory
+    try (Reader reader = Resources
+        .getResourceAsReader("org/apache/ibatis/submitted/duplicate_statements/mybatis-config.xml")) {
+      sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
+    }
 
-      // populate in-memory database
-      BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
-              "org/apache/ibatis/submitted/duplicate_statements/CreateDB.sql");
+    // populate in-memory database
+    BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
+        "org/apache/ibatis/submitted/duplicate_statements/CreateDB.sql");
   }
 
   @Test
diff --git a/src/test/java/org/apache/ibatis/submitted/dynsql/CustomUtil.java b/src/test/java/org/apache/ibatis/submitted/dynsql/CustomUtil.java
index 66fde5148df..9e535d3a25b 100644
--- a/src/test/java/org/apache/ibatis/submitted/dynsql/CustomUtil.java
+++ b/src/test/java/org/apache/ibatis/submitted/dynsql/CustomUtil.java
@@ -16,7 +16,7 @@
 package org.apache.ibatis.submitted.dynsql;
 
 public class CustomUtil {
-    public static String esc(final String s) {
-        return s.replace("'", "''");
-    }
+  public static String esc(final String s) {
+    return s.replace("'", "''");
+  }
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/dynsql/DynSqlMapper.java b/src/test/java/org/apache/ibatis/submitted/dynsql/DynSqlMapper.java
index 258c6226752..930e72d6a7f 100644
--- a/src/test/java/org/apache/ibatis/submitted/dynsql/DynSqlMapper.java
+++ b/src/test/java/org/apache/ibatis/submitted/dynsql/DynSqlMapper.java
@@ -23,8 +23,11 @@ public interface DynSqlMapper {
   String selectDescription(@Param("p") String p);
 
   List<String> selectDescriptionById(Integer id);
+
   List<String> selectDescriptionByConditions(Conditions conditions);
+
   List<String> selectDescriptionByConditions2(Conditions conditions);
+
   List<String> selectDescriptionByConditions3(Conditions conditions);
 
   class Conditions {
diff --git a/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_annotation/PersonMapper.java b/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_annotation/PersonMapper.java
index 434dd67b543..a825db51b86 100644
--- a/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_annotation/PersonMapper.java
+++ b/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_annotation/PersonMapper.java
@@ -21,6 +21,7 @@
 
 /**
  * @since #444
+ *
  * @author Kazuki Shimizu
  */
 public interface PersonMapper {
diff --git a/src/test/java/org/apache/ibatis/submitted/nestedresulthandler/Item.java b/src/test/java/org/apache/ibatis/submitted/nestedresulthandler/Item.java
index a6a106f3b54..ad2274b3a92 100644
--- a/src/test/java/org/apache/ibatis/submitted/nestedresulthandler/Item.java
+++ b/src/test/java/org/apache/ibatis/submitted/nestedresulthandler/Item.java
@@ -19,14 +19,8 @@ public class Item {
   private Integer id;
   private String name;
 
-  public String toString(){
-    return new StringBuilder()
-            .append("Item(")
-            .append(id)
-            .append(", ")
-            .append(name)
-            .append(" )")
-            .toString();
+  public String toString() {
+    return new StringBuilder().append("Item(").append(id).append(", ").append(name).append(" )").toString();
   }
 
   public Integer getId() {
diff --git a/src/test/java/org/apache/ibatis/submitted/nestedresulthandler/Person.java b/src/test/java/org/apache/ibatis/submitted/nestedresulthandler/Person.java
index 0135bb20be3..4c004474b18 100644
--- a/src/test/java/org/apache/ibatis/submitted/nestedresulthandler/Person.java
+++ b/src/test/java/org/apache/ibatis/submitted/nestedresulthandler/Person.java
@@ -24,16 +24,9 @@ public class Person {
   private String name;
   private List<Item> items = new ArrayList<>();
 
-  public String toString(){
-    return new StringBuilder()
-            .append("Person(")
-            .append(id)
-            .append(", ")
-            .append(name)
-            .append(", ")
-            .append(items)
-            .append(" )")
-            .toString();
+  public String toString() {
+    return new StringBuilder().append("Person(").append(id).append(", ").append(name).append(", ").append(items)
+        .append(" )").toString();
   }
 
   public Integer getId() {

From 1b3c414d257f0f8d3aa8904449d9a558610e8554 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Fri, 3 Feb 2023 23:09:51 -0500
Subject: [PATCH 2/2] [ci] Update copyright date

---
 .../java/org/apache/ibatis/executor/BatchExecutorException.java | 2 +-
 src/main/java/org/apache/ibatis/executor/CachingExecutor.java   | 2 +-
 src/main/java/org/apache/ibatis/executor/Executor.java          | 2 +-
 .../org/apache/ibatis/executor/keygen/SelectKeyGenerator.java   | 2 +-
 .../executor/loader/AbstractEnhancedDeserializationProxy.java   | 2 +-
 .../ibatis/executor/loader/AbstractSerialStateHolder.java       | 2 +-
 .../java/org/apache/ibatis/executor/loader/ProxyFactory.java    | 2 +-
 .../java/org/apache/ibatis/executor/loader/ResultLoader.java    | 2 +-
 .../ibatis/executor/loader/javassist/JavassistProxyFactory.java | 2 +-
 .../apache/ibatis/executor/result/DefaultMapResultHandler.java  | 2 +-
 src/main/java/org/apache/ibatis/io/VFS.java                     | 2 +-
 src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java           | 2 +-
 src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java          | 2 +-
 src/main/java/org/apache/ibatis/jdbc/SqlRunner.java             | 2 +-
 .../java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java     | 2 +-
 .../java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java   | 2 +-
 .../org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java | 2 +-
 .../java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java    | 2 +-
 .../java/org/apache/ibatis/logging/jdbc/StatementLogger.java    | 2 +-
 src/main/java/org/apache/ibatis/logging/log4j/Log4jImpl.java    | 2 +-
 src/main/java/org/apache/ibatis/logging/log4j/package-info.java | 2 +-
 src/main/java/org/apache/ibatis/logging/slf4j/Slf4jImpl.java    | 2 +-
 src/main/java/org/apache/ibatis/mapping/BoundSql.java           | 2 +-
 .../ibatis/submitted/blocking_cache/BlockingCacheTest.java      | 2 +-
 .../org/apache/ibatis/submitted/cacheorder/CacheOrderTest.java  | 2 +-
 .../submitted/call_setters_on_nulls/CallSettersOnNullsTest.java | 2 +-
 .../call_setters_on_nulls/DoNotCallSettersOnNullsTest.java      | 2 +-
 .../submitted/call_setters_on_nulls_again/MyBatisTest.java      | 2 +-
 .../apache/ibatis/submitted/camelcase/CamelCaseMappingTest.java | 2 +-
 .../ibatis/submitted/cglib_lazy_error/CglibNPELazyTest.java     | 2 +-
 .../apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java  | 2 +-
 .../org/apache/ibatis/submitted/cglib_lazy_error/Person.java    | 2 +-
 .../collectionparameters/CollectionParametersTest.java          | 2 +-
 .../submitted/column_forwarding/ColumnForwardingTest.java       | 2 +-
 .../submitted/column_prefix/ColumnPrefixAutoMappingTest.java    | 2 +-
 .../apache/ibatis/submitted/column_prefix/ColumnPrefixTest.java | 2 +-
 .../ibatis/submitted/complex_column/ComplexColumnTest.java      | 2 +-
 .../java/org/apache/ibatis/submitted/complex_column/Person.java | 2 +-
 .../apache/ibatis/submitted/complex_property/ComponentTest.java | 2 +-
 .../apache/ibatis/submitted/complex_type/ComplexTypeTest.java   | 2 +-
 src/test/java/org/apache/ibatis/submitted/count/CountTest.java  | 2 +-
 .../org/apache/ibatis/submitted/criterion/CriterionTest.java    | 2 +-
 .../apache/ibatis/submitted/cursor_nested/CursorNestedTest.java | 2 +-
 .../java/org/apache/ibatis/submitted/cursor_nested/User.java    | 2 +-
 .../apache/ibatis/submitted/cursor_simple/CursorSimpleTest.java | 2 +-
 .../ibatis/submitted/cursor_simple/PostgresCursorTest.java      | 2 +-
 .../java/org/apache/ibatis/submitted/cursor_simple/User.java    | 2 +-
 .../ibatis/submitted/custom_collection_handling/Contact.java    | 2 +-
 .../submitted/custom_collection_handling/CustomCollection.java  | 2 +-
 .../CustomCollectionHandlingTest.java                           | 2 +-
 .../custom_collection_handling/CustomObjectFactory.java         | 2 +-
 .../ibatis/submitted/custom_collection_handling/Person.java     | 2 +-
 .../ibatis/submitted/default_method/DefaultMethodTest.java      | 2 +-
 .../deferload_common_property/CommonPropertyDeferLoadTest.java  | 2 +-
 .../ibatis/submitted/deferload_common_property/Father.java      | 2 +-
 .../submitted/disallowdotsonnames/DisallowDotsOnNamesTest.java  | 2 +-
 .../org/apache/ibatis/submitted/disallowdotsonnames/Person.java | 2 +-
 .../ibatis/submitted/discriminator/DiscriminatorTest.java       | 2 +-
 .../java/org/apache/ibatis/submitted/discriminator/Mapper.java  | 2 +-
 .../duplicate_resource_loaded/DuplicateResourceTest.java        | 2 +-
 .../ibatis/submitted/duplicate_statements/AnnotatedMapper.java  | 2 +-
 .../submitted/duplicate_statements/AnnotatedMapperExtended.java | 2 +-
 .../submitted/duplicate_statements/DuplicateStatementsTest.java | 2 +-
 .../java/org/apache/ibatis/submitted/dynsql/CustomUtil.java     | 2 +-
 .../java/org/apache/ibatis/submitted/dynsql/DynSqlMapper.java   | 2 +-
 .../submitted/enumtypehandler_on_annotation/PersonMapper.java   | 2 +-
 .../org/apache/ibatis/submitted/nestedresulthandler/Item.java   | 2 +-
 .../org/apache/ibatis/submitted/nestedresulthandler/Person.java | 2 +-
 68 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/src/main/java/org/apache/ibatis/executor/BatchExecutorException.java b/src/main/java/org/apache/ibatis/executor/BatchExecutorException.java
index d5faeb1bfb2..c5acfefe9a3 100644
--- a/src/main/java/org/apache/ibatis/executor/BatchExecutorException.java
+++ b/src/main/java/org/apache/ibatis/executor/BatchExecutorException.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/executor/CachingExecutor.java b/src/main/java/org/apache/ibatis/executor/CachingExecutor.java
index 603a358124a..d17aa7e4bec 100644
--- a/src/main/java/org/apache/ibatis/executor/CachingExecutor.java
+++ b/src/main/java/org/apache/ibatis/executor/CachingExecutor.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/executor/Executor.java b/src/main/java/org/apache/ibatis/executor/Executor.java
index fc01c4fb503..837347373cc 100644
--- a/src/main/java/org/apache/ibatis/executor/Executor.java
+++ b/src/main/java/org/apache/ibatis/executor/Executor.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/executor/keygen/SelectKeyGenerator.java b/src/main/java/org/apache/ibatis/executor/keygen/SelectKeyGenerator.java
index af1f8c99afc..7dcf2696e79 100644
--- a/src/main/java/org/apache/ibatis/executor/keygen/SelectKeyGenerator.java
+++ b/src/main/java/org/apache/ibatis/executor/keygen/SelectKeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/executor/loader/AbstractEnhancedDeserializationProxy.java b/src/main/java/org/apache/ibatis/executor/loader/AbstractEnhancedDeserializationProxy.java
index a324eb2a397..6a1f85929e0 100644
--- a/src/main/java/org/apache/ibatis/executor/loader/AbstractEnhancedDeserializationProxy.java
+++ b/src/main/java/org/apache/ibatis/executor/loader/AbstractEnhancedDeserializationProxy.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/executor/loader/AbstractSerialStateHolder.java b/src/main/java/org/apache/ibatis/executor/loader/AbstractSerialStateHolder.java
index 2674ea08433..6eb15a6ef8b 100644
--- a/src/main/java/org/apache/ibatis/executor/loader/AbstractSerialStateHolder.java
+++ b/src/main/java/org/apache/ibatis/executor/loader/AbstractSerialStateHolder.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/executor/loader/ProxyFactory.java b/src/main/java/org/apache/ibatis/executor/loader/ProxyFactory.java
index 2a28104f404..ae573ea02d7 100644
--- a/src/main/java/org/apache/ibatis/executor/loader/ProxyFactory.java
+++ b/src/main/java/org/apache/ibatis/executor/loader/ProxyFactory.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/executor/loader/ResultLoader.java b/src/main/java/org/apache/ibatis/executor/loader/ResultLoader.java
index 458fcb767dd..485fa48f3d7 100644
--- a/src/main/java/org/apache/ibatis/executor/loader/ResultLoader.java
+++ b/src/main/java/org/apache/ibatis/executor/loader/ResultLoader.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/executor/loader/javassist/JavassistProxyFactory.java b/src/main/java/org/apache/ibatis/executor/loader/javassist/JavassistProxyFactory.java
index 67b5f5fe21a..749786d9d9d 100644
--- a/src/main/java/org/apache/ibatis/executor/loader/javassist/JavassistProxyFactory.java
+++ b/src/main/java/org/apache/ibatis/executor/loader/javassist/JavassistProxyFactory.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/executor/result/DefaultMapResultHandler.java b/src/main/java/org/apache/ibatis/executor/result/DefaultMapResultHandler.java
index df6bf41cce7..f2ee92bcc02 100644
--- a/src/main/java/org/apache/ibatis/executor/result/DefaultMapResultHandler.java
+++ b/src/main/java/org/apache/ibatis/executor/result/DefaultMapResultHandler.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/io/VFS.java b/src/main/java/org/apache/ibatis/io/VFS.java
index f7ed89597ba..ee21f9c44d2 100644
--- a/src/main/java/org/apache/ibatis/io/VFS.java
+++ b/src/main/java/org/apache/ibatis/io/VFS.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/jdbc/AbstractSQL.java b/src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java
index 3a75c1ccdea..07fafbe59f0 100644
--- a/src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java
+++ b/src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/jdbc/ScriptRunner.java b/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
index 38b553d42db..db0497b3233 100644
--- a/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
+++ b/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/jdbc/SqlRunner.java b/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java
index dbd09de5675..cce3e405a0a 100644
--- a/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java
+++ b/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java b/src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java
index d20ddfef5c6..287503f3607 100644
--- a/src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java
+++ b/src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java b/src/main/java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java
index f23f77844b6..408c98da703 100644
--- a/src/main/java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java
+++ b/src/main/java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java b/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java
index 8d546b20e92..0c40559589b 100644
--- a/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java
+++ b/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java b/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java
index d703b6e5bf8..902d8adc5c5 100644
--- a/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java
+++ b/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java b/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java
index 19c551ab5fc..286a4302365 100644
--- a/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java
+++ b/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/logging/log4j/Log4jImpl.java b/src/main/java/org/apache/ibatis/logging/log4j/Log4jImpl.java
index 0c2cd9e7cb5..5549644d68d 100644
--- a/src/main/java/org/apache/ibatis/logging/log4j/Log4jImpl.java
+++ b/src/main/java/org/apache/ibatis/logging/log4j/Log4jImpl.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/logging/log4j/package-info.java b/src/main/java/org/apache/ibatis/logging/log4j/package-info.java
index a4f7847d39a..df9bbe5e00f 100644
--- a/src/main/java/org/apache/ibatis/logging/log4j/package-info.java
+++ b/src/main/java/org/apache/ibatis/logging/log4j/package-info.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/logging/slf4j/Slf4jImpl.java b/src/main/java/org/apache/ibatis/logging/slf4j/Slf4jImpl.java
index 62483897521..0f816e9cdfa 100644
--- a/src/main/java/org/apache/ibatis/logging/slf4j/Slf4jImpl.java
+++ b/src/main/java/org/apache/ibatis/logging/slf4j/Slf4jImpl.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/main/java/org/apache/ibatis/mapping/BoundSql.java b/src/main/java/org/apache/ibatis/mapping/BoundSql.java
index aa23248f35e..c6f05cda225 100644
--- a/src/main/java/org/apache/ibatis/mapping/BoundSql.java
+++ b/src/main/java/org/apache/ibatis/mapping/BoundSql.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/blocking_cache/BlockingCacheTest.java b/src/test/java/org/apache/ibatis/submitted/blocking_cache/BlockingCacheTest.java
index 5a567f2d554..5233cf237e1 100644
--- a/src/test/java/org/apache/ibatis/submitted/blocking_cache/BlockingCacheTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/blocking_cache/BlockingCacheTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/cacheorder/CacheOrderTest.java b/src/test/java/org/apache/ibatis/submitted/cacheorder/CacheOrderTest.java
index fa97346808c..96109b3fd20 100644
--- a/src/test/java/org/apache/ibatis/submitted/cacheorder/CacheOrderTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/cacheorder/CacheOrderTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/call_setters_on_nulls/CallSettersOnNullsTest.java b/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls/CallSettersOnNullsTest.java
index ce5dfb50b14..168c4b2e5b3 100644
--- a/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls/CallSettersOnNullsTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls/CallSettersOnNullsTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/call_setters_on_nulls/DoNotCallSettersOnNullsTest.java b/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls/DoNotCallSettersOnNullsTest.java
index ca616eba103..4f544557e84 100644
--- a/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls/DoNotCallSettersOnNullsTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls/DoNotCallSettersOnNullsTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/call_setters_on_nulls_again/MyBatisTest.java b/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls_again/MyBatisTest.java
index a7643feb447..0a73ddc2b62 100644
--- a/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls_again/MyBatisTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls_again/MyBatisTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/camelcase/CamelCaseMappingTest.java b/src/test/java/org/apache/ibatis/submitted/camelcase/CamelCaseMappingTest.java
index e0210c289d6..cc54dcaa534 100644
--- a/src/test/java/org/apache/ibatis/submitted/camelcase/CamelCaseMappingTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/camelcase/CamelCaseMappingTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/cglib_lazy_error/CglibNPELazyTest.java b/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPELazyTest.java
index 821a41ae594..f584d891dc2 100644
--- a/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPELazyTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPELazyTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java b/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java
index 5ba97fc9373..f0a9426a480 100644
--- a/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java
+++ b/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/cglib_lazy_error/Person.java b/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/Person.java
index d6dbbfa96cd..b06fc7715f5 100644
--- a/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/Person.java
+++ b/src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/Person.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/collectionparameters/CollectionParametersTest.java b/src/test/java/org/apache/ibatis/submitted/collectionparameters/CollectionParametersTest.java
index d22d1382402..906eda2838c 100644
--- a/src/test/java/org/apache/ibatis/submitted/collectionparameters/CollectionParametersTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/collectionparameters/CollectionParametersTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/column_forwarding/ColumnForwardingTest.java b/src/test/java/org/apache/ibatis/submitted/column_forwarding/ColumnForwardingTest.java
index 3246e73743e..f56392d1cab 100644
--- a/src/test/java/org/apache/ibatis/submitted/column_forwarding/ColumnForwardingTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/column_forwarding/ColumnForwardingTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/column_prefix/ColumnPrefixAutoMappingTest.java b/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixAutoMappingTest.java
index 035fe31b5b2..b791b93b086 100644
--- a/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixAutoMappingTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixAutoMappingTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/column_prefix/ColumnPrefixTest.java b/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixTest.java
index bfd06c2e94d..6c3634f7b76 100644
--- a/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/complex_column/ComplexColumnTest.java b/src/test/java/org/apache/ibatis/submitted/complex_column/ComplexColumnTest.java
index 27151a40ae7..3e9dcd2fb26 100644
--- a/src/test/java/org/apache/ibatis/submitted/complex_column/ComplexColumnTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/complex_column/ComplexColumnTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/complex_column/Person.java b/src/test/java/org/apache/ibatis/submitted/complex_column/Person.java
index 1c55d5463f1..57f565077b5 100644
--- a/src/test/java/org/apache/ibatis/submitted/complex_column/Person.java
+++ b/src/test/java/org/apache/ibatis/submitted/complex_column/Person.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/complex_property/ComponentTest.java b/src/test/java/org/apache/ibatis/submitted/complex_property/ComponentTest.java
index 5689699c5bb..101d1fefb4d 100644
--- a/src/test/java/org/apache/ibatis/submitted/complex_property/ComponentTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/complex_property/ComponentTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/complex_type/ComplexTypeTest.java b/src/test/java/org/apache/ibatis/submitted/complex_type/ComplexTypeTest.java
index 04dcbb31f6f..052f9ac1c5c 100644
--- a/src/test/java/org/apache/ibatis/submitted/complex_type/ComplexTypeTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/complex_type/ComplexTypeTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/count/CountTest.java b/src/test/java/org/apache/ibatis/submitted/count/CountTest.java
index f63270d5ecb..1782bda306e 100644
--- a/src/test/java/org/apache/ibatis/submitted/count/CountTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/count/CountTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/criterion/CriterionTest.java b/src/test/java/org/apache/ibatis/submitted/criterion/CriterionTest.java
index d88cfae8905..678c47b7151 100644
--- a/src/test/java/org/apache/ibatis/submitted/criterion/CriterionTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/criterion/CriterionTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/cursor_nested/CursorNestedTest.java b/src/test/java/org/apache/ibatis/submitted/cursor_nested/CursorNestedTest.java
index 3b6d1815a49..f17d309ff84 100644
--- a/src/test/java/org/apache/ibatis/submitted/cursor_nested/CursorNestedTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/cursor_nested/CursorNestedTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/cursor_nested/User.java b/src/test/java/org/apache/ibatis/submitted/cursor_nested/User.java
index 9d0642fed6c..cb7846b490c 100644
--- a/src/test/java/org/apache/ibatis/submitted/cursor_nested/User.java
+++ b/src/test/java/org/apache/ibatis/submitted/cursor_nested/User.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/cursor_simple/CursorSimpleTest.java b/src/test/java/org/apache/ibatis/submitted/cursor_simple/CursorSimpleTest.java
index 224705849e4..11f4971f504 100644
--- a/src/test/java/org/apache/ibatis/submitted/cursor_simple/CursorSimpleTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/cursor_simple/CursorSimpleTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/cursor_simple/PostgresCursorTest.java b/src/test/java/org/apache/ibatis/submitted/cursor_simple/PostgresCursorTest.java
index 516dbbee4f1..0e6cd4f32e5 100644
--- a/src/test/java/org/apache/ibatis/submitted/cursor_simple/PostgresCursorTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/cursor_simple/PostgresCursorTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/cursor_simple/User.java b/src/test/java/org/apache/ibatis/submitted/cursor_simple/User.java
index 92930e7669c..b3a44d0927c 100644
--- a/src/test/java/org/apache/ibatis/submitted/cursor_simple/User.java
+++ b/src/test/java/org/apache/ibatis/submitted/cursor_simple/User.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/custom_collection_handling/Contact.java b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/Contact.java
index 1c16314540c..a3a81ef817b 100644
--- a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/Contact.java
+++ b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/Contact.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/custom_collection_handling/CustomCollection.java b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollection.java
index a87233c870e..bbc76b04193 100644
--- a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollection.java
+++ b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollection.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/custom_collection_handling/CustomCollectionHandlingTest.java b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollectionHandlingTest.java
index 319a112e715..6a5b2d84f4e 100644
--- a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollectionHandlingTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomCollectionHandlingTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/custom_collection_handling/CustomObjectFactory.java b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomObjectFactory.java
index 0930862864f..925faabef24 100644
--- a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomObjectFactory.java
+++ b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/CustomObjectFactory.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/custom_collection_handling/Person.java b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/Person.java
index 2bd35e78f53..c876e1e5b36 100644
--- a/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/Person.java
+++ b/src/test/java/org/apache/ibatis/submitted/custom_collection_handling/Person.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/default_method/DefaultMethodTest.java b/src/test/java/org/apache/ibatis/submitted/default_method/DefaultMethodTest.java
index 377dcb4db65..ce8d5d17b95 100644
--- a/src/test/java/org/apache/ibatis/submitted/default_method/DefaultMethodTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/default_method/DefaultMethodTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/deferload_common_property/CommonPropertyDeferLoadTest.java b/src/test/java/org/apache/ibatis/submitted/deferload_common_property/CommonPropertyDeferLoadTest.java
index edf963e87f0..54ef8ce2fea 100644
--- a/src/test/java/org/apache/ibatis/submitted/deferload_common_property/CommonPropertyDeferLoadTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/deferload_common_property/CommonPropertyDeferLoadTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/deferload_common_property/Father.java b/src/test/java/org/apache/ibatis/submitted/deferload_common_property/Father.java
index 31fa2c273ae..9c768942d1c 100644
--- a/src/test/java/org/apache/ibatis/submitted/deferload_common_property/Father.java
+++ b/src/test/java/org/apache/ibatis/submitted/deferload_common_property/Father.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/disallowdotsonnames/DisallowDotsOnNamesTest.java b/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/DisallowDotsOnNamesTest.java
index 497ea39c243..a9c519fdeb7 100644
--- a/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/DisallowDotsOnNamesTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/DisallowDotsOnNamesTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/disallowdotsonnames/Person.java b/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/Person.java
index 64a0e0e9a70..10135f2e8b0 100644
--- a/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/Person.java
+++ b/src/test/java/org/apache/ibatis/submitted/disallowdotsonnames/Person.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/discriminator/DiscriminatorTest.java b/src/test/java/org/apache/ibatis/submitted/discriminator/DiscriminatorTest.java
index 35bc57c3586..197b7b7eb27 100644
--- a/src/test/java/org/apache/ibatis/submitted/discriminator/DiscriminatorTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/discriminator/DiscriminatorTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/discriminator/Mapper.java b/src/test/java/org/apache/ibatis/submitted/discriminator/Mapper.java
index dbccad224d9..0b8ecd465d2 100644
--- a/src/test/java/org/apache/ibatis/submitted/discriminator/Mapper.java
+++ b/src/test/java/org/apache/ibatis/submitted/discriminator/Mapper.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/duplicate_resource_loaded/DuplicateResourceTest.java b/src/test/java/org/apache/ibatis/submitted/duplicate_resource_loaded/DuplicateResourceTest.java
index ae54c87c568..c761be63979 100644
--- a/src/test/java/org/apache/ibatis/submitted/duplicate_resource_loaded/DuplicateResourceTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/duplicate_resource_loaded/DuplicateResourceTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/duplicate_statements/AnnotatedMapper.java b/src/test/java/org/apache/ibatis/submitted/duplicate_statements/AnnotatedMapper.java
index 18457962da3..b085a627d66 100644
--- a/src/test/java/org/apache/ibatis/submitted/duplicate_statements/AnnotatedMapper.java
+++ b/src/test/java/org/apache/ibatis/submitted/duplicate_statements/AnnotatedMapper.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/duplicate_statements/AnnotatedMapperExtended.java b/src/test/java/org/apache/ibatis/submitted/duplicate_statements/AnnotatedMapperExtended.java
index 67cad0d811b..1a804d27d14 100644
--- a/src/test/java/org/apache/ibatis/submitted/duplicate_statements/AnnotatedMapperExtended.java
+++ b/src/test/java/org/apache/ibatis/submitted/duplicate_statements/AnnotatedMapperExtended.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/duplicate_statements/DuplicateStatementsTest.java b/src/test/java/org/apache/ibatis/submitted/duplicate_statements/DuplicateStatementsTest.java
index 9e17c1a9074..ca58ce094b8 100644
--- a/src/test/java/org/apache/ibatis/submitted/duplicate_statements/DuplicateStatementsTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/duplicate_statements/DuplicateStatementsTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/dynsql/CustomUtil.java b/src/test/java/org/apache/ibatis/submitted/dynsql/CustomUtil.java
index 9e535d3a25b..3194fc6754b 100644
--- a/src/test/java/org/apache/ibatis/submitted/dynsql/CustomUtil.java
+++ b/src/test/java/org/apache/ibatis/submitted/dynsql/CustomUtil.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/dynsql/DynSqlMapper.java b/src/test/java/org/apache/ibatis/submitted/dynsql/DynSqlMapper.java
index 930e72d6a7f..1811de6b374 100644
--- a/src/test/java/org/apache/ibatis/submitted/dynsql/DynSqlMapper.java
+++ b/src/test/java/org/apache/ibatis/submitted/dynsql/DynSqlMapper.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/enumtypehandler_on_annotation/PersonMapper.java b/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_annotation/PersonMapper.java
index a825db51b86..615f7803ac5 100644
--- a/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_annotation/PersonMapper.java
+++ b/src/test/java/org/apache/ibatis/submitted/enumtypehandler_on_annotation/PersonMapper.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/nestedresulthandler/Item.java b/src/test/java/org/apache/ibatis/submitted/nestedresulthandler/Item.java
index ad2274b3a92..6528dcb4719 100644
--- a/src/test/java/org/apache/ibatis/submitted/nestedresulthandler/Item.java
+++ b/src/test/java/org/apache/ibatis/submitted/nestedresulthandler/Item.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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/apache/ibatis/submitted/nestedresulthandler/Person.java b/src/test/java/org/apache/ibatis/submitted/nestedresulthandler/Person.java
index 4c004474b18..a90e5609758 100644
--- a/src/test/java/org/apache/ibatis/submitted/nestedresulthandler/Person.java
+++ b/src/test/java/org/apache/ibatis/submitted/nestedresulthandler/Person.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-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.