Skip to content

Commit 4978d77

Browse files
Sergey Patrikeevplamentotev
Sergey Patrikeev
authored andcommitted
Remove redundant call to 'extractFileIfIncluded'.
1 parent b805279 commit 4978d77

File tree

1 file changed

+8
-17
lines changed

1 file changed

+8
-17
lines changed

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

+8-17
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.apache.commons.compress.archivers.zip.ZipFile;
3030
import org.codehaus.plexus.archiver.AbstractUnArchiver;
3131
import org.codehaus.plexus.archiver.ArchiverException;
32-
import org.codehaus.plexus.components.io.filemappers.FileMapper;
3332
import org.codehaus.plexus.components.io.resources.PlexusIoResource;
3433

3534
/**
@@ -171,10 +170,10 @@ protected void execute()
171170
{
172171
try ( InputStream in = zf.getInputStream( ze ) )
173172
{
174-
extractFileIfIncluded( getSourceFile(), getDestDirectory(), in, fileInfo.getName(),
175-
new Date( ze.getTime() ), ze.isDirectory(),
176-
ze.getUnixMode() != 0 ? ze.getUnixMode() : null,
177-
resolveSymlink( zf, ze ), getFileMappers() );
173+
extractFile( getSourceFile(), getDestDirectory(), in, fileInfo.getName(),
174+
new Date( ze.getTime() ), ze.isDirectory(),
175+
ze.getUnixMode() != 0 ? ze.getUnixMode() : null,
176+
resolveSymlink( zf, ze ), getFileMappers() );
178177
}
179178
}
180179
}
@@ -199,14 +198,6 @@ private String resolveSymlink( ZipFile zf, ZipArchiveEntry ze )
199198
}
200199
}
201200

202-
private void extractFileIfIncluded( final File sourceFile, final File destDirectory, final InputStream inputStream,
203-
final String name, final Date time, final boolean isDirectory,
204-
final Integer mode, String symlinkDestination, final FileMapper[] fileMappers )
205-
throws IOException, ArchiverException
206-
{
207-
extractFile( sourceFile, destDirectory, inputStream, name, time, isDirectory, mode, symlinkDestination, fileMappers );
208-
}
209-
210201
@Override
211202
protected void execute( final String path, final File outputDirectory )
212203
throws ArchiverException
@@ -228,10 +219,10 @@ protected void execute( final String path, final File outputDirectory )
228219
{
229220
try ( InputStream in = zipFile.getInputStream( ze ) )
230221
{
231-
extractFileIfIncluded( getSourceFile(), outputDirectory, in,
232-
ze.getName(), new Date( ze.getTime() ), ze.isDirectory(),
233-
ze.getUnixMode() != 0 ? ze.getUnixMode() : null,
234-
resolveSymlink( zipFile, ze ), getFileMappers() );
222+
extractFile( getSourceFile(), outputDirectory, in,
223+
ze.getName(), new Date( ze.getTime() ), ze.isDirectory(),
224+
ze.getUnixMode() != 0 ? ze.getUnixMode() : null,
225+
resolveSymlink( zipFile, ze ), getFileMappers() );
235226
}
236227
}
237228
}

0 commit comments

Comments
 (0)