Remove redundant call to 'extractFileIfIncluded'.

codehaus-plexus · Aug 23, 2019 · 4978d77 · 4978d77
1 parent b805279
commit 4978d77
Showing 1 changed file with 8 additions and 17 deletions.
diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java
@@ -29,7 +29,6 @@
 import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.codehaus.plexus.archiver.AbstractUnArchiver;
 import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.components.io.filemappers.FileMapper;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 
 /**
@@ -171,10 +170,10 @@ protected void execute()
                 {
                     try ( InputStream in = zf.getInputStream( ze ) )
                     {
-                        extractFileIfIncluded( getSourceFile(), getDestDirectory(), in, fileInfo.getName(),
-                                               new Date( ze.getTime() ), ze.isDirectory(),
-                                               ze.getUnixMode() != 0 ? ze.getUnixMode() : null,
-                                               resolveSymlink( zf, ze ), getFileMappers() );
+                        extractFile( getSourceFile(), getDestDirectory(), in, fileInfo.getName(),
+                                     new Date( ze.getTime() ), ze.isDirectory(),
+                                     ze.getUnixMode() != 0 ? ze.getUnixMode() : null,
+                                     resolveSymlink( zf, ze ), getFileMappers() );
                     }
                 }
             }
@@ -199,14 +198,6 @@ private String resolveSymlink( ZipFile zf, ZipArchiveEntry ze )
         }
     }
 
-    private void extractFileIfIncluded( final File sourceFile, final File destDirectory, final InputStream inputStream,
-                                        final String name, final Date time, final boolean isDirectory,
-                                        final Integer mode, String symlinkDestination, final FileMapper[] fileMappers )
-        throws IOException, ArchiverException
-    {
-        extractFile( sourceFile, destDirectory, inputStream, name, time, isDirectory, mode, symlinkDestination, fileMappers );
-    }
-
     @Override
     protected void execute( final String path, final File outputDirectory )
         throws ArchiverException
@@ -228,10 +219,10 @@ protected void execute( final String path, final File outputDirectory )
                 {
                     try ( InputStream in = zipFile.getInputStream( ze ) )
                     {
-                        extractFileIfIncluded( getSourceFile(), outputDirectory, in,
-                                               ze.getName(), new Date( ze.getTime() ), ze.isDirectory(),
-                                               ze.getUnixMode() != 0 ? ze.getUnixMode() : null,
-                                               resolveSymlink( zipFile, ze ), getFileMappers() );
+                        extractFile( getSourceFile(), outputDirectory, in,
+                                     ze.getName(), new Date( ze.getTime() ), ze.isDirectory(),
+                                     ze.getUnixMode() != 0 ? ze.getUnixMode() : null,
+                                     resolveSymlink( zipFile, ze ), getFileMappers() );
                     }
                 }
             }