Merge pull request #2817 from hazendaz/rewrite

Add private constructors per open rewrite / fix two tests that were invalid

src/main/java/org/apache/ibatis/io/Resources.java

@@ -39,7 +39,7 @@ public class Resources {
    */
   private static Charset charset;
 
-  Resources() {
+  private Resources() {
   }
 
   /**

src/main/java/org/apache/ibatis/io/VFS.java

@@ -76,6 +76,9 @@ static VFS createVFS() {
 
       return vfs;
     }
+
+    private VFSHolder() {
+    }
   }
 
   /**

src/main/java/org/apache/ibatis/reflection/ArrayUtil.java

@@ -152,4 +152,7 @@ public static String toString(Object obj) {
     }
   }
 
+  private ArrayUtil() {
+  }
+
 }

src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java

@@ -339,6 +339,9 @@ static class MySqlProvider {
     public static String provideSql() {
       return "SELECT 1";
     }
+
+    private MySqlProvider() {
+    }
   }
 
   @Test

src/test/java/org/apache/ibatis/databases/blog/StoredProcedures.java

@@ -56,4 +56,7 @@ public static void selectAuthorViaOutParams(int id, String[] username, String[]
       bio[0] = rs.getString("bio");
     }
   }
+
+  private StoredProcedures() {
+  }
 }

src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java

@@ -682,4 +682,7 @@ static MappedStatement prepareInsertAuthorMappedStatementWithBeforeAutoKey(final
             }).build()).cache(authorCache).keyGenerator(new SelectKeyGenerator(kms, true)).keyProperty("id").build();
   }
 
+  private ExecutorTestHelper() {
+  }
+
 }

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

@@ -170,8 +170,4 @@ void shouldGetReaderWithClassLoader() throws IOException {
 
   }
 
-  @Test
-  void stupidJustForCoverage() {
-    assertNotNull(new Resources());
-  }
 }

src/test/java/org/apache/ibatis/reflection/ArrayUtilTest.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.
@@ -21,7 +21,7 @@
 
 import org.junit.jupiter.api.Test;
 
-class ArrayUtilTest extends ArrayUtil {
+class ArrayUtilTest {
 
   @Test
   void testHashCode() {

src/test/java/org/apache/ibatis/submitted/dirty_select/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.
@@ -48,5 +48,8 @@ static class MyProvider {
     public static String getSql() {
       return "insert into users (name) values (#{name}) returning id, name";
     }
+
+    private MyProvider() {
+    }
   }
 }

src/test/java/org/apache/ibatis/submitted/dynsql/CustomUtil.java

@@ -19,4 +19,7 @@ public class CustomUtil {
   public static String esc(final String s) {
     return s.replace("'", "''");
   }
+
+  private CustomUtil() {
+  }
 }

src/test/java/org/apache/ibatis/submitted/global_variables_defaults/SupportClasses.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.
@@ -71,6 +71,9 @@ static SupportClasses.CustomCache unwrap(Cache cache) {
         field.setAccessible(false);
       }
     }
+
+    private Utils() {
+    }
   }
 
 }

src/test/java/org/apache/ibatis/submitted/ognlstatic/StaticClass.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.
@@ -18,4 +18,7 @@
 public class StaticClass {
 
   public static String value = "User1";
+
+  private StaticClass() {
+  }
 }

src/test/java/org/apache/ibatis/submitted/primitive_result_type/ProductDAO.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.
@@ -58,4 +58,7 @@ public static List<Product> selectAllProducts() {
     }
   }
 
+  private ProductDAO() {
+  }
+
 }

src/test/java/org/apache/ibatis/submitted/repeatable/BothSelectAndSelectProviderMapper.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.
@@ -28,6 +28,9 @@ class SqlProvider {
     public static String getUser() {
       return "SELECT * FROM users WHERE id = #{id}";
     }
+
+    private SqlProvider() {
+    }
   }
 
 }

src/test/java/org/apache/ibatis/submitted/repeatable/BothSelectContainerAndSelectProviderContainerMapper.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.
@@ -30,6 +30,9 @@ class SqlProvider {
     public static String getUser() {
       return "SELECT * FROM users WHERE id = #{id}";
     }
+
+    private SqlProvider() {
+    }
   }
 
 }

src/test/java/org/apache/ibatis/submitted/repeatable/Mapper.java

@@ -110,6 +110,9 @@ public static String updateUserNameUsingProvider() {
     public static String delete() {
       return "DELETE FROM users WHERE name LIKE '%HSQL%'";
     }
+
+    private HsqlSqlProvider() {
+    }
   }
 
   class DerbySqlProvider {
@@ -128,6 +131,9 @@ public static String updateUserNameUsingProvider() {
     public static String delete() {
       return "DELETE FROM users WHERE name LIKE '%DERBY%'";
     }
+
+    private DerbySqlProvider() {
+    }
   }
 
   class DefaultSqlProvider {
@@ -146,6 +152,9 @@ public static String updateUserNameUsingProvider() {
     public static String delete() {
       return "DELETE FROM users WHERE name LIKE '%DEFAULT%'";
     }
+
+    private DefaultSqlProvider() {
+    }
   }
 
 }

src/test/java/org/apache/ibatis/submitted/serializecircular/UtilityTester.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.
@@ -58,4 +58,7 @@ private static Object deserialzeObject(byte[] aSerializedObject) {
     }
   }
 
+  private UtilityTester() {
+  }
+
 }

src/test/java/org/apache/ibatis/submitted/sqlprovider/ProviderMethodResolutionTest.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.
@@ -168,6 +168,9 @@ class ReservedMethodNameBasedSqlProvider {
       public static String provideSql() {
         return "DELETE FROM memos WHERE id = 1";
       }
+
+      private ReservedMethodNameBasedSqlProvider() {
+      }
     }
 
     class CustomMethodResolverBasedSqlProvider implements CustomProviderMethodResolver {
@@ -247,6 +250,9 @@ class SqlProvider {
       public static String select() {
         return "SELECT 1 FROM INFORMATION_SCHEMA.SYSTEM_USERS";
       }
+
+      private SqlProvider() {
+      }
     }
 
   }

src/test/java/org/apache/ibatis/submitted/sqlprovider/SqlProviderTest.java

@@ -723,6 +723,9 @@ public static String provideSql(ProviderContext c) {
         }
       }
 
+      private SqlProvider() {
+      }
+
     }
 
   }
@@ -920,6 +923,9 @@ public static String multipleMap(@Param("map1") Map<String, Object> map1,
         return "SELECT '" + map1.get("value") + map2.get("value") + "' FROM INFORMATION_SCHEMA.SYSTEM_USERS";
       }
 
+      private SqlProvider() {
+      }
+
     }
 
   }
@@ -996,6 +1002,9 @@ public static String provideSql(ProviderContext context) {
           return "SELECT '" + context.getDatabaseId() + "' FROM SYSIBM.SYSDUMMY1";
         }
       }
+
+      private SqlProvider() {
+      }
     }
   }