diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml index fa656b5..9eaf313 100644 --- a/maven-plugin-plugin/pom.xml +++ b/maven-plugin-plugin/pom.xml @@ -212,6 +212,15 @@ scp://people.apache.org/www/maven.apache.org/plugins/${project.artifactId}-${project.version} + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.5 + 1.5 + + org.codehaus.modello modello-maven-plugin @@ -227,6 +236,7 @@ src/main/mdo/pluginRequirements.mdo + true diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java index 0ee2f6d..c2f2cdf 100644 --- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java +++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java @@ -104,7 +104,7 @@ public abstract class AbstractGeneratorMojo * * @parameter */ - protected Set/* */extractors; + protected Set extractors; /** * @return the output directory where files will be generated. diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java index 40f85ab..6d3319d 100644 --- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java +++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java @@ -325,9 +325,10 @@ public class PluginReport boolean hasMavenReport = false; - for ( Iterator i = pluginDescriptor.getMojos().iterator(); i.hasNext(); ) + for ( @SuppressWarnings( "unchecked" ) + Iterator i = pluginDescriptor.getMojos().iterator(); i.hasNext(); ) { - MojoDescriptor mojo = (MojoDescriptor) i.next(); + MojoDescriptor mojo = i.next(); if ( PluginUtils.isMavenReport( mojo.getImplementation(), project ) ) { @@ -349,13 +350,11 @@ public class PluginReport tableHeader( new String[] { goalColumnName, descriptionColumnName } ); } - List mojos = new ArrayList(); + List mojos = new ArrayList(); mojos.addAll( pluginDescriptor.getMojos() ); PluginUtils.sortMojos( mojos ); - for ( Iterator i = mojos.iterator(); i.hasNext(); ) + for ( MojoDescriptor mojo : mojos ) { - MojoDescriptor mojo = (MojoDescriptor) i.next(); - String goalName = mojo.getFullGoalName(); /* diff --git a/maven-plugin-tools-ant/src/main/java/org/apache/maven/tools/plugin/extractor/ant/AntMojoDescriptorExtractor.java b/maven-plugin-tools-ant/src/main/java/org/apache/maven/tools/plugin/extractor/ant/AntMojoDescriptorExtractor.java index 73ae00d..036f569 100644 --- a/maven-plugin-tools-ant/src/main/java/org/apache/maven/tools/plugin/extractor/ant/AntMojoDescriptorExtractor.java +++ b/maven-plugin-tools-ant/src/main/java/org/apache/maven/tools/plugin/extractor/ant/AntMojoDescriptorExtractor.java @@ -19,6 +19,13 @@ package org.apache.maven.tools.plugin.extractor.ant; * under the License. */ +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.Parameter; @@ -32,14 +39,6 @@ import org.apache.maven.tools.plugin.extractor.ExtractionException; import org.codehaus.plexus.component.repository.ComponentRequirement; import org.codehaus.plexus.util.StringUtils; -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Extracts Mojo descriptors from Ant sources. * @@ -55,25 +54,21 @@ public class AntMojoDescriptorExtractor private static final String SCRIPT_FILE_EXTENSION = ".build.xml"; /** {@inheritDoc} */ - protected List extractMojoDescriptorsFromMetadata( Map metadataFilesKeyedByBasedir, + protected List extractMojoDescriptorsFromMetadata( Map> metadataFilesKeyedByBasedir, PluginToolsRequest request ) throws ExtractionException, InvalidPluginDescriptorException { - List descriptors = new ArrayList(); + List descriptors = new ArrayList(); PluginMetadataParser parser = new PluginMetadataParser(); - for ( Iterator mapIterator = metadataFilesKeyedByBasedir.entrySet().iterator(); mapIterator.hasNext(); ) + for ( Map.Entry> entry : metadataFilesKeyedByBasedir.entrySet() ) { - Map.Entry entry = (Map.Entry) mapIterator.next(); - String basedir = (String) entry.getKey(); - Set metadataFiles = (Set) entry.getValue(); + Set metadataFiles = entry.getValue(); - for ( Iterator it = metadataFiles.iterator(); it.hasNext(); ) + for ( File metadataFile : metadataFiles ) { - File metadataFile = (File) it.next(); - String basename = metadataFile.getName(); basename = basename.substring( 0, basename.length() - METADATA_FILE_EXTENSION.length() ); @@ -97,14 +92,12 @@ public class AntMojoDescriptorExtractor try { - Set mojoDescriptors = parser.parseMojoDescriptors( metadataFile ); + Set mojoDescriptors = parser.parseMojoDescriptors( metadataFile ); - for ( Iterator discoveredMojoIterator = mojoDescriptors.iterator(); discoveredMojoIterator - .hasNext(); ) + for ( MojoDescriptor descriptor : mojoDescriptors ) { - MojoDescriptor descriptor = (MojoDescriptor) discoveredMojoIterator.next(); - - Map paramMap = descriptor.getParameterMap(); + @SuppressWarnings( "unchecked" ) + Map paramMap = descriptor.getParameterMap(); if ( !paramMap.containsKey( "basedir" ) ) { @@ -175,15 +168,14 @@ public class AntMojoDescriptorExtractor descriptor.addParameter( param ); } - List requirements = descriptor.getRequirements(); - Map reqMap = new HashMap(); + @SuppressWarnings( "unchecked" ) + List requirements = descriptor.getRequirements(); + Map reqMap = new HashMap(); if ( requirements != null ) { - for ( Iterator reqIterator = requirements.iterator(); reqIterator.hasNext(); ) + for ( ComponentRequirement req : requirements ) { - ComponentRequirement req = (ComponentRequirement) reqIterator.next(); - reqMap.put( req.getRole(), req ); } } diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java index 0b201d0..00717ab 100644 --- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java +++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java @@ -19,7 +19,16 @@ package org.apache.maven.tools.plugin.extractor; * under the License. */ +import java.io.File; +import java.io.IOException; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; + import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException; +import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.project.MavenProject; import org.apache.maven.tools.plugin.DefaultPluginToolsRequest; @@ -29,15 +38,6 @@ import org.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; -import java.io.File; -import java.io.IOException; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; - /** * @author jdcasey * @version $Id$ @@ -47,14 +47,14 @@ public abstract class AbstractScriptedMojoDescriptorExtractor implements MojoDescriptorExtractor { /** {@inheritDoc} */ - public List execute( MavenProject project, PluginDescriptor pluginDescriptor ) + public List execute( MavenProject project, PluginDescriptor pluginDescriptor ) throws ExtractionException, InvalidPluginDescriptorException { return execute( new DefaultPluginToolsRequest( project, pluginDescriptor ) ); } /** {@inheritDoc} */ - public List execute( PluginToolsRequest request ) + public List execute( PluginToolsRequest request ) throws ExtractionException, InvalidPluginDescriptorException { getLogger().debug( "Running: " + getClass().getName() ); @@ -63,13 +63,15 @@ public abstract class AbstractScriptedMojoDescriptorExtractor MavenProject project = request.getProject(); - Map scriptFilesKeyedByBasedir = + @SuppressWarnings( "unchecked" ) + Map> scriptFilesKeyedByBasedir = gatherFilesByBasedir( project.getBasedir(), project.getScriptSourceRoots(), scriptExtension, request ); - List mojoDescriptors; + List mojoDescriptors; if ( !StringUtils.isEmpty( metadataExtension ) ) { - Map metadataFilesKeyedByBasedir = + @SuppressWarnings( "unchecked" ) + Map> metadataFilesKeyedByBasedir = gatherFilesByBasedir( project.getBasedir(), project.getScriptSourceRoots(), metadataExtension, request ); @@ -90,8 +92,7 @@ public abstract class AbstractScriptedMojoDescriptorExtractor * @param outputDirectory not null * @throws ExtractionException if any */ - protected void copyScriptsToOutputDirectory( Map scriptFilesKeyedByBasedir, String outputDirectory, - PluginToolsRequest request ) + protected void copyScriptsToOutputDirectory( Map> scriptFilesKeyedByBasedir, String outputDirectory, PluginToolsRequest request ) throws ExtractionException { File outputDir = new File( outputDirectory ); @@ -101,18 +102,14 @@ public abstract class AbstractScriptedMojoDescriptorExtractor outputDir.mkdirs(); } - for ( Iterator it = scriptFilesKeyedByBasedir.entrySet().iterator(); it.hasNext(); ) + for ( Map.Entry> entry : scriptFilesKeyedByBasedir.entrySet() ) { - Map.Entry entry = (Map.Entry) it.next(); + File sourceDir = new File( entry.getKey() ); - File sourceDir = new File( (String) entry.getKey() ); + Set scripts = entry.getValue(); - Set scripts = (Set) entry.getValue(); - - for ( Iterator scriptIterator = scripts.iterator(); scriptIterator.hasNext(); ) + for ( File scriptFile : scripts ) { - File scriptFile = (File) scriptIterator.next(); - String relativePath = scriptFile.getPath().substring( sourceDir.getPath().length() ); if ( relativePath.charAt( 0 ) == File.separatorChar ) @@ -146,16 +143,13 @@ public abstract class AbstractScriptedMojoDescriptorExtractor * @param scriptFileExtension not null * @return map with subdirs paths as key */ - protected Map gatherFilesByBasedir( File basedir, List directories, String scriptFileExtension, - PluginToolsRequest request ) + protected Map> gatherFilesByBasedir( File basedir, List directories, String scriptFileExtension, PluginToolsRequest request ) { - Map sourcesByBasedir = new TreeMap(); + Map> sourcesByBasedir = new TreeMap>(); - for ( Iterator it = directories.iterator(); it.hasNext(); ) + for ( String resourceDir : directories ) { - Set sources = new HashSet(); - - String resourceDir = (String) it.next(); + Set sources = new HashSet(); getLogger().debug( "Scanning script dir: " + resourceDir + " with extractor: " + getClass().getName() ); File dir = new File( resourceDir ); @@ -204,7 +198,7 @@ public abstract class AbstractScriptedMojoDescriptorExtractor * @throws ExtractionException if any * @throws InvalidPluginDescriptorException if any */ - protected List extractMojoDescriptorsFromMetadata( Map metadataFilesKeyedByBasedir, + protected List extractMojoDescriptorsFromMetadata( Map> metadataFilesKeyedByBasedir, PluginToolsRequest request ) throws ExtractionException, InvalidPluginDescriptorException { @@ -230,7 +224,7 @@ public abstract class AbstractScriptedMojoDescriptorExtractor * @throws ExtractionException if any * @throws InvalidPluginDescriptorException if any */ - protected List extractMojoDescriptors( Map scriptFilesKeyedByBasedir, PluginToolsRequest request ) + protected List extractMojoDescriptors( Map> scriptFilesKeyedByBasedir, PluginToolsRequest request ) throws ExtractionException, InvalidPluginDescriptorException { return null; diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/MojoDescriptorExtractor.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/MojoDescriptorExtractor.java index 1eba4f4..2577992 100644 --- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/MojoDescriptorExtractor.java +++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/MojoDescriptorExtractor.java @@ -20,6 +20,7 @@ package org.apache.maven.tools.plugin.extractor; */ import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException; +import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.project.MavenProject; import org.apache.maven.tools.plugin.PluginToolsRequest; @@ -46,7 +47,7 @@ public interface MojoDescriptorExtractor * @deprecated Use {@link MojoDescriptorExtractor#execute(PluginToolsRequest)} instead. * Provided for backward compatibility with maven-plugin-plugin < 2.5. */ - List execute( MavenProject project, PluginDescriptor pluginDescriptor ) + List execute( MavenProject project, PluginDescriptor pluginDescriptor ) throws ExtractionException, InvalidPluginDescriptorException; /** @@ -58,6 +59,6 @@ public interface MojoDescriptorExtractor * @throws InvalidPluginDescriptorException if any * @since 2.5 */ - List execute( PluginToolsRequest request ) + List execute( PluginToolsRequest request ) throws ExtractionException, InvalidPluginDescriptorException; } \ No newline at end of file diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java index 26f0a8a..3ea06d6 100644 --- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java +++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java @@ -105,9 +105,10 @@ public class PluginDescriptorGenerator if ( pluginDescriptor.getMojos() != null ) { - for ( Iterator it = pluginDescriptor.getMojos().iterator(); it.hasNext(); ) + for ( @SuppressWarnings( "unchecked" ) + Iterator it = pluginDescriptor.getMojos().iterator(); it.hasNext(); ) { - MojoDescriptor descriptor = (MojoDescriptor) it.next(); + MojoDescriptor descriptor = it.next(); processMojoDescriptor( descriptor, w ); } } @@ -322,20 +323,19 @@ public class PluginDescriptorGenerator // Parameters // ---------------------------------------------------------------------- - List parameters = mojoDescriptor.getParameters(); + @SuppressWarnings( "unchecked" ) + List parameters = mojoDescriptor.getParameters(); w.startElement( "parameters" ); - Map requirements = new LinkedHashMap(); + Map requirements = new LinkedHashMap(); - Set configuration = new LinkedHashSet(); + Set configuration = new LinkedHashSet(); if ( parameters != null ) { - for ( int j = 0; j < parameters.size(); j++ ) + for ( Parameter parameter : parameters ) { - Parameter parameter = (Parameter) parameters.get( j ); - String expression = parameter.getExpression(); if ( StringUtils.isNotEmpty( expression ) && expression.startsWith( "${component." ) ) @@ -422,10 +422,8 @@ public class PluginDescriptorGenerator { w.startElement( "configuration" ); - for ( Iterator i = configuration.iterator(); i.hasNext(); ) + for ( Parameter parameter : configuration ) { - Parameter parameter = (Parameter) i.next(); - w.startElement( parameter.getName() ); String type = parameter.getType(); @@ -458,10 +456,10 @@ public class PluginDescriptorGenerator { w.startElement( "requirements" ); - for ( Iterator i = requirements.keySet().iterator(); i.hasNext(); ) + for ( Map.Entry entry : requirements.entrySet() ) { - String key = (String) i.next(); - Requirement requirement = (Requirement) requirements.get( key ); + String key = entry.getKey(); + Requirement requirement = entry.getValue(); w.startElement( "requirement" ); diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java index 3923c0e..39cf798 100644 --- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java +++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java @@ -103,9 +103,10 @@ public class PluginHelpGenerator MojoDescriptor helpDescriptor = makeHelpDescriptor( pluginDescriptor ); // Verify that no help goal already exists - for ( Iterator it = pluginDescriptor.getMojos().iterator(); it.hasNext(); ) + for ( @SuppressWarnings( "unchecked" ) + Iterator it = pluginDescriptor.getMojos().iterator(); it.hasNext(); ) { - MojoDescriptor descriptor = (MojoDescriptor) it.next(); + MojoDescriptor descriptor = it.next(); if ( descriptor.getGoal().equals( helpDescriptor.getGoal() ) && !descriptor.getImplementation().equals( helpDescriptor.getImplementation() ) ) @@ -240,10 +241,11 @@ public class PluginHelpGenerator */ private static String discoverPackageName( PluginDescriptor pluginDescriptor ) { - Map packageNames = new HashMap(); - for ( Iterator it = pluginDescriptor.getMojos().iterator(); it.hasNext(); ) + Map packageNames = new HashMap(); + for ( @SuppressWarnings( "unchecked" ) + Iterator it = pluginDescriptor.getMojos().iterator(); it.hasNext(); ) { - MojoDescriptor descriptor = (MojoDescriptor) it.next(); + MojoDescriptor descriptor = it.next(); String impl = descriptor.getImplementation(); if ( impl.lastIndexOf( '.' ) != -1 ) @@ -267,9 +269,8 @@ public class PluginHelpGenerator String packageName = ""; int max = 0; - for ( Iterator it = packageNames.keySet().iterator(); it.hasNext(); ) + for ( String key : packageNames.keySet() ) { - String key = it.next().toString(); int value = ( (Integer) packageNames.get( key ) ).intValue(); if ( value > max ) { @@ -399,9 +400,10 @@ public class PluginHelpGenerator private static void writeVariables( Writer writer, MojoDescriptor helpDescriptor ) throws IOException { - for ( Iterator it = helpDescriptor.getParameters().iterator(); it.hasNext(); ) + for ( @SuppressWarnings( "unchecked" ) + Iterator it = helpDescriptor.getParameters().iterator(); it.hasNext(); ) { - Parameter param = (Parameter) it.next(); + Parameter param = it.next(); writer.write( " /**" + LS ); writer.write( " * " + StringUtils.escape( param.getDescription() ) + LS ); writer.write( " * " + LS ); @@ -434,12 +436,13 @@ public class PluginHelpGenerator private static void writeExecute( Writer writer, PluginDescriptor pluginDescriptor, MojoDescriptor helpDescriptor ) throws IOException { - List mojoDescriptors = new ArrayList(); + List mojoDescriptors = new ArrayList(); mojoDescriptors.add( helpDescriptor ); - for ( Iterator it = pluginDescriptor.getMojos().iterator(); it.hasNext(); ) + for ( @SuppressWarnings( "unchecked" ) + Iterator it = pluginDescriptor.getMojos().iterator(); it.hasNext(); ) { - MojoDescriptor mojoDescriptor = (MojoDescriptor) it.next(); + MojoDescriptor mojoDescriptor = it.next(); if ( !helpDescriptor.getGoal().equals( mojoDescriptor.getGoal() ) ) { @@ -509,9 +512,9 @@ public class PluginHelpGenerator writer.write( LS ); - for ( Iterator it = mojoDescriptors.iterator(); it.hasNext(); ) + for ( Iterator it = mojoDescriptors.iterator(); it.hasNext(); ) { - MojoDescriptor descriptor = (MojoDescriptor) it.next(); + MojoDescriptor descriptor = it.next(); writeGoal( writer, descriptor ); } @@ -556,7 +559,8 @@ public class PluginHelpGenerator if ( descriptor.getParameters() != null && descriptor.getParameters().size() > 0 ) { - List params = descriptor.getParameters(); + @SuppressWarnings( "unchecked" ) + List params = descriptor.getParameters(); PluginUtils.sortMojoParameters( params ); @@ -566,10 +570,8 @@ public class PluginHelpGenerator writer.write( " append( sb, \"Available parameters:\", 1 );" + LS ); writer.write( " append( sb, \"\", 0 );" + LS ); - for ( Iterator it = params.iterator(); it.hasNext(); ) + for ( Parameter parameter : params ) { - Parameter parameter = (Parameter) it.next(); - if ( parameter.isEditable() ) { writer.write( LS ); diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java index d32549f..b39bad1 100644 --- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java +++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java @@ -109,9 +109,10 @@ public class PluginXdocGenerator { if ( request.getPluginDescriptor().getMojos() != null ) { - for ( Iterator it = request.getPluginDescriptor().getMojos().iterator(); it.hasNext(); ) + for ( @SuppressWarnings( "unchecked" ) + Iterator it = request.getPluginDescriptor().getMojos().iterator(); it.hasNext(); ) { - MojoDescriptor descriptor = (MojoDescriptor) it.next(); + MojoDescriptor descriptor = it.next(); processMojoDescriptor( descriptor, destinationDirectory ); } @@ -442,10 +443,11 @@ public class PluginXdocGenerator */ private void writeGoalParameterTable( MojoDescriptor mojoDescriptor, XMLWriter w ) { - List parameterList = mojoDescriptor.getParameters(); + @SuppressWarnings( "unchecked" ) + List parameterList = mojoDescriptor.getParameters(); //remove components and read-only parameters - List list = filterParameters( parameterList ); + List list = filterParameters( parameterList ); if ( list != null && list.size() > 0 ) { @@ -470,16 +472,14 @@ public class PluginXdocGenerator * @param parameterList not null * @return the parameters list without components. */ - private List filterParameters( List parameterList ) + private List filterParameters( List parameterList ) { - List filtered = new ArrayList(); + List filtered = new ArrayList(); if ( parameterList != null ) { - for ( Iterator parameters = parameterList.iterator(); parameters.hasNext(); ) + for ( Parameter parameter : parameterList ) { - Parameter parameter = (Parameter) parameters.next(); - if ( parameter.isEditable() ) { String expression = parameter.getExpression(); @@ -500,14 +500,14 @@ public class PluginXdocGenerator * @param parameterList not null * @param w not null */ - private void writeParameterDetails( MojoDescriptor mojoDescriptor, List parameterList, XMLWriter w ) + private void writeParameterDetails( MojoDescriptor mojoDescriptor, List parameterList, XMLWriter w ) { w.startElement( "subsection" ); w.addAttribute( "name", getString( "pluginxdoc.mojodescriptor.parameter.details" ) ); - for ( Iterator parameters = parameterList.iterator(); parameters.hasNext(); ) + for ( Iterator parameters = parameterList.iterator(); parameters.hasNext(); ) { - Parameter parameter = (Parameter) parameters.next(); + Parameter parameter = parameters.next(); w.startElement( "p" ); w.writeMarkup( format( "pluginxdoc.mojodescriptor.parameter.name_internal", parameter.getName() ) ); @@ -633,16 +633,16 @@ public class PluginXdocGenerator * @param parameterList not null * @param w not null */ - private void writeParameterSummary( MojoDescriptor mojoDescriptor, List parameterList, XMLWriter w ) + private void writeParameterSummary( MojoDescriptor mojoDescriptor, List parameterList, XMLWriter w ) { - List requiredParams = getParametersByRequired( true, parameterList ); + List requiredParams = getParametersByRequired( true, parameterList ); if ( requiredParams.size() > 0 ) { writeParameterList( mojoDescriptor, getString( "pluginxdoc.mojodescriptor.requiredParameters" ), requiredParams, w ); } - List optionalParams = getParametersByRequired( false, parameterList ); + List optionalParams = getParametersByRequired( false, parameterList ); if ( optionalParams.size() > 0 ) { writeParameterList( mojoDescriptor, getString( "pluginxdoc.mojodescriptor.optionalParameters" ), @@ -656,7 +656,7 @@ public class PluginXdocGenerator * @param parameterList not null * @param w not null */ - private void writeParameterList( MojoDescriptor mojoDescriptor, String title, List parameterList, XMLWriter w ) + private void writeParameterList( MojoDescriptor mojoDescriptor, String title, List parameterList, XMLWriter w ) { w.startElement( "subsection" ); w.addAttribute( "name", title ); @@ -679,10 +679,8 @@ public class PluginXdocGenerator w.endElement(); //th w.endElement(); //tr - for ( Iterator parameters = parameterList.iterator(); parameters.hasNext(); ) + for ( Parameter parameter : parameterList ) { - Parameter parameter = (Parameter) parameters.next(); - w.startElement( "tr" ); w.startElement( "td" ); w.writeMarkup( format( "pluginxdoc.mojodescriptor.parameter.name_link", parameter.getName() ) ); @@ -744,14 +742,12 @@ public class PluginXdocGenerator * @param parameterList not null * @return list of parameters depending the value of required */ - private List getParametersByRequired( boolean required, List parameterList ) + private List getParametersByRequired( boolean required, List parameterList ) { - List list = new ArrayList(); + List list = new ArrayList(); - for ( Iterator parameters = parameterList.iterator(); parameters.hasNext(); ) + for ( Parameter parameter : parameterList ) { - Parameter parameter = (Parameter) parameters.next(); - if ( parameter.isRequired() == required ) { list.add( parameter ); diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java index 242f6da..826ef90 100644 --- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java +++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScanner.java @@ -19,6 +19,11 @@ package org.apache.maven.tools.plugin.scanner; * under the License. */ +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor; @@ -31,12 +36,6 @@ import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * @author jdcasey */ @@ -45,19 +44,19 @@ public class DefaultMojoScanner implements MojoScanner { - private Map mojoDescriptorExtractors; + private Map mojoDescriptorExtractors; /** * The names of the active extractors */ - private Set/* */activeExtractors; + private Set activeExtractors; /** * Default constructor * * @param extractors not null */ - public DefaultMojoScanner( Map extractors ) + public DefaultMojoScanner( Map extractors ) { this.mojoDescriptorExtractors = extractors; @@ -84,15 +83,14 @@ public class DefaultMojoScanner throws ExtractionException, InvalidPluginDescriptorException { Logger logger = getLogger(); - Set activeExtractorsInternal = getActiveExtractors(); + Set activeExtractorsInternal = getActiveExtractors(); logger.debug( "Using " + activeExtractorsInternal.size() + " mojo extractors." ); int numMojoDescriptors = 0; - for ( Iterator it = activeExtractorsInternal.iterator(); it.hasNext(); ) + for ( String language : activeExtractorsInternal ) { - String language = (String) it.next(); MojoDescriptorExtractor extractor = (MojoDescriptorExtractor) mojoDescriptorExtractors.get( language ); if ( extractor == null ) @@ -102,16 +100,14 @@ public class DefaultMojoScanner logger.info( "Applying mojo extractor for language: " + language ); - List extractorDescriptors = extractor.execute( request ); + List extractorDescriptors = extractor.execute( request ); logger.info( "Mojo extractor for language: " + language + " found " + extractorDescriptors.size() + " mojo descriptors." ); numMojoDescriptors += extractorDescriptors.size(); - for ( Iterator descriptorIt = extractorDescriptors.iterator(); descriptorIt.hasNext(); ) + for ( MojoDescriptor descriptor : extractorDescriptors ) { - MojoDescriptor descriptor = (MojoDescriptor) descriptorIt.next(); - logger.debug( "Adding mojo: " + descriptor + " to plugin descriptor." ); descriptor.setPluginDescriptor( request.getPluginDescriptor() ); @@ -132,20 +128,19 @@ public class DefaultMojoScanner * * @return A Set containing the names of the active extractors. */ - protected Set/* */getActiveExtractors() + protected Set getActiveExtractors() { - Set/* */result = activeExtractors; + Set result = activeExtractors; if ( result == null ) { - result = new HashSet/* */( mojoDescriptorExtractors.keySet() ); + result = new HashSet( mojoDescriptorExtractors.keySet() ); } return result; } - /** {@inheritDoc} */ - public void setActiveExtractors( Set/* */extractors ) + public void setActiveExtractors( Set extractors ) { if ( extractors == null ) { @@ -153,12 +148,10 @@ public class DefaultMojoScanner } else { - this.activeExtractors = new HashSet/* */(); + this.activeExtractors = new HashSet(); - for ( Iterator i = extractors.iterator(); i.hasNext(); ) + for ( String extractor : extractors ) { - String extractor = (String) i.next(); - if ( extractor != null && extractor.length() > 0 ) { this.activeExtractors.add( extractor ); diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java index a8d7531..c382e33 100644 --- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java +++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/scanner/MojoScanner.java @@ -66,6 +66,6 @@ public interface MojoScanner * all the scanner's extractors are considered active. Set entries that are null or * empty ("") will be ignored. */ - void setActiveExtractors( Set/* */extractors ); + void setActiveExtractors( Set extractors ); } diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java index 311e614..f6a08a0 100644 --- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java +++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java @@ -114,9 +114,10 @@ public final class PluginUtils { w.startElement( "dependencies" ); - for ( Iterator it = pluginDescriptor.getDependencies().iterator(); it.hasNext(); ) + for ( @SuppressWarnings( "unchecked" ) + Iterator it = pluginDescriptor.getDependencies().iterator(); it.hasNext(); ) { - ComponentDependency dep = (ComponentDependency) it.next(); + ComponentDependency dep = it.next(); w.startElement( "dependency" ); @@ -138,14 +139,12 @@ public final class PluginUtils * @param dependencies not null list of Dependency * @return list of component dependencies */ - public static List toComponentDependencies( List dependencies ) + public static List toComponentDependencies( List dependencies ) { - List componentDeps = new LinkedList(); + List componentDeps = new LinkedList(); - for ( Iterator it = dependencies.iterator(); it.hasNext(); ) + for ( Dependency dependency : dependencies ) { - Dependency dependency = (Dependency) it.next(); - ComponentDependency cd = new ComponentDependency(); cd.setArtifactId( dependency.getArtifactId() ); @@ -196,7 +195,7 @@ public final class PluginUtils ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); if ( project != null ) { - List classPathStrings; + List classPathStrings; try { classPathStrings = project.getCompileClasspathElements(); @@ -210,8 +209,8 @@ public final class PluginUtils throw (RuntimeException) new IllegalArgumentException().initCause( e ); } - List urls = new ArrayList( classPathStrings.size() ); - for ( Iterator it = classPathStrings.iterator(); it.hasNext(); ) + List urls = new ArrayList( classPathStrings.size() ); + for ( Iterator it = classPathStrings.iterator(); it.hasNext(); ) { try { @@ -227,7 +226,7 @@ public final class PluginUtils classLoader ); } - Class clazz = null; + Class clazz = null; try { clazz = Class.forName( impl, false, classLoader ); @@ -417,17 +416,17 @@ public final class PluginUtils * @param mojoDescriptors The mojo descriptors to sort, may be null. * @see MojoDescriptor#getGoal() */ - public static void sortMojos( List mojoDescriptors ) + public static void sortMojos( List mojoDescriptors ) { if ( mojoDescriptors != null ) { - Collections.sort( mojoDescriptors, new Comparator() + Collections.sort( mojoDescriptors, new Comparator() { /** {@inheritDoc} */ - public int compare( Object arg0, Object arg1 ) + public int compare( MojoDescriptor arg0, MojoDescriptor arg1 ) { - MojoDescriptor mojo0 = (MojoDescriptor) arg0; - MojoDescriptor mojo1 = (MojoDescriptor) arg1; + MojoDescriptor mojo0 = arg0; + MojoDescriptor mojo1 = arg1; return mojo0.getGoal().compareToIgnoreCase( mojo1.getGoal() ); } @@ -442,14 +441,14 @@ public final class PluginUtils * @see Parameter#getName() * @since 2.4.4 */ - public static void sortMojoParameters( List parameters ) + public static void sortMojoParameters( List parameters ) { if ( parameters != null ) { - Collections.sort( parameters, new Comparator() + Collections.sort( parameters, new Comparator() { /** {@inheritDoc} */ - public int compare( Object arg0, Object arg1 ) + public int compare( Parameter arg0, Parameter arg1 ) { Parameter parameter1 = (Parameter) arg0; Parameter parameter2 = (Parameter) arg1; @@ -534,7 +533,7 @@ public final class PluginUtils * A stack of {@link Counter} objects corresponding to the nesting of (un-)ordered lists. A * null element denotes an unordered list. */ - private Stack numbering = new Stack(); + private Stack numbering = new Stack(); /** * A flag whether an implicit line break is pending in the output buffer. This flag is used to postpone the diff --git a/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java b/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java index e4defe5..959930f 100644 --- a/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java +++ b/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java @@ -19,21 +19,20 @@ package org.apache.maven.tools.plugin.extractor.beanshell; * under the License. */ +import java.io.File; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.tools.plugin.PluginToolsRequest; import org.apache.maven.tools.plugin.extractor.AbstractScriptedMojoDescriptorExtractor; import org.apache.maven.tools.plugin.extractor.ExtractionException; -import java.io.File; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - import bsh.EvalError; import bsh.Interpreter; @@ -56,22 +55,18 @@ public class BeanshellMojoDescriptorExtractor } /** {@inheritDoc} */ - protected List extractMojoDescriptors( Map scriptFilesKeyedByBasedir, PluginToolsRequest request ) + protected List extractMojoDescriptors( Map> scriptFilesKeyedByBasedir, PluginToolsRequest request ) throws ExtractionException, InvalidPluginDescriptorException { - List descriptors = new ArrayList(); + List descriptors = new ArrayList(); - for ( Iterator mapIterator = scriptFilesKeyedByBasedir.entrySet().iterator(); mapIterator.hasNext(); ) + for ( Map.Entry> entry : scriptFilesKeyedByBasedir.entrySet() ) { - Map.Entry entry = (Map.Entry) mapIterator.next(); + String basedir = entry.getKey(); + Set metadataFiles = entry.getValue(); - String basedir = (String) entry.getKey(); - Set metadataFiles = (Set) entry.getValue(); - - for ( Iterator it = metadataFiles.iterator(); it.hasNext(); ) + for ( File scriptFile : metadataFiles ) { - File scriptFile = (File) it.next(); - String relativePath = null; if ( basedir.endsWith( "/" ) ) diff --git a/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java b/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java index 975c1c2..15dc6de 100644 --- a/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java +++ b/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java @@ -454,13 +454,11 @@ public class JavaMojoDescriptorExtractor // We're resolving class-level, ancestor-class-field, local-class-field order here. // --------------------------------------------------------------------------------- - Map rawParams = extractFieldParameterTags( javaClass ); + Map rawParams = extractFieldParameterTags( javaClass ); - for ( Iterator it = rawParams.entrySet().iterator(); it.hasNext(); ) + for ( Map.Entry entry : rawParams.entrySet() ) { - Map.Entry entry = (Map.Entry) it.next(); - - JavaField field = (JavaField) entry.getValue(); + JavaField field = entry.getValue(); Type type = field.getType(); @@ -506,7 +504,7 @@ public class JavaMojoDescriptorExtractor pd.setRequirement( new Requirement( role, roleHint ) ); - pd.setName( (String) entry.getKey() ); + pd.setName( entry.getKey() ); pd.setEditable( false ); /* TODO: or better like this? Need @component fields be editable for the user? @@ -535,7 +533,7 @@ public class JavaMojoDescriptorExtractor } else { - pd.setName( (String) entry.getKey() ); + pd.setName( entry.getKey() ); } pd.setRequired( field.getTagByName( JavaMojoAnnotation.REQUIRED ) != null ); @@ -593,9 +591,9 @@ public class JavaMojoDescriptorExtractor * @param javaClass not null * @return map with Mojo parameters names as keys */ - private Map extractFieldParameterTags( JavaClass javaClass ) + private Map extractFieldParameterTags( JavaClass javaClass ) { - Map rawParams; + Map rawParams; // we have to add the parent fields first, so that they will be overwritten by the local fields if // that actually happens... @@ -607,7 +605,7 @@ public class JavaMojoDescriptorExtractor } else { - rawParams = new TreeMap(); + rawParams = new TreeMap(); } JavaField[] classFields = javaClass.getFields(); @@ -629,19 +627,19 @@ public class JavaMojoDescriptorExtractor } /** {@inheritDoc} */ - public List execute( MavenProject project, PluginDescriptor pluginDescriptor ) + public List execute( MavenProject project, PluginDescriptor pluginDescriptor ) throws ExtractionException, InvalidPluginDescriptorException { return execute( new DefaultPluginToolsRequest( project, pluginDescriptor ) ); } /** {@inheritDoc} */ - public List execute( PluginToolsRequest request ) + public List execute( PluginToolsRequest request ) throws ExtractionException, InvalidPluginDescriptorException { JavaClass[] javaClasses = discoverClasses( request ); - List descriptors = new ArrayList(); + List descriptors = new ArrayList(); for ( int i = 0; i < javaClasses.length; i++ ) { @@ -673,9 +671,10 @@ public class JavaMojoDescriptorExtractor MavenProject project = request.getProject(); - for ( Iterator i = project.getCompileSourceRoots().iterator(); i.hasNext(); ) + for ( @SuppressWarnings( "unchecked" ) + Iterator i = project.getCompileSourceRoots().iterator(); i.hasNext(); ) { - builder.addSourceTree( new File( (String) i.next() ) ); + builder.addSourceTree( new File( i.next() ) ); } // TODO be more dynamic @@ -695,13 +694,14 @@ public class JavaMojoDescriptorExtractor protected void validate( MojoDescriptor mojoDescriptor ) throws InvalidParameterException { - List parameters = mojoDescriptor.getParameters(); + @SuppressWarnings( "unchecked" ) + List parameters = mojoDescriptor.getParameters(); if ( parameters != null ) { for ( int j = 0; j < parameters.size(); j++ ) { - validateParameter( (Parameter) parameters.get( j ), j ); + validateParameter( parameters.get( j ), j ); } } } diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/AbstractMojoTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/AbstractMojoTaglet.java index 9fb136f..6dc4fc2 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/AbstractMojoTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/AbstractMojoTaglet.java @@ -247,7 +247,7 @@ public abstract class AbstractMojoTaglet } else { - List l = getOnlyValues( getAllowedValue() ); + List l = getOnlyValues( getAllowedValue() ); if ( isNotEmpty( tagValue ) ) { if ( l.contains( tagValue ) ) @@ -300,7 +300,7 @@ public abstract class AbstractMojoTaglet } else { - List l = getOnlyValues( getAllowedValue() ); + List l = getOnlyValues( getAllowedValue() ); if ( isNotEmpty( tagValue ) ) { if ( l.contains( tagValue ) ) @@ -347,7 +347,7 @@ public abstract class AbstractMojoTaglet { sb.append( "
" ); - Enumeration names = att.getAttributeNames(); + Enumeration names = att.getAttributeNames(); while ( names.hasMoreElements() ) { Object key = names.nextElement(); @@ -383,14 +383,14 @@ public abstract class AbstractMojoTaglet * @return a list of parsed Strings or Collections.EMPTY_LIST. * By convention, the default value is the first element. */ - private static List getOnlyValues( String text ) + private static List getOnlyValues( String text ) { if ( text.indexOf( "|" ) == -1 ) { - return Collections.EMPTY_LIST; + return Collections.emptyList(); } - List l = new ArrayList(); + List l = new ArrayList(); StringTokenizer token = new StringTokenizer( text, "|" ); while ( token.hasMoreTokens() ) { diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoAggregatorTypeTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoAggregatorTypeTaglet.java index fb48c07..c1d6c33 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoAggregatorTypeTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoAggregatorTypeTaglet.java @@ -105,10 +105,10 @@ public class MojoAggregatorTypeTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoAggregatorTypeTaglet tag = new MojoAggregatorTypeTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoComponentFieldTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoComponentFieldTaglet.java index e3ac717..eae77cb 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoComponentFieldTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoComponentFieldTaglet.java @@ -107,10 +107,10 @@ public class MojoComponentFieldTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoComponentFieldTaglet tag = new MojoComponentFieldTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoConfiguratorTypeTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoConfiguratorTypeTaglet.java index 8ea4d88..babdedc 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoConfiguratorTypeTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoConfiguratorTypeTaglet.java @@ -104,10 +104,10 @@ public class MojoConfiguratorTypeTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoConfiguratorTypeTaglet tag = new MojoConfiguratorTypeTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoExecuteTypeTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoExecuteTypeTaglet.java index b6cda2b..2b1a1e3 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoExecuteTypeTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoExecuteTypeTaglet.java @@ -110,10 +110,10 @@ public class MojoExecuteTypeTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoExecuteTypeTaglet tag = new MojoExecuteTypeTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoExecutionStrategyTypeTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoExecutionStrategyTypeTaglet.java index 2254fea..e64a0c4 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoExecutionStrategyTypeTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoExecutionStrategyTypeTaglet.java @@ -104,10 +104,10 @@ public class MojoExecutionStrategyTypeTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoExecutionStrategyTypeTaglet tag = new MojoExecutionStrategyTypeTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoGoalTypeTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoGoalTypeTaglet.java index 2452f9e..2399ff7 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoGoalTypeTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoGoalTypeTaglet.java @@ -104,10 +104,10 @@ public class MojoGoalTypeTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoGoalTypeTaglet tag = new MojoGoalTypeTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoInheritByDefaultTypeTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoInheritByDefaultTypeTaglet.java index d5c3e09..fd196ad 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoInheritByDefaultTypeTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoInheritByDefaultTypeTaglet.java @@ -105,10 +105,10 @@ public class MojoInheritByDefaultTypeTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoInheritByDefaultTypeTaglet tag = new MojoInheritByDefaultTypeTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoInstantiationStrategyTypeTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoInstantiationStrategyTypeTaglet.java index 550c952..1fa074a 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoInstantiationStrategyTypeTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoInstantiationStrategyTypeTaglet.java @@ -104,10 +104,10 @@ public class MojoInstantiationStrategyTypeTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoInstantiationStrategyTypeTaglet tag = new MojoInstantiationStrategyTypeTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoParameterFieldTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoParameterFieldTaglet.java index 2ef4e9f..a70cb81 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoParameterFieldTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoParameterFieldTaglet.java @@ -111,10 +111,10 @@ public class MojoParameterFieldTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoParameterFieldTaglet tag = new MojoParameterFieldTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoPhaseTypeTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoPhaseTypeTaglet.java index 9349e97..4e73fc6 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoPhaseTypeTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoPhaseTypeTaglet.java @@ -104,10 +104,10 @@ public class MojoPhaseTypeTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoPhaseTypeTaglet tag = new MojoPhaseTypeTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoReadOnlyFieldTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoReadOnlyFieldTaglet.java index fad9278..5022e8f 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoReadOnlyFieldTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoReadOnlyFieldTaglet.java @@ -108,10 +108,10 @@ public class MojoReadOnlyFieldTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoReadOnlyFieldTaglet tag = new MojoReadOnlyFieldTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiredFieldTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiredFieldTaglet.java index 241ba71..29aae5f 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiredFieldTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiredFieldTaglet.java @@ -108,10 +108,10 @@ public class MojoRequiredFieldTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoRequiredFieldTaglet tag = new MojoRequiredFieldTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDependencyCollectionTypeTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDependencyCollectionTypeTaglet.java index e2c250f..f0bde8e 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDependencyCollectionTypeTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDependencyCollectionTypeTaglet.java @@ -104,10 +104,10 @@ public class MojoRequiresDependencyCollectionTypeTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoRequiresDependencyCollectionTypeTaglet tag = new MojoRequiresDependencyCollectionTypeTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDependencyResolutionTypeTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDependencyResolutionTypeTaglet.java index 82f24a6..6cd49f7 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDependencyResolutionTypeTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDependencyResolutionTypeTaglet.java @@ -105,10 +105,10 @@ public class MojoRequiresDependencyResolutionTypeTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoRequiresDependencyResolutionTypeTaglet tag = new MojoRequiresDependencyResolutionTypeTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDirectInvocationTypeTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDirectInvocationTypeTaglet.java index 24e37d0..c3a97a8 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDirectInvocationTypeTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDirectInvocationTypeTaglet.java @@ -105,10 +105,10 @@ public class MojoRequiresDirectInvocationTypeTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoRequiresDirectInvocationTypeTaglet tag = new MojoRequiresDirectInvocationTypeTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresOnLineTypeTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresOnLineTypeTaglet.java index c0be2b2..7bfa184 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresOnLineTypeTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresOnLineTypeTaglet.java @@ -105,10 +105,10 @@ public class MojoRequiresOnLineTypeTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoRequiresOnLineTypeTaglet tag = new MojoRequiresOnLineTypeTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresProjectTypeTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresProjectTypeTaglet.java index 53ca21c..0d8b865 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresProjectTypeTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresProjectTypeTaglet.java @@ -105,10 +105,10 @@ public class MojoRequiresProjectTypeTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoRequiresProjectTypeTaglet tag = new MojoRequiresProjectTypeTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresReportsTypeTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresReportsTypeTaglet.java index d134e96..7ad4c9d 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresReportsTypeTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresReportsTypeTaglet.java @@ -105,10 +105,10 @@ public class MojoRequiresReportsTypeTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoRequiresReportsTypeTaglet tag = new MojoRequiresReportsTypeTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoThreadSafeTypeTaglet.java b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoThreadSafeTypeTaglet.java index 6cf0116..0827479 100644 --- a/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoThreadSafeTypeTaglet.java +++ b/maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoThreadSafeTypeTaglet.java @@ -103,10 +103,10 @@ public class MojoThreadSafeTypeTaglet * * @param tagletMap the map to register this tag to. */ - public static void register( Map tagletMap ) + public static void register( Map tagletMap ) { MojoThreadSafeTypeTaglet tag = new MojoThreadSafeTypeTaglet(); - Taglet t = (Taglet) tagletMap.get( tag.getName() ); + Taglet t = tagletMap.get( tag.getName() ); if ( t != null ) { tagletMap.remove( tag.getName() ); diff --git a/maven-plugin-tools-model/pom.xml b/maven-plugin-tools-model/pom.xml index 6ffb27f..e297aa3 100644 --- a/maven-plugin-tools-model/pom.xml +++ b/maven-plugin-tools-model/pom.xml @@ -67,6 +67,7 @@ src/main/mdo/plugin-metadata.mdo 1.0.0 + true diff --git a/maven-plugin-tools-model/src/main/java/org/apache/maven/plugin/tools/model/PluginMetadataParser.java b/maven-plugin-tools-model/src/main/java/org/apache/maven/plugin/tools/model/PluginMetadataParser.java index 8a91f55..40a4772 100644 --- a/maven-plugin-tools-model/src/main/java/org/apache/maven/plugin/tools/model/PluginMetadataParser.java +++ b/maven-plugin-tools-model/src/main/java/org/apache/maven/plugin/tools/model/PluginMetadataParser.java @@ -19,6 +19,13 @@ package org.apache.maven.plugin.tools.model; * under the License. */ +import java.io.File; +import java.io.IOException; +import java.io.Reader; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.apache.maven.plugin.descriptor.DuplicateParameterException; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.Parameter; @@ -29,14 +36,6 @@ import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; -import java.io.File; -import java.io.IOException; -import java.io.Reader; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - /** * Parser for plugin metadata. * @@ -53,10 +52,10 @@ public class PluginMetadataParser * @return a set of MojoDescriptor * @throws PluginMetadataParseException if any */ - public Set parseMojoDescriptors( File metadataFile ) + public Set parseMojoDescriptors( File metadataFile ) throws PluginMetadataParseException { - Set descriptors = new HashSet(); + Set descriptors = new HashSet(); Reader reader = null; @@ -68,14 +67,12 @@ public class PluginMetadataParser PluginMetadata pluginMetadata = metadataReader.read( reader ); - List mojos = pluginMetadata.getMojos(); + List mojos = pluginMetadata.getMojos(); if ( mojos != null && !mojos.isEmpty() ) { - for ( Iterator it = mojos.iterator(); it.hasNext(); ) + for ( Mojo mojo :mojos ) { - Mojo mojo = (Mojo) it.next(); - MojoDescriptor descriptor = asDescriptor( metadataFile, mojo ); descriptors.add( descriptor ); @@ -137,15 +134,12 @@ public class PluginMetadataParser descriptor.setExecutePhase( le.getPhase() ); } - List parameters = mojo.getParameters(); + List parameters = mojo.getParameters(); if ( parameters != null && !parameters.isEmpty() ) { - for ( Iterator it = parameters.iterator(); it.hasNext(); ) + for ( org.apache.maven.plugin.tools.model.Parameter param : parameters ) { - org.apache.maven.plugin.tools.model.Parameter param = - (org.apache.maven.plugin.tools.model.Parameter) it.next(); - Parameter dParam = new Parameter(); dParam.setAlias( param.getAlias() ); dParam.setDeprecated( param.getDeprecation() ); @@ -186,14 +180,12 @@ public class PluginMetadataParser } } - List components = mojo.getComponents(); + List components = mojo.getComponents(); if ( components != null && !components.isEmpty() ) { - for ( Iterator it = components.iterator(); it.hasNext(); ) + for ( Component component : components ) { - Component component = (Component) it.next(); - ComponentRequirement cr = new ComponentRequirement(); cr.setRole( component.getRole() ); cr.setRoleHint( component.getHint() ); diff --git a/pom.xml b/pom.xml index 608e814..e1bdda2 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,13 @@ The Maven Plugin Tools contains the necessary tools to be able to produce Maven Plugins in a variety of languages. http://maven.apache.org/plugin-tools/ 2004 + + + + Robert Scholte + +1 + + @@ -220,6 +227,20 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.5 + 1.5 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.8.1 + maven-site-plugin 2.2