Using Files#write() to implement Files#append()

mkarg · michael-o · commit 9db3ea7f918d · 2023-01-21T23:52:42.000+01:00
This closes #235
diff --git a/src/main/java/org/codehaus/plexus/util/BaseFileUtils.java b/src/main/java/org/codehaus/plexus/util/BaseFileUtils.java
@@ -2,7 +2,9 @@
 
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.OpenOption;
 import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
 
 /**
  * Implementation specific to Java SE 8 version.
@@ -15,9 +17,9 @@ static String fileRead( Path path, String encoding ) throws IOException
         return encoding != null ? new String( bytes, encoding ) : new String( bytes );
     }
 
-    static void fileWrite( Path path, String encoding, String data ) throws IOException
+    static void fileWrite( Path path, String encoding, String data, OpenOption... openOptions ) throws IOException
     {
         byte[] bytes = encoding != null ? data.getBytes( encoding ) : data.getBytes();
-        Files.write( path, bytes );
+        Files.write( path, bytes, openOptions );
     }
 }
diff --git a/src/main/java/org/codehaus/plexus/util/FileUtils.java b/src/main/java/org/codehaus/plexus/util/FileUtils.java
@@ -387,18 +387,12 @@ public static void fileAppend( String fileName, String data )
     public static void fileAppend( String fileName, String encoding, String data )
         throws IOException
     {
-        try ( OutputStream out = Files.newOutputStream( Paths.get(fileName),
-                StandardOpenOption.APPEND, StandardOpenOption.CREATE ) )
-        {
-            if ( encoding != null )
-            {
-                out.write( data.getBytes( encoding ) );
-            }
-            else
-            {
-                out.write( data.getBytes() );
-            }
-        }
+        fileAppend( Paths.get( fileName), encoding, data );
+    }
+
+    private static void fileAppend( Path path, String encoding, String data ) throws IOException
+    {
+        fileWrite( path, encoding, data, StandardOpenOption.APPEND, StandardOpenOption.CREATE );
     }
 
     /**
diff --git a/src/main/java11/org/codehaus/plexus/util/BaseFileUtils.java b/src/main/java11/org/codehaus/plexus/util/BaseFileUtils.java
@@ -3,7 +3,9 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
+import java.nio.file.OpenOption;
 import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
 
 /**
  * Implementation specific to Java SE 11 version.
@@ -15,15 +17,15 @@ 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
+    static void fileWrite( Path path, String encoding, String data, OpenOption... openOptions ) throws IOException
     {
         if ( encoding != null )
         {
-            Files.writeString( path, data, Charset.forName( encoding ) );
+            Files.writeString( path, data, Charset.forName( encoding ), openOptions );
         }
         else
         {
-            Files.writeString( path, data );
+            Files.writeString( path, data, openOptions );
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`
`3`	`3`	`import java.io.IOException;`
`4`	`4`	`import java.nio.file.Files;`
	`5`	`+import java.nio.file.OpenOption;`
`5`	`6`	`import java.nio.file.Path;`
	`7`	`+import java.nio.file.StandardOpenOption;`
`6`	`8`
`7`	`9`	`/**`
`8`	`10`	`* Implementation specific to Java SE 8 version.`
`@@ -15,9 +17,9 @@ static String fileRead( Path path, String encoding ) throws IOException`
`15`	`17`	`return encoding != null ? new String( bytes, encoding ) : new String( bytes );`
`16`	`18`	`}`
`17`	`19`
`18`		`- static void fileWrite( Path path, String encoding, String data ) throws IOException`
	`20`	`+ static void fileWrite( Path path, String encoding, String data, OpenOption... openOptions ) throws IOException`
`19`	`21`	`{`
`20`	`22`	`byte[] bytes = encoding != null ? data.getBytes( encoding ) : data.getBytes();`
`21`		`- Files.write( path, bytes );`
	`23`	`+ Files.write( path, bytes, openOptions );`
`22`	`24`	`}`
`23`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,9 @@`
`3`	`3`	`import java.io.IOException;`
`4`	`4`	`import java.nio.charset.Charset;`
`5`	`5`	`import java.nio.file.Files;`
	`6`	`+import java.nio.file.OpenOption;`
`6`	`7`	`import java.nio.file.Path;`
	`8`	`+import java.nio.file.StandardOpenOption;`
`7`	`9`
`8`	`10`	`/**`
`9`	`11`	`* Implementation specific to Java SE 11 version.`
`@@ -15,15 +17,15 @@ static String fileRead( Path path, String encoding ) throws IOException`
`15`	`17`	`return encoding != null ? Files.readString( path, Charset.forName( encoding ) ) : Files.readString( path );`
`16`	`18`	`}`
`17`	`19`
`18`		`- static void fileWrite( Path path, String encoding, String data ) throws IOException`
	`20`	`+ static void fileWrite( Path path, String encoding, String data, OpenOption... openOptions ) throws IOException`
`19`	`21`	`{`
`20`	`22`	`if ( encoding != null )`
`21`	`23`	`{`
`22`		`- Files.writeString( path, data, Charset.forName( encoding ) );`
	`24`	`+ Files.writeString( path, data, Charset.forName( encoding ), openOptions );`
`23`	`25`	`}`
`24`	`26`	`else`
`25`	`27`	`{`
`26`		`- Files.writeString( path, data );`
	`28`	`+ Files.writeString( path, data, openOptions );`
`27`	`29`	`}`
`28`	`30`	`}`
`29`	`31`	`}`