[maven-file-management] 02/02: use Apache Commons IO

[el...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

elharo pushed a commit to branch depre
in repository https://gitbox.apache.org/repos/asf/maven-file-management.git

commit 04afc00fbe16de5f771f058a1733130781095085
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sat Sep 19 13:19:13 2020 -0400

    use Apache Commons IO
---
 .../shared/model/fileset/util/FileSetManager.java  | 27 ++++------------------
 .../model/fileset/util/FileSetUtilsTest.java       | 21 +++++++----------
 2 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java b/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
index 311dcf9..bc7c6ba 100644
--- a/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
+++ b/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
@@ -32,13 +32,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.shared.model.fileset.FileSet;
 import org.apache.maven.shared.model.fileset.mappers.FileNameMapper;
 import org.apache.maven.shared.model.fileset.mappers.MapperException;
 import org.apache.maven.shared.model.fileset.mappers.MapperUtil;
 import org.apache.maven.shared.utils.io.DirectoryScanner;
-import org.apache.maven.shared.utils.io.FileUtils;
 import org.codehaus.plexus.logging.Logger;
 
 /**
@@ -327,7 +327,7 @@ public class FileSetManager
                         messages.addInfoMessage( "Deleting file: " + file ).flush();
                     }
 
-                    if ( !delete( file ) )
+                    if ( !FileUtils.deleteQuietly( file ) )
                     {
                         String message = "Failed to delete file " + file.getAbsolutePath() + ". Reason is unknown.";
                         if ( throwsError )
@@ -580,7 +580,7 @@ public class FileSetManager
             }
             else
             {
-                if ( !delete( f ) )
+                if ( !FileUtils.deleteQuietly( f ) )
                 {
                     String message = "Unable to delete file " + f.getAbsolutePath();
                     if ( throwsError )
@@ -596,7 +596,7 @@ public class FileSetManager
             }
         }
 
-        if ( !delete( dir ) )
+        if ( !FileUtils.deleteQuietly( dir ) )
         {
             String message = "Unable to delete directory " + dir.getAbsolutePath();
             if ( throwsError )
@@ -611,25 +611,6 @@ public class FileSetManager
         }
     }
 
-    /**
-     * Delete a file
-     *
-     * @param f a file
-     */
-    private boolean delete( File f )
-    {
-        try
-        {
-            FileUtils.forceDelete( f );
-        }
-        catch ( IOException e )
-        {
-            return false;
-        }
-
-        return true;
-    }
-
     private DirectoryScanner scan( FileSet fileSet )
     {
         File basedir = new File( fileSet.getDirectory() );
diff --git a/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java b/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
index cdcf3b2..574f20a 100644
--- a/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
@@ -27,10 +27,10 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.maven.shared.model.fileset.FileSet;
 import org.apache.maven.shared.utils.cli.CommandLineException;
 import org.apache.maven.shared.utils.cli.Commandline;
-import org.apache.maven.shared.utils.io.FileUtils;
 
 import junit.framework.TestCase;
 
@@ -336,11 +336,6 @@ public class FileSetUtilsTest
         return result == 0;
     }
 
-    /**
-     * @param directoryName
-     * @return
-     * @throws IOException
-     */
     private File setupTestDirectory( String directoryName )
         throws IOException
     {
@@ -357,12 +352,12 @@ public class FileSetUtilsTest
         String testBase = System.getProperty( "testBase", "target/test-directories" );
 
         File testDir = new File( basedir, testBase + "/" + directoryName );
-        testDir.mkdirs();
-
-        FileUtils.copyDirectoryStructure( sourceDir, testDir );
-
-        testDirectories.add( testDir );
-
-        return testDir;
+        if ( testDir.mkdirs() ) {
+            FileUtils.copyDirectory( sourceDir, testDir );
+            testDirectories.add( testDir );
+            return testDir;
+        } else {
+            throw new IOException( "Could not create test directory " + testDir );
+        }
     }
 }