From 12d45a015bdcf391baf034e855e2b361c4d024ba Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Thu, 26 Sep 2024 20:34:25 -0400
Subject: [PATCH 1/3] [ci] Formatting

---
 .../org/apache/ibatis/mapping/VendorDatabaseIdProviderTest.java  | 1 -
 src/test/java/org/apache/ibatis/parsing/XNodeTest.java           | 1 -
 src/test/java/org/apache/ibatis/plugin/Mapper.java               | 1 -
 .../org/apache/ibatis/reflection/wrapper/BeanWrapperTest.java    | 1 -
 .../org/apache/ibatis/reflection/wrapper/MapWrapperTest.java     | 1 -
 .../java/org/apache/ibatis/submitted/discriminator/Contract.java | 1 -
 .../java/org/apache/ibatis/submitted/enum_with_method/Mood.java  | 1 -
 .../ibatis/submitted/enum_with_method/MoodTypeTypeHandler.java   | 1 -
 .../ibatis/submitted/literal_string/LiteralStringTest.java       | 1 -
 .../java/org/apache/ibatis/submitted/literal_string/Mapper.java  | 1 -
 10 files changed, 10 deletions(-)

diff --git a/src/test/java/org/apache/ibatis/mapping/VendorDatabaseIdProviderTest.java b/src/test/java/org/apache/ibatis/mapping/VendorDatabaseIdProviderTest.java
index bc4468b181c..755efd62f4a 100644
--- a/src/test/java/org/apache/ibatis/mapping/VendorDatabaseIdProviderTest.java
+++ b/src/test/java/org/apache/ibatis/mapping/VendorDatabaseIdProviderTest.java
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 package org.apache.ibatis.mapping;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/org/apache/ibatis/parsing/XNodeTest.java b/src/test/java/org/apache/ibatis/parsing/XNodeTest.java
index ab0cc9d86fe..628c20c66bb 100644
--- a/src/test/java/org/apache/ibatis/parsing/XNodeTest.java
+++ b/src/test/java/org/apache/ibatis/parsing/XNodeTest.java
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 package org.apache.ibatis.parsing;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/org/apache/ibatis/plugin/Mapper.java b/src/test/java/org/apache/ibatis/plugin/Mapper.java
index 2796f57745d..ba841b215ba 100644
--- a/src/test/java/org/apache/ibatis/plugin/Mapper.java
+++ b/src/test/java/org/apache/ibatis/plugin/Mapper.java
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 package org.apache.ibatis.plugin;
 
 import org.apache.ibatis.annotations.Select;
diff --git a/src/test/java/org/apache/ibatis/reflection/wrapper/BeanWrapperTest.java b/src/test/java/org/apache/ibatis/reflection/wrapper/BeanWrapperTest.java
index d5b89dad3be..3fdf1030ae5 100644
--- a/src/test/java/org/apache/ibatis/reflection/wrapper/BeanWrapperTest.java
+++ b/src/test/java/org/apache/ibatis/reflection/wrapper/BeanWrapperTest.java
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 package org.apache.ibatis.reflection.wrapper;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/org/apache/ibatis/reflection/wrapper/MapWrapperTest.java b/src/test/java/org/apache/ibatis/reflection/wrapper/MapWrapperTest.java
index 2beb3210d4b..a0fd504241c 100644
--- a/src/test/java/org/apache/ibatis/reflection/wrapper/MapWrapperTest.java
+++ b/src/test/java/org/apache/ibatis/reflection/wrapper/MapWrapperTest.java
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 package org.apache.ibatis.reflection.wrapper;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/org/apache/ibatis/submitted/discriminator/Contract.java b/src/test/java/org/apache/ibatis/submitted/discriminator/Contract.java
index fbd09ee024b..3a11e630ed9 100644
--- a/src/test/java/org/apache/ibatis/submitted/discriminator/Contract.java
+++ b/src/test/java/org/apache/ibatis/submitted/discriminator/Contract.java
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 package org.apache.ibatis.submitted.discriminator;
 
 public class Contract {
diff --git a/src/test/java/org/apache/ibatis/submitted/enum_with_method/Mood.java b/src/test/java/org/apache/ibatis/submitted/enum_with_method/Mood.java
index 9a415af500b..8ab8a28aeca 100644
--- a/src/test/java/org/apache/ibatis/submitted/enum_with_method/Mood.java
+++ b/src/test/java/org/apache/ibatis/submitted/enum_with_method/Mood.java
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 package org.apache.ibatis.submitted.enum_with_method;
 
 public enum Mood {
diff --git a/src/test/java/org/apache/ibatis/submitted/enum_with_method/MoodTypeTypeHandler.java b/src/test/java/org/apache/ibatis/submitted/enum_with_method/MoodTypeTypeHandler.java
index 5cb43900e5d..11cced228b2 100644
--- a/src/test/java/org/apache/ibatis/submitted/enum_with_method/MoodTypeTypeHandler.java
+++ b/src/test/java/org/apache/ibatis/submitted/enum_with_method/MoodTypeTypeHandler.java
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 package org.apache.ibatis.submitted.enum_with_method;
 
 import java.sql.CallableStatement;
diff --git a/src/test/java/org/apache/ibatis/submitted/literal_string/LiteralStringTest.java b/src/test/java/org/apache/ibatis/submitted/literal_string/LiteralStringTest.java
index e986cc4053d..838b046d4b0 100644
--- a/src/test/java/org/apache/ibatis/submitted/literal_string/LiteralStringTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/literal_string/LiteralStringTest.java
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 package org.apache.ibatis.submitted.literal_string;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/org/apache/ibatis/submitted/literal_string/Mapper.java b/src/test/java/org/apache/ibatis/submitted/literal_string/Mapper.java
index 209a5ed6e8d..171e9ebce8c 100644
--- a/src/test/java/org/apache/ibatis/submitted/literal_string/Mapper.java
+++ b/src/test/java/org/apache/ibatis/submitted/literal_string/Mapper.java
@@ -13,7 +13,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 package org.apache.ibatis.submitted.literal_string;
 
 import org.apache.ibatis.annotations.Insert;

From 5deaf35fe886be70667f7f2f6c4990d68d3c6a48 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Thu, 26 Sep 2024 21:13:15 -0400
Subject: [PATCH 2/3] [ci] Formatting

---
 src/main/java/org/apache/ibatis/io/DefaultVFS.java            | 2 +-
 src/main/java/org/apache/ibatis/io/VFS.java                   | 2 +-
 src/main/java/org/apache/ibatis/parsing/XPathParser.java      | 2 +-
 src/main/java/org/apache/ibatis/type/BlobTypeHandler.java     | 2 +-
 .../java/org/apache/ibatis/type/CharacterTypeHandler.java     | 2 +-
 src/main/java/org/apache/ibatis/type/DateOnlyTypeHandler.java | 2 +-
 src/main/java/org/apache/ibatis/type/DateTypeHandler.java     | 2 +-
 src/main/java/org/apache/ibatis/type/TimeOnlyTypeHandler.java | 2 +-
 .../java/org/apache/ibatis/type/YearMonthTypeHandler.java     | 2 +-
 src/site/es/xdoc/configuration.xml                            | 2 +-
 src/site/ja/xdoc/configuration.xml                            | 2 +-
 src/site/ko/xdoc/configuration.xml                            | 2 +-
 src/site/zh_CN/xdoc/configuration.xml                         | 2 +-
 .../apache/ibatis/mapping/VendorDatabaseIdProviderTest.java   | 2 +-
 src/test/java/org/apache/ibatis/parsing/XNodeTest.java        | 2 +-
 .../apache/ibatis/reflection/property/PropertyCopierTest.java | 4 ++--
 .../org/apache/ibatis/submitted/discriminator/Contract.java   | 2 +-
 .../org/apache/ibatis/submitted/enum_with_method/Mood.java    | 2 +-
 .../submitted/enum_with_method/MoodTypeTypeHandler.java       | 2 +-
 19 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/apache/ibatis/io/DefaultVFS.java b/src/main/java/org/apache/ibatis/io/DefaultVFS.java
index f0f93dfad62..b0339e2fe41 100644
--- a/src/main/java/org/apache/ibatis/io/DefaultVFS.java
+++ b/src/main/java/org/apache/ibatis/io/DefaultVFS.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/apache/ibatis/io/VFS.java b/src/main/java/org/apache/ibatis/io/VFS.java
index e0408241451..308946b2f38 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-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/apache/ibatis/parsing/XPathParser.java b/src/main/java/org/apache/ibatis/parsing/XPathParser.java
index 5d3fd8901e8..3ebc3be2f8b 100644
--- a/src/main/java/org/apache/ibatis/parsing/XPathParser.java
+++ b/src/main/java/org/apache/ibatis/parsing/XPathParser.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/apache/ibatis/type/BlobTypeHandler.java b/src/main/java/org/apache/ibatis/type/BlobTypeHandler.java
index 4d34a34a0f0..f4a6c4c15a8 100644
--- a/src/main/java/org/apache/ibatis/type/BlobTypeHandler.java
+++ b/src/main/java/org/apache/ibatis/type/BlobTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/apache/ibatis/type/CharacterTypeHandler.java b/src/main/java/org/apache/ibatis/type/CharacterTypeHandler.java
index 4815ff52735..9bc4b2c5554 100644
--- a/src/main/java/org/apache/ibatis/type/CharacterTypeHandler.java
+++ b/src/main/java/org/apache/ibatis/type/CharacterTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/apache/ibatis/type/DateOnlyTypeHandler.java b/src/main/java/org/apache/ibatis/type/DateOnlyTypeHandler.java
index b88fb312e43..ebd0187ffd7 100644
--- a/src/main/java/org/apache/ibatis/type/DateOnlyTypeHandler.java
+++ b/src/main/java/org/apache/ibatis/type/DateOnlyTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/apache/ibatis/type/DateTypeHandler.java b/src/main/java/org/apache/ibatis/type/DateTypeHandler.java
index 91b9b4f1835..9e9b2784e71 100644
--- a/src/main/java/org/apache/ibatis/type/DateTypeHandler.java
+++ b/src/main/java/org/apache/ibatis/type/DateTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/apache/ibatis/type/TimeOnlyTypeHandler.java b/src/main/java/org/apache/ibatis/type/TimeOnlyTypeHandler.java
index f33e6da64fb..7065198ed9f 100644
--- a/src/main/java/org/apache/ibatis/type/TimeOnlyTypeHandler.java
+++ b/src/main/java/org/apache/ibatis/type/TimeOnlyTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/apache/ibatis/type/YearMonthTypeHandler.java b/src/main/java/org/apache/ibatis/type/YearMonthTypeHandler.java
index 17c27483908..fb09ced7f93 100644
--- a/src/main/java/org/apache/ibatis/type/YearMonthTypeHandler.java
+++ b/src/main/java/org/apache/ibatis/type/YearMonthTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/site/es/xdoc/configuration.xml b/src/site/es/xdoc/configuration.xml
index 9307eb1b5c3..d7cc06476f4 100644
--- a/src/site/es/xdoc/configuration.xml
+++ b/src/site/es/xdoc/configuration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2023 the original author or authors.
+       Copyright 2009-2024 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
diff --git a/src/site/ja/xdoc/configuration.xml b/src/site/ja/xdoc/configuration.xml
index 1184e818ae5..13ee396a96c 100644
--- a/src/site/ja/xdoc/configuration.xml
+++ b/src/site/ja/xdoc/configuration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2023 the original author or authors.
+       Copyright 2009-2024 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
diff --git a/src/site/ko/xdoc/configuration.xml b/src/site/ko/xdoc/configuration.xml
index 9baea9b1b0f..083116523f2 100644
--- a/src/site/ko/xdoc/configuration.xml
+++ b/src/site/ko/xdoc/configuration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2023 the original author or authors.
+       Copyright 2009-2024 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
diff --git a/src/site/zh_CN/xdoc/configuration.xml b/src/site/zh_CN/xdoc/configuration.xml
index 81421a2edf1..e4671002bd0 100644
--- a/src/site/zh_CN/xdoc/configuration.xml
+++ b/src/site/zh_CN/xdoc/configuration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2023 the original author or authors.
+       Copyright 2009-2024 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/apache/ibatis/mapping/VendorDatabaseIdProviderTest.java b/src/test/java/org/apache/ibatis/mapping/VendorDatabaseIdProviderTest.java
index 755efd62f4a..78852b22b67 100644
--- a/src/test/java/org/apache/ibatis/mapping/VendorDatabaseIdProviderTest.java
+++ b/src/test/java/org/apache/ibatis/mapping/VendorDatabaseIdProviderTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/apache/ibatis/parsing/XNodeTest.java b/src/test/java/org/apache/ibatis/parsing/XNodeTest.java
index 628c20c66bb..09bb574b0a8 100644
--- a/src/test/java/org/apache/ibatis/parsing/XNodeTest.java
+++ b/src/test/java/org/apache/ibatis/parsing/XNodeTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/apache/ibatis/reflection/property/PropertyCopierTest.java b/src/test/java/org/apache/ibatis/reflection/property/PropertyCopierTest.java
index 4900d8ddc17..4e409b7cc6c 100644
--- a/src/test/java/org/apache/ibatis/reflection/property/PropertyCopierTest.java
+++ b/src/test/java/org/apache/ibatis/reflection/property/PropertyCopierTest.java
@@ -15,11 +15,11 @@
  */
 package org.apache.ibatis.reflection.property;
 
+import java.util.Arrays;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.util.Arrays;
-
 public class PropertyCopierTest {
 
   @Test
diff --git a/src/test/java/org/apache/ibatis/submitted/discriminator/Contract.java b/src/test/java/org/apache/ibatis/submitted/discriminator/Contract.java
index 3a11e630ed9..6cdaf084bb3 100644
--- a/src/test/java/org/apache/ibatis/submitted/discriminator/Contract.java
+++ b/src/test/java/org/apache/ibatis/submitted/discriminator/Contract.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/apache/ibatis/submitted/enum_with_method/Mood.java b/src/test/java/org/apache/ibatis/submitted/enum_with_method/Mood.java
index 8ab8a28aeca..d8036c5ece1 100644
--- a/src/test/java/org/apache/ibatis/submitted/enum_with_method/Mood.java
+++ b/src/test/java/org/apache/ibatis/submitted/enum_with_method/Mood.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/apache/ibatis/submitted/enum_with_method/MoodTypeTypeHandler.java b/src/test/java/org/apache/ibatis/submitted/enum_with_method/MoodTypeTypeHandler.java
index 11cced228b2..45e64bb4cce 100644
--- a/src/test/java/org/apache/ibatis/submitted/enum_with_method/MoodTypeTypeHandler.java
+++ b/src/test/java/org/apache/ibatis/submitted/enum_with_method/MoodTypeTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

From 410660aaa8ff2aeac63898c515111d030f988a69 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Thu, 26 Sep 2024 20:35:42 -0400
Subject: [PATCH 3/3] [fix] Make static fields private

---
 src/main/java/org/apache/ibatis/io/VFS.java | 4 ++--
 1 file changed, 2 insertions(+), 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 308946b2f38..05b741ade6c 100644
--- a/src/main/java/org/apache/ibatis/io/VFS.java
+++ b/src/main/java/org/apache/ibatis/io/VFS.java
@@ -36,12 +36,12 @@ public abstract class VFS {
   private static final Log log = LogFactory.getLog(VFS.class);
 
   /** The built-in implementations. */
-  public static final Class<?>[] IMPLEMENTATIONS = { JBoss6VFS.class, DefaultVFS.class };
+  private static final Class<?>[] IMPLEMENTATIONS = { JBoss6VFS.class, DefaultVFS.class };
 
   /**
    * The list to which implementations are added by {@link #addImplClass(Class)}.
    */
-  public static final List<Class<? extends VFS>> USER_IMPLEMENTATIONS = new ArrayList<>();
+  private static final List<Class<? extends VFS>> USER_IMPLEMENTATIONS = new ArrayList<>();
 
   /** Singleton instance holder. */
   private static class VFSHolder {