Merge pull request #2817 from hazendaz/rewrite

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

Author: hazendaz

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() {
+  }
 }