Review feedback from Alan

Author: jerboaa

src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ReleaseInfoPlugin.java

@@ -25,12 +25,13 @@
 package jdk.tools.jlink.internal.plugins;
 
 import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.io.Reader;
 import java.io.UncheckedIOException;
 import java.lang.module.ModuleDescriptor;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
@@ -108,8 +109,8 @@ public void configure(Map<String, String> config) {
             default: {
                 // --release-info <file>
                 Properties props = new Properties();
-                try (InputStreamReader isr = new InputStreamReader(new FileInputStream(operation), "UTF-8")) {
-                    props.load(isr);
+                try (Reader reader = Files.newBufferedReader(Path.of(operation))) {
+                    props.load(reader); // Use reader API so as to read in as UTF-8
                 } catch (IOException exp) {
                     throw new UncheckedIOException(exp);
                 }

test/jdk/tools/jlink/plugins/ReleaseInfoPluginTest.java

@@ -24,8 +24,7 @@
 import jdk.test.lib.process.*;
 import jdk.test.lib.Asserts;
 
-import java.io.InputStreamReader;
-import java.io.FileInputStream;
+import java.io.Reader;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Files;
@@ -67,12 +66,12 @@ public static void main(String[] args) throws Throwable {
                                "--release-info", utf8File.toString()
                              }, "java.base").assertSuccess();
 
-        // release file produced should have IMPLEMENTOR in an
-        // appropriate encoding
+        // release file produced should have IMPLEMENTOR in
+        // UTF-8 encoding
         var release = image.resolve("release");
         Properties props = new Properties();
-        try (InputStreamReader isr = new InputStreamReader(new FileInputStream(release.toFile()), "UTF-8")) {
-            props.load(isr);
+        try (Reader reader= Files.newBufferedReader(release)) {
+            props.load(reader); // Load as UTF-8
         }
         String noQuotesMods = ((String)props.get("MODULES")).replace("\"", "");
         Asserts.assertEquals("java.base", noQuotesMods);