From 727c444e411e2efbb3f2906c77585ce9cc955a75 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sat, 16 May 2020 18:06:48 -0400
Subject: [PATCH 1/2] [ci] Minor formatting adjustments

---
 .../java/org/apache/ibatis/jdbc/AbstractSQL.java   | 10 +++++++++-
 .../java/org/apache/ibatis/mapping/FetchType.java  |  8 +++++++-
 .../org/apache/ibatis/mapping/ParameterMode.java   |  8 +++++++-
 .../java/org/apache/ibatis/mapping/ResultFlag.java |  6 +++++-
 .../org/apache/ibatis/mapping/SqlCommandType.java  | 14 +++++++++++++-
 .../org/apache/ibatis/mapping/StatementType.java   |  8 +++++++-
 .../java/org/apache/ibatis/plugin/Intercepts.java  |  6 +++---
 .../org/apache/ibatis/session/ExecutorType.java    |  8 +++++++-
 .../ibatis/builder/XmlConfigBuilderTest.java       |  6 +++++-
 .../datasource/pooled/PooledDataSourceTest.java    |  5 ++---
 .../org/apache/ibatis/domain/blog/Section.java     |  9 ++++++++-
 .../apache/ibatis/jdbc/PooledDataSourceTest.java   |  1 +
 12 files changed, 74 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java b/src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java
index 07fafbe59f0..2f6181a8423 100644
--- a/src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java
+++ b/src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java
@@ -563,7 +563,15 @@ public boolean isEmpty() {
   private static class SQLStatement {
 
     public enum StatementType {
-      DELETE, INSERT, SELECT, UPDATE
+
+      DELETE,
+
+      INSERT,
+
+      SELECT,
+
+      UPDATE
+
     }
 
     private enum LimitingRowsStrategy {
diff --git a/src/main/java/org/apache/ibatis/mapping/FetchType.java b/src/main/java/org/apache/ibatis/mapping/FetchType.java
index a7decf6677a..0d558a531d5 100644
--- a/src/main/java/org/apache/ibatis/mapping/FetchType.java
+++ b/src/main/java/org/apache/ibatis/mapping/FetchType.java
@@ -19,5 +19,11 @@
  * @author Eduardo Macarron
  */
 public enum FetchType {
-  LAZY, EAGER, DEFAULT
+
+  LAZY,
+
+  EAGER,
+
+  DEFAULT
+
 }
diff --git a/src/main/java/org/apache/ibatis/mapping/ParameterMode.java b/src/main/java/org/apache/ibatis/mapping/ParameterMode.java
index 96b102d2c7b..a667fcf07b3 100644
--- a/src/main/java/org/apache/ibatis/mapping/ParameterMode.java
+++ b/src/main/java/org/apache/ibatis/mapping/ParameterMode.java
@@ -19,5 +19,11 @@
  * @author Clinton Begin
  */
 public enum ParameterMode {
-  IN, OUT, INOUT
+
+  IN,
+
+  OUT,
+
+  INOUT
+
 }
diff --git a/src/main/java/org/apache/ibatis/mapping/ResultFlag.java b/src/main/java/org/apache/ibatis/mapping/ResultFlag.java
index 8f346e396c7..48ebdf8249b 100644
--- a/src/main/java/org/apache/ibatis/mapping/ResultFlag.java
+++ b/src/main/java/org/apache/ibatis/mapping/ResultFlag.java
@@ -19,5 +19,9 @@
  * @author Clinton Begin
  */
 public enum ResultFlag {
-  ID, CONSTRUCTOR
+
+  ID,
+
+  CONSTRUCTOR
+
 }
diff --git a/src/main/java/org/apache/ibatis/mapping/SqlCommandType.java b/src/main/java/org/apache/ibatis/mapping/SqlCommandType.java
index a521dbd6b96..25e5ad687d7 100644
--- a/src/main/java/org/apache/ibatis/mapping/SqlCommandType.java
+++ b/src/main/java/org/apache/ibatis/mapping/SqlCommandType.java
@@ -19,5 +19,17 @@
  * @author Clinton Begin
  */
 public enum SqlCommandType {
-  UNKNOWN, INSERT, UPDATE, DELETE, SELECT, FLUSH
+
+  UNKNOWN,
+
+  INSERT,
+
+  UPDATE,
+
+  DELETE,
+
+  SELECT,
+
+  FLUSH
+
 }
diff --git a/src/main/java/org/apache/ibatis/mapping/StatementType.java b/src/main/java/org/apache/ibatis/mapping/StatementType.java
index 10e0e6c609e..2aa7d80fc96 100644
--- a/src/main/java/org/apache/ibatis/mapping/StatementType.java
+++ b/src/main/java/org/apache/ibatis/mapping/StatementType.java
@@ -19,5 +19,11 @@
  * @author Clinton Begin
  */
 public enum StatementType {
-  STATEMENT, PREPARED, CALLABLE
+
+  STATEMENT,
+
+  PREPARED,
+
+  CALLABLE
+
 }
diff --git a/src/main/java/org/apache/ibatis/plugin/Intercepts.java b/src/main/java/org/apache/ibatis/plugin/Intercepts.java
index 0e1f5ff2db6..853900c1982 100644
--- a/src/main/java/org/apache/ibatis/plugin/Intercepts.java
+++ b/src/main/java/org/apache/ibatis/plugin/Intercepts.java
@@ -28,10 +28,10 @@
  * <b>How to use:</b>
  *
  * <pre>
- * &#064;Intercepts({&#064;Signature(
- *   type= Executor.class,
+ * &#064;Intercepts({ &#064;Signature(
+ *   type = Executor.class,
  *   method = "update",
- *   args = {MappedStatement.class ,Object.class})})
+ *   args = { MappedStatement.class, Object.class }) })
  * public class ExamplePlugin implements Interceptor {
  *   &#064;Override
  *   public Object intercept(Invocation invocation) throws Throwable {
diff --git a/src/main/java/org/apache/ibatis/session/ExecutorType.java b/src/main/java/org/apache/ibatis/session/ExecutorType.java
index e4d856f59e7..a8ac1937b41 100644
--- a/src/main/java/org/apache/ibatis/session/ExecutorType.java
+++ b/src/main/java/org/apache/ibatis/session/ExecutorType.java
@@ -19,5 +19,11 @@
  * @author Clinton Begin
  */
 public enum ExecutorType {
-  SIMPLE, REUSE, BATCH
+
+  SIMPLE,
+
+  REUSE,
+
+  BATCH
+
 }
diff --git a/src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java b/src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java
index 43ef1af7116..3e8db72fd1f 100644
--- a/src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java
+++ b/src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java
@@ -114,7 +114,11 @@ void shouldSuccessfullyLoadMinimalXMLConfigFile() throws Exception {
   }
 
   enum MyEnum {
-    ONE, TWO
+
+    ONE,
+
+    TWO
+
   }
 
   public static class EnumOrderTypeHandler<E extends Enum<E>> extends BaseTypeHandler<E> {
diff --git a/src/test/java/org/apache/ibatis/datasource/pooled/PooledDataSourceTest.java b/src/test/java/org/apache/ibatis/datasource/pooled/PooledDataSourceTest.java
index bed61a6ea3f..cce510200c0 100644
--- a/src/test/java/org/apache/ibatis/datasource/pooled/PooledDataSourceTest.java
+++ b/src/test/java/org/apache/ibatis/datasource/pooled/PooledDataSourceTest.java
@@ -144,9 +144,8 @@ void forceCloseAllShouldRemoveAllActiveAndIdleConnection() throws SQLException {
     }
 
     assertEquals(dataSource.getPoolMaximumActiveConnections() - poolState.getIdleConnectionCount(),
-      poolState.getActiveConnectionCount());
-    assertEquals(dataSource.getPoolMaximumIdleConnections(),
-      poolState.getIdleConnectionCount());
+        poolState.getActiveConnectionCount());
+    assertEquals(dataSource.getPoolMaximumIdleConnections(), poolState.getIdleConnectionCount());
 
     dataSource.forceCloseAll();
 
diff --git a/src/test/java/org/apache/ibatis/domain/blog/Section.java b/src/test/java/org/apache/ibatis/domain/blog/Section.java
index 182950b7402..532003a0947 100644
--- a/src/test/java/org/apache/ibatis/domain/blog/Section.java
+++ b/src/test/java/org/apache/ibatis/domain/blog/Section.java
@@ -18,5 +18,12 @@
 import java.io.Serializable;
 
 public enum Section implements Serializable {
-  NEWS, VIDEOS, IMAGES, PODCASTS
+  NEWS,
+
+  VIDEOS,
+
+  IMAGES,
+
+  PODCASTS
+
 }
diff --git a/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java b/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java
index 175cf5fd3bc..b8710808174 100644
--- a/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java
+++ b/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java
@@ -85,4 +85,5 @@ void ShouldReturnRealConnection() throws Exception {
     JDBCConnection realConnection = (JDBCConnection) PooledDataSource.unwrapConnection(c);
     c.close();
   }
+
 }

From a95a26cef92af44b4bbc544f2d5bdefa24425920 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 20 Feb 2023 12:46:11 -0500
Subject: [PATCH 2/2] [ci] Import sort new test class

---
 .../ibatis/datasource/pooled/PooledDataSourceTest.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/apache/ibatis/datasource/pooled/PooledDataSourceTest.java b/src/test/java/org/apache/ibatis/datasource/pooled/PooledDataSourceTest.java
index cce510200c0..0e509e8e035 100644
--- a/src/test/java/org/apache/ibatis/datasource/pooled/PooledDataSourceTest.java
+++ b/src/test/java/org/apache/ibatis/datasource/pooled/PooledDataSourceTest.java
@@ -15,8 +15,7 @@
  */
 package org.apache.ibatis.datasource.pooled;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -25,7 +24,8 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 class PooledDataSourceTest {