Using Files.readString / writeString on JRE 11

Author: mkarg

src/main/java/org/codehaus/plexus/util/BaseFileUtils.java

@@ -0,0 +1,23 @@
+package org.codehaus.plexus.util;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+/**
+ * Implementation specific to Java SE 8 version.
+ */
+abstract class BaseFileUtils
+{
+    static String fileRead( Path path, String encoding ) throws IOException
+    {
+        byte[] bytes = Files.readAllBytes( path );
+        return encoding != null ? new String( bytes, encoding ) : new String( bytes );
+    }
+
+    static void fileWrite( Path path, String encoding, String data ) throws IOException
+    {
+        byte[] bytes = encoding != null ? data.getBytes( encoding ) : data.getBytes();
+        Files.write( path, bytes );
+    }
+}

src/main/java/org/codehaus/plexus/util/FileUtils.java

@@ -114,7 +114,7 @@
  * @author <a href="mailto:[email protected]">Jeff Turner</a>
  *
  */
-public class FileUtils
+public class FileUtils extends BaseFileUtils
 {
     /**
      * The number of bytes in a kilobyte.
@@ -358,13 +358,6 @@ public static String fileRead( File file, String encoding )
         return fileRead( file.toPath(), encoding );
     }
 
-    private static String fileRead( Path path, String encoding )
-        throws IOException
-    {
-        byte[] bytes = Files.readAllBytes( path );
-        return encoding != null ? new String( bytes, encoding ) : new String( bytes );
-    }
-
     /**
      * Appends data to a file. The file will be created if it does not exist. Note: the data is written with platform
      * encoding
@@ -467,13 +460,6 @@ public static void fileWrite( File file, String encoding, String data )
         fileWrite( file.toPath(), encoding, data );
     }
 
-    private static void fileWrite( Path path, String encoding, String data )
-        throws IOException
-    {
-        byte[] bytes = encoding != null ? data.getBytes( encoding ) : data.getBytes();
-        Files.write( path, bytes );
-    }
-
     /**
      * Deletes a file.
      *

src/main/java11/org/codehaus/plexus/util/BaseFileUtils.java

@@ -0,0 +1,29 @@
+package org.codehaus.plexus.util;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+/**
+ * Implementation specific to Java SE 11 version.
+ */
+abstract class BaseFileUtils
+{
+    static String fileRead( Path path, String encoding ) throws IOException
+    {
+        return encoding != null ? Files.readString( path, Charset.forName( encoding ) ) : Files.readString( path );
+    }
+
+    static void fileWrite( Path path, String encoding, String data ) throws IOException
+    {
+        if ( encoding != null )
+        {
+            Files.writeString( path, data, Charset.forName( encoding ) );
+        }
+        else
+        {
+            Files.writeString( path, data );
+        }
+    }
+}