More studies on buffering

Author: krosenvold

src/main/java/org/codehaus/plexus/archiver/bzip2/BZip2Compressor.java

@@ -44,6 +44,7 @@ public void compress()
         try
         {
             zOut = new BZip2CompressorOutputStream( bufferedOutputStream( fileOutputStream( getDestFile() ) ) );
+            // BUffering of the source stream seems to have little/no impact
             compress( getSource(), zOut );
         }
         catch ( IOException ioe )

src/main/java/org/codehaus/plexus/archiver/bzip2/BZip2UnArchiver.java

@@ -17,17 +17,20 @@
  *  limitations under the License.
  */
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
 import org.codehaus.plexus.archiver.AbstractUnArchiver;
 import org.codehaus.plexus.archiver.ArchiverException;
 
 import javax.annotation.Nonnull;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 
-import static org.codehaus.plexus.archiver.util.Streams.*;
+import static org.codehaus.plexus.archiver.util.Streams.bufferedInputStream;
+import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;
+import static org.codehaus.plexus.archiver.util.Streams.copyFully;
+import static org.codehaus.plexus.archiver.util.Streams.fileInputStream;
+import static org.codehaus.plexus.archiver.util.Streams.fileOutputStream;
 
 /**
  * @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
@@ -67,6 +70,7 @@ BZip2CompressorInputStream getBZip2InputStream( InputStream bis )
     {
         try
         {
+            // Note that bis must be buffered for performance. Does not need buffering around BZip2CompressorInputStream
             return new BZip2CompressorInputStream( bis );
         }
         catch ( IOException e )

src/main/java/org/codehaus/plexus/archiver/gzip/GZipCompressor.java

@@ -18,12 +18,13 @@
  */
 
 import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.util.Streams;
 import org.codehaus.plexus.archiver.util.Compressor;
+import org.codehaus.plexus.archiver.util.Streams;
 import org.codehaus.plexus.util.IOUtil;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.util.zip.GZIPOutputStream;
 
 /**
@@ -32,7 +33,7 @@
 public class GZipCompressor
     extends Compressor
 {
-    private GZIPOutputStream zOut;
+    private OutputStream zOut;
 
     /**
      * perform the GZip compression operation.
@@ -42,7 +43,7 @@ public void compress()
     {
         try
         {
-            zOut = new GZIPOutputStream( Streams.bufferedOutputStream( new FileOutputStream( getDestFile() ) ));
+            zOut = Streams.bufferedOutputStream( new GZIPOutputStream( new FileOutputStream( getDestFile() ) ) );
             compress( getSource(), zOut );
         }
         catch ( IOException ioe )

src/main/java/org/codehaus/plexus/archiver/gzip/GZipUnArchiver.java

@@ -19,15 +19,17 @@
 
 import org.codehaus.plexus.archiver.AbstractUnArchiver;
 import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.archiver.util.Streams;
 
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.zip.GZIPInputStream;
 
-import static org.codehaus.plexus.archiver.util.Streams.*;
+import static org.codehaus.plexus.archiver.util.Streams.copyFully;
+import static org.codehaus.plexus.archiver.util.Streams.fileInputStream;
+import static org.codehaus.plexus.archiver.util.Streams.fileOutputStream;
 
 /**
  * @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
@@ -66,7 +68,7 @@ private InputStream getGzipInputStream( FileInputStream in )
     {
         try
         {
-            return new BufferedInputStream( new GZIPInputStream( in ));
+            return Streams.bufferedInputStream( new GZIPInputStream( in ) );
         }
         catch ( IOException e )
         {

src/main/java/org/codehaus/plexus/archiver/gzip/PlexusIoGzipResourceCollection.java

@@ -1,19 +1,18 @@
 package org.codehaus.plexus.archiver.gzip;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.zip.GZIPInputStream;
-
+import org.codehaus.plexus.archiver.util.Streams;
 import org.codehaus.plexus.components.io.attributes.Java7FileAttributes;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
 import org.codehaus.plexus.components.io.resources.PlexusIoCompressedFileResourceCollection;
 import org.codehaus.plexus.util.IOUtil;
 
 import javax.annotation.Nonnull;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.zip.GZIPInputStream;
 
 
 /**
@@ -35,7 +34,7 @@ protected InputStream getInputStream( File file )
         InputStream fis = new FileInputStream( file );
         try
         {
-            InputStream result = new BufferedInputStream( new GZIPInputStream( fis ));
+            InputStream result = Streams.bufferedInputStream( new GZIPInputStream( fis ) );
             fis = null;
             return result;
         }
@@ -45,7 +44,10 @@ protected InputStream getInputStream( File file )
         }
     }
 
-	@Override protected PlexusIoResourceAttributes getAttributes(File file) throws IOException {
-        return new Java7FileAttributes(file, new HashMap<Integer, String>(), new HashMap<Integer, String>());
-	}
+    @Override
+    protected PlexusIoResourceAttributes getAttributes( File file )
+        throws IOException
+    {
+        return new Java7FileAttributes( file, new HashMap<Integer, String>(), new HashMap<Integer, String>() );
+    }
 }

src/main/java/org/codehaus/plexus/archiver/tar/GZipTarFile.java

@@ -1,6 +1,7 @@
 package org.codehaus.plexus.archiver.tar;
 
-import java.io.BufferedInputStream;
+import org.codehaus.plexus.archiver.util.Streams;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -10,7 +11,8 @@
 /**
  * Extension of {@link TarFile} for gzip compressed files.
  */
-public class GZipTarFile extends TarFile
+public class GZipTarFile
+    extends TarFile
 {
     /**
      * Creates a new instance with the given file.
@@ -24,14 +26,14 @@ protected InputStream getInputStream( File file )
         throws IOException
     {
         final InputStream inputStream = super.getInputStream( file );
-        return new BufferedInputStream( new GZIPInputStream( inputStream )
+        return Streams.bufferedInputStream( new GZIPInputStream( inputStream )
         {
             public void close()
                 throws IOException
             {
                 super.close();
                 inputStream.close();
             }
-        });
+        } );
     }
 }