FileUtils.readLines(File, Charset) now maps a null Charset to the

default Charset #744

Author: garydgregory

src/changes/changes.xml

@@ -56,6 +56,7 @@ 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.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>
+      <action dev="ggregory" type="fix"                due-to="Ryan Kurtz, Gary Gregory">FileUtils.readLines(File, Charset) now maps a null Charset to the default Charset #744.</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/test/java/org/apache/commons/io/FileUtilsTest.java

@@ -2821,35 +2821,26 @@ public void testReadFileToStringWithEncoding() throws Exception {
     public void testReadLines() throws Exception {
         final File file = TestUtils.newFile(tempDirFile, "lines.txt");
         try {
-            final String[] data = {"hello", "\u1234", "", "this is", "some text"};
+            final String[] data = { "hello", "\u1234", "", "this is", "some text" };
             TestUtils.createLineFileUtf8(file, data);
-
-            final List<String> lines = FileUtils.readLines(file, UTF_8);
+            List<String> lines = FileUtils.readLines(file, UTF_8);
+            assertEquals(Arrays.asList(data), lines);
+            lines = FileUtils.readLines(file, (Charset) null);
             assertEquals(Arrays.asList(data), lines);
         } finally {
             TestUtils.deleteFile(file);
         }
     }
 
     @Test
-    public void testReadLines_Errors() {
-        assertThrows(NullPointerException.class, () -> FileUtils.readLines(null));
-        assertThrows(IOException.class, () -> FileUtils.readLines(new File("non-exsistent")));
-        assertThrows(IOException.class, () -> FileUtils.readLines(tempDirFile));
-        assertThrows(UnsupportedCharsetException.class, () -> FileUtils.readLines(tempDirFile, "unsupported-charset"));
-    }
-
-    @Test
-    public void testReadLines_Defaults() throws Exception {
+    public void testReadLinesDefaults() throws Exception {
         final File file = TestUtils.newFile(tempDirFile, "lines.txt");
         try {
-            final String[] data = {"hello", "this is", "some text"};
+            final String[] data = { "hello", "this is", "some text" };
             TestUtils.createLineFileUtf8(file, data);
-
             final List<String> lines1 = FileUtils.readLines(file);
             final List<String> lines2 = FileUtils.readLines(file, (Charset) null);
             final List<String> lines3 = FileUtils.readLines(file, Charset.defaultCharset());
-
             assertEquals(lines1, Arrays.asList(data));
             assertEquals(lines1, lines2);
             assertEquals(lines1, lines3);
@@ -2858,6 +2849,14 @@ public void testReadLines_Defaults() throws Exception {
         }
     }
 
+    @Test
+    public void testReadLines_Errors() {
+        assertThrows(NullPointerException.class, () -> FileUtils.readLines(null));
+        assertThrows(IOException.class, () -> FileUtils.readLines(new File("non-exsistent")));
+        assertThrows(IOException.class, () -> FileUtils.readLines(tempDirFile));
+        assertThrows(UnsupportedCharsetException.class, () -> FileUtils.readLines(tempDirFile, "unsupported-charset"));
+    }
+
     @Test
     @EnabledIf("isPosixFilePermissionsSupported")
     public void testReadLines_IOExceptionOnPosixFileSystem() throws Exception {