Skip to content

Commit 0b16e9a

Browse files
krosenvoldkrosenvold
committed
Adapted to p-io 2.4
1 parent 5d1749b commit 0b16e9a

File tree

5 files changed

+24
-34
lines changed

5 files changed

+24
-34
lines changed

‎src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;
3232
import org.codehaus.plexus.components.io.resources.PlexusIoResource;
3333
import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
34+
import org.codehaus.plexus.components.io.resources.ResourceFactory;
35+
36+
import static org.codehaus.plexus.components.io.resources.ResourceFactory.createResource;
3437

3538
/**
3639
* @version $Revision: 1502 $ $Date$
@@ -45,8 +48,6 @@ public class ArchiveEntry
4548

4649
public static final int SYMLINK = 3;
4750

48-
private PlexusIoResourceCollection collection;
49-
5051
@Nonnull private PlexusIoResource resource;
5152

5253
private final String name;
@@ -73,7 +74,6 @@ private ArchiveEntry( String name, @Nonnull PlexusIoResource resource, int type,
7374
PlexusIoResourceCollection collection, int defaultDirMode )
7475
{
7576
this.name = name;
76-
this.collection = collection;
7777
this.defaultDirMode = defaultDirMode;
7878
try {
7979
this.resource = collection != null ? collection.resolve(resource) : resource;
@@ -168,8 +168,7 @@ public static ArchiveEntry createFileEntry( String target, PlexusIoResource reso
168168
}
169169

170170
public static ArchiveEntry createFileEntry( String target, File file, int permissions, int defaultDirectoryPermissions )
171-
throws ArchiverException
172-
{
171+
throws ArchiverException, IOException {
173172
if ( !file.isFile() )
174173
{
175174
throw new ArchiverException( "Not a file: " + file );
@@ -218,34 +217,16 @@ public static ArchiveEntry createDirectoryEntry( String target, @Nonnull PlexusI
218217

219218
public static ArchiveEntry createDirectoryEntry( String target, final File file, int permissions,
220219
int defaultDirMode1 )
221-
throws ArchiverException
222-
{
220+
throws ArchiverException, IOException {
223221
if ( !file.isDirectory() )
224222
{
225223
throw new ArchiverException( "Not a directory: " + file );
226224
}
227225

228-
final PlexusIoFileResource res = new PlexusIoFileResource( file, ArchiverAttributeUtils.getFileAttributes(file));
226+
final PlexusIoResource res = createResource( file, file.getName() );
229227
return new ArchiveEntry( target, res, DIRECTORY, permissions, null, defaultDirMode1 );
230228
}
231229

232-
public static ArchiveEntry createEntry( String target, File file, int filePerm, int dirPerm, int defaultDirectoryPermissions )
233-
throws ArchiverException
234-
{
235-
if ( file.isDirectory() )
236-
{
237-
return createDirectoryEntry( target, file, dirPerm, defaultDirectoryPermissions );
238-
}
239-
else if ( file.isFile() )
240-
{
241-
return createFileEntry( target, file, filePerm, defaultDirectoryPermissions );
242-
}
243-
else // FIXME: handle symlinks?
244-
{
245-
throw new ArchiverException( "Neither a file nor a directory: " + file );
246-
}
247-
}
248-
249230
public static ArchiveEntry createSymlinkEntry( String symlinkName, int permissions, String symlinkDestination,
250231
int defaultDirectoryPermissions
251232
)

‎src/main/java/org/codehaus/plexus/archiver/util/Compressor.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@
2626
import org.codehaus.plexus.archiver.ArchiverException;
2727
import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;
2828
import org.codehaus.plexus.components.io.resources.PlexusIoResource;
29+
import org.codehaus.plexus.components.io.resources.ResourceFactory;
2930
import org.codehaus.plexus.logging.AbstractLogEnabled;
3031
import org.codehaus.plexus.util.IOUtil;
3132

33+
import static org.codehaus.plexus.components.io.resources.ResourceFactory.createResource;
34+
3235
/**
3336
* @version $Revision$ $Date$
3437
*/
@@ -74,10 +77,8 @@ public PlexusIoResource getSource()
7477
* the file to compress; required.
7578
* @deprecated Use {@link #getSource()}.
7679
*/
77-
public void setSourceFile( File srcFile )
78-
{
79-
final PlexusIoFileResource res = new PlexusIoFileResource( srcFile, ArchiverAttributeUtils.getFileAttributes(srcFile));
80-
setSource( res );
80+
public void setSourceFile( File srcFile ) throws IOException {
81+
setSource( createResource( srcFile, srcFile.getName() ) );
8182
}
8283

8384
/**

‎src/test/java/org/codehaus/plexus/archiver/tar/TarArchiverTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils;
4040
import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
4141
import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;
42+
import org.codehaus.plexus.components.io.resources.ResourceFactory;
4243
import org.codehaus.plexus.logging.Logger;
4344
import org.codehaus.plexus.logging.console.ConsoleLogger;
4445
import org.codehaus.plexus.util.FileUtils;
@@ -56,6 +57,7 @@
5657
import java.util.Map;
5758

5859
import static org.codehaus.plexus.archiver.util.Streams.bufferedInputStream;
60+
import static org.codehaus.plexus.components.io.resources.ResourceFactory.createResource;
5961

6062
/**
6163
* @author Emmanuel Venisse
@@ -444,7 +446,7 @@ File createTarFile()
444446
File file = super.createTarFile();
445447
File compressedFile = new File( file.getPath() + ".gz" );
446448
Compressor compressor = new GZipCompressor();
447-
compressor.setSource( new PlexusIoFileResource( file, ArchiverAttributeUtils.getFileAttributes(file) ) );
449+
compressor.setSource( createResource( file, file.getName() ) );
448450
compressor.setDestFile( compressedFile );
449451
compressor.compress();
450452
compressor.close();
@@ -467,7 +469,7 @@ File createTarFile()
467469
File file = super.createTarFile();
468470
File compressedFile = new File( file.getPath() + ".bz2" );
469471
Compressor compressor = new BZip2Compressor();
470-
compressor.setSource( new PlexusIoFileResource( file, ArchiverAttributeUtils.getFileAttributes(file) ) );
472+
compressor.setSource( createResource( file ) );
471473
compressor.setDestFile( compressedFile );
472474
compressor.compress();
473475
compressor.close();

‎src/test/java/org/codehaus/plexus/archiver/tar/TarFileTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@
1515
import org.codehaus.plexus.archiver.util.ArchiverAttributeUtils;
1616
import org.codehaus.plexus.archiver.util.Compressor;
1717
import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;
18+
import org.codehaus.plexus.components.io.resources.ResourceFactory;
1819
import org.codehaus.plexus.util.FileUtils;
1920
import org.codehaus.plexus.util.IOUtil;
2021

22+
import static org.codehaus.plexus.components.io.resources.ResourceFactory.createResource;
23+
2124

2225
/**
2326
* Test case for {@link TarFile}.
@@ -88,7 +91,7 @@ private void testTarFile( Compressor compressor, String extension,
8891
if ( compressor != null )
8992
{
9093
final File compressedFile = new File( file.getPath() + extension );
91-
compressor.setSource( new PlexusIoFileResource( file, ArchiverAttributeUtils.getFileAttributes(file) ) );
94+
compressor.setSource( createResource( file, file.getName() ) );
9295
compressor.setDestFile( compressedFile );
9396
compressor.compress();
9497
compressor.close();

‎src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import org.codehaus.plexus.util.IOUtil;
5252
import org.codehaus.plexus.util.Os;
5353

54+
import javax.annotation.Nonnull;
5455
import java.io.ByteArrayInputStream;
5556
import java.io.ByteArrayOutputStream;
5657
import java.io.File;
@@ -340,7 +341,8 @@ public void testAddArchivedFileSet() throws Exception {
340341
final ZipArchiver zipArchiver = getZipArchiver(zipFIle);
341342
InputStreamTransformer is = new InputStreamTransformer()
342343
{
343-
public InputStream transform( PlexusIoResource resource, InputStream inputStream )
344+
@Nonnull
345+
public InputStream transform( @Nonnull PlexusIoResource resource, @Nonnull InputStream inputStream )
344346
throws IOException
345347
{
346348
return new BoundedInputStream( inputStream, 3 );
@@ -365,7 +367,8 @@ public void testCreateArchiveWithStreamTransformer()
365367
{
366368
InputStreamTransformer is = new InputStreamTransformer()
367369
{
368-
public InputStream transform( PlexusIoResource resource, InputStream inputStream )
370+
@Nonnull
371+
public InputStream transform( @Nonnull PlexusIoResource resource, @Nonnull InputStream inputStream )
369372
throws IOException
370373
{
371374
return new BoundedInputStream( inputStream, 3 );

0 commit comments

Comments
 (0)