From 65a0d556e3ed5adad5f56aabff6432f860b8cfc7 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 20 Feb 2023 19:39:16 -0500
Subject: [PATCH 01/10] [ci] Remove unnecessary super calls

---
 src/main/java/org/apache/ibatis/binding/BindingException.java | 1 -
 src/main/java/org/apache/ibatis/binding/MapperProxy.java      | 2 --
 src/main/java/org/apache/ibatis/builder/BuilderException.java | 1 -
 .../org/apache/ibatis/builder/IncompleteElementException.java | 1 -
 .../ibatis/builder/annotation/MapperAnnotationBuilder.java    | 1 -
 src/main/java/org/apache/ibatis/cache/CacheException.java     | 1 -
 src/main/java/org/apache/ibatis/cache/NullCacheKey.java       | 1 -
 .../org/apache/ibatis/datasource/DataSourceException.java     | 1 -
 .../java/org/apache/ibatis/exceptions/IbatisException.java    | 1 -
 .../org/apache/ibatis/exceptions/PersistenceException.java    | 1 -
 .../org/apache/ibatis/exceptions/TooManyResultsException.java | 1 -
 src/main/java/org/apache/ibatis/executor/BatchResult.java     | 1 -
 .../java/org/apache/ibatis/executor/ExecutorException.java    | 1 -
 .../org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java  | 1 -
 .../apache/ibatis/executor/resultset/ResultSetWrapper.java    | 1 -
 src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java         | 1 -
 src/main/java/org/apache/ibatis/jdbc/RuntimeSqlException.java | 1 -
 src/main/java/org/apache/ibatis/logging/LogException.java     | 1 -
 src/main/java/org/apache/ibatis/parsing/ParsingException.java | 1 -
 src/main/java/org/apache/ibatis/plugin/PluginException.java   | 1 -
 src/main/java/org/apache/ibatis/reflection/Jdk.java           | 1 -
 src/main/java/org/apache/ibatis/reflection/OptionalUtil.java  | 1 -
 src/main/java/org/apache/ibatis/reflection/ParamNameUtil.java | 1 -
 .../org/apache/ibatis/reflection/ReflectionException.java     | 1 -
 .../org/apache/ibatis/reflection/TypeParameterResolver.java   | 4 ----
 .../java/org/apache/ibatis/scripting/ScriptingException.java  | 1 -
 src/main/java/org/apache/ibatis/session/Configuration.java    | 1 -
 .../java/org/apache/ibatis/session/SqlSessionException.java   | 1 -
 .../org/apache/ibatis/transaction/TransactionException.java   | 1 -
 src/main/java/org/apache/ibatis/type/ArrayTypeHandler.java    | 1 -
 src/main/java/org/apache/ibatis/type/TypeException.java       | 1 -
 src/main/java/org/apache/ibatis/util/MapUtil.java             | 1 -
 32 files changed, 36 deletions(-)

diff --git a/src/main/java/org/apache/ibatis/binding/BindingException.java b/src/main/java/org/apache/ibatis/binding/BindingException.java
index 538e6dafc7a..8ad78072b57 100644
--- a/src/main/java/org/apache/ibatis/binding/BindingException.java
+++ b/src/main/java/org/apache/ibatis/binding/BindingException.java
@@ -25,7 +25,6 @@ public class BindingException extends PersistenceException {
   private static final long serialVersionUID = 4300802238789381562L;
 
   public BindingException() {
-    super();
   }
 
   public BindingException(String message) {
diff --git a/src/main/java/org/apache/ibatis/binding/MapperProxy.java b/src/main/java/org/apache/ibatis/binding/MapperProxy.java
index 9b63194b1ca..d658efd8cb4 100644
--- a/src/main/java/org/apache/ibatis/binding/MapperProxy.java
+++ b/src/main/java/org/apache/ibatis/binding/MapperProxy.java
@@ -134,7 +134,6 @@ private static class PlainMethodInvoker implements MapperMethodInvoker {
     private final MapperMethod mapperMethod;
 
     public PlainMethodInvoker(MapperMethod mapperMethod) {
-      super();
       this.mapperMethod = mapperMethod;
     }
 
@@ -148,7 +147,6 @@ private static class DefaultMethodInvoker implements MapperMethodInvoker {
     private final MethodHandle methodHandle;
 
     public DefaultMethodInvoker(MethodHandle methodHandle) {
-      super();
       this.methodHandle = methodHandle;
     }
 
diff --git a/src/main/java/org/apache/ibatis/builder/BuilderException.java b/src/main/java/org/apache/ibatis/builder/BuilderException.java
index 0df06b4c0c5..87cfc16a35e 100644
--- a/src/main/java/org/apache/ibatis/builder/BuilderException.java
+++ b/src/main/java/org/apache/ibatis/builder/BuilderException.java
@@ -25,7 +25,6 @@ public class BuilderException extends PersistenceException {
   private static final long serialVersionUID = -3885164021020443281L;
 
   public BuilderException() {
-    super();
   }
 
   public BuilderException(String message) {
diff --git a/src/main/java/org/apache/ibatis/builder/IncompleteElementException.java b/src/main/java/org/apache/ibatis/builder/IncompleteElementException.java
index 18ef706406b..761d4b33254 100644
--- a/src/main/java/org/apache/ibatis/builder/IncompleteElementException.java
+++ b/src/main/java/org/apache/ibatis/builder/IncompleteElementException.java
@@ -22,7 +22,6 @@ public class IncompleteElementException extends BuilderException {
   private static final long serialVersionUID = -3697292286890900315L;
 
   public IncompleteElementException() {
-    super();
   }
 
   public IncompleteElementException(String message, Throwable cause) {
diff --git a/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java b/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
index 1ce6d060459..196185a754f 100644
--- a/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
+++ b/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
@@ -664,7 +664,6 @@ private class AnnotationWrapper {
     private boolean dirtySelect;
 
     AnnotationWrapper(Annotation annotation) {
-      super();
       this.annotation = annotation;
       if (annotation instanceof Select) {
         databaseId = ((Select) annotation).databaseId();
diff --git a/src/main/java/org/apache/ibatis/cache/CacheException.java b/src/main/java/org/apache/ibatis/cache/CacheException.java
index dd3d7e92929..f26a02aeabc 100644
--- a/src/main/java/org/apache/ibatis/cache/CacheException.java
+++ b/src/main/java/org/apache/ibatis/cache/CacheException.java
@@ -25,7 +25,6 @@ public class CacheException extends PersistenceException {
   private static final long serialVersionUID = -193202262468464650L;
 
   public CacheException() {
-    super();
   }
 
   public CacheException(String message) {
diff --git a/src/main/java/org/apache/ibatis/cache/NullCacheKey.java b/src/main/java/org/apache/ibatis/cache/NullCacheKey.java
index 55a62592972..254a5120f7b 100644
--- a/src/main/java/org/apache/ibatis/cache/NullCacheKey.java
+++ b/src/main/java/org/apache/ibatis/cache/NullCacheKey.java
@@ -26,7 +26,6 @@ public final class NullCacheKey extends CacheKey {
   private static final long serialVersionUID = 3704229911977019465L;
 
   public NullCacheKey() {
-    super();
   }
 
   @Override
diff --git a/src/main/java/org/apache/ibatis/datasource/DataSourceException.java b/src/main/java/org/apache/ibatis/datasource/DataSourceException.java
index 3a9a24cc38a..d229d89c7ff 100644
--- a/src/main/java/org/apache/ibatis/datasource/DataSourceException.java
+++ b/src/main/java/org/apache/ibatis/datasource/DataSourceException.java
@@ -25,7 +25,6 @@ public class DataSourceException extends PersistenceException {
   private static final long serialVersionUID = -5251396250407091334L;
 
   public DataSourceException() {
-    super();
   }
 
   public DataSourceException(String message) {
diff --git a/src/main/java/org/apache/ibatis/exceptions/IbatisException.java b/src/main/java/org/apache/ibatis/exceptions/IbatisException.java
index e97a621895f..e9fd1940206 100644
--- a/src/main/java/org/apache/ibatis/exceptions/IbatisException.java
+++ b/src/main/java/org/apache/ibatis/exceptions/IbatisException.java
@@ -24,7 +24,6 @@ public class IbatisException extends RuntimeException {
   private static final long serialVersionUID = 3880206998166270511L;
 
   public IbatisException() {
-    super();
   }
 
   public IbatisException(String message) {
diff --git a/src/main/java/org/apache/ibatis/exceptions/PersistenceException.java b/src/main/java/org/apache/ibatis/exceptions/PersistenceException.java
index 572f41db624..4f48da3a9ba 100644
--- a/src/main/java/org/apache/ibatis/exceptions/PersistenceException.java
+++ b/src/main/java/org/apache/ibatis/exceptions/PersistenceException.java
@@ -24,7 +24,6 @@ public class PersistenceException extends IbatisException {
   private static final long serialVersionUID = -7537395265357977271L;
 
   public PersistenceException() {
-    super();
   }
 
   public PersistenceException(String message) {
diff --git a/src/main/java/org/apache/ibatis/exceptions/TooManyResultsException.java b/src/main/java/org/apache/ibatis/exceptions/TooManyResultsException.java
index cf5f5e6ada9..0420b3f8bb2 100644
--- a/src/main/java/org/apache/ibatis/exceptions/TooManyResultsException.java
+++ b/src/main/java/org/apache/ibatis/exceptions/TooManyResultsException.java
@@ -23,7 +23,6 @@ public class TooManyResultsException extends PersistenceException {
   private static final long serialVersionUID = 8935197089745865786L;
 
   public TooManyResultsException() {
-    super();
   }
 
   public TooManyResultsException(String message) {
diff --git a/src/main/java/org/apache/ibatis/executor/BatchResult.java b/src/main/java/org/apache/ibatis/executor/BatchResult.java
index 50f51591767..9f59faf76e5 100644
--- a/src/main/java/org/apache/ibatis/executor/BatchResult.java
+++ b/src/main/java/org/apache/ibatis/executor/BatchResult.java
@@ -32,7 +32,6 @@ public class BatchResult {
   private int[] updateCounts;
 
   public BatchResult(MappedStatement mappedStatement, String sql) {
-    super();
     this.mappedStatement = mappedStatement;
     this.sql = sql;
     this.parameterObjects = new ArrayList<>();
diff --git a/src/main/java/org/apache/ibatis/executor/ExecutorException.java b/src/main/java/org/apache/ibatis/executor/ExecutorException.java
index e5f96aded02..2fb77d13383 100644
--- a/src/main/java/org/apache/ibatis/executor/ExecutorException.java
+++ b/src/main/java/org/apache/ibatis/executor/ExecutorException.java
@@ -25,7 +25,6 @@ public class ExecutorException extends PersistenceException {
   private static final long serialVersionUID = 4060977051977364820L;
 
   public ExecutorException() {
-    super();
   }
 
   public ExecutorException(String message) {
diff --git a/src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java b/src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java
index 8054da3828b..b5adad048b1 100644
--- a/src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java
+++ b/src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java
@@ -240,7 +240,6 @@ private class KeyAssigner {
 
     protected KeyAssigner(Configuration configuration, ResultSetMetaData rsmd, int columnPosition, String paramName,
         String propertyName) {
-      super();
       this.configuration = configuration;
       this.rsmd = rsmd;
       this.typeHandlerRegistry = configuration.getTypeHandlerRegistry();
diff --git a/src/main/java/org/apache/ibatis/executor/resultset/ResultSetWrapper.java b/src/main/java/org/apache/ibatis/executor/resultset/ResultSetWrapper.java
index 48d81d5ed46..ae826baa44a 100644
--- a/src/main/java/org/apache/ibatis/executor/resultset/ResultSetWrapper.java
+++ b/src/main/java/org/apache/ibatis/executor/resultset/ResultSetWrapper.java
@@ -51,7 +51,6 @@ public class ResultSetWrapper {
   private final Map<String, List<String>> unMappedColumnNamesMap = new HashMap<>();
 
   public ResultSetWrapper(ResultSet rs, Configuration configuration) throws SQLException {
-    super();
     this.typeHandlerRegistry = configuration.getTypeHandlerRegistry();
     this.resultSet = rs;
     final ResultSetMetaData metaData = rs.getMetaData();
diff --git a/src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java b/src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java
index 2f6181a8423..6e031c46267 100644
--- a/src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java
+++ b/src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java
@@ -538,7 +538,6 @@ private static class SafeAppendable {
     private boolean empty = true;
 
     public SafeAppendable(Appendable a) {
-      super();
       this.appendable = a;
     }
 
diff --git a/src/main/java/org/apache/ibatis/jdbc/RuntimeSqlException.java b/src/main/java/org/apache/ibatis/jdbc/RuntimeSqlException.java
index 3073135d19f..719d3cd5bb2 100644
--- a/src/main/java/org/apache/ibatis/jdbc/RuntimeSqlException.java
+++ b/src/main/java/org/apache/ibatis/jdbc/RuntimeSqlException.java
@@ -23,7 +23,6 @@ public class RuntimeSqlException extends RuntimeException {
   private static final long serialVersionUID = 5224696788505678598L;
 
   public RuntimeSqlException() {
-    super();
   }
 
   public RuntimeSqlException(String message) {
diff --git a/src/main/java/org/apache/ibatis/logging/LogException.java b/src/main/java/org/apache/ibatis/logging/LogException.java
index 28946f2dee5..ca33a516582 100644
--- a/src/main/java/org/apache/ibatis/logging/LogException.java
+++ b/src/main/java/org/apache/ibatis/logging/LogException.java
@@ -25,7 +25,6 @@ public class LogException extends PersistenceException {
   private static final long serialVersionUID = 1022924004852350942L;
 
   public LogException() {
-    super();
   }
 
   public LogException(String message) {
diff --git a/src/main/java/org/apache/ibatis/parsing/ParsingException.java b/src/main/java/org/apache/ibatis/parsing/ParsingException.java
index 776e3899b88..57e5a5433d5 100644
--- a/src/main/java/org/apache/ibatis/parsing/ParsingException.java
+++ b/src/main/java/org/apache/ibatis/parsing/ParsingException.java
@@ -24,7 +24,6 @@ public class ParsingException extends PersistenceException {
   private static final long serialVersionUID = -176685891441325943L;
 
   public ParsingException() {
-    super();
   }
 
   public ParsingException(String message) {
diff --git a/src/main/java/org/apache/ibatis/plugin/PluginException.java b/src/main/java/org/apache/ibatis/plugin/PluginException.java
index 157ea8a1916..e1612facfc6 100644
--- a/src/main/java/org/apache/ibatis/plugin/PluginException.java
+++ b/src/main/java/org/apache/ibatis/plugin/PluginException.java
@@ -25,7 +25,6 @@ public class PluginException extends PersistenceException {
   private static final long serialVersionUID = 8548771664564998595L;
 
   public PluginException() {
-    super();
   }
 
   public PluginException(String message) {
diff --git a/src/main/java/org/apache/ibatis/reflection/Jdk.java b/src/main/java/org/apache/ibatis/reflection/Jdk.java
index 4b826dbd45e..a75f6dcc488 100644
--- a/src/main/java/org/apache/ibatis/reflection/Jdk.java
+++ b/src/main/java/org/apache/ibatis/reflection/Jdk.java
@@ -76,6 +76,5 @@ public class Jdk {
   }
 
   private Jdk() {
-    super();
   }
 }
diff --git a/src/main/java/org/apache/ibatis/reflection/OptionalUtil.java b/src/main/java/org/apache/ibatis/reflection/OptionalUtil.java
index 44b71c10ea6..50c2ed4e964 100644
--- a/src/main/java/org/apache/ibatis/reflection/OptionalUtil.java
+++ b/src/main/java/org/apache/ibatis/reflection/OptionalUtil.java
@@ -28,6 +28,5 @@ public static Object ofNullable(Object value) {
   }
 
   private OptionalUtil() {
-    super();
   }
 }
diff --git a/src/main/java/org/apache/ibatis/reflection/ParamNameUtil.java b/src/main/java/org/apache/ibatis/reflection/ParamNameUtil.java
index 45d3b1b071f..014edca177c 100644
--- a/src/main/java/org/apache/ibatis/reflection/ParamNameUtil.java
+++ b/src/main/java/org/apache/ibatis/reflection/ParamNameUtil.java
@@ -37,6 +37,5 @@ private static List<String> getParameterNames(Executable executable) {
   }
 
   private ParamNameUtil() {
-    super();
   }
 }
diff --git a/src/main/java/org/apache/ibatis/reflection/ReflectionException.java b/src/main/java/org/apache/ibatis/reflection/ReflectionException.java
index 5aff67c5b5e..fecc3f2d002 100644
--- a/src/main/java/org/apache/ibatis/reflection/ReflectionException.java
+++ b/src/main/java/org/apache/ibatis/reflection/ReflectionException.java
@@ -25,7 +25,6 @@ public class ReflectionException extends PersistenceException {
   private static final long serialVersionUID = 7642570221267566591L;
 
   public ReflectionException() {
-    super();
   }
 
   public ReflectionException(String message) {
diff --git a/src/main/java/org/apache/ibatis/reflection/TypeParameterResolver.java b/src/main/java/org/apache/ibatis/reflection/TypeParameterResolver.java
index 17641fc4e09..ef1c1da0732 100644
--- a/src/main/java/org/apache/ibatis/reflection/TypeParameterResolver.java
+++ b/src/main/java/org/apache/ibatis/reflection/TypeParameterResolver.java
@@ -242,7 +242,6 @@ private static ParameterizedType translateParentTypeVars(ParameterizedType srcTy
   }
 
   private TypeParameterResolver() {
-    super();
   }
 
   static class ParameterizedTypeImpl implements ParameterizedType {
@@ -253,7 +252,6 @@ static class ParameterizedTypeImpl implements ParameterizedType {
     private final Type[] actualTypeArguments;
 
     public ParameterizedTypeImpl(Class<?> rawType, Type ownerType, Type[] actualTypeArguments) {
-      super();
       this.rawType = rawType;
       this.ownerType = ownerType;
       this.actualTypeArguments = actualTypeArguments;
@@ -287,7 +285,6 @@ static class WildcardTypeImpl implements WildcardType {
     private final Type[] upperBounds;
 
     WildcardTypeImpl(Type[] lowerBounds, Type[] upperBounds) {
-      super();
       this.lowerBounds = lowerBounds;
       this.upperBounds = upperBounds;
     }
@@ -307,7 +304,6 @@ static class GenericArrayTypeImpl implements GenericArrayType {
     private final Type genericComponentType;
 
     GenericArrayTypeImpl(Type genericComponentType) {
-      super();
       this.genericComponentType = genericComponentType;
     }
 
diff --git a/src/main/java/org/apache/ibatis/scripting/ScriptingException.java b/src/main/java/org/apache/ibatis/scripting/ScriptingException.java
index 10286efce29..3aa8e093be5 100644
--- a/src/main/java/org/apache/ibatis/scripting/ScriptingException.java
+++ b/src/main/java/org/apache/ibatis/scripting/ScriptingException.java
@@ -25,7 +25,6 @@ public class ScriptingException extends PersistenceException {
   private static final long serialVersionUID = 7642570221267566591L;
 
   public ScriptingException() {
-    super();
   }
 
   public ScriptingException(String message) {
diff --git a/src/main/java/org/apache/ibatis/session/Configuration.java b/src/main/java/org/apache/ibatis/session/Configuration.java
index 14742db0257..76576fc690b 100644
--- a/src/main/java/org/apache/ibatis/session/Configuration.java
+++ b/src/main/java/org/apache/ibatis/session/Configuration.java
@@ -1039,7 +1039,6 @@ public StrictMap(String name, int initialCapacity) {
     }
 
     public StrictMap(String name) {
-      super();
       this.name = name;
     }
 
diff --git a/src/main/java/org/apache/ibatis/session/SqlSessionException.java b/src/main/java/org/apache/ibatis/session/SqlSessionException.java
index 84ddcacf4cc..1250fc82f6d 100644
--- a/src/main/java/org/apache/ibatis/session/SqlSessionException.java
+++ b/src/main/java/org/apache/ibatis/session/SqlSessionException.java
@@ -25,7 +25,6 @@ public class SqlSessionException extends PersistenceException {
   private static final long serialVersionUID = 3833184690240265047L;
 
   public SqlSessionException() {
-    super();
   }
 
   public SqlSessionException(String message) {
diff --git a/src/main/java/org/apache/ibatis/transaction/TransactionException.java b/src/main/java/org/apache/ibatis/transaction/TransactionException.java
index c207c078b3c..7383ab94184 100644
--- a/src/main/java/org/apache/ibatis/transaction/TransactionException.java
+++ b/src/main/java/org/apache/ibatis/transaction/TransactionException.java
@@ -25,7 +25,6 @@ public class TransactionException extends PersistenceException {
   private static final long serialVersionUID = -433589569461084605L;
 
   public TransactionException() {
-    super();
   }
 
   public TransactionException(String message) {
diff --git a/src/main/java/org/apache/ibatis/type/ArrayTypeHandler.java b/src/main/java/org/apache/ibatis/type/ArrayTypeHandler.java
index a5db8faa46e..074f53060de 100644
--- a/src/main/java/org/apache/ibatis/type/ArrayTypeHandler.java
+++ b/src/main/java/org/apache/ibatis/type/ArrayTypeHandler.java
@@ -73,7 +73,6 @@ public class ArrayTypeHandler extends BaseTypeHandler<Object> {
   }
 
   public ArrayTypeHandler() {
-    super();
   }
 
   @Override
diff --git a/src/main/java/org/apache/ibatis/type/TypeException.java b/src/main/java/org/apache/ibatis/type/TypeException.java
index d30369868ed..5c0fd377cf3 100644
--- a/src/main/java/org/apache/ibatis/type/TypeException.java
+++ b/src/main/java/org/apache/ibatis/type/TypeException.java
@@ -25,7 +25,6 @@ public class TypeException extends PersistenceException {
   private static final long serialVersionUID = 8614420898975117130L;
 
   public TypeException() {
-    super();
   }
 
   public TypeException(String message) {
diff --git a/src/main/java/org/apache/ibatis/util/MapUtil.java b/src/main/java/org/apache/ibatis/util/MapUtil.java
index b0a6797d813..6ac26fa744a 100644
--- a/src/main/java/org/apache/ibatis/util/MapUtil.java
+++ b/src/main/java/org/apache/ibatis/util/MapUtil.java
@@ -44,6 +44,5 @@ public static <K, V> Entry<K, V> entry(K key, V value) {
   }
 
   private MapUtil() {
-    super();
   }
 }

From 200e07ee56d3900c273d075de18c21db0ddc1453 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 20 Feb 2023 19:42:54 -0500
Subject: [PATCH 02/10] [ci] Make static classes 'static'

---
 .../ibatis/builder/annotation/MapperAnnotationBuilder.java      | 2 +-
 .../org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java    | 2 +-
 .../org/apache/ibatis/scripting/xmltags/XMLScriptBuilder.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java b/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
index 196185a754f..af960ce55a8 100644
--- a/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
+++ b/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
@@ -657,7 +657,7 @@ public static Class<?> getMethodReturnType(String mapperFqn, String localStateme
     return null;
   }
 
-  private class AnnotationWrapper {
+  private static class AnnotationWrapper {
     private final Annotation annotation;
     private final String databaseId;
     private final SqlCommandType sqlCommandType;
diff --git a/src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java b/src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java
index b5adad048b1..d9135494673 100644
--- a/src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java
+++ b/src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java
@@ -229,7 +229,7 @@ private static Collection<?> collectionize(Object param) {
     }
   }
 
-  private class KeyAssigner {
+  private static class KeyAssigner {
     private final Configuration configuration;
     private final ResultSetMetaData rsmd;
     private final TypeHandlerRegistry typeHandlerRegistry;
diff --git a/src/main/java/org/apache/ibatis/scripting/xmltags/XMLScriptBuilder.java b/src/main/java/org/apache/ibatis/scripting/xmltags/XMLScriptBuilder.java
index 3767e446f7d..6e9cafc1fb4 100644
--- a/src/main/java/org/apache/ibatis/scripting/xmltags/XMLScriptBuilder.java
+++ b/src/main/java/org/apache/ibatis/scripting/xmltags/XMLScriptBuilder.java
@@ -104,7 +104,7 @@ private interface NodeHandler {
     void handleNode(XNode nodeToHandle, List<SqlNode> targetContents);
   }
 
-  private class BindHandler implements NodeHandler {
+  private static class BindHandler implements NodeHandler {
     public BindHandler() {
       // Prevent Synthetic Access
     }

From cc812cc8d658ade811fe12f783ee347a31c502d9 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 20 Feb 2023 19:44:03 -0500
Subject: [PATCH 03/10] [ci] Remove unnecessary parentheses and allow quicker
 exit

---
 .../builder/annotation/MapperAnnotationBuilder.java       | 6 +++---
 .../apache/ibatis/datasource/pooled/PooledDataSource.java | 2 +-
 .../executor/resultset/DefaultResultSetHandler.java       | 8 ++++----
 src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java    | 2 +-
 src/main/java/org/apache/ibatis/mapping/ResultMap.java    | 2 +-
 .../java/org/apache/ibatis/parsing/PropertyParser.java    | 2 +-
 src/main/java/org/apache/ibatis/reflection/Reflector.java | 4 ++--
 .../apache/ibatis/reflection/property/PropertyNamer.java  | 4 ++--
 .../apache/ibatis/session/defaults/DefaultSqlSession.java | 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java b/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
index af960ce55a8..61c62ad360d 100644
--- a/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
+++ b/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
@@ -215,7 +215,7 @@ private void parseCacheRef() {
       if (refType != void.class && !refName.isEmpty()) {
         throw new BuilderException("Cannot use both value() and name() attribute in the @CacheNamespaceRef");
       }
-      String namespace = (refType != void.class) ? refType.getName() : refName;
+      String namespace = refType != void.class ? refType.getName() : refName;
       try {
         assistant.useCacheRef(namespace);
       } catch (IncompleteElementException e) {
@@ -462,8 +462,8 @@ private void applyResults(Result[] results, Class<?> resultType, List<ResultMapp
         flags.add(ResultFlag.ID);
       }
       @SuppressWarnings("unchecked")
-      Class<? extends TypeHandler<?>> typeHandler = (Class<? extends TypeHandler<?>>) ((result
-          .typeHandler() == UnknownTypeHandler.class) ? null : result.typeHandler());
+      Class<? extends TypeHandler<?>> typeHandler = (Class<? extends TypeHandler<?>>) (result
+          .typeHandler() == UnknownTypeHandler.class ? null : result.typeHandler());
       boolean hasNestedResultMap = hasNestedResultMap(result);
       ResultMapping resultMapping = assistant.buildResultMapping(resultType, nullOrEmpty(result.property()),
           nullOrEmpty(result.column()), result.javaType() == void.class ? null : result.javaType(),
diff --git a/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java b/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java
index f0b6ea43f32..8fa7458bab0 100644
--- a/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java
+++ b/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java
@@ -523,7 +523,7 @@ private PooledConnection popConnection(String username, String password) throws
             state.badConnectionCount++;
             localBadConnectionCount++;
             conn = null;
-            if (localBadConnectionCount > (poolMaximumIdleConnections + poolMaximumLocalBadConnectionTolerance)) {
+            if (localBadConnectionCount > poolMaximumIdleConnections + poolMaximumLocalBadConnectionTolerance) {
               if (log.isDebugEnabled()) {
                 log.debug("PooledDataSource: Could not get a good connection to the database.");
               }
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 b56c133e55e..f86e69b331f 100644
--- a/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
+++ b/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
@@ -486,7 +486,7 @@ private boolean applyPropertyMappings(ResultSetWrapper rsw, ResultMap resultMap,
         column = null;
       }
       if (propertyMapping.isCompositeResult()
-          || (column != null && mappedColumnNames.contains(column.toUpperCase(Locale.ENGLISH)))
+          || column != null && mappedColumnNames.contains(column.toUpperCase(Locale.ENGLISH))
           || propertyMapping.getResultSet() != null) {
         Object value = getPropertyMappingValue(rsw.getResultSet(), metaObject, propertyMapping, lazyLoader,
             columnPrefix);
@@ -503,7 +503,7 @@ private boolean applyPropertyMappings(ResultSetWrapper rsw, ResultMap resultMap,
           foundValues = true;
         }
         if (value != null
-            || (configuration.isCallSettersOnNulls() && !metaObject.getSetterType(property).isPrimitive())) {
+            || configuration.isCallSettersOnNulls() && !metaObject.getSetterType(property).isPrimitive()) {
           // gcode issue #377, call setter on nulls (value is not 'found')
           metaObject.setValue(property, value);
         }
@@ -565,7 +565,7 @@ private List<UnMappedColumnAutoMapping> createAutomaticMappings(ResultSetWrapper
           }
         } else {
           configuration.getAutoMappingUnknownColumnBehavior().doAction(mappedStatement, columnName,
-              (property != null) ? property : propertyName, null);
+              property != null ? property : propertyName, null);
         }
       }
       autoMappingsCache.put(mapKey, autoMapping);
@@ -583,7 +583,7 @@ private boolean applyAutomaticMappings(ResultSetWrapper rsw, ResultMap resultMap
         if (value != null) {
           foundValues = true;
         }
-        if (value != null || (configuration.isCallSettersOnNulls() && !mapping.primitive)) {
+        if (value != null || configuration.isCallSettersOnNulls() && !mapping.primitive) {
           // gcode issue #377, call setter on nulls (value is not 'found')
           metaObject.setValue(mapping.property, value);
         }
diff --git a/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java b/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
index 9f2f2c089aa..54114b10883 100644
--- a/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
+++ b/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
@@ -248,7 +248,7 @@ private void executeStatement(String command) throws SQLException {
       }
       try {
         boolean hasResults = statement.execute(sql);
-        while (!(!hasResults && statement.getUpdateCount() == -1)) {
+        while ((hasResults || (statement.getUpdateCount() != -1))) {
           checkWarnings(statement);
           printResults(statement, hasResults);
           hasResults = statement.getMoreResults();
diff --git a/src/main/java/org/apache/ibatis/mapping/ResultMap.java b/src/main/java/org/apache/ibatis/mapping/ResultMap.java
index 029dde54287..5115dcd9c28 100644
--- a/src/main/java/org/apache/ibatis/mapping/ResultMap.java
+++ b/src/main/java/org/apache/ibatis/mapping/ResultMap.java
@@ -93,7 +93,7 @@ public ResultMap build() {
       for (ResultMapping resultMapping : resultMap.resultMappings) {
         resultMap.hasNestedQueries = resultMap.hasNestedQueries || resultMapping.getNestedQueryId() != null;
         resultMap.hasNestedResultMaps = resultMap.hasNestedResultMaps
-            || (resultMapping.getNestedResultMapId() != null && resultMapping.getResultSet() == null);
+            || resultMapping.getNestedResultMapId() != null && resultMapping.getResultSet() == null;
         final String column = resultMapping.getColumn();
         if (column != null) {
           resultMap.mappedColumns.add(column.toUpperCase(Locale.ENGLISH));
diff --git a/src/main/java/org/apache/ibatis/parsing/PropertyParser.java b/src/main/java/org/apache/ibatis/parsing/PropertyParser.java
index 31d675921ed..57301667ea7 100644
--- a/src/main/java/org/apache/ibatis/parsing/PropertyParser.java
+++ b/src/main/java/org/apache/ibatis/parsing/PropertyParser.java
@@ -70,7 +70,7 @@ private VariableTokenHandler(Properties variables) {
     }
 
     private String getPropertyValue(String key, String defaultValue) {
-      return (variables == null) ? defaultValue : variables.getProperty(key, defaultValue);
+      return variables == null ? defaultValue : variables.getProperty(key, defaultValue);
     }
 
     @Override
diff --git a/src/main/java/org/apache/ibatis/reflection/Reflector.java b/src/main/java/org/apache/ibatis/reflection/Reflector.java
index d4d76c3c30b..abd03c70c31 100644
--- a/src/main/java/org/apache/ibatis/reflection/Reflector.java
+++ b/src/main/java/org/apache/ibatis/reflection/Reflector.java
@@ -243,7 +243,7 @@ private void addFields(Class<?> clazz) {
         // modification of final fields through reflection (JSR-133). (JGB)
         // pr #16 - final static can only be set by the classloader
         int modifiers = field.getModifiers();
-        if (!(Modifier.isFinal(modifiers) && Modifier.isStatic(modifiers))) {
+        if ((!Modifier.isFinal(modifiers) || !Modifier.isStatic(modifiers))) {
           addSetField(field);
         }
       }
@@ -273,7 +273,7 @@ private void addGetField(Field field) {
   }
 
   private boolean isValidPropertyName(String name) {
-    return !(name.startsWith("$") || "serialVersionUID".equals(name) || "class".equals(name));
+    return (!name.startsWith("$") && !"serialVersionUID".equals(name) && !"class".equals(name));
   }
 
   /**
diff --git a/src/main/java/org/apache/ibatis/reflection/property/PropertyNamer.java b/src/main/java/org/apache/ibatis/reflection/property/PropertyNamer.java
index f732ce2023c..aff60ce26c3 100644
--- a/src/main/java/org/apache/ibatis/reflection/property/PropertyNamer.java
+++ b/src/main/java/org/apache/ibatis/reflection/property/PropertyNamer.java
@@ -38,7 +38,7 @@ public static String methodToProperty(String name) {
           "Error parsing property name '" + name + "'.  Didn't start with 'is', 'get' or 'set'.");
     }
 
-    if (name.length() == 1 || (name.length() > 1 && !Character.isUpperCase(name.charAt(1)))) {
+    if (name.length() == 1 || name.length() > 1 && !Character.isUpperCase(name.charAt(1))) {
       name = name.substring(0, 1).toLowerCase(Locale.ENGLISH) + name.substring(1);
     }
 
@@ -50,7 +50,7 @@ public static boolean isProperty(String name) {
   }
 
   public static boolean isGetter(String name) {
-    return (name.startsWith("get") && name.length() > 3) || (name.startsWith("is") && name.length() > 2);
+    return name.startsWith("get") && name.length() > 3 || name.startsWith("is") && name.length() > 2;
   }
 
   public static boolean isSetter(String name) {
diff --git a/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSession.java b/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSession.java
index f345ca595d3..62b39becea5 100644
--- a/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSession.java
+++ b/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSession.java
@@ -313,7 +313,7 @@ private <T> void registerCursor(Cursor<T> cursor) {
   }
 
   private boolean isCommitOrRollbackRequired(boolean force) {
-    return (!autoCommit && dirty) || force;
+    return !autoCommit && dirty || force;
   }
 
   private Object wrapCollection(final Object object) {

From 077db4fe347bd3da5f97239d6412da87ceef4c68 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 20 Feb 2023 19:44:19 -0500
Subject: [PATCH 04/10] [ci] Add missing serial version uid as 1L

---
 src/main/java/org/apache/ibatis/cache/CacheKey.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/apache/ibatis/cache/CacheKey.java b/src/main/java/org/apache/ibatis/cache/CacheKey.java
index 13074124a10..474f80dff15 100644
--- a/src/main/java/org/apache/ibatis/cache/CacheKey.java
+++ b/src/main/java/org/apache/ibatis/cache/CacheKey.java
@@ -31,6 +31,8 @@ public class CacheKey implements Cloneable, Serializable {
 
   public static final CacheKey NULL_CACHE_KEY = new CacheKey() {
 
+    private static final long serialVersionUID = 1L;
+
     @Override
     public void update(Object object) {
       throw new CacheException("Not allowed to update a null cache key instance.");

From 01718f965aebffb89035604e5640c57ce6ece686 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 20 Feb 2023 19:44:38 -0500
Subject: [PATCH 05/10] [ci] Use diamond operator

---
 src/main/java/org/apache/ibatis/cache/decorators/LruCache.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java b/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java
index a887a13f0e5..df9c6062f1a 100644
--- a/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java
+++ b/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java
@@ -47,7 +47,7 @@ public int getSize() {
   }
 
   public void setSize(final int size) {
-    keyMap = new LinkedHashMap<Object, Object>(size, .75F, true) {
+    keyMap = new LinkedHashMap<>(size, .75F, true) {
       private static final long serialVersionUID = 4267176411845948333L;
 
       @Override

From 886461aa9d91fc1e4470a949afdc4b725d9a5268 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 20 Feb 2023 19:45:00 -0500
Subject: [PATCH 06/10] [ci] Remove named wrapper of list as type given already

---
 .../org/apache/ibatis/datasource/pooled/PooledConnection.java   | 2 +-
 .../ibatis/executor/loader/AbstractSerialStateHolder.java       | 2 +-
 .../java/org/apache/ibatis/reflection/wrapper/BaseWrapper.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java b/src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java
index 89dd90c5d06..b9c974806d8 100644
--- a/src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java
+++ b/src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java
@@ -29,7 +29,7 @@
 class PooledConnection implements InvocationHandler {
 
   private static final String CLOSE = "close";
-  private static final Class<?>[] IFACES = new Class<?>[] { Connection.class };
+  private static final Class<?>[] IFACES = { Connection.class };
 
   private final int hashCode;
   private final PooledDataSource dataSource;
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 6eb15a6ef8b..c5d36d96de5 100644
--- a/src/main/java/org/apache/ibatis/executor/loader/AbstractSerialStateHolder.java
+++ b/src/main/java/org/apache/ibatis/executor/loader/AbstractSerialStateHolder.java
@@ -42,7 +42,7 @@ public abstract class AbstractSerialStateHolder implements Externalizable {
 
   private static final long serialVersionUID = 8940388717901644661L;
   private static final ThreadLocal<ObjectOutputStream> stream = new ThreadLocal<>();
-  private byte[] userBeanBytes = new byte[0];
+  private byte[] userBeanBytes = {};
   private Object userBean;
   private Map<String, ResultLoaderMap.LoadPair> unloadedProperties;
   private ObjectFactory objectFactory;
diff --git a/src/main/java/org/apache/ibatis/reflection/wrapper/BaseWrapper.java b/src/main/java/org/apache/ibatis/reflection/wrapper/BaseWrapper.java
index fd6ae1be437..c85dfd0d30c 100644
--- a/src/main/java/org/apache/ibatis/reflection/wrapper/BaseWrapper.java
+++ b/src/main/java/org/apache/ibatis/reflection/wrapper/BaseWrapper.java
@@ -27,7 +27,7 @@
  */
 public abstract class BaseWrapper implements ObjectWrapper {
 
-  protected static final Object[] NO_ARGUMENTS = new Object[0];
+  protected static final Object[] NO_ARGUMENTS = {};
   protected final MetaObject metaObject;
 
   protected BaseWrapper(MetaObject metaObject) {

From fb3f1896fe98ba015b6ef6da282c85d59db49929 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 20 Feb 2023 19:45:26 -0500
Subject: [PATCH 07/10] [ci] Remove unused variable from internal method

---
 .../executor/resultset/DefaultResultSetHandler.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 f86e69b331f..5d9b684744b 100644
--- a/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
+++ b/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
@@ -764,8 +764,8 @@ private Object applyConstructorAutomapping(ResultSetWrapper rsw, ResultMap resul
       throws SQLException {
     boolean foundValues = false;
     if (configuration.isArgNameBasedConstructorAutoMapping()) {
-      foundValues = applyArgNameBasedConstructorAutoMapping(rsw, resultMap, columnPrefix, resultType,
-          constructorArgTypes, constructorArgs, constructor, foundValues);
+      foundValues = applyArgNameBasedConstructorAutoMapping(rsw, resultMap, columnPrefix, constructorArgTypes,
+          constructorArgs, constructor, foundValues);
     } else {
       foundValues = applyColumnOrderBasedConstructorAutomapping(rsw, constructorArgTypes, constructorArgs, constructor,
           foundValues);
@@ -789,8 +789,8 @@ private boolean applyColumnOrderBasedConstructorAutomapping(ResultSetWrapper rsw
   }
 
   private boolean applyArgNameBasedConstructorAutoMapping(ResultSetWrapper rsw, ResultMap resultMap,
-      String columnPrefix, Class<?> resultType, List<Class<?>> constructorArgTypes, List<Object> constructorArgs,
-      Constructor<?> constructor, boolean foundValues) throws SQLException {
+      String columnPrefix, List<Class<?>> constructorArgTypes, List<Object> constructorArgs, Constructor<?> constructor,
+      boolean foundValues) throws SQLException {
     List<String> missingArgs = null;
     Parameter[] params = constructor.getParameters();
     for (Parameter param : params) {

From 6152ed263bc8dffbde725b0708e01c880dadf14b Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 20 Feb 2023 19:45:39 -0500
Subject: [PATCH 08/10] [ci] Smarter list creation

---
 src/main/java/org/apache/ibatis/io/VFS.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/ibatis/io/VFS.java b/src/main/java/org/apache/ibatis/io/VFS.java
index 504bfcc2d57..96c881ffe2e 100644
--- a/src/main/java/org/apache/ibatis/io/VFS.java
+++ b/src/main/java/org/apache/ibatis/io/VFS.java
@@ -50,8 +50,7 @@ private static class VFSHolder {
     @SuppressWarnings("unchecked")
     static VFS createVFS() {
       // Try the user implementations first, then the built-ins
-      List<Class<? extends VFS>> impls = new ArrayList<>();
-      impls.addAll(USER_IMPLEMENTATIONS);
+      List<Class<? extends VFS>> impls = new ArrayList<>(USER_IMPLEMENTATIONS);
       impls.addAll(Arrays.asList((Class<? extends VFS>[]) IMPLEMENTATIONS));
 
       // Try each implementation class until a valid one is found

From a09dbd37cf042959b26e707f44cc230a2e24ee78 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 20 Feb 2023 19:48:21 -0500
Subject: [PATCH 09/10] [ci] Update copyright dates

---
 src/main/java/org/apache/ibatis/binding/BindingException.java   | 2 +-
 src/main/java/org/apache/ibatis/builder/BuilderException.java   | 2 +-
 .../org/apache/ibatis/builder/IncompleteElementException.java   | 2 +-
 src/main/java/org/apache/ibatis/cache/CacheException.java       | 2 +-
 src/main/java/org/apache/ibatis/cache/decorators/LruCache.java  | 2 +-
 .../java/org/apache/ibatis/datasource/DataSourceException.java  | 2 +-
 src/main/java/org/apache/ibatis/exceptions/IbatisException.java | 2 +-
 .../java/org/apache/ibatis/exceptions/PersistenceException.java | 2 +-
 .../org/apache/ibatis/exceptions/TooManyResultsException.java   | 2 +-
 src/main/java/org/apache/ibatis/executor/BatchResult.java       | 2 +-
 src/main/java/org/apache/ibatis/executor/ExecutorException.java | 2 +-
 src/main/java/org/apache/ibatis/jdbc/RuntimeSqlException.java   | 2 +-
 src/main/java/org/apache/ibatis/logging/LogException.java       | 2 +-
 src/main/java/org/apache/ibatis/parsing/ParsingException.java   | 2 +-
 src/main/java/org/apache/ibatis/plugin/PluginException.java     | 2 +-
 src/main/java/org/apache/ibatis/reflection/OptionalUtil.java    | 2 +-
 src/main/java/org/apache/ibatis/reflection/ParamNameUtil.java   | 2 +-
 .../java/org/apache/ibatis/reflection/ReflectionException.java  | 2 +-
 .../java/org/apache/ibatis/scripting/ScriptingException.java    | 2 +-
 .../java/org/apache/ibatis/session/SqlSessionException.java     | 2 +-
 .../org/apache/ibatis/transaction/TransactionException.java     | 2 +-
 src/main/java/org/apache/ibatis/type/ArrayTypeHandler.java      | 2 +-
 src/main/java/org/apache/ibatis/type/TypeException.java         | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/apache/ibatis/binding/BindingException.java b/src/main/java/org/apache/ibatis/binding/BindingException.java
index 8ad78072b57..7b2e0b410af 100644
--- a/src/main/java/org/apache/ibatis/binding/BindingException.java
+++ b/src/main/java/org/apache/ibatis/binding/BindingException.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/builder/BuilderException.java b/src/main/java/org/apache/ibatis/builder/BuilderException.java
index 87cfc16a35e..5f17adba5d7 100644
--- a/src/main/java/org/apache/ibatis/builder/BuilderException.java
+++ b/src/main/java/org/apache/ibatis/builder/BuilderException.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/builder/IncompleteElementException.java b/src/main/java/org/apache/ibatis/builder/IncompleteElementException.java
index 761d4b33254..a9b9b4fb65c 100644
--- a/src/main/java/org/apache/ibatis/builder/IncompleteElementException.java
+++ b/src/main/java/org/apache/ibatis/builder/IncompleteElementException.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/cache/CacheException.java b/src/main/java/org/apache/ibatis/cache/CacheException.java
index f26a02aeabc..6f6a1cde978 100644
--- a/src/main/java/org/apache/ibatis/cache/CacheException.java
+++ b/src/main/java/org/apache/ibatis/cache/CacheException.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/cache/decorators/LruCache.java b/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java
index df9c6062f1a..877ee10a4d8 100644
--- a/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java
+++ b/src/main/java/org/apache/ibatis/cache/decorators/LruCache.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/datasource/DataSourceException.java b/src/main/java/org/apache/ibatis/datasource/DataSourceException.java
index d229d89c7ff..92473100442 100644
--- a/src/main/java/org/apache/ibatis/datasource/DataSourceException.java
+++ b/src/main/java/org/apache/ibatis/datasource/DataSourceException.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/exceptions/IbatisException.java b/src/main/java/org/apache/ibatis/exceptions/IbatisException.java
index e9fd1940206..4348c6d4757 100644
--- a/src/main/java/org/apache/ibatis/exceptions/IbatisException.java
+++ b/src/main/java/org/apache/ibatis/exceptions/IbatisException.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/exceptions/PersistenceException.java b/src/main/java/org/apache/ibatis/exceptions/PersistenceException.java
index 4f48da3a9ba..58e59f14445 100644
--- a/src/main/java/org/apache/ibatis/exceptions/PersistenceException.java
+++ b/src/main/java/org/apache/ibatis/exceptions/PersistenceException.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/exceptions/TooManyResultsException.java b/src/main/java/org/apache/ibatis/exceptions/TooManyResultsException.java
index 0420b3f8bb2..944e9615f52 100644
--- a/src/main/java/org/apache/ibatis/exceptions/TooManyResultsException.java
+++ b/src/main/java/org/apache/ibatis/exceptions/TooManyResultsException.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/BatchResult.java b/src/main/java/org/apache/ibatis/executor/BatchResult.java
index 9f59faf76e5..b15a46c3bc2 100644
--- a/src/main/java/org/apache/ibatis/executor/BatchResult.java
+++ b/src/main/java/org/apache/ibatis/executor/BatchResult.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/ExecutorException.java b/src/main/java/org/apache/ibatis/executor/ExecutorException.java
index 2fb77d13383..4fb532840dd 100644
--- a/src/main/java/org/apache/ibatis/executor/ExecutorException.java
+++ b/src/main/java/org/apache/ibatis/executor/ExecutorException.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/RuntimeSqlException.java b/src/main/java/org/apache/ibatis/jdbc/RuntimeSqlException.java
index 719d3cd5bb2..466de503e9b 100644
--- a/src/main/java/org/apache/ibatis/jdbc/RuntimeSqlException.java
+++ b/src/main/java/org/apache/ibatis/jdbc/RuntimeSqlException.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/LogException.java b/src/main/java/org/apache/ibatis/logging/LogException.java
index ca33a516582..162f40a5f68 100644
--- a/src/main/java/org/apache/ibatis/logging/LogException.java
+++ b/src/main/java/org/apache/ibatis/logging/LogException.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/parsing/ParsingException.java b/src/main/java/org/apache/ibatis/parsing/ParsingException.java
index 57e5a5433d5..3eb47124614 100644
--- a/src/main/java/org/apache/ibatis/parsing/ParsingException.java
+++ b/src/main/java/org/apache/ibatis/parsing/ParsingException.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/plugin/PluginException.java b/src/main/java/org/apache/ibatis/plugin/PluginException.java
index e1612facfc6..c15134e949c 100644
--- a/src/main/java/org/apache/ibatis/plugin/PluginException.java
+++ b/src/main/java/org/apache/ibatis/plugin/PluginException.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/reflection/OptionalUtil.java b/src/main/java/org/apache/ibatis/reflection/OptionalUtil.java
index 50c2ed4e964..8f7003d8c89 100644
--- a/src/main/java/org/apache/ibatis/reflection/OptionalUtil.java
+++ b/src/main/java/org/apache/ibatis/reflection/OptionalUtil.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/reflection/ParamNameUtil.java b/src/main/java/org/apache/ibatis/reflection/ParamNameUtil.java
index 014edca177c..2ee588292f1 100644
--- a/src/main/java/org/apache/ibatis/reflection/ParamNameUtil.java
+++ b/src/main/java/org/apache/ibatis/reflection/ParamNameUtil.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/reflection/ReflectionException.java b/src/main/java/org/apache/ibatis/reflection/ReflectionException.java
index fecc3f2d002..ce3274a476c 100644
--- a/src/main/java/org/apache/ibatis/reflection/ReflectionException.java
+++ b/src/main/java/org/apache/ibatis/reflection/ReflectionException.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/scripting/ScriptingException.java b/src/main/java/org/apache/ibatis/scripting/ScriptingException.java
index 3aa8e093be5..60f94a330fd 100644
--- a/src/main/java/org/apache/ibatis/scripting/ScriptingException.java
+++ b/src/main/java/org/apache/ibatis/scripting/ScriptingException.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/session/SqlSessionException.java b/src/main/java/org/apache/ibatis/session/SqlSessionException.java
index 1250fc82f6d..770578bcf3f 100644
--- a/src/main/java/org/apache/ibatis/session/SqlSessionException.java
+++ b/src/main/java/org/apache/ibatis/session/SqlSessionException.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/transaction/TransactionException.java b/src/main/java/org/apache/ibatis/transaction/TransactionException.java
index 7383ab94184..da5f4f0c64e 100644
--- a/src/main/java/org/apache/ibatis/transaction/TransactionException.java
+++ b/src/main/java/org/apache/ibatis/transaction/TransactionException.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/type/ArrayTypeHandler.java b/src/main/java/org/apache/ibatis/type/ArrayTypeHandler.java
index 074f53060de..de4debd92a5 100644
--- a/src/main/java/org/apache/ibatis/type/ArrayTypeHandler.java
+++ b/src/main/java/org/apache/ibatis/type/ArrayTypeHandler.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/type/TypeException.java b/src/main/java/org/apache/ibatis/type/TypeException.java
index 5c0fd377cf3..65dae45b06a 100644
--- a/src/main/java/org/apache/ibatis/type/TypeException.java
+++ b/src/main/java/org/apache/ibatis/type/TypeException.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.

From 6c5c47887d6112a8fa8d2cd4cb56a5fe4082df7a Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 20 Feb 2023 19:56:11 -0500
Subject: [PATCH 10/10] [ci] Add back type as not until jdk 9 can this be
 determined

---
 src/main/java/org/apache/ibatis/cache/decorators/LruCache.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java b/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java
index 877ee10a4d8..1c593499471 100644
--- a/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java
+++ b/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java
@@ -47,7 +47,7 @@ public int getSize() {
   }
 
   public void setSize(final int size) {
-    keyMap = new LinkedHashMap<>(size, .75F, true) {
+    keyMap = new LinkedHashMap<Object, Object>(size, .75F, true) {
       private static final long serialVersionUID = 4267176411845948333L;
 
       @Override