Author: hboutemy
Date: Sun May 13 08:52:32 2012
New Revision: 1337814
URL: http://svn.apache.org/viewvc?rev=1337814&view=rev
Log:
use generics
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/ScannerTestExtractor.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java?rev=1337814&r1=1337813&r2=1337814&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
Sun May 13 08:52:32 2012
@@ -63,7 +63,7 @@ public abstract class AbstractGeneratorT
mojoDescriptor.setImplementation(
"org.apache.maven.tools.plugin.generator.TestMojo" );
mojoDescriptor.setDependencyResolutionRequired( "compile" );
- List params = new ArrayList();
+ List<Parameter> params = new ArrayList<Parameter>();
Parameter param = new Parameter();
param.setExpression( "${project.build.directory}" );
@@ -134,7 +134,7 @@ public abstract class AbstractGeneratorT
try
{
- Class generatorClass =
Thread.currentThread().getContextClassLoader().loadClass( generatorClassName );
+ Class<?> generatorClass =
Thread.currentThread().getContextClassLoader().loadClass( generatorClassName );
generator = (Generator) generatorClass.newInstance();
}
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java?rev=1337814&r1=1337813&r2=1337814&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java
Sun May 13 08:52:32 2012
@@ -63,9 +63,10 @@ public class PluginDescriptorGeneratorTe
// Dependencies
//
----------------------------------------------------------------------
- List dependencies = pluginDescriptor.getDependencies();
+ @SuppressWarnings( "unchecked" )
+ List<ComponentDependency> 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() );
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java?rev=1337814&r1=1337813&r2=1337814&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
Sun May 13 08:52:32 2012
@@ -28,6 +28,7 @@ import org.apache.maven.plugin.descripto
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<String, MojoDescriptorExtractor> extractors;
private Build build;
@@ -59,7 +59,7 @@ public class DefaultMojoScannerTest
protected void setUp()
throws Exception
{
- extractors = new HashMap();
+ extractors = new HashMap<String, MojoDescriptorExtractor>();
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<String> activeExtractors = new HashSet<String>();
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.<String>emptySet() );
try
{
scanner.populatePluginDescriptor( new DefaultPluginToolsRequest(
project, pluginDescriptor ) );
@@ -130,13 +130,13 @@ public class DefaultMojoScannerTest
// Ok
}
- checkResult( pluginDescriptor, Collections.EMPTY_SET );
+ checkResult( pluginDescriptor, Collections.<String>emptySet() );
}
public void testUnknownExtractor()
throws Exception
{
- Set activeExtractors = new HashSet();
+ Set<String> activeExtractors = new HashSet<String>();
activeExtractors.add( "four" );
PluginDescriptor pluginDescriptor = createPluginDescriptor();
@@ -153,7 +153,7 @@ public class DefaultMojoScannerTest
// Ok
}
- checkResult( pluginDescriptor, Collections.EMPTY_SET );
+ checkResult( pluginDescriptor, Collections.<String>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<String> expectedGoals )
{
- Set remainingGoals = new HashSet( expectedGoals );
- List descriptors = pluginDescriptor.getMojos();
+ Set<String> remainingGoals = new HashSet<String>( expectedGoals );
+ @SuppressWarnings( "unchecked" )
+ List<MojoDescriptor> 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() ) );
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/ScannerTestExtractor.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/ScannerTestExtractor.java?rev=1337814&r1=1337813&r2=1337814&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/ScannerTestExtractor.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/ScannerTestExtractor.java
Sun May 13 08:52:32 2012
@@ -44,13 +44,13 @@ public class ScannerTestExtractor
this.goal = goal;
}
- public List execute( MavenProject project, PluginDescriptor
pluginDescriptor )
+ public List<MojoDescriptor> execute( MavenProject project,
PluginDescriptor pluginDescriptor )
throws InvalidPluginDescriptorException, ExtractionException
{
return execute( new DefaultPluginToolsRequest( project,
pluginDescriptor ) );
}
- public List execute( PluginToolsRequest request )
+ public List<MojoDescriptor> execute( PluginToolsRequest request )
throws ExtractionException, InvalidPluginDescriptorException
{
MojoDescriptor desc = new MojoDescriptor();
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java?rev=1337814&r1=1337813&r2=1337814&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java
Sun May 13 08:52:32 2012
@@ -36,12 +36,12 @@ public class TestExtractor
implements MojoDescriptorExtractor
{
- public List execute( MavenProject project, PluginDescriptor
pluginDescriptor )
+ public List<MojoDescriptor> execute( MavenProject project,
PluginDescriptor pluginDescriptor )
{
return execute( new DefaultPluginToolsRequest( project,
pluginDescriptor ) );
}
- public List execute( PluginToolsRequest request )
+ public List<MojoDescriptor> execute( PluginToolsRequest request )
{
MojoDescriptor desc = new MojoDescriptor();
desc.setPluginDescriptor( request.getPluginDescriptor() );
