Clean up @SuppressWarnings
Remove dead code from tests
Close streams for tests when required
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1694836 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
index ae1f52e..329b7b4 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
@@ -553,8 +553,8 @@
}
@Override
- @SuppressWarnings( { "rawtypes", "deprecation" } )
- /** {@inheritDoc} */ public Map<String, ArchiveEntry> getFiles()
+ @SuppressWarnings( { "deprecation" } )
+ public Map<String, ArchiveEntry> getFiles()
{
inPublicApi.set( Boolean.TRUE );
try
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java
index d7bd3be..92e7b81 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java
@@ -524,7 +524,7 @@
if ( sources.isExcludeSubModuleDirectories() )
{
- @SuppressWarnings( "unchecked" ) final List<String> modules = moduleProject.getModules();
+ final List<String> modules = moduleProject.getModules();
for ( final String moduleSubPath : modules )
{
excludes.add( moduleSubPath + "/**" );
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java
index 9db17df..5e6873d 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java
@@ -108,7 +108,7 @@
return;
}
- @SuppressWarnings( "unchecked" ) final List<Dependency> deps = project.getDependencies();
+ final List<Dependency> deps = project.getDependencies();
if ( ( deps == null ) || deps.isEmpty() )
{
logger.debug( "Project " + project.getId() + " has no dependencies. Skipping dependency set addition." );
@@ -309,7 +309,7 @@
if ( dependencySet.isUseProjectAttachments() )
{
- @SuppressWarnings( "unchecked" ) final List<Artifact> attachments = project.getAttachedArtifacts();
+ final List<Artifact> attachments = project.getAttachedArtifacts();
if ( attachments != null )
{
for ( final Artifact attachment : attachments )
diff --git a/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java b/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java
index 75e5e45..0fafd2a 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java
@@ -74,7 +74,7 @@
@Nullable
public static Artifact findArtifactByClassifier( MavenProject mavenProject, String classifier )
{
- @SuppressWarnings( "unchecked" ) final List<Artifact> attachments = mavenProject.getAttachedArtifacts();
+ final List<Artifact> attachments = mavenProject.getAttachedArtifacts();
if ( ( attachments != null ) && !attachments.isEmpty() )
{
for ( final Artifact attachment : attachments )
diff --git a/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java b/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java
index 2af0789..307b9f5 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java
@@ -64,7 +64,7 @@
public static AssemblyXpp3Reader.ContentTransformer assemblyInterpolator(
final FixedStringSearchInterpolator interpolator, final InterpolationState is, final Logger logger )
{
- @SuppressWarnings( "unchecked" ) final Set<String> blacklistFields =
+ final Set<String> blacklistFields =
new HashSet<String>( FieldBasedObjectInterpolator.DEFAULT_BLACKLISTED_FIELD_NAMES );
blacklistFields.addAll( INTERPOLATION_BLACKLIST );
@@ -92,7 +92,7 @@
public static ComponentXpp3Reader.ContentTransformer componentInterpolator(
final FixedStringSearchInterpolator interpolator, final InterpolationState is, final Logger logger )
{
- @SuppressWarnings( "unchecked" ) final Set<String> blacklistFields =
+ final Set<String> blacklistFields =
new HashSet<String>( FieldBasedObjectInterpolator.DEFAULT_BLACKLISTED_FIELD_NAMES );
blacklistFields.addAll( INTERPOLATION_BLACKLIST );
diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java
index 8b757a4..16bd70a 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java
@@ -24,6 +24,7 @@
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -156,6 +157,7 @@
* line-ending characters, not null.
* @return an input stream that enforces a specifi line ending style
*/
+ @SuppressWarnings( "resource" )
public static InputStream lineEndingConverter( @Nonnull InputStream in, LineEndings lineEndings )
throws IOException
{
diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java
index 499b3e0..242fc50 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java
@@ -148,7 +148,7 @@
@Nonnull final MavenProject moduleProject )
throws IOException
{
- @SuppressWarnings( "unchecked" ) final List<String> modules = mainProject.getModules();
+ final List<String> modules = mainProject.getModules();
final File basedir = mainProject.getBasedir();
final File moduleFile = moduleProject.getFile().getCanonicalFile();
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java
index 191d9c7..7b1ac8f 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java
@@ -46,7 +46,6 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-@SuppressWarnings( "ResultOfMethodCallIgnored" )
public class AssemblyProxyArchiverTest
{
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
index fead036..7a8310d 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
@@ -19,7 +19,12 @@
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+
import junit.framework.TestCase;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Model;
import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException;
@@ -32,15 +37,10 @@
import org.apache.maven.plugins.assembly.model.Assembly;
import org.apache.maven.plugins.assembly.model.DependencySet;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuilder;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.easymock.classextension.EasyMockSupport;
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-
public class DependencySetAssemblyPhaseTest
extends TestCase
{
@@ -141,14 +141,8 @@
private DependencySetAssemblyPhase createPhase( final MockAndControlForAddDependencySetsTask macTask,
final Logger logger, DependencyResolver dr )
{
- ProjectBuilder projectBuilder = null;
-
- if ( macTask != null )
- {
- projectBuilder = macTask.projectBuilder;
- }
-
final DependencySetAssemblyPhase phase = new DependencySetAssemblyPhase( null, dr, null );
+
phase.enableLogging( logger );
return phase;
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java
index 2cdd5c4..bf658bd 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java
@@ -482,20 +482,10 @@
}
- public void expectGetTemporaryRootDirectory( final File tempRoot )
- {
- expect( configSource.getTemporaryRootDirectory() ).andReturn( tempRoot ).atLeastOnce();
- }
-
public void expectGetBasedir( final File basedir )
{
expect( configSource.getBasedir() ).andReturn( basedir ).atLeastOnce();
}
-
- public void expectGetEncoding()
- {
- expect( configSource.getEncoding() ).andReturn( "UTF-8" ).atLeastOnce();
- }
}
private final class MockAndControlForLogger
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java
index 3211436..0c6551d 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java
@@ -129,30 +129,6 @@
logger = mm.createMock( Logger.class );
}
- public void expectDebug( final boolean debugCheck, final boolean debugEnabled )
- {
- if ( debugCheck )
- {
- expect( logger.isDebugEnabled() ).andReturn( debugEnabled ).anyTimes();
- }
-
- logger.debug( (String) anyObject() );
- EasyMock.expectLastCall().anyTimes();
- }
-
- public void expectWarn( final boolean debugCheck, final boolean debugEnabled )
- {
- if ( debugCheck )
- {
- expect( logger.isDebugEnabled() ).andReturn( debugEnabled ).anyTimes();
- }
-
- logger.debug( (String) anyObject() );
- EasyMock.expectLastCall().anyTimes();
- logger.warn( (String) anyObject() );
- EasyMock.expectLastCall().anyTimes();
- }
-
public void expectError( final boolean debugCheck, final boolean debugEnabled )
{
if ( debugCheck )
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
index 8b6b869..86b9de0 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
@@ -58,7 +58,6 @@
import static java.util.Collections.singleton;
-@SuppressWarnings( "OctalInteger" )
public class ModuleSetAssemblyPhaseTest
extends TestCase
{
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java
index d56e548..27b1e07 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java
@@ -19,7 +19,15 @@
* under the License.
*/
+import static org.easymock.EasyMock.anyObject;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.Arrays;
+
import junit.framework.TestCase;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Model;
import org.apache.maven.plugins.assembly.archive.ArchiveCreationException;
@@ -35,14 +43,6 @@
import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.easymock.classextension.EasyMockSupport;
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.Arrays;
-
-import static org.easymock.EasyMock.anyObject;
-
-@SuppressWarnings( "OctalInteger" )
public class AddArtifactTaskTest
extends TestCase
{
@@ -142,9 +142,7 @@
mac.expectInterpolators();
ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", "artifact", "version", "jar", false );
- File artifactFile = artifactMock.setNewFile();
-
- String outputLocation = "";
+ artifactMock.setNewFile();
mac.expectGetDestFile( new File( "junk" ) );
try
@@ -178,12 +176,8 @@
mac.expectModeChange( -1, -1, directoryMode, fileMode, 2 );
mac.expectInterpolators();
-// mac.expectIsSnapshot( false );
-
- String outputLocation = "";
-
ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", "artifact", "version", "jar", false );
- File artifactFile = artifactMock.setNewFile();
+ artifactMock.setNewFile();
mac.expectGetDestFile( new File( "junk" ) );
try
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
index aa312c1..8ab9625 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
@@ -41,7 +41,6 @@
import java.util.HashSet;
import java.util.Set;
-@SuppressWarnings( "OctalInteger" )
public class AddDependencySetsTaskTest
extends TestCase
{
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java
index eb1b122..106c03f 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java
@@ -38,7 +38,6 @@
import static org.easymock.EasyMock.expect;
-@SuppressWarnings( "ResultOfMethodCallIgnored" )
public class AddFileSetsTaskTest
extends TestCase
{
diff --git a/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java b/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
index 48b2786..b4adf36 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
@@ -20,6 +20,7 @@
*/
import junit.framework.TestCase;
+
import org.apache.maven.plugins.assembly.testutils.TestFileManager;
import org.codehaus.plexus.archiver.ArchiveEntry;
import org.codehaus.plexus.archiver.ArchiveFinalizer;
@@ -43,6 +44,7 @@
import org.jdom.xpath.XPath;
import javax.annotation.Nonnull;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -259,16 +261,28 @@
archiver.createArchive();
- final ZipFile zf = new ZipFile( archiveFile );
+ ZipFile zf = null;
+ try
+ {
+ zf = new ZipFile( archiveFile );
- final ZipEntry ze = zf.getEntry( ComponentsXmlArchiverFileFilter.COMPONENTS_XML_PATH );
+ final ZipEntry ze = zf.getEntry( ComponentsXmlArchiverFileFilter.COMPONENTS_XML_PATH );
- assertNotNull( ze );
+ assertNotNull( ze );
- final FileOutputStream fileStream = new FileOutputStream( descriptorFile );
+ final FileOutputStream fileStream = new FileOutputStream( descriptorFile );
- IOUtil.copy( zf.getInputStream( ze ), fileStream );
- IOUtil.close( fileStream );
+ IOUtil.copy( zf.getInputStream( ze ), fileStream );
+ IOUtil.close( fileStream );
+ }
+ finally
+ {
+ if ( zf != null )
+ {
+ zf.close();
+ }
+ }
+
final SAXBuilder builder = new SAXBuilder( false );
@@ -475,7 +489,6 @@
throw new UnsupportedOperationException( "not supported" );
}
- @SuppressWarnings( "rawtypes" )
public Map<String, ArchiveEntry> getFiles()
{
throw new UnsupportedOperationException( "not supported" );
diff --git a/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java b/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java
index 02417be..762f65e 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java
@@ -37,7 +37,6 @@
import static org.junit.Assert.assertEquals;
-@SuppressWarnings( "ConstantConditions" )
public class ReaderFormatterTest
{
@Test
diff --git a/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java b/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
index dd2253d..59f03cd 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
@@ -60,7 +60,6 @@
import static org.easymock.EasyMock.expect;
-@SuppressWarnings( "ResultOfMethodCallIgnored" )
public class DefaultAssemblyReaderTest
extends TestCase
{
diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java
index 9191280..563e091 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java
@@ -24,6 +24,8 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import org.codehaus.plexus.util.IOUtil;
+
public class LinuxLineFeedInputStreamTest
extends TestCase
{
@@ -82,10 +84,19 @@
throws IOException
{
ByteArrayInputStream baos = new ByteArrayInputStream( msg.getBytes() );
- LinuxLineFeedInputStream lf = new LinuxLineFeedInputStream( baos, ensure );
- byte[] buf = new byte[100];
- final int read = lf.read( buf );
- return new String( buf, 0, read );
+
+ LinuxLineFeedInputStream lf = null;
+ try
+ {
+ lf = new LinuxLineFeedInputStream( baos, ensure );
+ byte[] buf = new byte[100];
+ final int read = lf.read( buf );
+ return new String( buf, 0, read );
+ }
+ finally
+ {
+ IOUtil.close( lf );
+ }
}
}
\ No newline at end of file
diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java
index c94f7f7..b4255df 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java
@@ -24,6 +24,8 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import org.codehaus.plexus.util.IOUtil;
+
public class WindowsLineFeedInputStreamTest
extends TestCase
{
@@ -83,11 +85,18 @@
throws IOException
{
ByteArrayInputStream baos = new ByteArrayInputStream( msg.getBytes() );
- WindowsLineFeedInputStream lf = new WindowsLineFeedInputStream( baos, ensure );
- byte[] buf = new byte[100];
- final int read = lf.read( buf );
- return new String( buf, 0, read );
+
+ WindowsLineFeedInputStream lf = null;
+ try
+ {
+ lf = new WindowsLineFeedInputStream( baos, ensure );
+ byte[] buf = new byte[100];
+ final int read = lf.read( buf );
+ return new String( buf, 0, read );
+ }
+ finally
+ {
+ IOUtil.close( lf );
+ }
}
-
-
}
\ No newline at end of file
