Converted to single transformer, added testcase

krosenvold · krosenvold · commit 238fe08fa65f · 2014-10-20T21:43:04.000+02:00
diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java
@@ -42,6 +42,7 @@
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.components.io.attributes.Java7Reflector;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
+import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResourceCollection;
 import org.codehaus.plexus.components.io.resources.PlexusIoArchivedResourceCollection;
 import org.codehaus.plexus.components.io.resources.PlexusIoFileResourceCollection;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
@@ -310,7 +311,7 @@ public void addFileSet( @Nonnull final FileSet fileSet )
         collection.setPrefix( fileSet.getPrefix() );
         collection.setCaseSensitive( fileSet.isCaseSensitive() );
         collection.setUsingDefaultExcludes( fileSet.isUsingDefaultExcludes() );
-        collection.setStreamTransformers( fileSet.getStreamTransformers() );
+        collection.setStreamTransformer( fileSet.getStreamTransformer() );
 
         if ( getOverrideDirectoryMode() > -1 || getOverrideFileMode() > -1 )
         {
@@ -684,6 +685,9 @@ protected PlexusIoResourceCollection asResourceCollection( final ArchivedFileSet
                                              + resources.getClass().getName() );
         }
 
+        if (resources instanceof AbstractPlexusIoResourceCollection ){
+            ((AbstractPlexusIoResourceCollection)resources).setStreamTransformer( fileSet.getStreamTransformer() );
+        }
         final PlexusIoProxyResourceCollection proxy = new PlexusIoProxyResourceCollection(resources);
 
         proxy.setExcludes( fileSet.getExcludes() );
@@ -693,7 +697,7 @@ protected PlexusIoResourceCollection asResourceCollection( final ArchivedFileSet
         proxy.setPrefix( fileSet.getPrefix() );
         proxy.setUsingDefaultExcludes( fileSet.isUsingDefaultExcludes() );
         proxy.setFileSelectors( fileSet.getFileSelectors() );
-        proxy.setStreamTransformers( fileSet.getStreamTransformers() );
+        proxy.setStreamTransformer( fileSet.getStreamTransformer() );
 
         if ( getOverrideDirectoryMode() > -1 || getOverrideFileMode() > -1 )
         {
diff --git a/src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java b/src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java
@@ -30,11 +30,6 @@
 import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 import org.codehaus.plexus.components.io.resources.PlexusIoResourceWithAttributes;
-import org.codehaus.plexus.components.io.resources.PlexusIoSymlinkResource;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
 
 /**
  * @version $Revision: 1502 $ $Date$
@@ -173,7 +168,7 @@ public static ArchiveEntry createFileEntry( String target, File file, int permis
             throw new ArchiverException( "Failed to read filesystem attributes for: " + file, e );
         }
         
-        final PlexusIoFileResource res =  PlexusIoFileResource.existingFile( file, attrs );
+        final PlexusIoFileResource res =  PlexusIoFileResource.justAFile( file, attrs );
         return new ArchiveEntry( target, res, FILE, permissions );
     }
 
diff --git a/src/main/java/org/codehaus/plexus/archiver/BaseFileSet.java b/src/main/java/org/codehaus/plexus/archiver/BaseFileSet.java
@@ -65,7 +65,7 @@ public interface BaseFileSet
      * @return The transformers.
      */
 
-    InputStreamTransformer[] getStreamTransformers();
+    InputStreamTransformer getStreamTransformer();
 
 
 }
diff --git a/src/main/java/org/codehaus/plexus/archiver/util/AbstractFileSet.java b/src/main/java/org/codehaus/plexus/archiver/util/AbstractFileSet.java
@@ -20,7 +20,6 @@
 import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
 
 import javax.annotation.Nonnull;
-import java.util.Arrays;
 
 
 /**
@@ -30,7 +29,6 @@
 public abstract class AbstractFileSet<T extends AbstractFileSet>
     implements BaseFileSet
 {
-    private static final InputStreamTransformer[] empty = new InputStreamTransformer[0];
 
     private String prefix;
 
@@ -46,7 +44,7 @@ public abstract class AbstractFileSet<T extends AbstractFileSet>
 
     private boolean includingEmptyDirectories = true;
 
-    private InputStreamTransformer[] streamTransformers = empty;
+    private InputStreamTransformer streamTransformer = null;
 
 
     /**
@@ -171,15 +169,13 @@ public T includeEmptyDirs( boolean includeEmptyDirectories  ){
         return (T) this;
     }
 
-    public void addStreamTransformers( @Nonnull InputStreamTransformer... streamTransformer )
+    public void setStreamTransformer( @Nonnull InputStreamTransformer streamTransformer )
     {
-        final int orgLength = this.streamTransformers.length;
-        streamTransformers = Arrays.copyOf( this.streamTransformers, orgLength + streamTransformer.length );
-        System.arraycopy(streamTransformer, 0, streamTransformers, orgLength, streamTransformer.length);
+        this.streamTransformer = streamTransformer;
     }
 
-    public InputStreamTransformer[] getStreamTransformers()
+    public InputStreamTransformer getStreamTransformer()
     {
-        return streamTransformers;
+        return streamTransformer;
     }
 }
diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java b/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java
@@ -601,7 +601,7 @@ protected void zipFile( ArchiveEntry entry, ZipArchiveOutputStream zOut, String
         }
         catch ( IOException e )
         {
-            throw new ArchiverException( "IOException when zipping " + entry.getName() + ": " + e.getMessage(), e );
+            throw new ArchiverException( "IOException when zipping r" + entry.getName() + ": " + e.getMessage(), e );
         }
         finally
         {
diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/PlexusIoZipFileResourceCollection.java b/src/main/java/org/codehaus/plexus/archiver/zip/PlexusIoZipFileResourceCollection.java
@@ -39,7 +39,7 @@ public PlexusIoResource next()
             {
                 final ZipArchiveEntry entry = (ZipArchiveEntry) en.nextElement();
 
-                return new ZipResource( zipFile, entry );
+                return new ZipResource( zipFile, entry, getStreamTransformer() );
             }
 
             public void remove()
diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/ZipResource.java b/src/main/java/org/codehaus/plexus/archiver/zip/ZipResource.java
@@ -5,10 +5,13 @@
 import java.net.URL;
 
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.codehaus.plexus.archiver.UnixStat;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
 import org.codehaus.plexus.components.io.attributes.SimpleResourceAttributes;
+import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
 import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResource;
+import org.codehaus.plexus.components.io.resources.ClosingInputStream;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 import org.codehaus.plexus.components.io.resources.PlexusIoResourceWithAttributes;
 
@@ -18,14 +21,18 @@ public class ZipResource extends AbstractPlexusIoResource
 
     private final org.apache.commons.compress.archivers.zip.ZipFile zipFile;
     private final ZipArchiveEntry entry;
+
+    private final InputStreamTransformer streamTransformer;
+
     private PlexusIoResourceAttributes attributes;
 
-    public ZipResource( org.apache.commons.compress.archivers.zip.ZipFile zipFile, ZipArchiveEntry entry )
+    public ZipResource( ZipFile zipFile, ZipArchiveEntry entry, InputStreamTransformer streamTransformer )
     {
         super(entry.getName(),getLastModofied( entry), entry.isDirectory() ? PlexusIoResource.UNKNOWN_RESOURCE_SIZE : entry.getSize() ,
               !entry.isDirectory(), entry.isDirectory(), true);
         this.zipFile = zipFile;
         this.entry = entry;
+        this.streamTransformer = streamTransformer;
     }
 
     private static long getLastModofied( ZipArchiveEntry entry )
@@ -68,7 +75,8 @@ public URL getURL()
     public InputStream getContents()
         throws IOException
     {
-        return zipFile.getInputStream( entry );
+        final InputStream inputStream = zipFile.getInputStream( entry );
+        return new ClosingInputStream( streamTransformer.transform( this, inputStream ), inputStream);
     }
 
 }
diff --git a/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/zip/ZipArchiverTest.java
@@ -25,14 +25,21 @@
  */
 
 import org.apache.commons.compress.archivers.zip.*;
+import org.apache.commons.compress.utils.BoundedInputStream;
+import org.codehaus.plexus.archiver.ArchivedFileSet;
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.BasePlexusArchiverTest;
 import org.codehaus.plexus.archiver.UnixStat;
 import org.codehaus.plexus.archiver.util.ArchiveEntryUtils;
+import org.codehaus.plexus.archiver.util.DefaultArchivedFileSet;
+import org.codehaus.plexus.archiver.util.DefaultFileSet;
 import org.codehaus.plexus.archiver.util.Streams;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
+import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
+import org.codehaus.plexus.components.io.resources.PlexusIoFileResourceCollection;
+import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.logging.console.ConsoleLogger;
 import org.codehaus.plexus.util.FileUtils;
@@ -258,6 +265,40 @@ public void testCreateArchive()
         createArchive(archiver);
     }
 
+    public void testCreateArchiveWithStreamTransformer()
+        throws IOException
+    {
+        InputStreamTransformer is = new InputStreamTransformer()
+        {
+            public InputStream transform( PlexusIoResource resource, InputStream inputStream )
+                throws IOException
+            {
+                return new BoundedInputStream( inputStream, 3 );
+            }
+        };
+
+        final ZipArchiver zipArchiver = getZipArchiver( getTestFile( "target/output/all3bytes.zip" ) );
+        DefaultArchivedFileSet afs = new DefaultArchivedFileSet( new File("src/test/resources/test.zip" ));
+        afs.setStreamTransformer( is );
+        afs.setPrefix( "azip/" );
+        zipArchiver.addArchivedFileSet( afs );
+
+        DefaultFileSet dfs = new DefaultFileSet( new File("src/test/resources/mjar179" ));
+        dfs.setStreamTransformer( is );
+        dfs.setPrefix( "mj179/" );
+        zipArchiver.addFileSet( dfs );
+
+        PlexusIoFileResourceCollection files = new PlexusIoFileResourceCollection();
+        files.setBaseDir( new File("src/test/resources" ));
+        files.setStreamTransformer( is );
+        files.setPrefix( "plexus/" );
+        zipArchiver.addResources( files );
+
+        zipArchiver.createArchive();
+
+
+
+    }
     private ZipArchiver newArchiver( String name ) throws Exception {
         ZipArchiver archiver = getZipArchiver(getTestFile( "target/output/" + name ));
 
diff --git a/src/test/resources/test.zip b/src/test/resources/test.zip

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public interface BaseFileSet`
`65`	`65`	`* @return The transformers.`
`66`	`66`	`*/`
`67`	`67`
`68`		`- InputStreamTransformer[] getStreamTransformers();`
	`68`	`+ InputStreamTransformer getStreamTransformer();`
`69`	`69`
`70`	`70`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`import org.codehaus.plexus.components.io.functions.InputStreamTransformer;`
`21`	`21`
`22`	`22`	`import javax.annotation.Nonnull;`
`23`		`-import java.util.Arrays;`
`24`	`23`
`25`	`24`
`26`	`25`	`/**`
`@@ -30,7 +29,6 @@`
`30`	`29`	`public abstract class AbstractFileSet<T extends AbstractFileSet>`
`31`	`30`	`implements BaseFileSet`
`32`	`31`	`{`
`33`		`- private static final InputStreamTransformer[] empty = new InputStreamTransformer[0];`
`34`	`32`
`35`	`33`	`private String prefix;`
`36`	`34`
`@@ -46,7 +44,7 @@ public abstract class AbstractFileSet<T extends AbstractFileSet>`
`46`	`44`
`47`	`45`	`private boolean includingEmptyDirectories = true;`
`48`	`46`
`49`		`- private InputStreamTransformer[] streamTransformers = empty;`
	`47`	`+ private InputStreamTransformer streamTransformer = null;`
`50`	`48`
`51`	`49`
`52`	`50`	`/**`
`@@ -171,15 +169,13 @@ public T includeEmptyDirs( boolean includeEmptyDirectories ){`
`171`	`169`	`return (T) this;`
`172`	`170`	`}`
`173`	`171`
`174`		`- public void addStreamTransformers( @Nonnull InputStreamTransformer... streamTransformer )`
	`172`	`+ public void setStreamTransformer( @Nonnull InputStreamTransformer streamTransformer )`
`175`	`173`	`{`
`176`		`- final int orgLength = this.streamTransformers.length;`
`177`		`- streamTransformers = Arrays.copyOf( this.streamTransformers, orgLength + streamTransformer.length );`
`178`		`- System.arraycopy(streamTransformer, 0, streamTransformers, orgLength, streamTransformer.length);`
	`174`	`+ this.streamTransformer = streamTransformer;`
`179`	`175`	`}`
`180`	`176`
`181`		`- public InputStreamTransformer[] getStreamTransformers()`
	`177`	`+ public InputStreamTransformer getStreamTransformer()`
`182`	`178`	`{`
`183`		`- return streamTransformers;`
	`179`	`+ return streamTransformer;`
`184`	`180`	`}`
`185`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,7 @@ protected void zipFile( ArchiveEntry entry, ZipArchiveOutputStream zOut, String`
`601`	`601`	`}`
`602`	`602`	`catch ( IOException e )`
`603`	`603`	`{`
`604`		`- throw new ArchiverException( "IOException when zipping " + entry.getName() + ": " + e.getMessage(), e );`
	`604`	`+ throw new ArchiverException( "IOException when zipping r" + entry.getName() + ": " + e.getMessage(), e );`
`605`	`605`	`}`
`606`	`606`	`finally`
`607`	`607`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public PlexusIoResource next()`
`39`	`39`	`{`
`40`	`40`	`final ZipArchiveEntry entry = (ZipArchiveEntry) en.nextElement();`
`41`	`41`
`42`		`- return new ZipResource( zipFile, entry );`
	`42`	`+ return new ZipResource( zipFile, entry, getStreamTransformer() );`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public void remove()`