Misc language level fixes and automated cleanups

krosenvold · krosenvold · commit 059e031ad637 · 2015-01-10T08:46:09.000+01:00
diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java
@@ -35,7 +35,6 @@
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 
 /**
diff --git a/src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java b/src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java
@@ -18,14 +18,13 @@
  */
 
 import org.codehaus.plexus.archiver.resources.PlexusIoVirtualSymlinkResource;
-import org.codehaus.plexus.archiver.util.ArchiverAttributeUtils;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
 import javax.annotation.Nonnull;
 
-import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
 import org.codehaus.plexus.components.io.functions.ResourceAttributeSupplier;
 import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;
diff --git a/src/main/java/org/codehaus/plexus/archiver/BaseFileSet.java b/src/main/java/org/codehaus/plexus/archiver/BaseFileSet.java
@@ -5,8 +5,6 @@
 import org.codehaus.plexus.components.io.fileselectors.FileSelector;
 import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
 
-import java.util.Arrays;
-
 
 /**
  * A file set is a set of files, which may be added to an
diff --git a/src/main/java/org/codehaus/plexus/archiver/DotDirectiveArchiveFinalizer.java b/src/main/java/org/codehaus/plexus/archiver/DotDirectiveArchiveFinalizer.java
@@ -8,7 +8,6 @@
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 
diff --git a/src/main/java/org/codehaus/plexus/archiver/bzip2/BZip2Compressor.java b/src/main/java/org/codehaus/plexus/archiver/bzip2/BZip2Compressor.java
@@ -23,7 +23,6 @@
 import org.codehaus.plexus.util.IOUtil;
 
 import java.io.IOException;
-import java.io.OutputStream;
 
 import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;
 import static org.codehaus.plexus.archiver.util.Streams.fileOutputStream;
diff --git a/src/main/java/org/codehaus/plexus/archiver/bzip2/PlexusIoBzip2ResourceCollection.java b/src/main/java/org/codehaus/plexus/archiver/bzip2/PlexusIoBzip2ResourceCollection.java
@@ -6,7 +6,6 @@
 import java.io.InputStream;
 import java.util.HashMap;
 
-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;
diff --git a/src/main/java/org/codehaus/plexus/archiver/snappy/SnappyArchiver.java b/src/main/java/org/codehaus/plexus/archiver/snappy/SnappyArchiver.java
@@ -21,7 +21,6 @@
 import org.codehaus.plexus.archiver.ArchiveEntry;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.ResourceIterator;
-import org.codehaus.plexus.archiver.bzip2.BZip2Compressor;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/SnappyTarFile.java b/src/main/java/org/codehaus/plexus/archiver/tar/SnappyTarFile.java
@@ -1,13 +1,10 @@
 package org.codehaus.plexus.archiver.tar;
 
-import org.codehaus.plexus.archiver.bzip2.BZip2UnArchiver;
 import org.codehaus.plexus.archiver.snappy.SnappyUnArchiver;
-import org.xerial.snappy.SnappyInputStream;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.zip.GZIPInputStream;
 
 
 /**
diff --git a/src/main/java/org/codehaus/plexus/archiver/util/ResourceUtils.java b/src/main/java/org/codehaus/plexus/archiver/util/ResourceUtils.java
@@ -7,7 +7,6 @@
 import java.io.OutputStream;
 
 import org.codehaus.plexus.components.io.functions.FileSupplier;
-import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 import org.codehaus.plexus.util.IOUtil;
 
diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/AnonymousResource.java b/src/main/java/org/codehaus/plexus/archiver/zip/AnonymousResource.java
@@ -1,7 +1,6 @@
 package org.codehaus.plexus.archiver.zip;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
diff --git a/src/test/java/org/codehaus/plexus/archiver/jar/IndexTest.java b/src/test/java/org/codehaus/plexus/archiver/jar/IndexTest.java
@@ -17,13 +17,11 @@
  *
  */
 
-import java.io.BufferedInputStream;
 import java.io.InputStream;
 
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.archiver.Archiver;
-import org.codehaus.plexus.archiver.util.Streams;
 
 import static org.codehaus.plexus.archiver.util.Streams.bufferedInputStream;
 
diff --git a/src/test/java/org/codehaus/plexus/archiver/jar/JarArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/jar/JarArchiverTest.java
@@ -6,7 +6,6 @@
 import java.io.IOException;
 
 import junit.framework.TestCase;
-import org.codehaus.plexus.archiver.FileSet;
 
 public class JarArchiverTest
     extends TestCase
diff --git a/src/test/java/org/codehaus/plexus/archiver/jar/JdkManifestFactoryTest.java b/src/test/java/org/codehaus/plexus/archiver/jar/JdkManifestFactoryTest.java
@@ -1,7 +1,6 @@
 package org.codehaus.plexus.archiver.jar;
 
 import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.jar.Attributes;
diff --git a/src/test/java/org/codehaus/plexus/archiver/jar/SecurityFilterTest.java b/src/test/java/org/codehaus/plexus/archiver/jar/SecurityFilterTest.java
@@ -54,29 +54,25 @@ public void testSecurityFilters()
         // Create our test jar with fake security files
         JarArchiver archiver = (JarArchiver) lookup( Archiver.ROLE, "jar" );
         archiver.setArchiveFilters(filters);
-        for ( int i = 0; i < filteredFiles.length; i++ )
-        {
-            archiver.addFile( dummyContent, filteredFiles[i] );
+        for (String filteredFile1 : filteredFiles) {
+            archiver.addFile(dummyContent, filteredFile1);
         }
-        for ( int i = 0; i < unFilteredFiles.length; i++ )
-        {
-            archiver.addFile( dummyContent, unFilteredFiles[i] );
+        for (String unFilteredFile1 : unFilteredFiles) {
+            archiver.addFile(dummyContent, unFilteredFile1);
         }
         archiver.setDestFile( getTestFile( "target/jar-security/test-archive.jar" ) );
         archiver.createArchive();
 
         // Verify that the fake files were filtered out of the created jar and that
         // the legitimate files were not
         org.apache.commons.compress.archivers.zip.ZipFile zf = new org.apache.commons.compress.archivers.zip.ZipFile( archiver.getDestFile() );
-        for ( int i = 0; i < filteredFiles.length; i++ )
-        {
-            ZipArchiveEntry entry = zf.getEntry( filteredFiles[i] );
-            assertNull( "Entry was not filtered out: " + filteredFiles[i], entry );
+        for (String filteredFile : filteredFiles) {
+            ZipArchiveEntry entry = zf.getEntry(filteredFile);
+            assertNull("Entry was not filtered out: " + filteredFile, entry);
         }
-        for ( int i = 0; i < unFilteredFiles.length; i++ )
-        {
-            ZipArchiveEntry entry = zf.getEntry( unFilteredFiles[i] );
-            assertNotNull( "Entry was filtered out: " + unFilteredFiles[i], entry );
+        for (String unFilteredFile : unFilteredFiles) {
+            ZipArchiveEntry entry = zf.getEntry(unFilteredFile);
+            assertNotNull("Entry was filtered out: " + unFilteredFile, entry);
         }
     }
 
diff --git a/src/test/java/org/codehaus/plexus/archiver/tar/TarArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/tar/TarArchiverTest.java
@@ -33,13 +33,10 @@
 import org.codehaus.plexus.archiver.bzip2.BZip2Compressor;
 import org.codehaus.plexus.archiver.gzip.GZipCompressor;
 import org.codehaus.plexus.archiver.util.ArchiveEntryUtils;
-import org.codehaus.plexus.archiver.util.ArchiverAttributeUtils;
 import org.codehaus.plexus.archiver.util.Compressor;
 import org.codehaus.plexus.archiver.zip.ArchiveFileComparator;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils;
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
-import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;
-import org.codehaus.plexus.components.io.resources.ResourceFactory;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.logging.console.ConsoleLogger;
 import org.codehaus.plexus.util.FileUtils;
diff --git a/src/test/java/org/codehaus/plexus/archiver/tar/TarFileTest.java b/src/test/java/org/codehaus/plexus/archiver/tar/TarFileTest.java
@@ -12,10 +12,7 @@
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.bzip2.BZip2Compressor;
 import org.codehaus.plexus.archiver.gzip.GZipCompressor;
-import org.codehaus.plexus.archiver.util.ArchiverAttributeUtils;
 import org.codehaus.plexus.archiver.util.Compressor;
-import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;
-import org.codehaus.plexus.components.io.resources.ResourceFactory;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
 
diff --git a/src/test/java/org/codehaus/plexus/archiver/tar/TarSnappyUnArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/tar/TarSnappyUnArchiverTest.java
@@ -27,7 +27,6 @@
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.UnArchiver;
-import org.codehaus.plexus.archiver.gzip.GZipArchiver;
 import org.codehaus.plexus.archiver.snappy.SnappyArchiver;
 
 import java.io.File;
diff --git a/src/test/java/org/codehaus/plexus/archiver/tar/TarUnArchiverTest.java b/src/test/java/org/codehaus/plexus/archiver/tar/TarUnArchiverTest.java
@@ -7,7 +7,6 @@
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
-import java.lang.reflect.Method;
 
 /**
  * @author <a href="mailto:viktor@jv-ration.com">Viktor Sadovnikov</a>
diff --git a/src/test/java/org/codehaus/plexus/archiver/zip/ArchiveFileComparator.java b/src/test/java/org/codehaus/plexus/archiver/zip/ArchiveFileComparator.java
@@ -8,10 +8,7 @@
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.zip.*;
-import org.apache.commons.compress.archivers.zip.ZipFile;
-import org.codehaus.plexus.archiver.ArchiveEntry;
 import org.codehaus.plexus.archiver.ArchiveFile;
-import org.codehaus.plexus.archiver.ArchiveFile.Entry;
 import org.codehaus.plexus.util.IOUtil;
 import org.junit.Assert;
 
diff --git a/src/test/resources/manifests/manifest2.mf b/src/test/resources/manifests/manifest2.mf
@@ -1,3 +1,4 @@
 Manifest-Version: 1.0
 Header-without-colon maybe mistyped
 
+
