You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/11/10 19:29:18 UTC
(commons-io) branch master updated (d5d22c3df -> 4c14c0763)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
from d5d22c3df [IO-856] FileUtils.listFiles(final File, String[], boolean) can throw NoSuchFileException
new 8dff97ba7 Fix action type
new 4c14c0763 [IO-859] FileUtils.forceDelete on non-existent file on Windows throws IOException rather than FileNotFoundException
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/changes/changes.xml | 3 ++-
src/main/java/org/apache/commons/io/FileUtils.java | 10 ++++++----
src/main/java/org/apache/commons/io/file/PathUtils.java | 4 ++--
src/test/java/org/apache/commons/io/FileUtilsTest.java | 5 +++--
4 files changed, 13 insertions(+), 9 deletions(-)
(commons-io) 01/02: Fix action type
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit 8dff97ba754359ca10029792ad519d60840bfe49
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Nov 10 14:18:03 2024 -0500
Fix action type
---
src/changes/changes.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0a6f0496a..660f73e19 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -53,7 +53,7 @@ The <action> type attribute can be add,update,fix,remove.
<action dev="ggregory" type="fix" due-to="Gary Gregory">RandomAccessFileMode.toString() is more helpful for debugging when it inherits from Enum.</action>
<action dev="ggregory" type="fix" due-to="Gary Gregory">Fix implicit narrowing conversion in compound assignment in UnsynchronizedBufferedReader.skip(long).</action>
<action dev="ggregory" type="fix" issue="IO-860" due-to="Stefan Feenstra, Gary Gregory">Missing reserved file names in FileSystem.WINDOWS (superscript digits for COM and LPT).</action>
- <action dev="ggregory" type="add" issue="IO-856" due-to="Thomas Hartwig, Gary Gregory">FileUtils.listFiles(final File, String[], boolean) can throw NoSuchFileException #697, #699.</action>
+ <action dev="ggregory" type="fix" issue="IO-856" due-to="Thomas Hartwig, Gary Gregory">FileUtils.listFiles(final File, String[], boolean) can throw NoSuchFileException #697, #699.</action>
<!-- ADD -->
<action dev="ggregory" type="add" due-to="Gary Gregory">Add @FunctionalInterface to ClassNameMatcher.</action>
<action dev="ggregory" type="add" due-to="Gary Gregory">Add ValidatingObjectInputStream.Builder and ValidatingObjectInputStream.builder().</action>
(commons-io) 02/02: [IO-859] FileUtils.forceDelete on non-existent file on Windows throws IOException rather than FileNotFoundException
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit 4c14c0763ffa7a2f42549afc7b034a67322781ed
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Nov 10 14:29:11 2024 -0500
[IO-859] FileUtils.forceDelete on non-existent file on Windows throws
IOException rather than FileNotFoundException
---
src/changes/changes.xml | 1 +
src/main/java/org/apache/commons/io/FileUtils.java | 10 ++++++----
src/main/java/org/apache/commons/io/file/PathUtils.java | 4 ++--
src/test/java/org/apache/commons/io/FileUtilsTest.java | 5 +++--
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 660f73e19..a9666650e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -54,6 +54,7 @@ The <action> type attribute can be add,update,fix,remove.
<action dev="ggregory" type="fix" due-to="Gary Gregory">Fix implicit narrowing conversion in compound assignment in UnsynchronizedBufferedReader.skip(long).</action>
<action dev="ggregory" type="fix" issue="IO-860" due-to="Stefan Feenstra, Gary Gregory">Missing reserved file names in FileSystem.WINDOWS (superscript digits for COM and LPT).</action>
<action dev="ggregory" type="fix" issue="IO-856" due-to="Thomas Hartwig, Gary Gregory">FileUtils.listFiles(final File, String[], boolean) can throw NoSuchFileException #697, #699.</action>
+ <action dev="ggregory" type="fix" issue="IO-859" due-to="JD Dean, Gary Gregory">FileUtils.forceDelete on non-existent file on Windows throws IOException rather than FileNotFoundException.</action>
<!-- ADD -->
<action dev="ggregory" type="add" due-to="Gary Gregory">Add @FunctionalInterface to ClassNameMatcher.</action>
<action dev="ggregory" type="add" due-to="Gary Gregory">Add ValidatingObjectInputStream.Builder and ValidatingObjectInputStream.builder().</action>
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java b/src/main/java/org/apache/commons/io/FileUtils.java
index b8ab62a39..4cdc23054 100644
--- a/src/main/java/org/apache/commons/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -42,6 +42,7 @@ import java.nio.file.FileVisitOption;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.LinkOption;
+import java.nio.file.NoSuchFileException;
import java.nio.file.NotDirectoryException;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
@@ -1384,12 +1385,13 @@ public class FileUtils {
*/
public static void forceDelete(final File file) throws IOException {
Objects.requireNonNull(file, PROTOCOL_FILE);
-
+ checkFileExists(file, file.getName()); // fail-fast
final Counters.PathCounters deleteCounters;
try {
- deleteCounters = PathUtils.delete(
- file.toPath(), PathUtils.EMPTY_LINK_OPTION_ARRAY,
- StandardDeleteOption.OVERRIDE_READ_ONLY);
+ deleteCounters = PathUtils.delete(file.toPath(), PathUtils.EMPTY_LINK_OPTION_ARRAY, StandardDeleteOption.OVERRIDE_READ_ONLY);
+ } catch (final NoSuchFileException ex) {
+ // Map NIO to IO exception
+ throw new FileNotFoundException("Cannot delete file: " + file);
} catch (final IOException ex) {
throw new IOException("Cannot delete file: " + file, ex);
}
diff --git a/src/main/java/org/apache/commons/io/file/PathUtils.java b/src/main/java/org/apache/commons/io/file/PathUtils.java
index 80fbedbca..d82f92c18 100644
--- a/src/main/java/org/apache/commons/io/file/PathUtils.java
+++ b/src/main/java/org/apache/commons/io/file/PathUtils.java
@@ -559,9 +559,9 @@ public final class PathUtils {
public static PathCounters deleteFile(final Path file, final LinkOption[] linkOptions, final DeleteOption... deleteOptions)
throws NoSuchFileException, IOException {
//
- // TODO Needs clean up
+ // TODO Needs clean up?
//
- if (Files.isDirectory(file, linkOptions)) {
+ if (!Files.exists(file, linkOptions) || Files.isDirectory(file, linkOptions)) {
throw new NoSuchFileException(file.toString());
}
final PathCounters pathCounts = Counters.longPathCounters();
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTest.java b/src/test/java/org/apache/commons/io/FileUtilsTest.java
index 94d076412..3438a324d 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTest.java
@@ -24,6 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Assumptions.assumeFalse;
@@ -1647,10 +1648,10 @@ public class FileUtilsTest extends AbstractTempDirTest {
}
@Test
- public void testForceDeleteAFile3() {
+ public void testForceDeleteAFileDoesNotExist() {
final File destination = new File(tempDirFile, "no_such_file");
assertFalse(destination.exists(), "Check No Exist");
- assertThrows(IOException.class, () -> FileUtils.forceDelete(destination));
+ assertThrowsExactly(FileNotFoundException.class, () -> FileUtils.forceDelete(destination));
}