From 62964ecbef346b55d0c9bf9d22bc6b41a1dd6bc7 Mon Sep 17 00:00:00 2001 From: Markus KARG Date: Sun, 15 Jan 2023 13:37:19 +0000 Subject: [PATCH] Simplified code --- .../org/codehaus/plexus/util/BaseFileUtils.java | 9 ++++----- .../org/codehaus/plexus/util/BaseFileUtils.java | 17 +++++------------ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/codehaus/plexus/util/BaseFileUtils.java b/src/main/java/org/codehaus/plexus/util/BaseFileUtils.java index 386e81f1..45bf134d 100644 --- a/src/main/java/org/codehaus/plexus/util/BaseFileUtils.java +++ b/src/main/java/org/codehaus/plexus/util/BaseFileUtils.java @@ -2,6 +2,7 @@ import java.io.IOException; import java.nio.file.Files; +import java.nio.file.OpenOption; import java.nio.file.Path; import java.nio.file.StandardOpenOption; @@ -16,16 +17,14 @@ 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 ); } static void fileAppend( Path path, String encoding, String data ) throws IOException { - byte[] bytes = encoding != null ? data.getBytes( encoding ) : data.getBytes(); - Files.write( path, bytes, StandardOpenOption.APPEND, StandardOpenOption.CREATE ); + 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 index 688fa686..be47004f 100644 --- a/src/main/java11/org/codehaus/plexus/util/BaseFileUtils.java +++ b/src/main/java11/org/codehaus/plexus/util/BaseFileUtils.java @@ -3,6 +3,7 @@ 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; @@ -16,28 +17,20 @@ 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 ); } } static void fileAppend( Path path, String encoding, String data ) throws IOException { - if ( encoding != null ) - { - Files.writeString( path, data, Charset.forName( encoding ), - StandardOpenOption.APPEND, StandardOpenOption.CREATE ); - } - else - { - Files.writeString( path, data,StandardOpenOption.APPEND, StandardOpenOption.CREATE ); - } + fileWrite( path, encoding, data, StandardOpenOption.APPEND, StandardOpenOption.CREATE ); } }