Author: rfscholte
Date: Sat Aug 8 18:35:14 2015
New Revision: 1694836
URL: http://svn.apache.org/r1694836
Log:
Clean up @SuppressWarnings
Remove dead code from tests
Close streams for tests when required
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
Sat Aug 8 18:35:14 2015
@@ -553,8 +553,8 @@ public class AssemblyProxyArchiver
}
@Override
- @SuppressWarnings( { "rawtypes", "deprecation" } )
- /** {@inheritDoc} */ public Map<String, ArchiveEntry> getFiles()
+ @SuppressWarnings( { "deprecation" } )
+ public Map<String, ArchiveEntry> getFiles()
{
inPublicApi.set( Boolean.TRUE );
try
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java
Sat Aug 8 18:35:14 2015
@@ -524,7 +524,7 @@ public class ModuleSetAssemblyPhase
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 + "/**" );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java
Sat Aug 8 18:35:14 2015
@@ -108,7 +108,7 @@ public class AddDependencySetsTask
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 @@ public class AddDependencySetsTask
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 )
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java
Sat Aug 8 18:35:14 2015
@@ -74,7 +74,7 @@ public class MavenProjects
@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 )
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java
Sat Aug 8 18:35:14 2015
@@ -64,7 +64,7 @@ public class AssemblyInterpolator
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 class AssemblyInterpolator
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 );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/LineEndingsUtils.java
Sat Aug 8 18:35:14 2015
@@ -24,6 +24,7 @@ import org.codehaus.plexus.util.IOUtil;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -156,6 +157,7 @@ public final class LineEndingsUtils
* 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
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java
Sat Aug 8 18:35:14 2015
@@ -148,7 +148,7 @@ public final class ProjectUtils
@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();
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java
Sat Aug 8 18:35:14 2015
@@ -46,7 +46,6 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-@SuppressWarnings( "ResultOfMethodCallIgnored" )
public class AssemblyProxyArchiverTest
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
Sat Aug 8 18:35:14 2015
@@ -19,7 +19,12 @@ package org.apache.maven.plugins.assembl
* 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
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 @@ public class DependencySetAssemblyPhaseT
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;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java
Sat Aug 8 18:35:14 2015
@@ -482,20 +482,10 @@ public class FileItemAssemblyPhaseTest
}
- 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
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java
Sat Aug 8 18:35:14 2015
@@ -129,30 +129,6 @@ public class FileSetAssemblyPhaseTest
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 )
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
Sat Aug 8 18:35:14 2015
@@ -58,7 +58,6 @@ import java.util.Set;
import static java.util.Collections.singleton;
-@SuppressWarnings( "OctalInteger" )
public class ModuleSetAssemblyPhaseTest
extends TestCase
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java
Sat Aug 8 18:35:14 2015
@@ -19,7 +19,15 @@ package org.apache.maven.plugins.assembl
* 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.Logge
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 @@ public class AddArtifactTaskTest
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 @@ public class AddArtifactTaskTest
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
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
Sat Aug 8 18:35:14 2015
@@ -41,7 +41,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-@SuppressWarnings( "OctalInteger" )
public class AddDependencySetsTaskTest
extends TestCase
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java
Sat Aug 8 18:35:14 2015
@@ -38,7 +38,6 @@ import java.util.ArrayList;
import static org.easymock.EasyMock.expect;
-@SuppressWarnings( "ResultOfMethodCallIgnored" )
public class AddFileSetsTaskTest
extends TestCase
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
Sat Aug 8 18:35:14 2015
@@ -20,6 +20,7 @@ package org.apache.maven.plugins.assembl
*/
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.input.SAXBuilder;
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 @@ public class ComponentsXmlArchiverFileFi
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 @@ public class ComponentsXmlArchiverFileFi
throw new UnsupportedOperationException( "not supported" );
}
- @SuppressWarnings( "rawtypes" )
public Map<String, ArchiveEntry> getFiles()
{
throw new UnsupportedOperationException( "not supported" );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java
Sat Aug 8 18:35:14 2015
@@ -37,7 +37,6 @@ import java.io.InputStream;
import static org.junit.Assert.assertEquals;
-@SuppressWarnings( "ConstantConditions" )
public class ReaderFormatterTest
{
@Test
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
Sat Aug 8 18:35:14 2015
@@ -60,7 +60,6 @@ import java.util.List;
import static org.easymock.EasyMock.expect;
-@SuppressWarnings( "ResultOfMethodCallIgnored" )
public class DefaultAssemblyReaderTest
extends TestCase
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/LinuxLineFeedInputStreamTest.java
Sat Aug 8 18:35:14 2015
@@ -24,6 +24,8 @@ import junit.framework.TestCase;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import org.codehaus.plexus.util.IOUtil;
+
public class LinuxLineFeedInputStreamTest
extends TestCase
{
@@ -82,10 +84,19 @@ public class LinuxLineFeedInputStreamTes
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
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java?rev=1694836&r1=1694835&r2=1694836&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/WindowsLineFeedInputStreamTest.java
Sat Aug 8 18:35:14 2015
@@ -24,6 +24,8 @@ import junit.framework.TestCase;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import org.codehaus.plexus.util.IOUtil;
+
public class WindowsLineFeedInputStreamTest
extends TestCase
{
@@ -83,11 +85,18 @@ public class WindowsLineFeedInputStreamT
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
