[IO-318] Add Charset sister APIs to method that take a String charset name. LockableFileWriterTest.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1307431 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

src/main/java/org/apache/commons/io/output/LockableFileWriter.java

@@ -22,8 +22,12 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
 import java.io.Writer;
+import java.nio.charset.Charset;
+import java.nio.charset.UnsupportedCharsetException;
 
+import org.apache.commons.io.Charsets;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 
@@ -130,7 +134,7 @@ public LockableFileWriter(File file, boolean append) throws IOException {
      * @throws IOException in case of an I/O error
      */
     public LockableFileWriter(File file, boolean append, String lockDir) throws IOException {
-        this(file, null, append, lockDir);
+        this(file, Charset.defaultCharset(), append, lockDir);
     }
 
     /**
@@ -140,6 +144,22 @@ public LockableFileWriter(File file, boolean append, String lockDir) throws IOEx
      * @param encoding  the encoding to use, null means platform default
      * @throws NullPointerException if the file is null
      * @throws IOException in case of an I/O error
+     * @since 2.3
+     */
+    public LockableFileWriter(File file, Charset encoding) throws IOException {
+        this(file, encoding, false, null);
+    }
+
+    /**
+     * Constructs a LockableFileWriter with a file encoding.
+     *
+     * @param file  the file to write to, not null
+     * @param encoding  the encoding to use, null means platform default
+     * @throws NullPointerException if the file is null
+     * @throws IOException in case of an I/O error
+     * @throws UnsupportedCharsetException
+     *             thrown instead of {@link UnsupportedEncodingException} in version 2.2 if the encoding is not
+     *             supported.
      */
     public LockableFileWriter(File file, String encoding) throws IOException {
         this(file, encoding, false, null);
@@ -154,8 +174,9 @@ public LockableFileWriter(File file, String encoding) throws IOException {
      * @param lockDir  the directory in which the lock file should be held
      * @throws NullPointerException if the file is null
      * @throws IOException in case of an I/O error
+     * @since 2.3
      */
-    public LockableFileWriter(File file, String encoding, boolean append,
+    public LockableFileWriter(File file, Charset encoding, boolean append,
             String lockDir) throws IOException {
         super();
         // init file to create/append
@@ -183,6 +204,24 @@ public LockableFileWriter(File file, String encoding, boolean append,
         out = initWriter(file, encoding, append);
     }
 
+    /**
+     * Constructs a LockableFileWriter with a file encoding.
+     *
+     * @param file  the file to write to, not null
+     * @param encoding  the encoding to use, null means platform default
+     * @param append  true if content should be appended, false to overwrite
+     * @param lockDir  the directory in which the lock file should be held
+     * @throws NullPointerException if the file is null
+     * @throws IOException in case of an I/O error
+     * @throws UnsupportedCharsetException
+     *             thrown instead of {@link UnsupportedEncodingException} in version 2.2 if the encoding is not
+     *             supported.
+     */
+    public LockableFileWriter(File file, String encoding, boolean append,
+            String lockDir) throws IOException {
+        this(file, Charsets.toCharset(encoding), append, lockDir);
+    }
+
     //-----------------------------------------------------------------------
     /**
      * Tests that we can write to the lock directory.
@@ -227,7 +266,7 @@ private void createLock() throws IOException {
      * @return The initialised writer
      * @throws IOException if an error occurs
      */
-    private Writer initWriter(File file, String encoding, boolean append) throws IOException {
+    private Writer initWriter(File file, Charset encoding, boolean append) throws IOException {
         boolean fileExistedAlready = file.exists();
         OutputStream stream = null;
         Writer writer = null;

src/test/java/org/apache/commons/io/output/LockableFileWriterTest.java

@@ -19,6 +19,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
+import java.nio.charset.UnsupportedCharsetException;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.testtools.FileBasedTestCase;
@@ -159,12 +160,12 @@ public void testFileNotLocked() throws IOException {
     }
 
     //-----------------------------------------------------------------------
-    public void testConstructor_File_encoding_badEncoding() {
+    public void testConstructor_File_encoding_badEncoding() throws IOException {
         Writer writer = null;
         try {
             writer = new LockableFileWriter(file, "BAD-ENCODE");
             fail();
-        } catch (IOException ex) {
+        } catch (UnsupportedCharsetException ex) {
             // expected
             assertFalse(file.exists());
             assertFalse(lockFile.exists());