Merge pull request #956 from hazendaz/java.io.fixes

Rewrite more of java.io to java.nio
revelc · Jan 20, 2025 · 9b17ec0 · 9b17ec0
2 parents a9adacd + 2e0b869
commit 9b17ec0
Showing 1 changed file with 9 additions and 18 deletions.
diff --git a/src/main/java/net/revelc/code/formatter/FormatterMojo.java b/src/main/java/net/revelc/code/formatter/FormatterMojo.java
@@ -16,13 +16,8 @@
 
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
 import java.io.StringWriter;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
@@ -636,8 +631,8 @@ private Properties readFileHashCacheFile() {
             return props;
         }
 
-        try (var stream = new BufferedInputStream(Files.newInputStream(cacheFile))) {
-            props.load(stream);
+        try (var reader = Files.newBufferedReader(cacheFile)) {
+            props.load(reader);
         } catch (final IOException e) {
             log.warn("Cannot load file hash cache properties file", e);
         }
@@ -879,15 +874,13 @@ private String sha512hash(final String str) {
      */
     private String readFileAsString(final Path file) throws IOException {
         final var fileData = new StringBuilder(1000);
-        try (var fileStream = Files.newInputStream(file);
-                var fileReader = new InputStreamReader(fileStream, Charset.forName(this.encoding));
-                var reader = new BufferedReader(fileReader)) {
-            var buf = new char[1024];
+        try (var reader = Files.newBufferedReader(file, Charset.forName(this.encoding))) {
+            var buffer = new char[1024];
             var numRead = 0;
-            while ((numRead = reader.read(buf)) != -1) {
-                final var readData = String.valueOf(buf, 0, numRead);
+            while ((numRead = reader.read(buffer)) != -1) {
+                final var readData = String.valueOf(buffer, 0, numRead);
                 fileData.append(readData);
-                buf = new char[1024];
+                buffer = new char[1024];
             }
         }
         return fileData.toString();
@@ -909,10 +902,8 @@ private void writeStringToFile(final String str, final Path file) throws IOExcep
             return;
         }
 
-        try (var fileStream = Files.newOutputStream(file);
-                var fileWriter = new OutputStreamWriter(fileStream, Charset.forName(this.encoding));
-                var bw = new BufferedWriter(fileWriter)) {
-            bw.write(str);
+        try (var buffer = Files.newBufferedWriter(file, Charset.forName(this.encoding))) {
+            buffer.write(str);
         }
     }