Use NIO to make modernizer happy

Author: harawata

src/main/java/org/apache/ibatis/migration/Environment.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2010-2023 the original author or authors.
+ *    Copyright 2010-2025 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.
@@ -16,10 +16,11 @@
 package org.apache.ibatis.migration;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.charset.Charset;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -208,7 +209,7 @@ private boolean isMigrationsKey(String key) {
 
   private Properties loadPropertiesFromFile(File file) {
     Properties properties = new Properties();
-    try (FileInputStream inputStream = new FileInputStream(file)) {
+    try (InputStream inputStream = Files.newInputStream(file.toPath())) {
       properties.load(inputStream);
       return properties;
     } catch (FileNotFoundException e) {

src/main/java/org/apache/ibatis/migration/MigrationReader.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2010-2023 the original author or authors.
+ *    Copyright 2010-2025 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.
@@ -16,13 +16,13 @@
 package org.apache.ibatis.migration;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FilterReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.Charset;
+import java.nio.file.Files;
 import java.util.Properties;
 
 public class MigrationReader extends FilterReader {
@@ -85,7 +85,7 @@ private enum VariableStatus {
   }
 
   public MigrationReader(File file, String charset, boolean undo, Properties variables) throws IOException {
-    this(new FileInputStream(file), charset, undo, variables);
+    this(Files.newInputStream(file.toPath()), charset, undo, variables);
   }
 
   public MigrationReader(InputStream inputStream, String charset, boolean undo, Properties variables) {

src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2010-2023 the original author or authors.
+ *    Copyright 2010-2025 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,8 +18,6 @@
 import static org.apache.ibatis.migration.utils.Util.file;
 
 import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.LineNumberReader;
 import java.io.OutputStream;
@@ -28,6 +26,8 @@
 import java.io.Reader;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -161,7 +161,7 @@ protected void copyResourceTo(String resource, File toFile, Properties variables
   protected void copyExternalResourceTo(String resource, File toFile, Properties variables) {
     printStream.println("Creating: " + toFile.getName());
     try {
-      File sourceFile = new File(resource);
+      File sourceFile = Paths.get(resource).toFile();
       copyTemplate(sourceFile, toFile, variables);
     } catch (Exception e) {
       throw new MigrationException("Error copying " + resource + " to " + toFile.getAbsolutePath() + ".  Cause: " + e,
@@ -170,15 +170,15 @@ protected void copyExternalResourceTo(String resource, File toFile, Properties v
   }
 
   protected static void copyTemplate(File templateFile, File toFile, Properties variables) throws IOException {
-    try (FileReader reader = new FileReader(templateFile)) {
+    try (Reader reader = Files.newBufferedReader(templateFile.toPath())) {
       copyTemplate(reader, toFile, variables);
     }
   }
 
   protected static void copyTemplate(Reader templateReader, File toFile, Properties variables) throws IOException {
     VariableReplacer replacer = new VariableReplacer(variables);
     try (LineNumberReader reader = new LineNumberReader(templateReader);
-        PrintWriter writer = new PrintWriter(new FileWriter(toFile))) {
+        PrintWriter writer = new PrintWriter(Files.newBufferedWriter(toFile.toPath()))) {
       String line;
       while ((line = reader.readLine()) != null) {
         line = replacer.replace(line);
@@ -259,7 +259,7 @@ private ClassLoader getDriverClassLoader() {
   private File getCustomDriverPath() {
     String customDriverPath = environment().getDriverPath();
     if (customDriverPath != null && customDriverPath.length() > 0) {
-      return new File(customDriverPath);
+      return Paths.get(customDriverPath).toFile();
     }
     return options.getPaths().getDriverPath();
   }

src/main/java/org/apache/ibatis/migration/hook/FileHookScriptFactory.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2010-2023 the original author or authors.
+ *    Copyright 2010-2025 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,7 +58,7 @@ public HookScript create(String hookSetting) {
     // First segment is language
     String scriptLang = segments[0];
     // Second segment is file
-    File scriptFile = new File(hooksDir, segments[1]);
+    File scriptFile = hooksDir.toPath().resolve(segments[1]).toFile();
     // The rest are script dependent options
     String[] hookOptions = Arrays.copyOfRange(segments, 2, segments.length);
     if (!scriptFile.exists()) {

src/main/java/org/apache/ibatis/migration/hook/Jsr223HookScript.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2010-2023 the original author or authors.
+ *    Copyright 2010-2025 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.
@@ -16,11 +16,11 @@
 package org.apache.ibatis.migration.hook;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.nio.charset.Charset;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -102,8 +102,8 @@ public void execute(Map<String, Object> bindingMap) {
     bindings.putAll(bindingMap);
     try {
       printStream.println(Util.horizontalLine("Applying JSR-223 hook : " + scriptFile.getName(), 80));
-      try (
-          InputStreamReader stream = new InputStreamReader(new FileInputStream(scriptFile), Charset.forName(charset))) {
+      try (InputStreamReader stream = new InputStreamReader(Files.newInputStream(scriptFile.toPath()),
+          Charset.forName(charset))) {
         engine.eval(stream);
       }
       if (functionName != null || objectName != null && methodName != null) {

src/main/java/org/apache/ibatis/migration/hook/SqlHookScript.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2010-2023 the original author or authors.
+ *    Copyright 2010-2025 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.
@@ -17,10 +17,11 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintStream;
 import java.io.StringReader;
+import java.nio.file.Files;
 import java.util.Map;
 import java.util.Properties;
 
@@ -57,7 +58,7 @@ public void execute(Map<String, Object> bindingMap) {
     HookContext context = (HookContext) bindingMap.get(MigrationHook.HOOK_CONTEXT);
     printStream.println(Util.horizontalLine("Applying SQL hook: " + scriptFile.getName(), 80));
 
-    try (FileInputStream inputStream = new FileInputStream(scriptFile);
+    try (InputStream inputStream = Files.newInputStream(scriptFile.toPath());
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
       byte[] buffer = new byte[1024];
       int length;

src/main/java/org/apache/ibatis/migration/io/DefaultVFS.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2010-2023 the original author or authors.
+ *    Copyright 2010-2025 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.
@@ -26,6 +26,7 @@
 import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.file.InvalidPathException;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -124,7 +125,7 @@ public List<String> list(URL url, String path) throws IOException {
             // No idea where the exception came from so rethrow it
             throw e;
           }
-          File file = new File(url.getFile());
+          File file = Paths.get(url.getFile()).toFile();
           if (log.isLoggable(Level.FINER)) {
             log.log(Level.FINER, "Listing directory " + file.getAbsolutePath());
           }
@@ -266,12 +267,12 @@ protected URL findJarForResource(URL url) throws MalformedURLException {
         log.log(Level.FINER, "Not a JAR: " + jarUrl);
       }
       jarUrl.replace(0, jarUrl.length(), testUrl.getFile());
-      File file = new File(jarUrl.toString());
+      File file = Paths.get(jarUrl.toString()).toFile();
 
       // File name might be URL-encoded
       if (!file.exists()) {
         try {
-          file = new File(URLEncoder.encode(jarUrl.toString(), "UTF-8"));
+          file = Paths.get(URLEncoder.encode(jarUrl.toString(), "UTF-8")).toFile();
         } catch (UnsupportedEncodingException e) {
           throw new RuntimeException("Unsupported encoding?  UTF-8?  That's impossible.");
         }

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

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2010-2023 the original author or authors.
+ *    Copyright 2010-2025 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.
@@ -23,6 +23,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.Charset;
+import java.nio.file.Paths;
 import java.util.Properties;
 
 /**
@@ -227,7 +228,7 @@ public static Reader getResourceAsReader(ClassLoader loader, String resource) th
    *           If the resource cannot be found or read
    */
   public static File getResourceAsFile(String resource) throws IOException {
-    return new File(getResourceURL(resource).getFile());
+    return Paths.get(getResourceURL(resource).getFile()).toFile();
   }
 
   /**
@@ -244,7 +245,7 @@ public static File getResourceAsFile(String resource) throws IOException {
    *           If the resource cannot be found or read
    */
   public static File getResourceAsFile(ClassLoader loader, String resource) throws IOException {
-    return new File(getResourceURL(loader, resource).getFile());
+    return Paths.get(getResourceURL(loader, resource).getFile()).toFile();
   }
 
   /**

src/main/java/org/apache/ibatis/migration/options/OptionsParser.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2010-2022 the original author or authors.
+ *    Copyright 2010-2025 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.
@@ -17,7 +17,7 @@
 
 import static org.apache.ibatis.migration.utils.Util.isOption;
 
-import java.io.File;
+import java.nio.file.Paths;
 
 public enum OptionsParser {
   ;
@@ -55,19 +55,19 @@ private static boolean parseOptions(String arg, SelectedOptions options) {
 
       switch (option) {
         case PATH:
-          options.getPaths().setBasePath(new File(argParts[1]));
+          options.getPaths().setBasePath(Paths.get(argParts[1]).toFile());
           break;
         case ENVPATH:
-          options.getPaths().setEnvPath(new File(argParts[1]));
+          options.getPaths().setEnvPath(Paths.get(argParts[1]).toFile());
           break;
         case SCRIPTPATH:
-          options.getPaths().setScriptPath(new File(argParts[1]));
+          options.getPaths().setScriptPath(Paths.get(argParts[1]).toFile());
           break;
         case DRIVERPATH:
-          options.getPaths().setDriverPath(new File(argParts[1]));
+          options.getPaths().setDriverPath(Paths.get(argParts[1]).toFile());
           break;
         case HOOKPATH:
-          options.getPaths().setHookPath(new File(argParts[1]));
+          options.getPaths().setHookPath(Paths.get(argParts[1]).toFile());
           break;
         case ENV:
           options.setEnvironment(argParts[1]);

src/main/java/org/apache/ibatis/migration/options/SelectedPaths.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2010-2022 the original author or authors.
+ *    Copyright 2010-2025 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,9 +18,10 @@
 import static org.apache.ibatis.migration.utils.Util.file;
 
 import java.io.File;
+import java.nio.file.Paths;
 
 public class SelectedPaths {
-  private File basePath = new File("./");
+  private File basePath = Paths.get("./").toFile();
   private File envPath;
   private File scriptPath;
   private File driverPath;