Skip to content

Commit d838cde

Browse files
Replace FileUtils.deleteDirectory(File) with JDK provided API
Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.codehaus.plexus.PlexusFileUtilsRecipes%24DeleteDirectoryFileRecipe?organizationId=NzQ1YmJlODUtZjNkMy00OTNkLThhNDAtZWJmZDg4N2U1ZjU1 Co-authored-by: Moderne <team@moderne.io>
1 parent a701fb9 commit d838cde

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

src/main/java/org/codehaus/plexus/util/FileUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ public static void forceDelete(final String file) throws IOException {
11741174
*/
11751175
public static void forceDelete(final File file) throws IOException {
11761176
if (file.isDirectory()) {
1177-
deleteDirectory(file);
1177+
org.apache.commons.io.FileUtils.deleteDirectory(file);
11781178
} else {
11791179
/*
11801180
* NOTE: Always try to delete the file even if it appears to be non-existent. This will ensure that a
@@ -1321,7 +1321,7 @@ public static void forceMkdir(final File file) throws IOException {
13211321
* @throws IOException if any
13221322
*/
13231323
public static void deleteDirectory(final String directory) throws IOException {
1324-
deleteDirectory(new File(directory));
1324+
org.apache.commons.io.FileUtils.deleteDirectory(new File(directory));
13251325
}
13261326

13271327
/**

src/test/java/org/codehaus/plexus/util/DirectoryScannerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ void regexExcludeWithNegativeLookahead() throws IOException {
432432

433433
File dir = new File(testDir, "regex-dir");
434434
try {
435-
FileUtils.deleteDirectory(dir);
435+
org.apache.commons.io.FileUtils.deleteDirectory(dir);
436436
} catch (IOException ignored) {
437437
}
438438

@@ -471,7 +471,7 @@ void regexWithSlashInsideCharacterClass() throws IOException {
471471

472472
File dir = new File(testDir, "regex-dir");
473473
try {
474-
FileUtils.deleteDirectory(dir);
474+
org.apache.commons.io.FileUtils.deleteDirectory(dir);
475475
} catch (IOException ignored) {
476476
}
477477

src/test/java/org/codehaus/plexus/util/FileUtilsTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void setUp() throws Exception {
8989
getTestDirectory().mkdirs();
9090
createFile(testFile1, testFile1Size);
9191
createFile(testFile2, testFile2Size);
92-
FileUtils.deleteDirectory(getTestDirectory());
92+
org.apache.commons.io.FileUtils.deleteDirectory(getTestDirectory());
9393
getTestDirectory().mkdirs();
9494
createFile(testFile1, testFile1Size);
9595
createFile(testFile2, testFile2Size);
@@ -942,7 +942,7 @@ void removeExtensionWithPaths() {
942942
void copyDirectoryStructureWithAEmptyDirectoryStructure() throws Exception {
943943
File from = new File(getTestDirectory(), "from");
944944

945-
FileUtils.deleteDirectory(from);
945+
org.apache.commons.io.FileUtils.deleteDirectory(from);
946946

947947
assertTrue(from.mkdirs());
948948

@@ -963,7 +963,7 @@ void copyDirectoryStructureWithAPopulatedStructure() throws Exception {
963963
// Make a structure to copy
964964
File from = new File(getTestDirectory(), "from");
965965

966-
FileUtils.deleteDirectory(from);
966+
org.apache.commons.io.FileUtils.deleteDirectory(from);
967967

968968
File fRoot = new File(from, "root.txt");
969969

@@ -1026,7 +1026,7 @@ void copyDirectoryStructureIfModified() throws Exception {
10261026
// Make a structure to copy
10271027
File from = new File(getTestDirectory(), "from");
10281028

1029-
FileUtils.deleteDirectory(from);
1029+
org.apache.commons.io.FileUtils.deleteDirectory(from);
10301030

10311031
File fRoot = new File(from, "root.txt");
10321032

@@ -1108,7 +1108,7 @@ void copyDirectoryStructureToSelf() throws Exception {
11081108
// Make a structure to copy
11091109
File toFrom = new File(getTestDirectory(), "tofrom");
11101110

1111-
FileUtils.deleteDirectory(toFrom);
1111+
org.apache.commons.io.FileUtils.deleteDirectory(toFrom);
11121112

11131113
File fRoot = new File(toFrom, "root.txt");
11141114

@@ -1505,7 +1505,7 @@ void deleteDirectoryWithValidFileSymlink() throws Exception {
15051505
File symlink = new File(getTestDirectory(), "fileSymlink");
15061506
createSymlink(symlink, symlinkTarget);
15071507
try {
1508-
FileUtils.deleteDirectory(getTestDirectory());
1508+
org.apache.commons.io.FileUtils.deleteDirectory(getTestDirectory());
15091509
} finally {
15101510
/*
15111511
* Ensure to cleanup problematic symlink or "mvn clean" will fail
@@ -1527,7 +1527,7 @@ void deleteDirectoryWithValidDirSymlink() throws Exception {
15271527
File symlink = new File(getTestDirectory(), "dirSymlink");
15281528
createSymlink(symlink, symlinkTarget);
15291529
try {
1530-
FileUtils.deleteDirectory(getTestDirectory());
1530+
org.apache.commons.io.FileUtils.deleteDirectory(getTestDirectory());
15311531
} finally {
15321532
/*
15331533
* Ensure to cleanup problematic symlink or "mvn clean" will fail
@@ -1548,7 +1548,7 @@ void deleteDirectoryWithDanglingSymlink() throws Exception {
15481548
File symlink = new File(getTestDirectory(), "danglingSymlink");
15491549
createSymlink(symlink, symlinkTarget);
15501550
try {
1551-
FileUtils.deleteDirectory(getTestDirectory());
1551+
org.apache.commons.io.FileUtils.deleteDirectory(getTestDirectory());
15521552
} finally {
15531553
/*
15541554
* Ensure to cleanup problematic symlink or "mvn clean" will fail

0 commit comments

Comments
 (0)