From fb6cee3d5c0cfb80aa06f711a5e51e17c222ab3b Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 13 May 2012 08:52:32 +0000 Subject: [PATCH] use generics git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1337814 13f79535-47bb-0310-9956-ffa450edef68 --- .../generator/AbstractGeneratorTestCase.java | 4 +-- .../PluginDescriptorGeneratorTest.java | 5 ++-- .../scanner/DefaultMojoScannerTest.java | 30 +++++++++---------- .../plugin/scanner/ScannerTestExtractor.java | 4 +-- .../tools/plugin/scanner/TestExtractor.java | 4 +-- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java index 0087e1c..7a0ae75 100644 --- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java +++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java @@ -63,7 +63,7 @@ public abstract class AbstractGeneratorTestCase mojoDescriptor.setImplementation( "org.apache.maven.tools.plugin.generator.TestMojo" ); mojoDescriptor.setDependencyResolutionRequired( "compile" ); - List params = new ArrayList(); + List params = new ArrayList(); Parameter param = new Parameter(); param.setExpression( "${project.build.directory}" ); @@ -134,7 +134,7 @@ public abstract class AbstractGeneratorTestCase try { - Class generatorClass = Thread.currentThread().getContextClassLoader().loadClass( generatorClassName ); + Class generatorClass = Thread.currentThread().getContextClassLoader().loadClass( generatorClassName ); generator = (Generator) generatorClass.newInstance(); } diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java index aae1a6e..cd70d97 100644 --- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java +++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java @@ -63,9 +63,10 @@ public class PluginDescriptorGeneratorTest // Dependencies // ---------------------------------------------------------------------- - List dependencies = pluginDescriptor.getDependencies(); + @SuppressWarnings( "unchecked" ) + List dependencies = pluginDescriptor.getDependencies(); - checkDependency( "testGroup", "testArtifact", "0.0.0", (ComponentDependency) dependencies.get( 0 ) ); + checkDependency( "testGroup", "testArtifact", "0.0.0", dependencies.get( 0 ) ); assertEquals( 1, dependencies.size() ); diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java index af192a5..704c2a5 100644 --- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java +++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java @@ -28,6 +28,7 @@ import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.project.MavenProject; import org.apache.maven.tools.plugin.DefaultPluginToolsRequest; import org.apache.maven.tools.plugin.extractor.ExtractionException; +import org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor; import java.io.File; import java.util.Arrays; @@ -35,7 +36,6 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -46,7 +46,7 @@ import java.util.Set; public class DefaultMojoScannerTest extends TestCase { - private Map extractors; + private Map extractors; private Build build; @@ -59,7 +59,7 @@ public class DefaultMojoScannerTest protected void setUp() throws Exception { - extractors = new HashMap(); + extractors = new HashMap(); extractors.put( "one", new ScannerTestExtractor( "one" ) ); extractors.put( "two", new ScannerTestExtractor( "two" ) ); extractors.put( "three", new ScannerTestExtractor( "three" ) ); @@ -89,7 +89,7 @@ public class DefaultMojoScannerTest public void testSpecifiedExtractors() throws Exception { - Set activeExtractors = new HashSet(); + Set activeExtractors = new HashSet(); activeExtractors.add( "one" ); activeExtractors.add( "" ); activeExtractors.add( null ); @@ -119,7 +119,7 @@ public class DefaultMojoScannerTest { PluginDescriptor pluginDescriptor = createPluginDescriptor(); - scanner.setActiveExtractors( Collections.EMPTY_SET ); + scanner.setActiveExtractors( Collections.emptySet() ); try { scanner.populatePluginDescriptor( new DefaultPluginToolsRequest( project, pluginDescriptor ) ); @@ -130,13 +130,13 @@ public class DefaultMojoScannerTest // Ok } - checkResult( pluginDescriptor, Collections.EMPTY_SET ); + checkResult( pluginDescriptor, Collections.emptySet() ); } public void testUnknownExtractor() throws Exception { - Set activeExtractors = new HashSet(); + Set activeExtractors = new HashSet(); activeExtractors.add( "four" ); PluginDescriptor pluginDescriptor = createPluginDescriptor(); @@ -153,7 +153,7 @@ public class DefaultMojoScannerTest // Ok } - checkResult( pluginDescriptor, Collections.EMPTY_SET ); + checkResult( pluginDescriptor, Collections.emptySet() ); } private PluginDescriptor createPluginDescriptor() @@ -173,20 +173,20 @@ public class DefaultMojoScannerTest * @param pluginDescriptor The {@link PluginDescriptor} to check. * @param expectedGoals The goal names of the {@link MojoDescriptor}s. */ - protected void checkResult( PluginDescriptor pluginDescriptor, Collection expectedGoals ) + protected void checkResult( PluginDescriptor pluginDescriptor, Collection expectedGoals ) { - Set remainingGoals = new HashSet( expectedGoals ); - List descriptors = pluginDescriptor.getMojos(); + Set remainingGoals = new HashSet( expectedGoals ); + @SuppressWarnings( "unchecked" ) + List descriptors = pluginDescriptor.getMojos(); if ( descriptors == null ) { - // TODO Maybe getMojos should be more user frendly and not return null - descriptors = Collections.EMPTY_LIST; + // TODO Maybe getMojos should be more user friendly and not return null + descriptors = Collections.emptyList(); } - for ( Iterator i = descriptors.iterator(); i.hasNext(); ) + for ( MojoDescriptor desc : descriptors ) { - MojoDescriptor desc = (MojoDescriptor) i.next(); assertEquals( pluginDescriptor, desc.getPluginDescriptor() ); assertTrue( "Unexpected goal in PluginDescriptor: " + desc.getGoal(), remainingGoals.remove( desc.getGoal() ) ); diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/ScannerTestExtractor.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/ScannerTestExtractor.java index 85b72c1..4a7a526 100644 --- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/ScannerTestExtractor.java +++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/ScannerTestExtractor.java @@ -44,13 +44,13 @@ public class ScannerTestExtractor this.goal = goal; } - public List execute( MavenProject project, PluginDescriptor pluginDescriptor ) + public List execute( MavenProject project, PluginDescriptor pluginDescriptor ) throws InvalidPluginDescriptorException, ExtractionException { return execute( new DefaultPluginToolsRequest( project, pluginDescriptor ) ); } - public List execute( PluginToolsRequest request ) + public List execute( PluginToolsRequest request ) throws ExtractionException, InvalidPluginDescriptorException { MojoDescriptor desc = new MojoDescriptor(); diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java index daeca11..d228a49 100644 --- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java +++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java @@ -36,12 +36,12 @@ public class TestExtractor implements MojoDescriptorExtractor { - public List execute( MavenProject project, PluginDescriptor pluginDescriptor ) + public List execute( MavenProject project, PluginDescriptor pluginDescriptor ) { return execute( new DefaultPluginToolsRequest( project, pluginDescriptor ) ); } - public List execute( PluginToolsRequest request ) + public List execute( PluginToolsRequest request ) { MojoDescriptor desc = new MojoDescriptor(); desc.setPluginDescriptor( request.getPluginDescriptor() );