Author: krosenvold Date: Sat Oct 25 07:51:48 2014 New Revision: 1634194 URL: http://svn.apache.org/r1634194 Log: Code style cleanup
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.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/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.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/AddFileSetsTaskTest.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/io/DefaultAssemblyReaderTest.java Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java?rev=1634194&r1=1634193&r2=1634194&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java Sat Oct 25 07:51:48 2014 @@ -27,6 +27,7 @@ import org.codehaus.plexus.archiver.UnAr import org.codehaus.plexus.components.io.fileselectors.FileInfo; import org.codehaus.plexus.util.IOUtil; +import javax.annotation.Nonnull; import java.io.BufferedReader; import java.io.File; import java.io.FileOutputStream; @@ -119,7 +120,7 @@ abstract class AbstractLineAggregatingHa return new ArrayList<String>( catalog.keySet() ); } - public boolean isSelected( final FileInfo fileInfo ) + public boolean isSelected( final @Nonnull FileInfo fileInfo ) throws IOException { if ( excludeOverride ) Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java?rev=1634194&r1=1634193&r2=1634194&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java Sat Oct 25 07:51:48 2014 @@ -45,6 +45,8 @@ import org.codehaus.plexus.util.xml.Xpp3 import org.codehaus.plexus.util.xml.Xpp3DomWriter; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; +import javax.annotation.Nonnull; + /** * Components XML file filter. * @@ -188,7 +190,7 @@ public class ComponentsXmlArchiverFileFi return null; } - public boolean isSelected( final FileInfo fileInfo ) + public boolean isSelected( final @Nonnull FileInfo fileInfo ) throws IOException { if ( fileInfo.isFile() ) 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=1634194&r1=1634193&r2=1634194&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 Sat Oct 25 07:51:48 2014 @@ -46,7 +46,6 @@ public class ReaderFormatter { try { - // @todo this test can be improved boolean isPropertiesFile = AssemblyFileUtils.isPropertyFile( sourceName ); MavenReaderFilterRequest filterRequest = Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java?rev=1634194&r1=1634193&r2=1634194&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java Sat Oct 25 07:51:48 2014 @@ -52,7 +52,6 @@ import org.codehaus.plexus.components.io import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; import org.codehaus.plexus.util.FileUtils; -import org.easymock.MockControl; import org.easymock.classextension.EasyMockSupport; import org.junit.AfterClass; import org.junit.Before; Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java?rev=1634194&r1=1634193&r2=1634194&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiverTest.java Sat Oct 25 07:51:48 2014 @@ -19,6 +19,7 @@ package org.apache.maven.plugin.assembly * under the License. */ +import static org.easymock.EasyMock.anyObject; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -40,10 +41,14 @@ import org.codehaus.plexus.components.io import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; import org.codehaus.plexus.util.FileUtils; -import org.easymock.MockControl; +import org.easymock.EasyMock; +import org.easymock.classextension.EasyMockSupport; import org.junit.AfterClass; import org.junit.Test; +import javax.annotation.Nonnull; + +@SuppressWarnings("ResultOfMethodCallIgnored") public class AssemblyProxyArchiverTest { @@ -114,21 +119,20 @@ public class AssemblyProxyArchiverTest public void addFile_NoPerms_CallAcceptFilesOnlyOnce() throws IOException, ArchiverException { - final MockControl delegateControl = MockControl.createControl( Archiver.class ); - final Archiver delegate = (Archiver) delegateControl.getMock(); + EasyMockSupport mm = new EasyMockSupport(); + final Archiver delegate = mm.createMock(Archiver.class); - delegate.addFile( null, null ); - delegateControl.setMatcher( MockControl.ALWAYS_MATCHER ); - delegateControl.setVoidCallable(); + delegate.addFile( (File)anyObject(), (String)anyObject() ); + EasyMock.expectLastCall().anyTimes(); delegate.setForced( true ); - delegateControl.setVoidCallable( MockControl.ZERO_OR_MORE ); + EasyMock.expectLastCall().anyTimes(); final CounterSelector counter = new CounterSelector( true ); final List<FileSelector> selectors = new ArrayList<FileSelector>(); selectors.add( counter ); - delegateControl.replay(); + mm.replayAll(); final AssemblyProxyArchiver archiver = new AssemblyProxyArchiver( "", delegate, null, selectors, null, new File( "." ), @@ -142,7 +146,7 @@ public class AssemblyProxyArchiverTest assertEquals( 1, counter.getCount() ); - delegateControl.verify(); + mm.verifyAll(); } @Test @@ -194,7 +198,7 @@ public class AssemblyProxyArchiverTest return count; } - public boolean isSelected( final FileInfo fileInfo ) + public boolean isSelected( final @Nonnull FileInfo fileInfo ) throws IOException { if ( fileInfo.isFile() ) 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=1634194&r1=1634193&r2=1634194&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 Sat Oct 25 07:51:48 2014 @@ -200,13 +200,11 @@ public class AddArtifactTaskTest { mac.expectModeChange( -1, -1, -1, -1, 1 ); - String outputLocation = ""; - String[] includes = { "**/*.txt" }; String[] excludes = { "**/README.txt" }; ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", "artifact", "version", "jar", false ); - File artifactFile = artifactMock.setNewFile(); + artifactMock.setNewFile(); mac.expectGetDestFile( new File( "junk" ) ); mac.expectAddArchivedFileSet(); Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java?rev=1634194&r1=1634193&r2=1634194&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java Sat Oct 25 07:51:48 2014 @@ -38,6 +38,7 @@ import org.easymock.classextension.EasyM 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/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=1634194&r1=1634193&r2=1634194&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 Sat Oct 25 07:51:48 2014 @@ -36,7 +36,6 @@ import org.apache.maven.plugin.assembly. import org.apache.maven.project.MavenProject; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; -import org.easymock.MockControl; import org.easymock.classextension.EasyMockSupport; import static org.easymock.EasyMock.expect; @@ -190,7 +189,6 @@ public class AssemblyInterpolatorTest final AssemblerConfigurationSource cs = mm.createMock( AssemblerConfigurationSource.class ); - final MockControl lrCtl = MockControl.createControl( ArtifactRepository.class ); final ArtifactRepository lr = mm.createMock( ArtifactRepository.class ); expect( lr.getBasedir()).andReturn( "/path/to/local/repo").anyTimes(); Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java?rev=1634194&r1=1634193&r2=1634194&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java Sat Oct 25 07:51:48 2014 @@ -53,6 +53,7 @@ import java.util.List; import static org.easymock.EasyMock.expect; +@SuppressWarnings("ResultOfMethodCallIgnored") public class DefaultAssemblyReaderTest extends TestCase {