Merge pull request #448 from harawata/use-nio

Use NIO to make modernizer happy

Author: harawata

.mvn/extensions.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2010-2024 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.

.mvn/settings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2010-2024 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.

.mvn/wrapper/MavenWrapperDownloader.java

@@ -25,7 +25,6 @@
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.concurrent.ThreadLocalRandom;
 
@@ -46,7 +45,7 @@ public static void main(String[] args) {
             log(" - Downloader started");
             final URL wrapperUrl = URI.create(args[0]).toURL();
             final String jarPath = args[1].replace("..", ""); // Sanitize path
-            final Path wrapperJarPath = Paths.get(jarPath).toAbsolutePath().normalize();
+            final Path wrapperJarPath = Path.of(jarPath).toAbsolutePath().normalize();
             downloadFileFromURL(wrapperUrl, wrapperJarPath);
             log("Done");
         } catch (IOException e) {

Dockerfile

@@ -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.

pom.xml

@@ -63,8 +63,8 @@
 
   <properties>
     <!-- Java Usage -->
-    <java.version>8</java.version>
-    <java.release.version>8</java.release.version>
+    <java.version>11</java.version>
+    <java.release.version>11</java.release.version>
 
     <findbugs.onlyAnalyze>org.apache.ibatis.migration</findbugs.onlyAnalyze>
     <clirr.comparisonVersion>3.2.0</clirr.comparisonVersion>

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.Path;
 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 = Path.of(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 Path.of(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) {