29
29
import org .apache .commons .compress .archivers .zip .ZipFile ;
30
30
import org .codehaus .plexus .archiver .AbstractUnArchiver ;
31
31
import org .codehaus .plexus .archiver .ArchiverException ;
32
- import org .codehaus .plexus .components .io .filemappers .FileMapper ;
33
32
import org .codehaus .plexus .components .io .resources .PlexusIoResource ;
34
33
35
34
/**
@@ -171,10 +170,10 @@ protected void execute()
171
170
{
172
171
try ( InputStream in = zf .getInputStream ( ze ) )
173
172
{
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 () );
178
177
}
179
178
}
180
179
}
@@ -199,14 +198,6 @@ private String resolveSymlink( ZipFile zf, ZipArchiveEntry ze )
199
198
}
200
199
}
201
200
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
-
210
201
@ Override
211
202
protected void execute ( final String path , final File outputDirectory )
212
203
throws ArchiverException
@@ -228,10 +219,10 @@ protected void execute( final String path, final File outputDirectory )
228
219
{
229
220
try ( InputStream in = zipFile .getInputStream ( ze ) )
230
221
{
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 () );
235
226
}
236
227
}
237
228
}
0 commit comments