Code analysis cleanup

Author: krosenvold

src/main/java/org/codehaus/plexus/archiver/filters/JarSecurityFileFilter.java

@@ -3,7 +3,6 @@
 import java.io.InputStream;
 
 import org.codehaus.plexus.archiver.ArchiveFileFilter;
-import org.codehaus.plexus.archiver.ArchiveFilterException;
 import org.codehaus.plexus.util.SelectorUtils;
 
 

src/main/java/org/codehaus/plexus/archiver/filters/JarSecurityFileSelector.java

@@ -19,6 +19,8 @@
 import org.codehaus.plexus.components.io.fileselectors.FileSelector;
 import org.codehaus.plexus.util.SelectorUtils;
 
+import javax.annotation.Nonnull;
+
 /**
  * @version $Id$
  * @since 1.0-alpha-9
@@ -36,7 +38,7 @@ public class JarSecurityFileSelector
         "META-INF/*.dsa",
         "META-INF/*.sf" };
 
-    public boolean isSelected( FileInfo fileInfo )
+    public boolean isSelected( @Nonnull FileInfo fileInfo )
         throws IOException
     {
         String name = fileInfo.getName();

src/main/java/org/codehaus/plexus/archiver/resources/PlexusIoVirtualFileResource.java

@@ -27,6 +27,8 @@
 import org.codehaus.plexus.components.io.functions.ResourceAttributeSupplier;
 import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResource;
 
+import javax.annotation.Nonnull;
+
 /**
  * A file resource that does not necessarily exist (anywhere).
  */
@@ -55,6 +57,7 @@ public File getFile()
         return file;
     }
 
+    @Nonnull
     public InputStream getContents()
         throws IOException
     {

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

@@ -11,6 +11,8 @@
 import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResource;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 
+import javax.annotation.Nonnull;
+
 public class TarResource
     extends AbstractPlexusIoResource
     implements ResourceAttributeSupplier
@@ -55,6 +57,7 @@ public URL getURL()
         return null;
     }
 
+    @Nonnull
     public InputStream getContents()
         throws IOException
     {

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

@@ -18,19 +18,15 @@
  */
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
 import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.components.io.resources.PlexusIoFileResource;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.IOUtil;
 
-import static org.codehaus.plexus.components.io.resources.ResourceFactory.createResource;
-
 /**
  * @version $Revision$ $Date$
  */

src/main/java/org/codehaus/plexus/archiver/util/FilterSupport.java

@@ -4,7 +4,6 @@
 import java.util.List;
 
 import org.codehaus.plexus.archiver.ArchiveFileFilter;
-import org.codehaus.plexus.archiver.ArchiveFilterException;
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.components.io.fileselectors.FileSelector;
 import org.codehaus.plexus.logging.Logger;

src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java

@@ -28,11 +28,12 @@
 import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.apache.commons.compress.utils.IOUtils;
 import org.codehaus.plexus.archiver.AbstractUnArchiver;
-import org.codehaus.plexus.archiver.ArchiveFilterException;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 import org.codehaus.plexus.util.IOUtil;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author <a href="mailto:[email protected]">Emmanuel Venisse</a>
  * @version $Id$
@@ -102,6 +103,7 @@ public boolean isSymbolicLink()
             return zipEntry.isUnixSymlink();
         }
 
+        @Nonnull
         public InputStream getContents()
             throws IOException
         {

src/main/java/org/codehaus/plexus/archiver/zip/AnonymousResource.java

@@ -7,6 +7,8 @@
 
 import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResource;
 
+import javax.annotation.Nonnull;
+
 public class AnonymousResource extends AbstractPlexusIoResource {
 
 	private final File file;
@@ -22,6 +24,7 @@ public AnonymousResource(File file, String name)
 		this.file = file;
 	}
 
+	@Nonnull
 	public InputStream getContents()
 			throws IOException
 	{

src/main/java/org/codehaus/plexus/archiver/zip/ZipResource.java

@@ -15,6 +15,8 @@
 import org.codehaus.plexus.components.io.resources.ClosingInputStream;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
 
+import javax.annotation.Nonnull;
+
 public class ZipResource extends AbstractPlexusIoResource
     implements ResourceAttributeSupplier
 {
@@ -72,6 +74,7 @@ public URL getURL()
         return null;
     }
 
+    @Nonnull
     public InputStream getContents()
         throws IOException
     {

src/test/java/org/codehaus/plexus/archiver/jar/ManifestTest.java

@@ -21,7 +21,6 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.Enumeration;
 import java.util.jar.Attributes;
 import org.codehaus.plexus.PlexusTestCase;