Skip to content

Handling null charset in FileUtils.readLines(File, Charset) #744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garydgregory merged 1 commit into from
May 6, 2025
Merged

Handling null charset in FileUtils.readLines(File, Charset) #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/apache/commons/io/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2817,7 +2817,7 @@ public static List<String> readLines(final File file) throws IOException {
* @since 2.3
*/
public static List<String> readLines(final File file, final Charset charset) throws IOException {
return Files.readAllLines(file.toPath(), charset);
return Files.readAllLines(file.toPath(), Charsets.toCharset(charset));
}

/**
Expand Down
19 changes: 19 additions & 0 deletions src/test/java/org/apache/commons/io/FileUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2839,6 +2839,25 @@ public void testReadLines_Errors() {
assertThrows(UnsupportedCharsetException.class, () -> FileUtils.readLines(tempDirFile, "unsupported-charset"));
}

@Test
public void testReadLines_Defaults() throws Exception {
final File file = TestUtils.newFile(tempDirFile, "lines.txt");
try {
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);
} finally {
TestUtils.deleteFile(file);
}
}

@Test
@EnabledIf("isPosixFilePermissionsSupported")
public void testReadLines_IOExceptionOnPosixFileSystem() throws Exception {
Expand Down