You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/05/20 14:26:44 UTC
svn commit: r1340693 -
/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
Author: hboutemy
Date: Sun May 20 12:26:44 2012
New Revision: 1340693
URL: http://svn.apache.org/viewvc?rev=1340693&view=rev
Log:
extracted scanAnnotations() and scanJavadoc() methods for better understanding
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java?rev=1340693&r1=1340692&r2=1340693&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java Sun May 20 12:26:44 2012
@@ -100,19 +100,34 @@ public class JavaAnnotationsMojoDescript
public List<MojoDescriptor> execute( PluginToolsRequest request )
throws ExtractionException, InvalidPluginDescriptorException
{
+ Map<String, MojoAnnotatedClass> mojoAnnotatedClasses = scanAnnotations( request );
+ Map<String, JavaClass> javaClassesMap = scanJavadoc( request, mojoAnnotatedClasses.values() );
+
+ populateDataFromJavadoc( mojoAnnotatedClasses, javaClassesMap );
+
+ return toMojoDescriptors( mojoAnnotatedClasses, request, javaClassesMap );
+ }
+
+ private Map<String, MojoAnnotatedClass> scanAnnotations( PluginToolsRequest request )
+ throws ExtractionException
+ {
MojoAnnotationsScannerRequest mojoAnnotationsScannerRequest = new MojoAnnotationsScannerRequest();
- mojoAnnotationsScannerRequest.setClassesDirectories(
- Arrays.asList( new File( request.getProject().getBuild().getOutputDirectory() ) ) );
+ File output = new File( request.getProject().getBuild().getOutputDirectory() );
+ mojoAnnotationsScannerRequest.setClassesDirectories( Arrays.asList( output ) );
mojoAnnotationsScannerRequest.setDependencies( request.getDependencies() );
mojoAnnotationsScannerRequest.setProject( request.getProject() );
- Map<String, MojoAnnotatedClass> mojoAnnotatedClasses =
- mojoAnnotationsScanner.scan( mojoAnnotationsScannerRequest );
+ return mojoAnnotationsScanner.scan( mojoAnnotationsScannerRequest );
+ }
+ private Map<String, JavaClass> scanJavadoc( PluginToolsRequest request,
+ Collection<MojoAnnotatedClass> mojoAnnotatedClasses )
+ throws ExtractionException
+ {
// found artifact from reactors to scan sources
// we currently only scan sources from reactors
List<MavenProject> mavenProjects = new ArrayList<MavenProject>();
@@ -120,7 +135,7 @@ public class JavaAnnotationsMojoDescript
// if we need to scan sources from external artifacts
Set<Artifact> externalArtifacts = new HashSet<Artifact>();
- for ( MojoAnnotatedClass mojoAnnotatedClass : mojoAnnotatedClasses.values() )
+ for ( MojoAnnotatedClass mojoAnnotatedClass : mojoAnnotatedClasses )
{
if ( !StringUtils.equals( mojoAnnotatedClass.getArtifact().getArtifactId(),
request.getProject().getArtifact().getArtifactId() ) )
@@ -163,13 +178,9 @@ public class JavaAnnotationsMojoDescript
javaClassesMap.putAll( discoverClasses( request ) );
- populateDataFromJavadoc( mojoAnnotatedClasses, javaClassesMap );
-
- return toMojoDescriptors( mojoAnnotatedClasses, request, javaClassesMap );
-
+ return javaClassesMap;
}
-
protected Map<String, JavaClass> discoverClassesFromSourcesJar( Artifact artifact, PluginToolsRequest request,
String classifier )
throws ExtractionException