Made TarUnArchiver not subclass AbstractZipUnArchiver

Refactoring suggested by Viktor Sadovnikov

Author: krosenvold

src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java

@@ -17,15 +17,22 @@
  *  limitations under the License.
  */
 
+import org.codehaus.plexus.archiver.util.ArchiveEntryUtils;
 import org.codehaus.plexus.archiver.util.FilterSupport;
 import org.codehaus.plexus.components.io.fileselectors.FileSelector;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
 
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
@@ -281,4 +288,57 @@ public void setIgnorePermissions( final boolean ignorePermissions )
         this.ignorePermissions = ignorePermissions;
     }
 
+    protected void extractFile( final File srcF, final File dir, final InputStream compressedInputStream,
+                                final String entryName, final Date entryDate, final boolean isDirectory,
+                                final Integer mode )
+        throws IOException, ArchiverException
+    {
+        final File f = FileUtils.resolveFile( dir, entryName );
+
+        try
+        {
+            if ( !isOverwrite() && f.exists() && ( f.lastModified() >= entryDate.getTime() ) )
+            {
+                return;
+            }
+
+            // create intermediary directories - sometimes zip don't add them
+            final File dirF = f.getParentFile();
+            if ( dirF != null )
+            {
+                dirF.mkdirs();
+            }
+
+            if ( isDirectory )
+            {
+                f.mkdirs();
+            }
+            else
+            {
+                OutputStream out = null;
+                try
+                {
+                    out = new FileOutputStream( f );
+
+                    IOUtil.copy( compressedInputStream, out );
+                }
+                finally
+                {
+                    IOUtil.close( out );
+                }
+            }
+
+            f.setLastModified( entryDate.getTime() );
+
+            if ( !isIgnorePermissions() && mode != null && !isDirectory)
+            {
+                ArchiveEntryUtils.chmod( f, mode, getLogger(), isUseJvmChmod() );
+            }
+        }
+        catch ( final FileNotFoundException ex )
+        {
+            getLogger().warn( "Unable to expand to file " + f.getPath() );
+        }
+    }
+
 }

src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java

@@ -20,9 +20,9 @@
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
+import org.codehaus.plexus.archiver.AbstractUnArchiver;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.util.EnumeratedAttribute;
-import org.codehaus.plexus.archiver.zip.AbstractZipUnArchiver;
 import org.codehaus.plexus.util.IOUtil;
 
 import java.io.BufferedInputStream;
@@ -37,7 +37,7 @@
  * @version $Revision$ $Date$
  */
 public class TarUnArchiver
-    extends AbstractZipUnArchiver
+    extends AbstractUnArchiver
 {
     public TarUnArchiver()
     {
@@ -80,34 +80,42 @@ public void setEncoding( String encoding )
 
     protected void execute()
         throws ArchiverException
+    {
+        execute( getSourceFile(), getDestDirectory() );
+    }
+
+    protected void execute( String path, File outputDirectory )
+    {
+        execute( new File( path ), getDestDirectory() );
+    }
+
+    protected void execute( File sourceFile, File destDirectory )
+        throws ArchiverException
     {
         TarArchiveInputStream tis = null;
         try
         {
-            getLogger().info( "Expanding: " + getSourceFile() + " into " + getDestDirectory() );
-            File sourceFile = getSourceFile();
+            getLogger().info( "Expanding: " + sourceFile + " into " + destDirectory );
             TarFile tarFile = new TarFile( sourceFile );
-            tis = new TarArchiveInputStream( compression.decompress( sourceFile,
-                                                              new BufferedInputStream(
-                                                                  new FileInputStream( sourceFile ) ) ) );
+            tis = new TarArchiveInputStream(
+                compression.decompress( sourceFile, new BufferedInputStream( new FileInputStream( sourceFile ) ) ) );
             TarArchiveEntry te;
             while ( ( te = tis.getNextTarEntry() ) != null )
             {
-
-                TarResource fileInfo = new TarResource( tarFile, te);
-                if (!isSelected( te.getName(), fileInfo )) {
-                    continue;
+                TarResource fileInfo = new TarResource( tarFile, te );
+                if ( isSelected( te.getName(), fileInfo ) )
+                {
+                    extractFile( sourceFile, destDirectory, tis, te.getName(), te.getModTime(), te.isDirectory(),
+                                 te.getMode() != 0 ? te.getMode() : null );
                 }
 
-                extractFile(getSourceFile(), getDestDirectory(), tis, te.getName(), te.getModTime(),
-                        te.isDirectory(), te.getMode() != 0 ? te.getMode() : null);
             }
             getLogger().debug( "expand complete" );
 
         }
         catch ( IOException ioe )
         {
-            throw new ArchiverException( "Error while expanding " + getSourceFile().getAbsolutePath(), ioe );
+            throw new ArchiverException( "Error while expanding " + sourceFile.getAbsolutePath(), ioe );
         }
         finally
         {
@@ -179,7 +187,7 @@ public UntarCompressionMethod( String method )
          */
         public String[] getValues()
         {
-            return new String[]{NONE, GZIP, BZIP2};
+            return new String[]{ NONE, GZIP, BZIP2 };
         }
 
         /**
@@ -189,7 +197,7 @@ public String[] getValues()
          * @param file    provides location information for BuildException
          * @param istream input stream
          * @return input stream with on-the-fly decompression
-         * @throws IOException    thrown by GZIPInputStream constructor
+         * @throws IOException thrown by GZIPInputStream constructor
          */
         private InputStream decompress( final File file, final InputStream istream )
             throws IOException, ArchiverException

src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java

@@ -193,59 +193,6 @@ private void extractFileIfIncluded( final File sourceFile, final File destDirect
         }
     }
 
-    protected void extractFile( final File srcF, final File dir, final InputStream compressedInputStream,
-                                final String entryName, final Date entryDate, final boolean isDirectory,
-                                final Integer mode )
-        throws IOException, ArchiverException
-    {
-        final File f = FileUtils.resolveFile( dir, entryName );
-
-        try
-        {
-            if ( !isOverwrite() && f.exists() && ( f.lastModified() >= entryDate.getTime() ) )
-            {
-                return;
-            }
-
-            // create intermediary directories - sometimes zip don't add them
-            final File dirF = f.getParentFile();
-            if ( dirF != null )
-            {
-                dirF.mkdirs();
-            }
-
-            if ( isDirectory )
-            {
-                f.mkdirs();
-            }
-            else
-            {
-                OutputStream out = null;
-                try
-                {
-                    out = new FileOutputStream( f );
-
-                    IOUtil.copy( compressedInputStream, out );
-                }
-                finally
-                {
-                    IOUtil.close( out );
-                }
-            }
-
-            f.setLastModified( entryDate.getTime() );
-
-            if ( !isIgnorePermissions() && mode != null && !isDirectory)
-            {
-                ArchiveEntryUtils.chmod( f, mode, getLogger(), isUseJvmChmod() );
-            }
-        }
-        catch ( final FileNotFoundException ex )
-        {
-            getLogger().warn( "Unable to expand to file " + f.getPath() );
-        }
-    }
-
     protected void execute( final String path, final File outputDirectory )
         throws ArchiverException
     {