Author: krosenvold
Date: Sun May 31 12:59:49 2015
New Revision: 1682730
URL: http://svn.apache.org/r1682730
Log:
Code analysis cleanup prior to release
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStreamTest.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java?rev=1682730&r1=1682729&r2=1682730&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java
Sun May 31 12:59:49 2015
@@ -24,7 +24,7 @@ import org.codehaus.plexus.archiver.zip.
/**
* @author jdcasey
* @version $Id$
- * @todo delete this class once the plexus maven plugin can merge a generated
components.xml with an existing one.
+ * //todo delete this class once the plexus maven plugin can merge a generated
components.xml with an existing one.
*/
class SarUnArchiver
extends ZipUnArchiver
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java?rev=1682730&r1=1682729&r2=1682730&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
Sun May 31 12:59:49 2015
@@ -127,7 +127,7 @@ public class ReaderFormatter
{
return new InputStreamTransformer()
{
- public InputStream transform( PlexusIoResource
plexusIoResource, InputStream inputStream )
+ @Nonnull public InputStream transform( @Nonnull
PlexusIoResource plexusIoResource, @Nonnull InputStream inputStream )
throws IOException
{
InputStream result = inputStream;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?rev=1682730&r1=1682729&r2=1682730&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
Sun May 31 12:59:49 2015
@@ -959,7 +959,7 @@ public abstract class AbstractAssemblyMo
return delimiters;
}
- public FixedStringSearchInterpolator getCommandLinePropsInterpolator()
+ @Nonnull public FixedStringSearchInterpolator
getCommandLinePropsInterpolator()
{
if ( commanndLinePropertiesInterpolator == null )
{
@@ -978,7 +978,7 @@ public abstract class AbstractAssemblyMo
return envInterpolator;
}
- public FixedStringSearchInterpolator getRepositoryInterpolator()
+ @Nonnull public FixedStringSearchInterpolator getRepositoryInterpolator()
{
if ( rootInterpolator == null )
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java?rev=1682730&r1=1682729&r2=1682730&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
Sun May 31 12:59:49 2015
@@ -78,7 +78,6 @@ public class DependencySetAssemblyPhaseT
new MockAndControlForAddDependencySetsTask( mm, project );
final ArtifactMock artifactMock = new ArtifactMock( mm, "group",
"dep", "1", "jar", false );
- final File artifactFile = artifactMock.setNewFile();
System.out.println( "On test setup, hashcode for dependency artifact:
" + artifactMock.getArtifact()
.hashCode() );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java?rev=1682730&r1=1682729&r2=1682730&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
Sun May 31 12:59:49 2015
@@ -96,8 +96,6 @@ public class FileItemAssemblyPhaseTest
macCS.expectGetBasedir( basedir );
- final File tempRoot = fileManager.createTempDir();
-
macCS.expectGetProject( new MavenProject( new Model() ) );
macCS.expectGetFinalName( "final-name" );
@@ -142,8 +140,6 @@ public class FileItemAssemblyPhaseTest
macCS.expectGetBasedir( basedir );
- final File tempRoot = fileManager.createTempDir();
-
macCS.expectGetProject( new MavenProject( new Model() ) );
macCS.expectGetFinalName( "final-name" );
@@ -192,8 +188,6 @@ public class FileItemAssemblyPhaseTest
macCS.expectGetBasedir( basedir );
- final File tempRoot = fileManager.createTempDir();
-
macCS.expectGetProject( new MavenProject( new Model() ) );
macCS.expectGetFinalName( "final-name" );
@@ -275,8 +269,6 @@ public class FileItemAssemblyPhaseTest
macCS.expectGetBasedir( basedir );
- final File tempRoot = fileManager.createTempDir();
-
macCS.expectGetProject( new MavenProject( new Model() ) );
macCS.expectGetFinalName( "final-name" );
@@ -362,8 +354,6 @@ public class FileItemAssemblyPhaseTest
macCS.expectGetBasedir( basedir );
- final File tempRoot = fileManager.createTempDir();
-
macCS.expectGetProject( new MavenProject( new Model() ) );
macCS.expectGetFinalName( "final-name" );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java?rev=1682730&r1=1682729&r2=1682730&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java
Sun May 31 12:59:49 2015
@@ -95,8 +95,6 @@ public class FileSetAssemblyPhaseTest
macTask.expectGetArchiveBaseDirectory();
- final File basedir = fileManager.createTempDir();
-
final MavenProject project = new MavenProject( new Model() );
macLogger.expectError( true, true );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?rev=1682730&r1=1682729&r2=1682730&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
Sun May 31 12:59:49 2015
@@ -58,6 +58,7 @@ import java.util.Set;
import static java.util.Collections.singleton;
+@SuppressWarnings( "OctalInteger" )
public class ModuleSetAssemblyPhaseTest
extends TestCase
{
@@ -484,8 +485,6 @@ public class ModuleSetAssemblyPhaseTest
final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- Assembly assembly = new Assembly();
-
createPhase( logger, macTask.dependencyResolver, null
).addModuleBinaries( null, null, binaries, projects, macTask.archiver,
macTask.configSource );
mm.verifyAll();
@@ -752,14 +751,12 @@ public class ModuleSetAssemblyPhaseTest
final MockAndControlForAddDependencySetsTask macTask = new
MockAndControlForAddDependencySetsTask( mm, project );
- final List<ArtifactMock> macArtifacts = new ArrayList<ArtifactMock>();
-
- macArtifacts.add( addArtifact( project, mm, false ) );
+ addArtifact( project, mm, false );
final MavenProject project2 = createProject( "group", "artifact2",
"version", project );
- macArtifacts.add( addArtifact( project2, mm, false ) );
+ addArtifact( project2, mm, false );
final MavenProject project3 = createProject( "group", "artifact3",
"version", project2 );
- macArtifacts.add( addArtifact( project3, mm, true ) );
+ addArtifact( project3, mm, true );
final List<MavenProject> projects = new ArrayList<MavenProject>();
projects.add( project );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java?rev=1682730&r1=1682729&r2=1682730&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java
Sun May 31 12:59:49 2015
@@ -42,6 +42,7 @@ import java.util.Arrays;
import static org.easymock.EasyMock.anyObject;
+@SuppressWarnings( "OctalInteger" )
public class AddArtifactTaskTest
extends TestCase
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java?rev=1682730&r1=1682729&r2=1682730&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
Sun May 31 12:59:49 2015
@@ -42,6 +42,7 @@ import java.util.Set;
import junit.framework.TestCase;
import org.easymock.classextension.EasyMockSupport;
+@SuppressWarnings( "OctalInteger" )
public class AddDependencySetsTaskTest
extends TestCase
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java?rev=1682730&r1=1682729&r2=1682730&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
Sun May 31 12:59:49 2015
@@ -81,20 +81,14 @@ public class DefaultDependencyResolverTe
public void test_getDependencySetResolutionRequirements()
throws DependencyResolutionException
{
- final List<DependencySet> depSets = new ArrayList<DependencySet>();
-
final DependencySet ds1 = new DependencySet();
ds1.setScope( Artifact.SCOPE_COMPILE );
ds1.setUseTransitiveDependencies( false );
- depSets.add( ds1 );
-
final DependencySet ds2 = new DependencySet();
ds2.setScope( Artifact.SCOPE_SYSTEM );
ds2.setUseTransitiveDependencies( false );
- depSets.add( ds2 );
-
final MavenProject project = createMavenProject( "main-group",
"main-artifact", "1", null );
final ResolutionManagementInfo info = new ResolutionManagementInfo(
project );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java?rev=1682730&r1=1682729&r2=1682730&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java
Sun May 31 12:59:49 2015
@@ -35,8 +35,6 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
import org.codehaus.plexus.interpolation.fixed.PropertiesBasedValueSource;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.easymock.classextension.EasyMockSupport;
import java.io.IOException;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java?rev=1682730&r1=1682729&r2=1682730&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java
Sun May 31 12:59:49 2015
@@ -28,7 +28,6 @@ import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.archive.DefaultAssemblyArchiverTest;
-import org.apache.maven.plugin.assembly.archive.task.AddFileSetsTask;
import org.apache.maven.plugin.assembly.archive.task.testutils.ArtifactMock;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugin.assembly.model.Assembly;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStreamTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStreamTest.java?rev=1682730&r1=1682729&r2=1682730&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStreamTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStreamTest.java
Sun May 31 12:59:49 2015
@@ -20,13 +20,10 @@ package org.apache.maven.plugin.assembly
*/
import junit.framework.TestCase;
-import org.junit.Test;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
-
public class LinuxLineFeedInputStreamTest
extends TestCase
{
