AbstractOrigin.getWriter(Charset) now maps a null Charset to the default

Charset

- org.apache.commons.io.build.AbstractOrigin.getWriter(Charset) now maps
a null Charset to the default Charset
- org.apache.commons.io.build.AbstractOrigin.AbstractRandomAccessFileOrigin.getWriter(Charset)
now maps a null Charset to the default Charset
- org.apache.commons.io.build.AbstractOrigin.OutputStreamOrigin.getWriter(Charset)
now maps a null Charset to the default Charset

Author: garydgregory

src/changes/changes.xml

@@ -53,6 +53,9 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" type="fix"                due-to="Gary Gregory">org.apache.commons.io.build.AbstractOrigin.AbstractRandomAccessFileOrigin.getReader(Charset) now maps a null Charset to the default Charset.</action>
       <action dev="ggregory" type="fix"                due-to="Gary Gregory">org.apache.commons.io.build.AbstractOrigin.ByeArrayOrigin.getReader(Charset) now maps a null Charset to the default Charset.</action>
       <action dev="ggregory" type="fix"                due-to="Gary Gregory">org.apache.commons.io.build.AbstractOrigin.InputStreamOrigin.getReader(Charset) now maps a null Charset to the default Charset.</action>
+      <action dev="ggregory" type="fix"                due-to="Gary Gregory">org.apache.commons.io.build.AbstractOrigin.getWriter(Charset) now maps a null Charset to the default Charset.</action>
+      <action dev="ggregory" type="fix"                due-to="Gary Gregory">org.apache.commons.io.build.AbstractOrigin.AbstractRandomAccessFileOrigin.getWriter(Charset) now maps a null Charset to the default Charset.</action>
+      <action dev="ggregory" type="fix"                due-to="Gary Gregory">org.apache.commons.io.build.AbstractOrigin.OutputStreamOrigin.getWriter(Charset) now maps a null Charset to the default Charset.</action>
       <!-- ADD -->
       <action dev="ggregory" type="add" issue="IO-875" due-to="Pierre Baumard, Gary Gregory">Add and use org.apache.commons.io.file.CountingPathVisitor.accept(Path, BasicFileAttributes) #743.</action> 
       <!-- UPDATE -->

src/main/java/org/apache/commons/io/build/AbstractOrigin.java

@@ -134,7 +134,7 @@ public Reader getReader(final Charset charset) throws IOException {
 
         @Override
         public Writer getWriter(final Charset charset, final OpenOption... options) throws IOException {
-            return new OutputStreamWriter(getOutputStream(options), charset);
+            return new OutputStreamWriter(getOutputStream(options), Charsets.toCharset(charset));
         }
 
         @Override
@@ -392,7 +392,7 @@ public OutputStream getOutputStream(final OpenOption... options) {
          */
         @Override
         public Writer getWriter(final Charset charset, final OpenOption... options) throws IOException {
-            return new OutputStreamWriter(origin, charset);
+            return new OutputStreamWriter(origin, Charsets.toCharset(charset));
         }
     }
 
@@ -752,7 +752,7 @@ private String getSimpleClassName() {
      * @throws UnsupportedOperationException if the origin cannot be converted to a Path.
      */
     public Writer getWriter(final Charset charset, final OpenOption... options) throws IOException {
-        return Files.newBufferedWriter(getPath(), charset, options);
+        return Files.newBufferedWriter(getPath(), Charsets.toCharset(charset), options);
     }
 
     /**

src/test/java/org/apache/commons/io/build/AbstractOriginTest.java

@@ -234,6 +234,10 @@ public void testGetWriter() throws IOException {
         try (Writer writer = getOriginRw().getWriter(Charset.defaultCharset())) {
             assertNotNull(writer);
         }
+        setOriginRw(newOriginRw());
+        try (Writer writer = getOriginRw().getWriter(null)) {
+            assertNotNull(writer);
+        }
     }
 
     @Test